From 6b88fbfb8e98827e1cc83f0f18fa5a39c3d09bb4 Mon Sep 17 00:00:00 2001 From: CovenEsme <84377742+CovenEsme@users.noreply.github.com> Date: Fri, 14 Mar 2025 13:31:49 +0000 Subject: [PATCH] Revert "Add float f suffix" This reverts commit d3d336f7a3d669f43599988e594877f603d1ad10. --- .../Math/Double_precision/s_sin.c | 23 ++++++++++--------- .../Math/Double_precision/s_tan.c | 11 ++++----- src/REL/d/a/obj/d_a_obj_fence_boko.cpp | 2 +- src/REL/d/a/obj/d_a_obj_fence_boko2.cpp | 2 +- src/REL/d/a/obj/d_a_obj_iron_stage.cpp | 2 +- src/REL/d/a/obj/d_a_obj_pumpkin_bar.cpp | 4 ++-- src/REL/d/a/obj/d_a_obj_shrine_after.cpp | 2 +- src/REL/d/a/obj/d_a_obj_shrine_before.cpp | 2 +- src/egg/core/eggController.cpp | 13 ++++++----- 9 files changed, 30 insertions(+), 31 deletions(-) diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_sin.c b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_sin.c index 4d8bae38..ad62cff9 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_sin.c +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_sin.c @@ -46,8 +46,7 @@ #ifdef __STDC__ double sin(double x) #else -double sin(x) -double x; +double sin(x) double x; #endif { double y[2], z = 0.0; @@ -58,23 +57,25 @@ double x; /* |x| ~< pi/4 */ ix &= 0x7fffffff; - if (ix <= 0x3fe921fb) { + if (ix <= 0x3fe921fb) return __kernel_sin(x, z, 0); - } /* sin(Inf or NaN) is NaN */ - else if (ix >= 0x7ff00000) { + else if (ix >= 0x7ff00000) return x - x; - } /* argument reduction needed */ else { n = __ieee754_rem_pio2(x, y); switch (n & 3) { - case 0: return __kernel_sin(y[0], y[1], 1); - case 1: return __kernel_cos(y[0], y[1]); - case 2: return -__kernel_sin(y[0], y[1], 1); - default: return -__kernel_cos(y[0], y[1]); + case 0: + return __kernel_sin(y[0], y[1], 1); + case 1: + return __kernel_cos(y[0], y[1]); + case 2: + return -__kernel_sin(y[0], y[1], 1); + default: + return -__kernel_cos(y[0], y[1]); } } -} +} \ No newline at end of file diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_tan.c b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_tan.c index 8a4b6275..88296b42 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_tan.c +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_tan.c @@ -45,8 +45,7 @@ #ifdef __STDC__ double tan(double x) #else -double tan(x) -double x; +double tan(x) double x; #endif { double y[2], z = 0.0; @@ -57,14 +56,12 @@ double x; /* |x| ~< pi/4 */ ix &= 0x7fffffff; - if (ix <= 0x3fe921fb) { + if (ix <= 0x3fe921fb) return __kernel_tan(x, z, 1); - } /* tan(Inf or NaN) is NaN */ - else if (ix >= 0x7ff00000) { + else if (ix >= 0x7ff00000) return x - x; /* NaN */ - } /* argument reduction needed */ else { @@ -72,4 +69,4 @@ double x; return __kernel_tan(y[0], y[1], 1 - ((n & 1) << 1)); /* 1 -- n even -1 -- n odd */ } -} +} \ No newline at end of file diff --git a/src/REL/d/a/obj/d_a_obj_fence_boko.cpp b/src/REL/d/a/obj/d_a_obj_fence_boko.cpp index 2ac61e55..854552be 100644 --- a/src/REL/d/a/obj/d_a_obj_fence_boko.cpp +++ b/src/REL/d/a/obj/d_a_obj_fence_boko.cpp @@ -27,7 +27,7 @@ int dAcOfenceBoko_c::create() { roomid = mCollision.mRoomId; mModel.setPriorityDraw(0x1C, 0x9); boundingBox.Set(mVec3_c(-210.0f, -10.0f, -20.0f), mVec3_c(210.0f, 340.0f, 20.0f)); - mCullingDistance = 50000.0f; + mCullingDistance = 50000.0; return SUCCEEDED; } diff --git a/src/REL/d/a/obj/d_a_obj_fence_boko2.cpp b/src/REL/d/a/obj/d_a_obj_fence_boko2.cpp index f55c87b1..8792f07a 100644 --- a/src/REL/d/a/obj/d_a_obj_fence_boko2.cpp +++ b/src/REL/d/a/obj/d_a_obj_fence_boko2.cpp @@ -23,7 +23,7 @@ int dAcOfenceBoko2_c::create() { dBgS::GetInstance()->RegistBg(&mCollision, this); mModel.setPriorityDraw(0x1C, 0x9); boundingBox.Set(mVec3_c(-160.0f, -40.0f, -70.0f), mVec3_c(180.0f, 300.0f, 60.0f)); - mCullingDistance = 50000.0f; + mCullingDistance = 50000.0; return SUCCEEDED; } diff --git a/src/REL/d/a/obj/d_a_obj_iron_stage.cpp b/src/REL/d/a/obj/d_a_obj_iron_stage.cpp index e4f2b57e..9ee35a1f 100644 --- a/src/REL/d/a/obj/d_a_obj_iron_stage.cpp +++ b/src/REL/d/a/obj/d_a_obj_iron_stage.cpp @@ -23,7 +23,7 @@ int dAcOironStage_c::create() { dBgS::GetInstance()->Regist(&mCollision, this); mModel.setPriorityDraw(0x1C, 0x9); boundingBox.Set(mVec3_c(-460.0f, -210.0f, -260.0f), mVec3_c(460.0f, 210.0f, 260.0f)); - mCullingDistance = 15000.0f; + mCullingDistance = 15000.0; return SUCCEEDED; } diff --git a/src/REL/d/a/obj/d_a_obj_pumpkin_bar.cpp b/src/REL/d/a/obj/d_a_obj_pumpkin_bar.cpp index 42d95a42..90f046c8 100644 --- a/src/REL/d/a/obj/d_a_obj_pumpkin_bar.cpp +++ b/src/REL/d/a/obj/d_a_obj_pumpkin_bar.cpp @@ -44,9 +44,9 @@ int dAcOpumpkinBar_c::create() { // 100000.0 is in the rodata and the instructions need it. // This also works if a separate variable is used but I // think it's more likely that mCullingDistance got set twice. - mCullingDistance = 100000.0f; + mCullingDistance = 100000.0; boundingBox.Set(mVec3_c(-2790.0f, -1450.0f, -8270.0f), mVec3_c(2880.0f, 2120.0f, 1370.0f)); - mCullingDistance = 500000.0f; + mCullingDistance = 500000.0; mBarCollision.SetRideCallback(barCollisionRideCallback); return SUCCEEDED; } diff --git a/src/REL/d/a/obj/d_a_obj_shrine_after.cpp b/src/REL/d/a/obj/d_a_obj_shrine_after.cpp index 782c3883..4796600c 100644 --- a/src/REL/d/a/obj/d_a_obj_shrine_after.cpp +++ b/src/REL/d/a/obj/d_a_obj_shrine_after.cpp @@ -15,7 +15,7 @@ int dAcOshrineAfter_c::create() { mModel.setLocalMtx(mWorldMtx); mModel.setPriorityDraw(0x1C, 0x9); boundingBox.Set(mVec3_c(-4000.0f, 7000.0f, 5000.0f), mVec3_c(5000.0f, 15000.0f, 14000.0f)); - mCullingDistance = 50000.0f; + mCullingDistance = 50000.0; return SUCCEEDED; } diff --git a/src/REL/d/a/obj/d_a_obj_shrine_before.cpp b/src/REL/d/a/obj/d_a_obj_shrine_before.cpp index 441a93fd..9bca3319 100644 --- a/src/REL/d/a/obj/d_a_obj_shrine_before.cpp +++ b/src/REL/d/a/obj/d_a_obj_shrine_before.cpp @@ -15,7 +15,7 @@ int dAcOshrineBefore_c::create() { mModel.setLocalMtx(mWorldMtx); mModel.setPriorityDraw(0x1C, 0x9); boundingBox.Set(mVec3_c(-4000.0f, 7000.0f, 5000.0f), mVec3_c(4000.0f, 13000.0f, 14000.0f)); - mCullingDistance = 50000.0f; + mCullingDistance = 50000.0; return SUCCEEDED; } diff --git a/src/egg/core/eggController.cpp b/src/egg/core/eggController.cpp index bcc0c551..b73a02a4 100644 --- a/src/egg/core/eggController.cpp +++ b/src/egg/core/eggController.cpp @@ -8,6 +8,7 @@ #include "rvl/VI.h" // IWYU pragma: export #include "string.h" + EGG::NullController null_controller; namespace EGG { @@ -62,8 +63,8 @@ CoreController::CoreController() : mDpdPos(), mAccel(), mAccelFlags(), mFlag(0) void CoreController::sceneReset() { mAccel.set(0.0, 0.0, 0.0); - mDpdPos.x = 0.0f; - mDpdPos.y = 0.0f; + mDpdPos.x = 0.0; + mDpdPos.y = 0.0; mIdleTime = 0; mPostureMatrixPrev.makeIdentity(); mPostureMatrix.makeIdentity(); @@ -285,7 +286,7 @@ void CoreController::endFrame() { /* 0x80499AC0 */ f32 CoreController::getFreeStickX() const { if (mCoreStatus->getDevType() == WPAD_DEV_CORE) { - return 0.0f; + return 0.0; } return mCoreStatus[0].getFSStickX(); } @@ -293,7 +294,7 @@ f32 CoreController::getFreeStickX() const { /* 0x80499AE0 */ f32 CoreController::getFreeStickY() const { if (mCoreStatus->getDevType() == WPAD_DEV_CORE) { - return 0.0f; + return 0.0; } return mCoreStatus[0].getFSStickY(); } @@ -428,8 +429,8 @@ void ControllerRumbleUnit::init() { mPattern = nullptr; mPatternPos = nullptr; mTimer = 0; - mIntensity = 0.0f; - mRampUp = 0.0f; + mIntensity = 0.0; + mRampUp = 0.0; mFlag.makeAllZero(); }