diff options
author | aap <aap@papnet.eu> | 2020-05-09 21:18:00 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-05-09 21:18:00 +0200 |
commit | e4683a30741f9528aa0f62fc259660b66c53bbec (patch) | |
tree | 38b775b96a2f1bc3ef0020275bf6c18a5a0c310b /src/control/Curves.cpp | |
parent | back to ped.ifp (diff) | |
parent | new curves + boat fix (diff) | |
download | re3-e4683a30741f9528aa0f62fc259660b66c53bbec.tar re3-e4683a30741f9528aa0f62fc259660b66c53bbec.tar.gz re3-e4683a30741f9528aa0f62fc259660b66c53bbec.tar.bz2 re3-e4683a30741f9528aa0f62fc259660b66c53bbec.tar.lz re3-e4683a30741f9528aa0f62fc259660b66c53bbec.tar.xz re3-e4683a30741f9528aa0f62fc259660b66c53bbec.tar.zst re3-e4683a30741f9528aa0f62fc259660b66c53bbec.zip |
Diffstat (limited to 'src/control/Curves.cpp')
-rw-r--r-- | src/control/Curves.cpp | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/src/control/Curves.cpp b/src/control/Curves.cpp index 623ab040..31a2767a 100644 --- a/src/control/Curves.cpp +++ b/src/control/Curves.cpp @@ -11,7 +11,7 @@ float CCurves::CalcSpeedScaleFactor(CVector* pPoint1, CVector* pPoint2, float di if (dp > 0.9f) return distance + Abs((pPoint1->x * dir1Y - pPoint1->y * dir1X) - (pPoint2->x * dir1Y - pPoint2->y * dir1X)); else - return ((1.0f - dp) * 0.2f + 1.0f) * distance; + return ((1.0f - dp) * 0.25f + 1.0f) * distance; } void CCurves::CalcCurvePoint(CVector* pPos1, CVector* pPos2, CVector* pDir1, CVector* pDir2, float between, int32 timeOnCurve, CVector* pOutPos, CVector* pOutDir) @@ -19,7 +19,21 @@ void CCurves::CalcCurvePoint(CVector* pPos1, CVector* pPos2, CVector* pDir1, CVe float actualFactor = CalcSpeedScaleFactor(pPos1, pPos2, pDir1->x, pDir1->y, pDir2->x, pDir2->y); CVector2D dir1 = *pDir1 * actualFactor; CVector2D dir2 = *pDir2 * actualFactor; - float curveCoef = 0.5f - 0.5f * cos(3.1415f * between); + float t1 = Abs(DotProduct2D(*pPos1 - *pPos2, *pDir1)); + float t2 = Abs(DotProduct2D(*pPos2 - *pPos1, *pDir2)); + float curveCoef; + if (t1 > t2) { + if (between < (t1 - t2) / (t1 + t2)) + curveCoef = 0.0f; + else + curveCoef = 0.5f - 0.5f * Cos(3.1415f * (t1 + t2) / (2 * t2) * (between - (t1 - t2) / (t1 + t2))); + } + else { + if (2 * t1 / (t1 + t2) < between) + curveCoef = 1.0f; + else + curveCoef = 0.5f - 0.5f * Cos(3.1415f * between * (t1 + t2) / (2 * t1)); + } *pOutPos = CVector( (pPos1->x + between * dir1.x) * (1.0f - curveCoef) + (pPos2->x - (1 - between) * dir2.x) * curveCoef, (pPos1->y + between * dir1.y) * (1.0f - curveCoef) + (pPos2->y - (1 - between) * dir2.y) * curveCoef, |