TheCloud/isle-portable
1
0
Fork 0
mirror of https://github.com/isledecomp/isle-portable.git synced 2025-09-23 03:55:44 -04:00
Code Issues Packages Projects Releases Wiki Activity

Name for bounding box in ROI (#1541)

Browse Source 
* Name for bounding box in ROI

* Use snake_case for member
This commit is contained in:
Fabian Neundorf 2025-06-06 20:47:45 +02:00 committed by GitHub
parent 9134dd791c
commit ac4d3b2490
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
LEGO1/lego/legoomni/src/common/legocharactermanager.cpp
View File

@ -500,7 +500,7 @@ LegoROI* LegoCharacterManager::CreateActorROI(const char* p_key)
boundingBox.Max()[0] = g_actorLODs[c_topLOD].m_boundingBox[3]; boundingBox.Max()[0] = g_actorLODs[c_topLOD].m_boundingBox[3];
boundingBox.Max()[1] = g_actorLODs[c_topLOD].m_boundingBox[4]; boundingBox.Max()[1] = g_actorLODs[c_topLOD].m_boundingBox[4];
boundingBox.Max()[2] = g_actorLODs[c_topLOD].m_boundingBox[5]; boundingBox.Max()[2] = g_actorLODs[c_topLOD].m_boundingBox[5];
roi->SetUnknown0x80(boundingBox); roi->SetBoundingBox(boundingBox);
comp = new CompoundObject(); comp = new CompoundObject();
roi->SetComp(comp); roi->SetComp(comp);
@ -551,7 +551,7 @@ LegoROI* LegoCharacterManager::CreateActorROI(const char* p_key)
childBoundingBox.Max()[0] = g_actorLODs[i + 1].m_boundingBox[3]; childBoundingBox.Max()[0] = g_actorLODs[i + 1].m_boundingBox[3];
childBoundingBox.Max()[1] = g_actorLODs[i + 1].m_boundingBox[4]; childBoundingBox.Max()[1] = g_actorLODs[i + 1].m_boundingBox[4];
childBoundingBox.Max()[2] = g_actorLODs[i + 1].m_boundingBox[5]; childBoundingBox.Max()[2] = g_actorLODs[i + 1].m_boundingBox[5];
childROI->SetUnknown0x80(childBoundingBox); childROI->SetBoundingBox(childBoundingBox);
CalcLocalTransform( CalcLocalTransform(
Mx3DPointFloat(g_actorLODs[i + 1].m_position), Mx3DPointFloat(g_actorLODs[i + 1].m_position),
@ -1073,7 +1073,7 @@ MxResult LegoCharacterManager::UpdateBoundingSphereAndBox(LegoROI* p_roi)
SET3(boundingBox.Min(), min); SET3(boundingBox.Min(), min);
SET3(boundingBox.Max(), max); SET3(boundingBox.Max(), max);
p_roi->SetUnknown0x80(boundingBox); p_roi->SetBoundingBox(boundingBox);
p_roi->WrappedUpdateWorldData(); p_roi->WrappedUpdateWorldData();

8
LEGO1/lego/sources/roi/legoroi.cpp
View File

@ -150,8 +150,8 @@ LegoResult LegoROI::Read(
goto done; goto done;
} }
SET3(m_unk0x80.Min(), box.GetMin()); SET3(m_bounding_box.Min(), box.GetMin());
SET3(m_unk0x80.Max(), box.GetMax()); SET3(m_bounding_box.Max(), box.GetMax());
if (p_storage->Read(&length, sizeof(LegoU32)) != SUCCESS) { if (p_storage->Read(&length, sizeof(LegoU32)) != SUCCESS) {
goto done; goto done;
@ -617,8 +617,8 @@ LegoU32 LegoROI::FUN_100a9410(
Mx3DPointFloat local4c(p_v1); Mx3DPointFloat local4c(p_v1);
local58 = m_unk0x80.Min(); local58 = m_bounding_box.Min();
locala8 = m_unk0x80.Max(); locala8 = m_bounding_box.Max();
localc0[3] = local9c[3] = local168[3] = 1.0f; localc0[3] = local9c[3] = local168[3] = 1.0f;

2
LEGO1/lego/sources/roi/legoroi.h
View File

@ -78,7 +78,7 @@ public:
void SetComp(CompoundObject* p_comp) { comp = p_comp; } void SetComp(CompoundObject* p_comp) { comp = p_comp; }
void SetBoundingSphere(const BoundingSphere& p_sphere) { m_sphere = m_world_bounding_sphere = p_sphere; } void SetBoundingSphere(const BoundingSphere& p_sphere) { m_sphere = m_world_bounding_sphere = p_sphere; }
void SetUnknown0x80(const BoundingBox& p_unk0x80) { m_unk0x80 = p_unk0x80; } void SetBoundingBox(const BoundingBox& p_box) { m_bounding_box = p_box; }
// SYNTHETIC: LEGO1 0x100a82b0 // SYNTHETIC: LEGO1 0x100a82b0
// LegoROI::`scalar deleting destructor' // LegoROI::`scalar deleting destructor'

2
LEGO1/realtime/orientableroi.h
View File

@ -70,7 +70,7 @@ public:
protected: protected:
MxMatrix m_local2world; // 0x10 MxMatrix m_local2world; // 0x10
BoundingBox m_world_bounding_box; // 0x58 BoundingBox m_world_bounding_box; // 0x58
BoundingBox m_unk0x80; // 0x80 BoundingBox m_bounding_box; // 0x80
BoundingSphere m_world_bounding_sphere; // 0xa8 BoundingSphere m_world_bounding_sphere; // 0xa8
Mx3DPointFloat m_world_velocity; // 0xc0 Mx3DPointFloat m_world_velocity; // 0xc0
OrientableROI* m_parentROI; // 0xd4 OrientableROI* m_parentROI; // 0xd4