From 71efd5a8b65f3a7a96b151fcaed36c1c7771d9b3 Mon Sep 17 00:00:00 2001 From: jonschz Date: Thu, 29 Aug 2024 22:14:05 +0200 Subject: [PATCH] Linter fixes v2 --- LEGO1/lego/legoomni/include/legoutils.h | 2 +- .../lego/legoomni/src/build/legocarbuild.cpp | 41 ++++++++----------- LEGO1/lego/legoomni/src/common/legoutils.cpp | 32 +++++++-------- 3 files changed, 35 insertions(+), 40 deletions(-) diff --git a/LEGO1/lego/legoomni/include/legoutils.h b/LEGO1/lego/legoomni/include/legoutils.h index edd379dd..ee0a001d 100644 --- a/LEGO1/lego/legoomni/include/legoutils.h +++ b/LEGO1/lego/legoomni/include/legoutils.h @@ -41,7 +41,7 @@ LegoROI* PickROI(MxLong, MxLong); LegoROI* PickParentROI(MxLong p_a, MxLong p_b); void FUN_1003dde0(LegoROI* p_param1, MxFloat p_param2); MxBool FUN_1003ded0(MxFloat p_param1[3], MxFloat p_param2[3], MxFloat p_param3[3]); -MxBool TransformWorldToScreen(const MxFloat world[3], MxFloat screen[4]); +MxBool TransformWorldToScreen(const MxFloat p_world[3], MxFloat p_screen[4]); MxS16 CountTotalTreeNodes(LegoTreeNode* p_node); void FUN_1003e050(LegoAnimPresenter* p_presenter); Extra::ActionType MatchActionString(const char*); diff --git a/LEGO1/lego/legoomni/src/build/legocarbuild.cpp b/LEGO1/lego/legoomni/src/build/legocarbuild.cpp index 50c4b3b9..328facde 100644 --- a/LEGO1/lego/legoomni/src/build/legocarbuild.cpp +++ b/LEGO1/lego/legoomni/src/build/legocarbuild.cpp @@ -27,7 +27,6 @@ MxFloat LegoCarBuild::g_unk0x100d65a8 = 0.07; // GLOBAL: LEGO1 0x100f11cc MxS16 LegoCarBuild::g_unk0x100f11cc = -1; - // STUB: LEGO1 0x100226d0 // FUNCTION: BETA10 0x1006ac10 LegoCarBuild::LegoCarBuild() @@ -236,14 +235,14 @@ void LegoCarBuild::VTable0x70() void LegoCarBuild::VTable0x74(MxFloat p_param1[3], MxFloat p_param2[3]) { MxFloat fVar1; - MxFloat local_20[3]; - MxFloat local_14[3]; + MxFloat local20[3]; + MxFloat local14[3]; - FUN_1003ded0(p_param1, local_14, local_20); + FUN_1003ded0(p_param1, local14, local20); - fVar1 = (m_unk0x2a4[2] - local_20[2]) / local_14[2]; - p_param2[0] = (fVar1 * local_14[0] + local_20[0]) - m_unk0x2a4[0]; - p_param2[1] = (fVar1 * local_14[1] + local_20[1]) - m_unk0x2a4[1]; + fVar1 = (m_unk0x2a4[2] - local20[2]) / local14[2]; + p_param2[0] = (fVar1 * local14[0] + local20[0]) - m_unk0x2a4[0]; + p_param2[1] = (fVar1 * local14[1] + local20[1]) - m_unk0x2a4[1]; p_param2[2] = 0.0; return; } @@ -253,16 +252,16 @@ void LegoCarBuild::VTable0x74(MxFloat p_param1[3], MxFloat p_param2[3]) void LegoCarBuild::VTable0x78(MxFloat p_param1[3], MxFloat p_param2[3]) { MxFloat fVar1; - MxFloat local_18[3]; - MxFloat local_c[3]; + MxFloat local18[3]; + MxFloat localc[3]; - FUN_1003ded0(p_param1, local_18, local_c); + FUN_1003ded0(p_param1, local18, localc); p_param2[2] = m_unk0x2a4[2] + (m_unk0x2bc[2] - m_unk0x2a4[2]) * ((p_param1[1] - m_unk0x294) / (m_unk0x29c - m_unk0x294)); - fVar1 = (p_param2[2] - local_c[2]) / local_18[2]; - p_param2[0] = fVar1 * local_18[0] - m_unk0x2a4[0] + local_c[0]; - p_param2[1] = fVar1 * local_18[1] - m_unk0x2a4[1] + local_c[1]; + fVar1 = (p_param2[2] - localc[2]) / local18[2]; + p_param2[0] = fVar1 * local18[0] - m_unk0x2a4[0] + localc[0]; + p_param2[1] = fVar1 * local18[1] - m_unk0x2a4[1] + localc[1]; p_param2[2] = p_param2[2] - m_unk0x2a4[2]; } @@ -270,22 +269,20 @@ void LegoCarBuild::VTable0x78(MxFloat p_param1[3], MxFloat p_param2[3]) // FUNCTION: BETA10 0x1006bfb5 void LegoCarBuild::VTable0x7c(MxFloat p_param1[3], MxFloat p_param2[3]) { - MxFloat local_18[3]; - MxFloat local_c[3]; - FUN_1003ded0(p_param1, local_18, local_c); + MxFloat local18[3]; + MxFloat localc[3]; + FUN_1003ded0(p_param1, local18, localc); - MxFloat fVar1 = (m_unk0x2bc[1] - local_c[1]) / local_18[1]; - p_param2[0] = fVar1 * local_18[0] - m_unk0x2a4[0] + local_c[0]; + MxFloat fVar1 = (m_unk0x2bc[1] - localc[1]) / local18[1]; + p_param2[0] = fVar1 * local18[0] - m_unk0x2a4[0] + localc[0]; p_param2[1] = m_unk0x2bc[1] - m_unk0x2a4[1]; - p_param2[2] = fVar1 * local_18[2] - m_unk0x2a4[2] + local_c[2]; + p_param2[2] = fVar1 * local18[2] - m_unk0x2a4[2] + localc[2]; } // FUNCTION: LEGO1 0x100236a0 // FUNCTION: BETA10 0x100701f0 void LegoCarBuild::VTable0x80(MxFloat p_param1[2], MxFloat p_param2[2], MxFloat p_param3, MxFloat p_param4[2]) { - // The code does the right thing and matches BETA10 perfectly, but mismatches LEGO1. - // Maybe compiler entropy? if (p_param1[1] == 0.0f) { return; } @@ -299,7 +296,6 @@ void LegoCarBuild::VTable0x80(MxFloat p_param1[2], MxFloat p_param2[2], MxFloat return SUCCESS; \ } - // FUNCTION: LEGO1 0x100238b0 // FUNCTION: BETA10 0x1006c18f MxResult LegoCarBuild::Tickle() @@ -452,7 +448,6 @@ void LegoCarBuild::FUN_10024ef0() FUN_10015820(FALSE, 7); } - // FUNCTION: LEGO1 0x10024f50 // FUNCTION: BETA10 0x1006dfce void LegoCarBuild::FUN_10024f50() diff --git a/LEGO1/lego/legoomni/src/common/legoutils.cpp b/LEGO1/lego/legoomni/src/common/legoutils.cpp index 62b774a6..eeca0bd0 100644 --- a/LEGO1/lego/legoomni/src/common/legoutils.cpp +++ b/LEGO1/lego/legoomni/src/common/legoutils.cpp @@ -72,35 +72,35 @@ void FUN_1003dde0(LegoROI* p_param1, MxFloat p_param2) // FUNCTION: BETA10 0x100d3802 MxBool FUN_1003ded0(MxFloat p_param1[3], MxFloat p_param2[3], MxFloat p_param3[3]) { - MxFloat local_1c[4]; - MxFloat local_10[3]; + MxFloat local1c[4]; + MxFloat local10[3]; Tgl::View* view = VideoManager()->Get3DManager()->GetLego3DView()->GetView(); - local_1c[0] = p_param1[0]; - local_1c[1] = p_param1[1]; - local_1c[2] = 1.0f; - local_1c[3] = 1.0f; + local1c[0] = p_param1[0]; + local1c[1] = p_param1[1]; + local1c[2] = 1.0f; + local1c[3] = 1.0f; - view->TransformScreenToWorld(local_1c, p_param3); + view->TransformScreenToWorld(local1c, p_param3); - local_1c[0] *= 2.0; - local_1c[1] *= 2.0; - local_1c[3] = 2.0; + local1c[0] *= 2.0; + local1c[1] *= 2.0; + local1c[3] = 2.0; - view->TransformScreenToWorld(local_1c, local_10); + view->TransformScreenToWorld(local1c, local10); - p_param2[0] = local_10[0] - p_param3[0]; - p_param2[1] = local_10[1] - p_param3[1]; - p_param2[2] = local_10[2] - p_param3[2]; + p_param2[0] = local10[0] - p_param3[0]; + p_param2[1] = local10[1] - p_param3[1]; + p_param2[2] = local10[2] - p_param3[2]; return TRUE; } // FUNCTION: LEGO1 0x1003df70 // FUNCTION: BETA10 0x100d38cb -MxBool TransformWorldToScreen(const MxFloat world[3], MxFloat screen[4]) +MxBool TransformWorldToScreen(const MxFloat p_world[3], MxFloat p_screen[4]) { - VideoManager()->Get3DManager()->GetLego3DView()->GetView()->TransformWorldToScreen(world, screen); + VideoManager()->Get3DManager()->GetLego3DView()->GetView()->TransformWorldToScreen(p_world, p_screen); return TRUE; }