diff options
| author | Caroline Madsen <69010899+randomsalience@users.noreply.github.com> | 2024-10-15 16:59:31 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-10-15 23:59:31 +0300 |
| commit | 9f58034704ae6fea53ba8b3e6dc10d3135d0da7c (patch) | |
| tree | 1f62a71331fdc053b26e208a2727ec10d37cb22d /include/JSystem/J2DGraph | |
| parent | 9895999b7b465a487c59153788be86498abb9159 (diff) | |
J3D work (#2212)
Diffstat (limited to 'include/JSystem/J2DGraph')
| -rw-r--r-- | include/JSystem/J2DGraph/J2DAnimation.h | 32 |
1 files changed, 1 insertions, 31 deletions
diff --git a/include/JSystem/J2DGraph/J2DAnimation.h b/include/JSystem/J2DGraph/J2DAnimation.h index 8f37c4c7af..a4bd2fb07d 100644 --- a/include/JSystem/J2DGraph/J2DAnimation.h +++ b/include/JSystem/J2DGraph/J2DAnimation.h @@ -1,6 +1,7 @@ #ifndef J2DANIMATION_H #define J2DANIMATION_H +#include "JSystem/JMath/JMath.h" #include "JSystem/J3DGraphAnimator/J3DAnimation.h" typedef struct _GXColor GXColor; @@ -468,37 +469,6 @@ public: template <typename T> inline f32 J2DHermiteInterpolation(f32, T*, T*, T*, T*, T*, T*); -inline f32 JMAHermiteInterpolation(register f32 p1, register f32 p2, register f32 p3, - register f32 p4, register f32 p5, register f32 p6, - register f32 p7) { - register f32 ff25; - register f32 ff31; - register f32 ff30; - register f32 ff29; - register f32 ff28; - register f32 ff27; - register f32 ff26; - // clang-format off - asm { - fsubs ff31, p1, p2 - fsubs ff30, p5, p2 - fdivs ff29, ff31, ff30 - fmuls ff28,ff29,ff29 - fadds ff25,ff29,ff29 - fsubs ff27,ff28,ff29 - fsubs ff30, p3, p6 - fmsubs ff26,ff25,ff27,ff28 - fmadds ff25,p4,ff27,p4 - fmadds ff26,ff26,ff30,p3 - fmadds ff25,p7,ff27,ff25 - fmsubs ff25,ff29,p4,ff25 - fnmsubs ff25,ff31,ff25,ff26 - - } - // clang-format on - return ff25; -} - template <> inline f32 J2DHermiteInterpolation<f32>(f32 f1, f32* f2, f32* f3, f32* f4, f32* f5, f32* f6, f32* f7) { |