d_spline_path ok (#2176)

1 files changed, 104 insertions, 71 deletions

diff --git a/src/d/d_spline_path.cpp b/src/d/d_spline_path.cpp
index 919bb73501..a9b4b73330 100644
--- a/src/d/d_spline_path.cpp
+++ b/src/d/d_spline_path.cpp
@@ -4,31 +4,10 @@
  */
 
 #include "d/d_spline_path.h"
-#include "dol2asm.h"
-
-//
-// Forward References:
-//
-
-extern "C" void Init__14d2DBSplinePathFll();
-extern "C" void Step__14d2DBSplinePathFv();
-extern "C" void Calc__14d2DBSplinePathFP4cXyz();
-extern "C" void Calc__14d2DBSplinePathFPf();
-extern "C" void Spot__14d2DBSplinePathFPff();
-extern "C" void Init__10dPathCurveFP5dPath();
-extern "C" void bSpline2__10dPathCurveFf();
-
-//
-// Declarations:
-//
-
-/* ############################################################################################## */
-/* 80452BC8-80452BD0 0011C8 0008+00 4/4 0/0 0/0 .sdata2          @3632 */
-SECTION_SDATA2 static f64 lit_3632 = 4503601774854144.0 /* cast s32 to float */;
+#include "d/d_path.h"
+#include "d/d_stage.h"
 
 /* 80097878-80097904 0921B8 008C+00 0/0 7/7 0/0 .text            Init__14d2DBSplinePathFll */
-#ifdef NONMATCHING
-// matches with literals
 void d2DBSplinePath::Init(s32 param_0, s32 param_1) {
     s32 tmp;
     s32 tmp2;
@@ -44,60 +23,74 @@ void d2DBSplinePath::Init(s32 param_0, s32 param_1) {
 
     field_0x2c = 0;
 }
-#else
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-asm void d2DBSplinePath::Init(s32 param_0, s32 param_1) {
-    nofralloc
-#include "asm/d/d_spline_path/Init__14d2DBSplinePathFll.s"
-}
-#pragma pop
-#endif
-
-/* ############################################################################################## */
-/* 80452BD0-80452BD4 0011D0 0004+00 3/3 0/0 0/0 .sdata2          @3684 */
-SECTION_SDATA2 static f32 lit_3684 = 1.0f;
-
-/* 80452BD4-80452BD8 0011D4 0004+00 3/3 0/0 0/0 .sdata2          @3685 */
-SECTION_SDATA2 static f32 lit_3685 = 0.5f;
 
 /* 80097904-80097A6C 092244 0168+00 0/0 5/5 0/0 .text            Step__14d2DBSplinePathFv */
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-asm void d2DBSplinePath::Step() {
-    nofralloc
-#include "asm/d/d_spline_path/Step__14d2DBSplinePathFv.s"
+bool d2DBSplinePath::Step() {
+    if (field_0x00 >= field_0x0c) {
+        field_0x08 = 0;
+    }
+    if (field_0x08 == 1) {
+        field_0x08 = 2;
+    }
+    if (field_0x08 == 2) {
+        if (field_0x00 <= field_0x0c - 1) {
+            f32 fVar2 = field_0x10 * field_0x00;
+            int uVar1 = fVar2;
+            fVar2 -= uVar1;
+            if (field_0x00 == field_0x0c - 1) {
+                field_0x08 = 3;
+                fVar2 = 1.0f;
+            }
+            mCurveKey[0] = (uVar1 < field_0x04 - 1) ? uVar1 : field_0x04 - 1;
+            mCurveKey[1] = (uVar1 + 1 < field_0x04 - 1) ? uVar1 + 1 : field_0x04 - 1;
+            mCurveKey[2] = (uVar1 + 2 < field_0x04 - 1) ? uVar1 + 2 : field_0x04 - 1;
+            f32 fVar7 = 1.0f - fVar2;
+            mCurveWeight[0] = fVar7 * fVar7 * 0.5f;
+            mCurveWeight[1] = (fVar2 * (1.0f - fVar2)) + 0.5f;
+            mCurveWeight[2] = fVar2 * fVar2 * 0.5f;
+            field_0x00++;
+        } else {
+            field_0x08 = 0;
+        }
+    }
+    return field_0x08 == 2 || field_0x08 == 3;
 }
-#pragma pop
 
 /* 80097A6C-80097B20 0923AC 00B4+00 0/0 1/1 0/0 .text            Calc__14d2DBSplinePathFP4cXyz */
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-asm void d2DBSplinePath::Calc(cXyz* param_0) {
-    nofralloc
-#include "asm/d/d_spline_path/Calc__14d2DBSplinePathFP4cXyz.s"
+cXyz d2DBSplinePath::Calc(cXyz* v) {
+    cXyz ret;
+    ret.x = mCurveWeight[0] * v[mCurveKey[0]].x + mCurveWeight[1] * v[mCurveKey[1]].x + mCurveWeight[2] * v[mCurveKey[2]].x;
+    ret.y = mCurveWeight[0] * v[mCurveKey[0]].y + mCurveWeight[1] * v[mCurveKey[1]].y + mCurveWeight[2] * v[mCurveKey[2]].y;
+    ret.z = mCurveWeight[0] * v[mCurveKey[0]].z + mCurveWeight[1] * v[mCurveKey[1]].z + mCurveWeight[2] * v[mCurveKey[2]].z;
+    return ret;
 }
-#pragma pop
 
 /* 80097B20-80097B68 092460 0048+00 0/0 5/5 0/0 .text            Calc__14d2DBSplinePathFPf */
 f32 d2DBSplinePath::Calc(f32* param_0) {
-    return field_0x14 * param_0[field_0x20] +
-           field_0x18 * param_0[field_0x24] +
-           field_0x1c * param_0[field_0x28];
+    return mCurveWeight[0] * param_0[mCurveKey[0]] +
+           mCurveWeight[1] * param_0[mCurveKey[1]] +
+           mCurveWeight[2] * param_0[mCurveKey[2]];
 }
 
 /* 80097B68-80097C5C 0924A8 00F4+00 0/0 1/1 0/0 .text            Spot__14d2DBSplinePathFPff */
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-asm void d2DBSplinePath::Spot(f32* param_0, f32 param_1) {
-    nofralloc
-#include "asm/d/d_spline_path/Spot__14d2DBSplinePathFPff.s"
+f32 d2DBSplinePath::Spot(f32* param_1, f32 param_2) {
+    int uVar10;
+    if (field_0x04 < 2) {
+        uVar10 = 1;
+    } else {
+        uVar10 = field_0x04 - 2;
+    }
+    f32 fVar5 = param_2 * uVar10;
+    int uVar11 = fVar5;
+    fVar5 = fVar5 - uVar11;
+
+    int iVar9 = (uVar11 < field_0x04 - 1) ? uVar11 : field_0x04 - 1;
+    int iVar8 = (uVar11 + 1 < field_0x04 - 1) ? uVar11 + 1 : field_0x04 - 1;
+    int iVar7 = (uVar11 + 2 < field_0x04 - 1) ? uVar11 + 2 : field_0x04 - 1;
+    f32 fVar6 = 1.0f - fVar5;
+    return fVar6 * fVar6 * 0.5f * param_1[iVar9] + (fVar5 * fVar6 + 0.5f) * param_1[iVar8] +
+           fVar5 * fVar5 * 0.5f * param_1[iVar7];
 }
-#pragma pop
 
 /* 80097C5C-80097C74 09259C 0018+00 0/0 0/0 1/1 .text            Init__10dPathCurveFP5dPath */
 void dPathCurve::Init(dPath* i_path) {
@@ -107,11 +100,51 @@ void dPathCurve::Init(dPath* i_path) {
 }
 
 /* 80097C74-80097E8C 0925B4 0218+00 0/0 0/0 1/1 .text            bSpline2__10dPathCurveFf */
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-asm void dPathCurve::bSpline2(f32 param_0) {
-    nofralloc
-#include "asm/d/d_spline_path/bSpline2__10dPathCurveFf.s"
+cXyz dPathCurve::bSpline2(f32 param_0) {
+    cXyz local_7c;
+    int uVar12 = mpPath->m_num;
+    if (uVar12 <= 1) {
+        return mpPath->m_points[0].m_position;
+    } else if (uVar12 == 2) {
+        local_7c.x = param_0 * (mpPath->m_points[1].m_position.x -
+                                               mpPath->m_points[0].m_position.x);
+        local_7c.y = param_0 * (mpPath->m_points[1].m_position.y -
+                                               mpPath->m_points[0].m_position.y);
+        local_7c.z = param_0 * (mpPath->m_points[1].m_position.z -
+                                               mpPath->m_points[0].m_position.z);
+        local_7c += mpPath->m_points[0].m_position;
+        return local_7c;
+    } else {
+        f32 fVar2 = uVar12 * param_0;
+        int uVar4 = fVar2;
+        fVar2 -= uVar4;
+        f32 fVar8 = 1.0f - fVar2;
+        f32 fVar7 = fVar8 * fVar8 * 0.5f;
+        f32 fVar6 = fVar2 * fVar8 + 0.5f;
+        f32 fVar5 = fVar2 * fVar2 * 0.5f;
+
+        int iVar10;
+        int uVar9;
+        int iVar8;
+        if (uVar4 <= 0) {
+            iVar10 = 0;
+            uVar9 = 0;
+            iVar8 = 1;
+        } else if (uVar4 >= uVar12) {
+            iVar10 = uVar12 - 2;
+            uVar9 = uVar12 - 1;
+            iVar8 = uVar12 - 1;
+        } else {
+            iVar10 = uVar4 - 1;
+            uVar9 = uVar4;
+            iVar8 = uVar4 + 1;
+        }
+        Vec* point11 = &mpPath->m_points[iVar10].m_position;
+        Vec* point10 = &mpPath->m_points[uVar9].m_position;
+        Vec* point8 = &mpPath->m_points[iVar8].m_position;
+        local_7c.x = point11->x * fVar7 + point10->x * fVar6 + point8->x * fVar5;
+        local_7c.y = point11->y * fVar7 + point10->y * fVar6 + point8->y * fVar5;
+        local_7c.z = point11->z * fVar7 + point10->z * fVar6 + point8->z * fVar5;
+        return local_7c;
+    }
 }
-#pragma pop