isledecomp/isle-portable
1
0
Fork 0
mirror of https://github.com/isledecomp/isle-portable.git synced 2025-05-09 04:32:22 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Match Act3::DebugCopter ()

Browse source 
* Match `Act3::DebugCopter`

* Rename param
This commit is contained in:
Christian Semmler 2025-02-21 15:50:38 -07:00 • committed by GitHub
parent 78e924e4ee
commit 5e5b048b34
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 13 additions and 11 deletions
LEGO1
lego/legoomni
include
act3.h
src/worlds
act3.cpp
mxgeometry
mxquaternion.h

2
LEGO1/lego/legoomni/include/act3.h
View file

@ -155,7 +155,7 @@ protected:
const Matrix4& p_destination, const Matrix4& p_destination,
const Matrix4& p_startPosition, const Matrix4& p_startPosition,
const Matrix4& p_endPosition, const Matrix4& p_endPosition,
const MxQuaternionTransformer& p_unk0x1f4 const MxQuaternionTransformer& p_quatTransform
); );
Act3State* m_state; // 0xf8 Act3State* m_state; // 0xf8

14
LEGO1/lego/legoomni/src/worlds/act3.cpp
View file

@ -793,7 +793,7 @@ void Act3::DebugCopter(
const Matrix4& p_destination, const Matrix4& p_destination,
const Matrix4& p_startPosition, const Matrix4& p_startPosition,
const Matrix4& p_endPosition, const Matrix4& p_endPosition,
const MxQuaternionTransformer& p_unk0x1f4 const MxQuaternionTransformer& p_quatTransform
) )
{ {
DebugPrintf("Copter matrix...\n\n"); DebugPrintf("Copter matrix...\n\n");
@ -823,19 +823,17 @@ void Act3::DebugCopter(
DebugPrintf("\t%g, %g, %g, %g", EXPAND4(p_endPosition[2])); DebugPrintf("\t%g, %g, %g, %g", EXPAND4(p_endPosition[2]));
DebugPrintf("\t%g, %g, %g, %g\n\n", EXPAND4(p_endPosition[3])); DebugPrintf("\t%g, %g, %g, %g\n\n", EXPAND4(p_endPosition[3]));
Mx4DPointFloat unk0x00, unk0x18; Mx4DPointFloat startQuat, endQuat;
if (p_unk0x1f4.GetFlags() != 0) { if (p_quatTransform.GetFlags() != 0) {
// TODO: Match p_quatTransform.GetQuat(startQuat, endQuat);
unk0x00 = p_unk0x1f4.GetStartQuat();
unk0x18 = p_unk0x1f4.GetEndQuat();
DebugPrintf("Source quaternion..."); DebugPrintf("Source quaternion...");
// STRING: LEGO1 0x100f7864 // STRING: LEGO1 0x100f7864
DebugPrintf("\t%g, %g, %g, %g\n", EXPAND4(unk0x00)); DebugPrintf("\t%g, %g, %g, %g\n", EXPAND4(startQuat));
DebugPrintf("Destination quaternion..."); DebugPrintf("Destination quaternion...");
DebugPrintf("\t%g, %g, %g, %g\n", EXPAND4(unk0x18)); DebugPrintf("\t%g, %g, %g, %g\n", EXPAND4(endQuat));
} }
} }

8
LEGO1/mxgeometry/mxquaternion.h
View file

@ -21,8 +21,12 @@ public:
inline void SetEnd(Vector4& p_v); inline void SetEnd(Vector4& p_v);
inline int InterpolateToMatrix(Matrix4& p_matrix, float p_f); inline int InterpolateToMatrix(Matrix4& p_matrix, float p_f);
const Vector4& GetStartQuat() const { return m_startQuat; } void GetQuat(Vector4& p_startQuat, Vector4& p_endQuat) const
const Vector4& GetEndQuat() const { return m_endQuat; } {
p_startQuat = m_startQuat;
p_endQuat = m_endQuat;
}
undefined4 GetFlags() const { return m_flags; } undefined4 GetFlags() const { return m_flags; }
private: private: