summaryrefslogtreecommitdiffstats
path: root/src/control/Curves.cpp
diff options
context:
space:
mode:
authorNikolay Korolev <nickvnuk@gmail.com>2019-09-15 12:29:38 +0200
committerNikolay Korolev <nickvnuk@gmail.com>2019-09-15 12:29:38 +0200
commit7234e6e698e1e0316efcc367f6154b20abaaafe4 (patch)
tree39908ef29e1b0f4944765f4ac96db256e3083fe6 /src/control/Curves.cpp
parentMerge pull request #208 from Nick007J/master (diff)
downloadre3-7234e6e698e1e0316efcc367f6154b20abaaafe4.tar
re3-7234e6e698e1e0316efcc367f6154b20abaaafe4.tar.gz
re3-7234e6e698e1e0316efcc367f6154b20abaaafe4.tar.bz2
re3-7234e6e698e1e0316efcc367f6154b20abaaafe4.tar.lz
re3-7234e6e698e1e0316efcc367f6154b20abaaafe4.tar.xz
re3-7234e6e698e1e0316efcc367f6154b20abaaafe4.tar.zst
re3-7234e6e698e1e0316efcc367f6154b20abaaafe4.zip
Diffstat (limited to 'src/control/Curves.cpp')
-rw-r--r--src/control/Curves.cpp33
1 files changed, 33 insertions, 0 deletions
diff --git a/src/control/Curves.cpp b/src/control/Curves.cpp
index 84d4af5a..c5f64bf7 100644
--- a/src/control/Curves.cpp
+++ b/src/control/Curves.cpp
@@ -2,5 +2,38 @@
#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);
+ CVector2D dir2(dir2X, dir2Y);
+ float distance = (*pPoint1 - *pPoint2).Magnitude2D();
+ float dp = DotProduct2D(dir1, dir2);
+ 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;
+}
+#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);
+ CVector2D dir1 = *pDir1 * actualFactor;
+ CVector2D dir2 = *pDir2 * actualFactor;
+ float curveCoef = 0.5f - 0.5f * cos(3.1415f * between);
+ *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,
+ 0.0f);
+ *pOutDir = CVector(
+ (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