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

100 % on FUN_10010510

Browse Source
This commit is contained in:
jonschz 2024-04-30 20:58:47 +02:00
parent 397677a067
commit ea68494d6a
3 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
LEGO1/lego/legoomni/src/actors/skateboard.cpp
View File

@ -148,10 +148,7 @@ void SkateBoard::FUN_10010510()
if (m_act1state->m_unk0x022 == '\0') { if (m_act1state->m_unk0x022 == '\0') {
m_act1state->m_unk0x022 = 1; m_act1state->m_unk0x022 = 1;
MxMatrix matrix = MxMatrix(CurrentActor()->GetROI()->GetLocal2World()); MxMatrix matrix = MxMatrix(CurrentActor()->GetROI()->GetLocal2World());
float x = 2.5 * matrix[2][0]; matrix.TranslateBy(2.5 * matrix[2][0], 0.2 + matrix[2][1], 2.5 * matrix[2][2]);
float z = 2.5 * matrix[2][2];
float y = 0.2 + matrix[2][1];
matrix.TranslateBy(&x, &y, &z);
AnimationManager() AnimationManager()
->FUN_10060dc0(IsleScript::c_sns008in_RunAnim, &matrix, '\x01', '\0', NULL, 0, TRUE, TRUE, '\x01'); ->FUN_10060dc0(IsleScript::c_sns008in_RunAnim, &matrix, '\x01', '\0', NULL, 0, TRUE, TRUE, '\x01');
} }

2
LEGO1/lego/sources/anim/legoanim.cpp
View File

@ -515,7 +515,7 @@ inline void LegoAnimNodeData::GetTranslation(
break; break;
} }
p_matrix.TranslateBy(&x, &y, &z); p_matrix.TranslateBy(x, y, z);
} }
// FUNCTION: LEGO1 0x100a06f0 // FUNCTION: LEGO1 0x100a06f0

8
LEGO1/realtime/matrix.h
View File

@ -74,11 +74,11 @@ class Matrix4 {
} // vtable+0x2c } // vtable+0x2c
// FUNCTION: LEGO1 0x10002460 // FUNCTION: LEGO1 0x10002460
virtual void TranslateBy(const float* p_x, const float* p_y, const float* p_z) virtual void TranslateBy(const float &p_x, const float &p_y, const float &p_z)
{ {
m_data[3][0] += *p_x; m_data[3][0] += p_x;
m_data[3][1] += *p_y; m_data[3][1] += p_y;
m_data[3][2] += *p_z; m_data[3][2] += p_z;
} // vtable+0x30 } // vtable+0x30
// FUNCTION: LEGO1 0x100024a0 // FUNCTION: LEGO1 0x100024a0