diff --git a/LEGO1/lego/legoomni/src/actors/helicopter.cpp b/LEGO1/lego/legoomni/src/actors/helicopter.cpp index 0e62e724..9957a290 100644 --- a/LEGO1/lego/legoomni/src/actors/helicopter.cpp +++ b/LEGO1/lego/legoomni/src/actors/helicopter.cpp @@ -407,7 +407,7 @@ void Helicopter::Animate(float p_time) Vector3 v2(m_unk0x1a8[3]); float* loc = m_unk0x1a8[3]; mat.SetIdentity(); - m_unk0x1f4.Unknown6(mat, f2); + m_unk0x1f4.BETA_1004aaa0(mat, f2); v2.SetVector(loc); v2 -= v; v2 *= f2; @@ -465,9 +465,9 @@ void Helicopter::FUN_100042a0(const Matrix4& p_matrix) m_unk0x1f0 = Timer()->GetTime(); - m_unk0x1f4.Unknown2(local48); - m_unk0x1f4.Unknown3(local90); // quite sure, but isn't inlined - why? - m_unk0x1f4.Unknown7(); // sure about this one + m_unk0x1f4.BETA_1004a9f0(local48); + m_unk0x1f4.FUN_10004620(local90); // quite sure, but isn't inlined - why? + m_unk0x1f4.FUN_10004520(); // sure about this one } // FUNCTION: LEGO1 0x10004640 diff --git a/LEGO1/lego/legoomni/src/build/legocarbuild.cpp b/LEGO1/lego/legoomni/src/build/legocarbuild.cpp index e8ac3d7d..69d2e8a0 100644 --- a/LEGO1/lego/legoomni/src/build/legocarbuild.cpp +++ b/LEGO1/lego/legoomni/src/build/legocarbuild.cpp @@ -358,7 +358,7 @@ void LegoCarBuild::VTable0x70() m_unk0x2a0 = sqrt((MxDouble) DISTSQRD2(m_unk0x290, m_unk0x298)); - m_unk0x25c.Unknown1(m_unk0x178, m_unk0x208); + m_unk0x25c.BETA_1004a9b0(m_unk0x178, m_unk0x208); } // FUNCTION: LEGO1 0x10023130 @@ -406,7 +406,7 @@ void LegoCarBuild::FUN_10023130(MxLong p_x, MxLong p_y) MxFloat local1c = sqrt((double) (NORMSQRD2(local20))) / m_unk0x2a0; - m_unk0x25c.Unknown6(local78, local1c); + m_unk0x25c.BETA_1004aaa0(local78, local1c); local78[3][0] = m_unk0x178[3][0] + local18[0]; local78[3][1] = m_unk0x178[3][1] + local18[1]; diff --git a/LEGO1/lego/legoomni/src/common/legoanimationmanager.cpp b/LEGO1/lego/legoomni/src/common/legoanimationmanager.cpp index 4b74fdf1..ec73ba08 100644 --- a/LEGO1/lego/legoomni/src/common/legoanimationmanager.cpp +++ b/LEGO1/lego/legoomni/src/common/legoanimationmanager.cpp @@ -2793,8 +2793,8 @@ void LegoAnimationManager::FUN_100648f0(LegoTranInfo* p_tranInfo, MxLong p_unk0x LegoLocation* location = NavController()->GetLocation(p_tranInfo->m_location); if (location != NULL) { CalcLocalTransform(location->m_position, location->m_direction, location->m_up, m_unk0x484); - m_unk0x4cc.Unknown1(m_unk0x43c, m_unk0x484); - m_unk0x4cc.Unknown7(); + m_unk0x4cc.BETA_1004a9b0(m_unk0x43c, m_unk0x484); + m_unk0x4cc.FUN_10004520(); } else { p_tranInfo->m_flags &= ~LegoTranInfo::c_bit1; @@ -2828,7 +2828,7 @@ void LegoAnimationManager::FUN_10064b50(MxLong p_time) sub[1] = (m_unk0x484[3][1] - m_unk0x43c[3][1]) * und; sub[2] = (m_unk0x484[3][2] - m_unk0x43c[3][2]) * und; - m_unk0x4cc.Unknown6(mat, (float) (p_time - m_unk0x434) / 1000.0f); + m_unk0x4cc.BETA_1004aaa0(mat, (float) (p_time - m_unk0x434) / 1000.0f); VPV3(mat[3], m_unk0x43c[3], sub); mat[3][3] = 1.0f; diff --git a/LEGO1/lego/sources/anim/legoanim.cpp b/LEGO1/lego/sources/anim/legoanim.cpp index 0328738b..4ee2dc69 100644 --- a/LEGO1/lego/sources/anim/legoanim.cpp +++ b/LEGO1/lego/sources/anim/legoanim.cpp @@ -878,9 +878,9 @@ inline void LegoAnimNodeData::GetTranslation( c[3] = p_rotationKeys[i + 1].GetAngle(); } - b.Unknown4(a); - b.Unknown5(c); - b.Unknown6( + b.BETA_10180b80(a); + b.BETA_10180bc0(c); + b.BETA_1004aaa0( p_matrix, (p_time - p_rotationKeys[i].GetTime()) / (p_rotationKeys[i + 1].GetTime() - p_rotationKeys[i].GetTime()) ); diff --git a/LEGO1/mxgeometry/mxgeometry3d.h b/LEGO1/mxgeometry/mxgeometry3d.h index a79ddb19..15fd1ab0 100644 --- a/LEGO1/mxgeometry/mxgeometry3d.h +++ b/LEGO1/mxgeometry/mxgeometry3d.h @@ -105,14 +105,14 @@ class UnknownMx4DPointFloat { UnknownMx4DPointFloat() : m_unk0x30(0) {} // FUNCTION: BETA10 0x1004a9b0 - void Unknown1(Matrix4& p_m1, Matrix4& p_m2) + void BETA_1004a9b0(Matrix4& p_m1, Matrix4& p_m2) { - Unknown2(p_m1); - Unknown3(p_m2); + BETA_1004a9f0(p_m1); + FUN_10004620(p_m2); } // FUNCTION: BETA10 0x1004a9f0 - void Unknown2(Matrix4& p_m) + void BETA_1004a9f0(Matrix4& p_m) { p_m.ToQuaternion(m_unk0x00); m_unk0x30 |= c_bit1; @@ -120,21 +120,21 @@ class UnknownMx4DPointFloat { // FUNCTION: LEGO1 0x10004620 // FUNCTION: BETA10 0x1004aa30 - void Unknown3(Matrix4& p_m) + void FUN_10004620(Matrix4& p_m) { p_m.ToQuaternion(m_unk0x18); m_unk0x30 |= c_bit2; } // FUNCTION: BETA10 0x10180b80 - void Unknown4(Vector4& p_v) + void BETA_10180b80(Vector4& p_v) { m_unk0x00 = p_v; m_unk0x30 |= c_bit1; } // FUNCTION: BETA10 0x10180bc0 - void Unknown5(Vector4& p_v) + void BETA_10180bc0(Vector4& p_v) { m_unk0x18 = p_v; m_unk0x30 |= c_bit2; @@ -144,8 +144,8 @@ class UnknownMx4DPointFloat { const Vector4& GetUnknown0x18() const { return m_unk0x18; } undefined4 GetUnknown0x30() const { return m_unk0x30; } - inline int Unknown6(Matrix4& p_matrix, float p_f); - inline long Unknown7(); + inline int BETA_1004aaa0(Matrix4& p_matrix, float p_f); + inline long FUN_10004520(); private: inline int FUN_100040a0(Vector4& p_v, float p_f); @@ -156,7 +156,7 @@ class UnknownMx4DPointFloat { }; // FUNCTION: BETA10 0x1004aaa0 -int UnknownMx4DPointFloat::Unknown6(Matrix4& p_matrix, float p_f) +int UnknownMx4DPointFloat::BETA_1004aaa0(Matrix4& p_matrix, float p_f) { float data[4]; Vector4 v(data); @@ -170,7 +170,7 @@ int UnknownMx4DPointFloat::Unknown6(Matrix4& p_matrix, float p_f) } // FUNCTION: LEGO1 0x10004520 -inline long UnknownMx4DPointFloat::Unknown7() +inline long UnknownMx4DPointFloat::FUN_10004520() { if (!m_unk0x30) { return -1;