Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Match Act3::DebugCopter #1392

Merged
merged 2 commits into from
Feb 21, 2025
+13 −11
Merged

Match Act3::DebugCopter #1392

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2c99291
Match `Act3::DebugCopter`
foxtacles Feb 21, 2025
f6ed418
Rename param
foxtacles Feb 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion LEGO1/lego/legoomni/include/act3.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ class Act3 : public LegoWorld {
const Matrix4& p_destination,
const Matrix4& p_startPosition,
const Matrix4& p_endPosition,
const MxQuaternionTransformer& p_unk0x1f4
const MxQuaternionTransformer& p_quatTransform
);

Act3State* m_state; // 0xf8
Expand Down
14 changes: 6 additions & 8 deletions LEGO1/lego/legoomni/src/worlds/act3.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -793,7 +793,7 @@ void Act3::DebugCopter(
const Matrix4& p_destination,
const Matrix4& p_startPosition,
const Matrix4& p_endPosition,
const MxQuaternionTransformer& p_unk0x1f4
const MxQuaternionTransformer& p_quatTransform
)
{
DebugPrintf("Copter matrix...\n\n");
Expand Down Expand Up @@ -823,19 +823,17 @@ void Act3::DebugCopter(
DebugPrintf("\t%g, %g, %g, %g", EXPAND4(p_endPosition[2]));
DebugPrintf("\t%g, %g, %g, %g\n\n", EXPAND4(p_endPosition[3]));

Mx4DPointFloat unk0x00, unk0x18;
Mx4DPointFloat startQuat, endQuat;

if (p_unk0x1f4.GetFlags() != 0) {
// TODO: Match
unk0x00 = p_unk0x1f4.GetStartQuat();
unk0x18 = p_unk0x1f4.GetEndQuat();
if (p_quatTransform.GetFlags() != 0) {
p_quatTransform.GetQuat(startQuat, endQuat);

DebugPrintf("Source quaternion...");
// 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("\t%g, %g, %g, %g\n", EXPAND4(unk0x18));
DebugPrintf("\t%g, %g, %g, %g\n", EXPAND4(endQuat));
}
}

Expand Down
8 changes: 6 additions & 2 deletions LEGO1/mxgeometry/mxquaternion.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,12 @@ class MxQuaternionTransformer {
inline void SetEnd(Vector4& p_v);
inline int InterpolateToMatrix(Matrix4& p_matrix, float p_f);

const Vector4& GetStartQuat() const { return m_startQuat; }
const Vector4& GetEndQuat() const { return m_endQuat; }
void GetQuat(Vector4& p_startQuat, Vector4& p_endQuat) const
{
p_startQuat = m_startQuat;
p_endQuat = m_endQuat;
}

undefined4 GetFlags() const { return m_flags; }

private:
Expand Down