diff options
| author | Nikolay Korolev <nickvnuk@gmail.com> | 2020-03-29 17:51:18 +0200 |
|---|---|---|
| committer | Nikolay Korolev <nickvnuk@gmail.com> | 2020-03-29 17:51:18 +0200 |
| commit | 24b8c7819c52ed09dd46d1a453dbaffd86b9e699 (patch) | |
| tree | 54236602fd5bb48eea2b95ab5ccfc77d4080d3c0 /src/control/Curves.cpp | |
| parent | fix (diff) | |
| parent | Merge pull request #365 from Fire-Head/master (diff) | |
| download | re3-24b8c7819c52ed09dd46d1a453dbaffd86b9e699.tar re3-24b8c7819c52ed09dd46d1a453dbaffd86b9e699.tar.gz re3-24b8c7819c52ed09dd46d1a453dbaffd86b9e699.tar.bz2 re3-24b8c7819c52ed09dd46d1a453dbaffd86b9e699.tar.lz re3-24b8c7819c52ed09dd46d1a453dbaffd86b9e699.tar.xz re3-24b8c7819c52ed09dd46d1a453dbaffd86b9e699.tar.zst re3-24b8c7819c52ed09dd46d1a453dbaffd86b9e699.zip | |
Diffstat (limited to 'src/control/Curves.cpp')
| -rw-r--r-- | src/control/Curves.cpp | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/src/control/Curves.cpp b/src/control/Curves.cpp index c5f64bf7..5c6ef06d 100644 --- a/src/control/Curves.cpp +++ b/src/control/Curves.cpp @@ -2,9 +2,6 @@ #include "patcher.h" #include "Curves.h" -#if 0 -WRAPPER float CCurves::CalcSpeedScaleFactor(CVector*, CVector*, float, float, float, float) { EAXJMP(0x420410); } -#else float CCurves::CalcSpeedScaleFactor(CVector* pPoint1, CVector* pPoint2, float dir1X, float dir1Y, float dir2X, float dir2Y) { CVector2D dir1(dir1X, dir1Y); @@ -16,11 +13,7 @@ float CCurves::CalcSpeedScaleFactor(CVector* pPoint1, CVector* pPoint2, float di else return ((1.0f - dp) * 0.2f + 1.0f) * distance; } -#endif -#if 0 -WRAPPER void CCurves::CalcCurvePoint(CVector*, CVector*, CVector*, CVector*, float, int32, CVector*, CVector*) { EAXJMP(0x4204D0); } -#else void CCurves::CalcCurvePoint(CVector* pPos1, CVector* pPos2, CVector* pDir1, CVector* pDir2, float between, int32 timeOnCurve, CVector* pOutPos, CVector* pOutDir) { float actualFactor = CalcSpeedScaleFactor(pPos1, pPos2, pDir1->x, pDir1->y, pDir2->x, pDir2->y); @@ -35,5 +28,4 @@ void CCurves::CalcCurvePoint(CVector* pPos1, CVector* pPos2, CVector* pDir1, CVe (dir1.x * (1.0f - curveCoef) + dir2.x * curveCoef) / (timeOnCurve * 0.001f), (dir1.y * (1.0f - curveCoef) + dir2.y * curveCoef) / (timeOnCurve * 0.001f), 0.0f); -} -#endif
\ No newline at end of file +}
\ No newline at end of file |