diff options
| author | TakaRikka <38417346+TakaRikka@users.noreply.github.com> | 2024-04-21 05:27:47 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-21 15:27:47 +0300 |
| commit | b24b477fc4b641e58069455cdabfe80d5d0995b4 (patch) | |
| tree | 9fa859e8d7bd9be5129191d349cad1da2f61f1a5 /libs | |
| parent | 151c5099abdddb91c8c4cf3565c0c5075a0e0146 (diff) | |
d_a_tag_firewall done (#2137)
* mostly fix TVec3 ctors
* d_a_tag_firewall done
* remove asm
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/JSystem/J2DGraph/J2DPane.cpp | 4 | ||||
| -rw-r--r-- | libs/JSystem/J3DGraphLoader/J3DJointFactory.cpp | 15 | ||||
| -rw-r--r-- | libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cmath.h | 6 | ||||
| -rw-r--r-- | libs/Z2AudioLib/Z2SeMgr.cpp | 2 | ||||
| -rw-r--r-- | libs/Z2AudioLib/Z2WolfHowlMgr.cpp | 4 |
5 files changed, 21 insertions, 10 deletions
diff --git a/libs/JSystem/J2DGraph/J2DPane.cpp b/libs/JSystem/J2DGraph/J2DPane.cpp index 33c6f907a7..0d8f67c3c4 100644 --- a/libs/JSystem/J2DGraph/J2DPane.cpp +++ b/libs/JSystem/J2DGraph/J2DPane.cpp @@ -610,8 +610,8 @@ void J2DPane::setInfluencedAlpha(bool influencedAlpha, bool param_1) { } /* 802F79A8-802F7A8C 2F22E8 00E4+00 0/0 3/3 0/0 .text getGlbVtx__7J2DPaneCFUc */ -JGeometry::TVec3<f32> J2DPane::getGlbVtx(u8 param_0) const { - JGeometry::TVec3<f32> out; +Vec J2DPane::getGlbVtx(u8 param_0) const { + Vec out; if (param_0 >= 4) { out.x = 0; out.y = 0; diff --git a/libs/JSystem/J3DGraphLoader/J3DJointFactory.cpp b/libs/JSystem/J3DGraphLoader/J3DJointFactory.cpp index 4044cdf604..2a70e00f52 100644 --- a/libs/JSystem/J3DGraphLoader/J3DJointFactory.cpp +++ b/libs/JSystem/J3DGraphLoader/J3DJointFactory.cpp @@ -13,6 +13,8 @@ // extern "C" u16* func_8033677C(const void*, const void*); // JSUConvertOffsetToPtr<u16> +extern "C" void* __nw__FUl(); +extern "C" void __ct__8J3DJointFv(); /* 80337178-803371D0 331AB8 0058+00 0/0 1/1 0/0 .text __ct__15J3DJointFactoryFRC13J3DJointBlock */ J3DJointFactory::J3DJointFactory(J3DJointBlock const& block) { @@ -24,7 +26,16 @@ J3DJointFactory::J3DJointFactory(J3DJointBlock const& block) { } /* 803371D0-80337338 331B10 0168+00 0/0 1/1 0/0 .text create__15J3DJointFactoryFi */ -J3DJoint* J3DJointFactory::create(int no) { +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm J3DJoint* J3DJointFactory::create(int param_0) { + nofralloc +#include "asm/JSystem/J3DGraphLoader/J3DJointFactory/create__15J3DJointFactoryFi.s" +} +#pragma pop + +/* J3DJoint* J3DJointFactory::create(int no) { J3DJoint* joint = new J3DJoint(); joint->mJntNo = no; joint->mKind = getKind(no); @@ -39,4 +50,4 @@ J3DJoint* J3DJointFactory::create(int no) { joint->mScaleCompensate = 0; return joint; -}
\ No newline at end of file +} */
\ No newline at end of file diff --git a/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cmath.h b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cmath.h index aff37fb6d1..bcfd4e4e94 100644 --- a/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cmath.h +++ b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cmath.h @@ -15,9 +15,9 @@ inline float sqrt(float x) { return ::sqrtf(x); } -/* float abs(float num) { - return ::fabsf(num); -} */ +inline float abs(float x) { + return ::fabsf(x); +} } // namespace std #endif diff --git a/libs/Z2AudioLib/Z2SeMgr.cpp b/libs/Z2AudioLib/Z2SeMgr.cpp index ed3ac0c1fa..b28f773d02 100644 --- a/libs/Z2AudioLib/Z2SeMgr.cpp +++ b/libs/Z2AudioLib/Z2SeMgr.cpp @@ -199,7 +199,7 @@ void Z2SeMgr::modHeightAtCamera(Vec const** param_0) { } } field_0x340[idx] = **param_0; - JGeometry::TVec3<f32> cam_pos = Z2GetAudience()->getAudioCamPos(); + Vec cam_pos = Z2GetAudience()->getAudioCamPos(); if (field_0x340[idx].y > cam_pos.y) { field_0x340[idx].y = cam_pos.y; } diff --git a/libs/Z2AudioLib/Z2WolfHowlMgr.cpp b/libs/Z2AudioLib/Z2WolfHowlMgr.cpp index 4a66db16d4..a841d5c6d4 100644 --- a/libs/Z2AudioLib/Z2WolfHowlMgr.cpp +++ b/libs/Z2AudioLib/Z2WolfHowlMgr.cpp @@ -467,8 +467,8 @@ void Z2WolfHowlMgr::startWindStoneSound(s8 param_0, Vec* param_1) { if (param_1 == NULL || Z2GetLink() == NULL || Z2GetLink()->getCurrentPos() == NULL) { return; } - JGeometry::TVec3<f32> local_60 = Z2GetAudience()->getAudioCamPos(); - f32 dVar13 = sqrtf(VECSquareDistance(param_1, local_60)); + Vec local_60 = Z2GetAudience()->getAudioCamPos(); + f32 dVar13 = sqrtf(VECSquareDistance(param_1, &local_60)); if (dVar13 > 2100.0f && field_0x04) { field_0x04->stop(); } else if (dVar13 < 2100.0f && !field_0x04) { |
