isledecomp/isle
1
0
Fork 0
mirror of https://github.com/isledecomp/isle.git synced 2026-01-16 13:01:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Rename cameraTransition variables

Browse Source
This commit is contained in:
Sebastian Mischke 2026-01-08 00:00:01 +01:00
parent c83a42738b
commit 274e2ddfe0
3 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
LEGO1/lego/legoomni/include/helicopter.h
View File

@ -88,10 +88,10 @@ class Helicopter : public IslePathActor {
protected: protected:
void SetupCameraTransition(const Matrix4& p_matrix); void SetupCameraTransition(const Matrix4& p_matrix);
MxMatrix m_unk0x160; // 0x160 MxMatrix m_cameraTransitionStartMatrix; // 0x160
MxMatrix m_unk0x1a8; // 0x1a8 MxMatrix m_cameraTransitionEndMatrix; // 0x1a8
float m_unk0x1f0; // 0x1f0 float m_cameraTransitionTime; // 0x1f0
MxQuaternionTransformer m_unk0x1f4; // 0x1f4 MxQuaternionTransformer m_cameraTransitionInterpolator; // 0x1f4
HelicopterState* m_state; // 0x228 HelicopterState* m_state; // 0x228
MxAtomId m_script; // 0x22c MxAtomId m_script; // 0x22c
}; };

26
LEGO1/lego/legoomni/src/actors/helicopter.cpp
View File

@ -414,12 +414,12 @@ void Helicopter::Animate(float p_time)
} }
MxMatrix mat; MxMatrix mat;
Vector3 v1(m_unk0x160[3]); Vector3 v1(m_cameraTransitionStartMatrix[3]);
Vector3 v2(mat[3]); Vector3 v2(mat[3]);
Vector3 v3(m_unk0x1a8[3]); Vector3 v3(m_cameraTransitionEndMatrix[3]);
mat.SetIdentity(); mat.SetIdentity();
m_unk0x1f4.InterpolateToMatrix(mat, f2); m_cameraTransitionInterpolator.InterpolateToMatrix(mat, f2);
v2 = v3; v2 = v3;
v2 -= v1; v2 -= v1;
@ -452,15 +452,15 @@ void Helicopter::SetupCameraTransition(const Matrix4& p_matrix)
Vector3 vec1(local48[3]); // local98 // esp+0x30 Vector3 vec1(local48[3]); // local98 // esp+0x30
Vector3 vec2(local90[3]); // localac // esp+0x1c Vector3 vec2(local90[3]); // localac // esp+0x1c
Vector3 vec3(m_unk0x1a8[0]); // locala8 // esp+0x20 Vector3 vec3(m_cameraTransitionEndMatrix[0]); // locala8 // esp+0x20
Vector3 vec4(m_unk0x1a8[1]); // localb8 // esp+0x10 Vector3 vec4(m_cameraTransitionEndMatrix[1]); // localb8 // esp+0x10
Vector3 vec5(m_unk0x1a8[2]); // EDI Vector3 vec5(m_cameraTransitionEndMatrix[2]); // EDI
// the typecast makes this function match for unknown reasons // the typecast makes this function match for unknown reasons
Vector3 vec6((const float*) m_unk0x1a8[3]); // locala0 // esp+0x28 Vector3 vec6((const float*) m_cameraTransitionEndMatrix[3]); // locala0 // esp+0x28
m_world->GetCameraController()->GetPointOfView(local48); m_world->GetCameraController()->GetPointOfView(local48);
m_unk0x1a8.SetIdentity(); m_cameraTransitionEndMatrix.SetIdentity();
local90 = p_matrix; local90 = p_matrix;
vec2[1] += 20.0f; vec2[1] += 20.0f;
@ -476,16 +476,16 @@ void Helicopter::SetupCameraTransition(const Matrix4& p_matrix)
vec4.EqualsCross(vec5, vec3); vec4.EqualsCross(vec5, vec3);
vec6 = vec2; vec6 = vec2;
local90 = m_unk0x1a8; local90 = m_cameraTransitionEndMatrix;
m_unk0x160 = local48; m_cameraTransitionStartMatrix = local48;
vec1.Clear(); vec1.Clear();
vec2.Clear(); vec2.Clear();
m_unk0x1f0 = Timer()->GetTime(); m_cameraTransitionTime = Timer()->GetTime();
m_unk0x1f4.SetStartEnd(local48, local90); m_cameraTransitionInterpolator.SetStartEnd(local48, local90);
m_unk0x1f4.NormalizeDirection(); m_cameraTransitionInterpolator.NormalizeDirection();
} }
// FUNCTION: LEGO1 0x10004640 // FUNCTION: LEGO1 0x10004640

8
LEGO1/lego/legoomni/src/worlds/act3.cpp
View File

@ -789,9 +789,9 @@ void Act3::GoodEnding(const Matrix4& p_destination)
DebugCopter( DebugCopter(
m_copter->GetROI()->GetLocal2World(), m_copter->GetROI()->GetLocal2World(),
p_destination, p_destination,
m_copter->m_unk0x160, m_copter->m_cameraTransitionStartMatrix,
m_copter->m_unk0x1a8, m_copter->m_cameraTransitionEndMatrix,
m_copter->m_unk0x1f4 m_copter->m_cameraTransitionInterpolator
); );
#else #else
m_state->m_state = Act3State::e_goodEnding; m_state->m_state = Act3State::e_goodEnding;
@ -874,7 +874,7 @@ void Act3::BadEnding(const Matrix4& p_destination)
p_destination, p_destination,
m_copter->m_unk0x160, m_copter->m_unk0x160,
m_copter->m_unk0x1a8, m_copter->m_unk0x1a8,
m_copter->m_unk0x1f4 m_copter->m_cameraTransitionInterpolator
); );
} }