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

Fix naming

Browse Source
This commit is contained in:
Christian Semmler 2024-05-18 11:40:20 -04:00
parent 8d8454ff58
commit 64c2eadb22
1 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
LEGO1/lego/legoomni/src/common/legoanimationmanager.cpp
View File

@ -2097,7 +2097,7 @@ MxBool LegoAnimationManager::FUN_10064010(LegoPathBoundary*, LegoUnknown100db7f4
// FUNCTION: BETA10 0x100454f5 // FUNCTION: BETA10 0x100454f5
MxBool LegoAnimationManager::FUN_10064120(LegoLocation::Boundary* p_boundary, MxBool p_bool1, MxBool p_bool2) MxBool LegoAnimationManager::FUN_10064120(LegoLocation::Boundary* p_boundary, MxBool p_bool1, MxBool p_bool2)
{ {
MxU32 local_2c = 12; MxU32 local2c = 12;
float destScale = ((rand() * 0.5) / 32767.0) + 0.25; float destScale = ((rand() * 0.5) / 32767.0) + 0.25;
IslePathActor* actor = CurrentActor(); IslePathActor* actor = CurrentActor();
@ -2112,8 +2112,8 @@ MxBool LegoAnimationManager::FUN_10064120(LegoLocation::Boundary* p_boundary, Mx
} }
Mx3DPointFloat direction = actor->GetWorldDirection(); Mx3DPointFloat direction = actor->GetWorldDirection();
float local_4c = 0.0f; float local4c = 0.0f;
LegoUnknown100db7f4* local_50 = NULL; LegoUnknown100db7f4* local50 = NULL;
LegoS32 numEdges = boundary->GetNumEdges(); LegoS32 numEdges = boundary->GetNumEdges();
Mx3DPointFloat vec; Mx3DPointFloat vec;
LegoUnknown100db7f4* e; LegoUnknown100db7f4* e;
@ -2124,31 +2124,31 @@ MxBool LegoAnimationManager::FUN_10064120(LegoLocation::Boundary* p_boundary, Mx
e->FUN_1002ddc0(*boundary, vec); e->FUN_1002ddc0(*boundary, vec);
float dot = vec.Dot(&direction, &vec); float dot = vec.Dot(&direction, &vec);
if (dot > local_4c) { if (dot > local4c) {
local_50 = e; local50 = e;
local_4c = dot; local4c = dot;
} }
} }
e = local_50; e = local50;
do { do {
e = (LegoUnknown100db7f4*) e->GetCounterclockwiseEdge(boundary); e = (LegoUnknown100db7f4*) e->GetCounterclockwiseEdge(boundary);
if (e->GetMask0x03()) { if (e->GetMask0x03()) {
break; break;
} }
} while (e != local_50); } while (e != local50);
if (e == local_50) { if (e == local50) {
return FALSE; return FALSE;
} }
LegoUnknown100db7f4* local_34 = e; LegoUnknown100db7f4* local34 = e;
LegoUnknown100db7f4* local_8 = local_50; LegoUnknown100db7f4* local8 = local50;
while (local_2c--) { while (local2c--) {
if (local_34 != NULL) { if (local34 != NULL) {
if (local_34->Unknown(*boundary, LegoWEGEdge::c_bit1) && FUN_10064010(boundary, local_34, destScale) && if (local34->Unknown(*boundary, LegoWEGEdge::c_bit1) && FUN_10064010(boundary, local34, destScale) &&
(!p_bool2 || FUN_10064010(boundary, local_8, destScale))) { (!p_bool2 || FUN_10064010(boundary, local8, destScale))) {
p_boundary->m_srcScale = p_boundary->m_destScale = destScale; p_boundary->m_srcScale = p_boundary->m_destScale = destScale;
p_boundary->m_name = boundary->GetName(); p_boundary->m_name = boundary->GetName();
numEdges = boundary->GetNumEdges(); numEdges = boundary->GetNumEdges();
@ -2156,10 +2156,10 @@ MxBool LegoAnimationManager::FUN_10064120(LegoLocation::Boundary* p_boundary, Mx
for (i = 0; i < numEdges; i++) { for (i = 0; i < numEdges; i++) {
LegoUnknown100db7f4* e = (LegoUnknown100db7f4*) boundary->GetEdges()[i]; LegoUnknown100db7f4* e = (LegoUnknown100db7f4*) boundary->GetEdges()[i];
if (local_34 == e) { if (local34 == e) {
p_boundary->m_src = i; p_boundary->m_src = i;
} }
else if (local_8 == e) { else if (local8 == e) {
p_boundary->m_dest = i; p_boundary->m_dest = i;
} }
} }
@ -2167,20 +2167,20 @@ MxBool LegoAnimationManager::FUN_10064120(LegoLocation::Boundary* p_boundary, Mx
return TRUE; return TRUE;
} }
local_8 = local_34; local8 = local34;
boundary = (LegoPathBoundary*) local_34->OtherFace(boundary); boundary = (LegoPathBoundary*) local34->OtherFace(boundary);
local_50 = local_34; local50 = local34;
do { do {
if (p_bool1) { if (p_bool1) {
local_34 = (LegoUnknown100db7f4*) local_34->GetCounterclockwiseEdge(boundary); local34 = (LegoUnknown100db7f4*) local34->GetCounterclockwiseEdge(boundary);
} }
else { else {
local_34 = (LegoUnknown100db7f4*) local_34->GetClockwiseEdge(boundary); local34 = (LegoUnknown100db7f4*) local34->GetClockwiseEdge(boundary);
} }
} while (!local_34->GetMask0x03() && local_34 != local_50); } while (!local34->GetMask0x03() && local34 != local50);
if (local_34 == local_50) { if (local34 == local50) {
return FALSE; return FALSE;
} }
} }