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

Style

Browse Source
This commit is contained in:
Christian Semmler 2024-03-26 13:09:54 -04:00
parent 4a36e402d6
commit b781d1b6b8
3 changed files with 44 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
LEGO1/lego/legoomni/include/legoanimactor.h
View File

@ -42,10 +42,10 @@ class LegoAnimActor : public virtual LegoPathActor {
void ParseAction(char* p_extra) override; // vtable+0x20 void ParseAction(char* p_extra) override; // vtable+0x20
void SetWorldSpeed(MxFloat p_worldSpeed) override; // vtable+0x30 void SetWorldSpeed(MxFloat p_worldSpeed) override; // vtable+0x30
void VTable0x70(float p_float) override; // vtable+0x70 void VTable0x70(float p_und) override; // vtable+0x70
void VTable0x74(Matrix4& p_transform) override; // vtable+0x74 void VTable0x74(Matrix4& p_transform) override; // vtable+0x74
virtual MxResult FUN_1001c1f0(float& p_out); virtual MxResult FUN_1001c1f0(float& p_und);
virtual MxResult FUN_1001c360(float, Matrix4& p_transform); virtual MxResult FUN_1001c360(float, Matrix4& p_transform);
virtual MxResult FUN_1001c450(LegoAnim* p_AnimTreePtr, float p_unk0x00, LegoROI** p_roiMap, MxU32 p_numROIs); virtual MxResult FUN_1001c450(LegoAnim* p_AnimTreePtr, float p_unk0x00, LegoROI** p_roiMap, MxU32 p_numROIs);
virtual void ClearMaps(); virtual void ClearMaps();

66
LEGO1/lego/legoomni/src/paths/legoanimactor.cpp
View File

@ -43,21 +43,22 @@ LegoAnimActor::~LegoAnimActor()
} }
// FUNCTION: LEGO1 0x1001c1f0 // FUNCTION: LEGO1 0x1001c1f0
MxResult LegoAnimActor::FUN_1001c1f0(float& p_out) MxResult LegoAnimActor::FUN_1001c1f0(float& p_und)
{ {
float duration = (float) m_animMaps[m_curAnim]->m_AnimTreePtr->GetDuration(); float duration = (float) m_animMaps[m_curAnim]->m_AnimTreePtr->GetDuration();
p_out = m_unk0x80 - duration * ((MxS32) (m_unk0x80 / duration)); p_und = m_unk0x80 - duration * ((MxS32) (m_unk0x80 / duration));
return SUCCESS; return SUCCESS;
} }
// FUNCTION: LEGO1 0x1001c240 // FUNCTION: LEGO1 0x1001c240
void LegoAnimActor::VTable0x74(Matrix4& p_transform) void LegoAnimActor::VTable0x74(Matrix4& p_transform)
{ {
float f; float und;
LegoPathActor::VTable0x74(p_transform); LegoPathActor::VTable0x74(p_transform);
if (m_curAnim >= 0) { if (m_curAnim >= 0) {
FUN_1001c1f0(f); FUN_1001c1f0(und);
FUN_1001c360(f, p_transform); FUN_1001c360(und, p_transform);
} }
} }
@ -67,6 +68,7 @@ void LegoAnimActor::VTable0x70(float p_float)
if (m_unk0x84 == 0) { if (m_unk0x84 == 0) {
m_unk0x84 = p_float - 1.0f; m_unk0x84 = p_float - 1.0f;
} }
if (m_unk0xdc == 0 && !m_userNavFlag && m_worldSpeed <= 0) { if (m_unk0xdc == 0 && !m_userNavFlag && m_worldSpeed <= 0) {
if (m_curAnim >= 0) { if (m_curAnim >= 0) {
MxMatrix matrix(m_unk0xec); MxMatrix matrix(m_unk0xec);
@ -74,6 +76,7 @@ void LegoAnimActor::VTable0x70(float p_float)
FUN_1001c1f0(f); FUN_1001c1f0(f);
FUN_1001c360(f, matrix); FUN_1001c360(f, matrix);
} }
m_unk0x84 = m_unk0x80 = p_float; m_unk0x84 = m_unk0x80 = p_float;
} }
else { else {
@ -82,35 +85,46 @@ void LegoAnimActor::VTable0x70(float p_float)
} }
// FUNCTION: LEGO1 0x1001c360 // FUNCTION: LEGO1 0x1001c360
MxResult LegoAnimActor::FUN_1001c360(float p_float, Matrix4& p_transform) MxResult LegoAnimActor::FUN_1001c360(float p_und, Matrix4& p_transform)
{ {
if (p_float >= 0) { if (p_und >= 0) {
LegoAnimActorStruct* anim = m_animMaps[m_curAnim]; LegoROI** roiMap = m_animMaps[m_curAnim]->m_roiMap;
LegoROI** roiMap = anim->m_roiMap; MxU32 numROIs = m_animMaps[m_curAnim]->m_numROIs;
MxU32 numROIs = anim->m_numROIs;
if (m_boundary->GetFlag0x10()) { if (!m_boundary->GetFlag0x10()) {
LegoTreeNode* root = anim->m_AnimTreePtr->GetRoot(); MxU32 i;
m_roi->SetVisibility(TRUE); m_roi->SetVisibility(FALSE);
for (MxU32 i = 0; i < numROIs; i++) {
if (roiMap[i] && (roiMap[i] != m_roi)) { for (i = 0; i < numROIs; i++) {
roiMap[i]->SetVisibility(TRUE); LegoROI* roi = roiMap[i];
if (roi != NULL && m_roi != roi) {
roi->SetVisibility(FALSE);
} }
} }
for (MxU32 childIdx = 0; childIdx < root->GetNumChildren(); childIdx++) { }
LegoROI::FUN_100a8e80(root->GetChild(childIdx), p_transform, p_float, roiMap); else {
MxU32 i;
LegoTreeNode* root = m_animMaps[m_curAnim]->m_AnimTreePtr->GetRoot();
m_roi->SetVisibility(TRUE);
for (i = 0; i < numROIs; i++) {
LegoROI* roi = roiMap[i];
if (roi != NULL && m_roi != roi) {
roi->SetVisibility(TRUE);
}
} }
for (i = 0; i < root->GetNumChildren(); i++) {
LegoROI::FUN_100a8e80(root->GetChild(i), p_transform, p_und, roiMap);
}
if (m_cameraFlag) { if (m_cameraFlag) {
FUN_10010c30(); FUN_10010c30();
} }
} }
else {
m_roi->SetVisibility(FALSE);
for (MxU32 i = 0; i < numROIs; i++) {
if (roiMap[i] && roiMap[i] != m_roi) {
roiMap[i]->SetVisibility(FALSE);
}
}
}
return SUCCESS; return SUCCESS;
} }
else { else {

3
LEGO1/lego/sources/geom/legowegedge.h
View File

@ -12,7 +12,8 @@ class LegoWEGEdge : public LegoWEEdge {
LegoWEGEdge(); LegoWEGEdge();
~LegoWEGEdge() override; // vtable+0x00 ~LegoWEGEdge() override; // vtable+0x00
LegoResult VTable0x04() override; // vtable+0x04 LegoResult VTable0x04() override; // vtable+0x04
inline LegoBool GetFlag0x10() { return m_unk0x0c & 0x10 ? FALSE : TRUE; }
inline LegoU32 GetFlag0x10() { return m_unk0x0c & 0x10 ? FALSE : TRUE; }
// SYNTHETIC: LEGO1 0x1009a7e0 // SYNTHETIC: LEGO1 0x1009a7e0
// LegoWEGEdge::`scalar deleting destructor' // LegoWEGEdge::`scalar deleting destructor'