diff options
| author | kipcode66 <kipcode66@gmail.com> | 2025-12-07 00:08:05 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-12-06 21:08:05 -0800 |
| commit | fc31053cb6cbae738923c93f4ab574b06334d73d (patch) | |
| tree | f47a4ddc2b88d00a87617a56e8489b2f60028bb8 /src/JSystem/J3DGraphAnimator | |
| parent | 7ac2c38caf44f8b20088a4f0376371ce15c78844 (diff) | |
Improving compatibility with standard cpp compiler (#2920)
* Improving compatibility with standard cpp compiler
* Add __REGISTER macro for non mwcc compatibility
* Fix for PR comments
* fix missing define for revolution
* Simplifying cSAngle conversion
Diffstat (limited to 'src/JSystem/J3DGraphAnimator')
| -rw-r--r-- | src/JSystem/J3DGraphAnimator/J3DAnimation.cpp | 8 | ||||
| -rw-r--r-- | src/JSystem/J3DGraphAnimator/J3DMtxBuffer.cpp | 52 |
2 files changed, 30 insertions, 30 deletions
diff --git a/src/JSystem/J3DGraphAnimator/J3DAnimation.cpp b/src/JSystem/J3DGraphAnimator/J3DAnimation.cpp index 870871a88a..8cfa46ff23 100644 --- a/src/JSystem/J3DGraphAnimator/J3DAnimation.cpp +++ b/src/JSystem/J3DGraphAnimator/J3DAnimation.cpp @@ -507,10 +507,10 @@ inline f32 J3DHermiteInterpolation(f32 p1, f32 const* p2, f32 const* p3, f32 con return JMAHermiteInterpolation(p1, *p2, *p3, *p4, *p5, *p6, *p7); } -inline f32 J3DHermiteInterpolation(register f32 pp1, register s16 const* pp2, - register s16 const* pp3, register s16 const* pp4, - register s16 const* pp5, register s16 const* pp6, - register s16 const* pp7) { +inline f32 J3DHermiteInterpolation(__REGISTER f32 pp1, __REGISTER s16 const* pp2, + __REGISTER s16 const* pp3, __REGISTER s16 const* pp4, + __REGISTER s16 const* pp5, __REGISTER s16 const* pp6, + __REGISTER s16 const* pp7) { #ifdef __MWERKS__ register f32 p1 = pp1; register f32 ff8; diff --git a/src/JSystem/J3DGraphAnimator/J3DMtxBuffer.cpp b/src/JSystem/J3DGraphAnimator/J3DMtxBuffer.cpp index 8aeab2520f..4acd201eb0 100644 --- a/src/JSystem/J3DGraphAnimator/J3DMtxBuffer.cpp +++ b/src/JSystem/J3DGraphAnimator/J3DMtxBuffer.cpp @@ -237,10 +237,10 @@ s32 J3DMtxBuffer::createBumpMtxArray(J3DModelData* i_modelData, u32 mtxNum) { static f32 J3DUnit01[] = { 0.0f, 1.0f }; void J3DMtxBuffer::calcWeightEnvelopeMtx() { - register MtxP weightAnmMtx; - register Mtx* worldMtx; - register Mtx* invMtx; - register f32 weight; + __REGISTER MtxP weightAnmMtx; + __REGISTER Mtx* worldMtx; + __REGISTER Mtx* invMtx; + __REGISTER f32 weight; int idx; int j; int mixNum; @@ -251,27 +251,27 @@ void J3DMtxBuffer::calcWeightEnvelopeMtx() { u8* pScale; #if DEBUG || !__MWERKS__ - register Mtx mtx; + __REGISTER Mtx mtx; #else - register f32 var_f1; - register f32 var_f2; - register f32 var_f3; - register f32 var_f4; - register f32 var_f5; - register f32 var_f6; - register f32 var_f7; - register f32 var_f8; - register f32 var_f9; - register f32 var_f10; - register f32 var_f11; - register f32 var_f12; - register f32 var_f13; - register f32 var_f31; - register f32 var_f30; - register f32 var_f29; - register f32 var_f28; - register f32 var_f27; - register f32* var_r7 = J3DUnit01; + __REGISTER f32 var_f1; + __REGISTER f32 var_f2; + __REGISTER f32 var_f3; + __REGISTER f32 var_f4; + __REGISTER f32 var_f5; + __REGISTER f32 var_f6; + __REGISTER f32 var_f7; + __REGISTER f32 var_f8; + __REGISTER f32 var_f9; + __REGISTER f32 var_f10; + __REGISTER f32 var_f11; + __REGISTER f32 var_f12; + __REGISTER f32 var_f13; + __REGISTER f32 var_f31; + __REGISTER f32 var_f30; + __REGISTER f32 var_f29; + __REGISTER f32 var_f28; + __REGISTER f32 var_f27; + __REGISTER f32* var_r7 = J3DUnit01; #endif i = -1; @@ -316,8 +316,8 @@ void J3DMtxBuffer::calcWeightEnvelopeMtx() { MTXConcat(*worldMtx, *invMtx, mtx); #else // Fakematch? Doesn't match if worldMtx and invMtx are used directly. - register void* var_r5 = worldMtx; - register void* var_r6 = invMtx; + __REGISTER void* var_r5 = worldMtx; + __REGISTER void* var_r6 = invMtx; asm { psq_l var_f2, 0x0(var_r6), 0, 0 /* qr0 */ psq_l var_f1, 0x0(var_r5), 0, 0 /* qr0 */ |