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

Rename

Browse Source
This commit is contained in:
Christian Semmler 2024-12-22 11:35:19 -07:00
parent c4467e2c17
commit 317aace275
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
LEGO1/lego/legoomni/src/paths/legopathboundary.cpp
View File

@ -48,7 +48,7 @@ void LegoPathBoundary::FUN_100575b0(Vector3& p_point1, Vector3& p_point2, LegoPa
{ {
Vector3* ccwV = NULL; Vector3* ccwV = NULL;
if (m_numPathTrigger > 0 && m_unk0x50 != NULL) { if (m_numTriggers > 0 && m_unk0x50 != NULL) {
ccwV = m_edges[0]->CCWVertex(*this); ccwV = m_edges[0]->CCWVertex(*this);
Mx3DPointFloat v; Mx3DPointFloat v;
@ -61,7 +61,7 @@ void LegoPathBoundary::FUN_100575b0(Vector3& p_point1, Vector3& p_point2, LegoPa
float dot2 = v.Dot(&v, m_unk0x50); float dot2 = v.Dot(&v, m_unk0x50);
if (dot2 > dot1) { if (dot2 > dot1) {
for (MxS32 i = 0; i < m_numPathTrigger; i++) { for (MxS32 i = 0; i < m_numTriggers; i++) {
LegoPathStruct* s = m_pathTrigger[i].m_pathStruct; LegoPathStruct* s = m_pathTrigger[i].m_pathStruct;
if (m_pathTrigger[i].m_unk0x08 >= dot1 && m_pathTrigger[i].m_unk0x08 < dot2) { if (m_pathTrigger[i].m_unk0x08 >= dot1 && m_pathTrigger[i].m_unk0x08 < dot2) {
@ -70,7 +70,7 @@ void LegoPathBoundary::FUN_100575b0(Vector3& p_point1, Vector3& p_point2, LegoPa
} }
} }
else if (dot2 < dot1) { else if (dot2 < dot1) {
for (MxS32 i = 0; i < m_numPathTrigger; i++) { for (MxS32 i = 0; i < m_numTriggers; i++) {
LegoPathStruct* s = m_pathTrigger[i].m_pathStruct; LegoPathStruct* s = m_pathTrigger[i].m_pathStruct;
if (m_pathTrigger[i].m_unk0x08 >= dot2 && m_pathTrigger[i].m_unk0x08 < dot1) { if (m_pathTrigger[i].m_unk0x08 >= dot2 && m_pathTrigger[i].m_unk0x08 < dot1) {

8
LEGO1/lego/legoomni/src/paths/legopathcontroller.cpp
View File

@ -673,15 +673,15 @@ MxResult LegoPathController::ReadBoundaries(LegoStorage* p_storage)
return FAILURE; return FAILURE;
} }
if (p_storage->Read(&boundary.m_numPathTrigger, sizeof(boundary.m_numPathTrigger)) != SUCCESS) { if (p_storage->Read(&boundary.m_numTriggers, sizeof(boundary.m_numTriggers)) != SUCCESS) {
return FAILURE; return FAILURE;
} }
if (boundary.m_numPathTrigger > 0) { if (boundary.m_numTriggers > 0) {
boundary.m_unk0x50 = new Mx3DPointFloat; boundary.m_unk0x50 = new Mx3DPointFloat;
boundary.m_pathTrigger = new LegoWEGEdge::PathWithTrigger[boundary.m_numPathTrigger]; boundary.m_pathTrigger = new LegoWEGEdge::PathWithTrigger[boundary.m_numTriggers];
for (j = 0; j < boundary.m_numPathTrigger; j++) { for (j = 0; j < boundary.m_numTriggers; j++) {
if (p_storage->Read(&s, sizeof(s)) != SUCCESS) { if (p_storage->Read(&s, sizeof(s)) != SUCCESS) {
return FAILURE; return FAILURE;
} }

6
LEGO1/lego/sources/geom/legowegedge.cpp
View File

@ -16,7 +16,7 @@ LegoWEGEdge::LegoWEGEdge()
m_unk0x14.Clear(); m_unk0x14.Clear();
m_edgeNormals = NULL; m_edgeNormals = NULL;
m_flags = 0; m_flags = 0;
m_numPathTrigger = 0; m_numTriggers = 0;
m_pathTrigger = NULL; m_pathTrigger = NULL;
m_unk0x50 = NULL; m_unk0x50 = NULL;
} }
@ -151,7 +151,7 @@ LegoS32 LegoWEGEdge::VTable0x04()
} }
} }
if (m_numPathTrigger > 0) { if (m_numTriggers > 0) {
Vector3* vTrig1 = m_edges[0]->CCWVertex(*this); Vector3* vTrig1 = m_edges[0]->CCWVertex(*this);
Vector3* vTrig2 = m_edges[1]->CCWVertex(*this); Vector3* vTrig2 = m_edges[1]->CCWVertex(*this);
assert(vTrig1 && vTrig2); assert(vTrig1 && vTrig2);
@ -198,7 +198,7 @@ LegoS32 LegoWEGEdge::VTable0x04()
local98 += 0.001; local98 += 0.001;
local9c -= 0.001; local9c -= 0.001;
for (LegoS32 j = 0; j < m_numPathTrigger; j++) { for (LegoS32 j = 0; j < m_numTriggers; j++) {
if (m_pathTrigger[j].m_unk0x08 < local98) { if (m_pathTrigger[j].m_unk0x08 < local98) {
m_pathTrigger[j].m_unk0x08 = local98; m_pathTrigger[j].m_unk0x08 = local98;
} }

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

@ -81,7 +81,7 @@ class LegoWEGEdge : public LegoWEEdge {
Mx4DPointFloat* m_edgeNormals; // 0x2c Mx4DPointFloat* m_edgeNormals; // 0x2c
Mx3DPointFloat m_unk0x30; // 0x30 Mx3DPointFloat m_unk0x30; // 0x30
float m_unk0x44; // 0x44 float m_unk0x44; // 0x44
LegoU8 m_numPathTrigger; // 0x48 LegoU8 m_numTriggers; // 0x48
PathWithTrigger* m_pathTrigger; // 0x4c PathWithTrigger* m_pathTrigger; // 0x4c
Mx3DPointFloat* m_unk0x50; // 0x50 Mx3DPointFloat* m_unk0x50; // 0x50
}; };