isledecomp/isle
1
0
Fork 0
mirror of https://github.com/isledecomp/isle.git synced 2026-02-28 15:07:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Cleanup

Browse Source
This commit is contained in:
jonschz 2026-02-14 11:04:00 +01:00
parent ddb3bf8264
commit 7c0de8049d
1 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
LEGO1/lego/legoomni/src/paths/legopathactor.cpp
View File

@ -549,14 +549,8 @@ MxS32 LegoPathActor::CheckIntersections(Vector3& p_rayOrigin, Vector3& p_rayEnd,
while (1) { while (1) {
assert(b); assert(b);
MxU32 result = CheckPresenterAndActorIntersections( MxU32 result =
b, CheckPresenterAndActorIntersections(b, p_rayOrigin, rayDirection, len, radius, p_intersectionPoint);
p_rayOrigin,
rayDirection,
len,
radius,
p_intersectionPoint
);
if (result != 0) { if (result != 0) {
return result; return result;
@ -565,7 +559,8 @@ MxS32 LegoPathActor::CheckIntersections(Vector3& p_rayOrigin, Vector3& p_rayEnd,
if (local18 == NULL) { if (local18 == NULL) {
local18 = (LegoOrientedEdge*) local14->GetCounterclockwiseEdge(*m_boundary); local18 = (LegoOrientedEdge*) local14->GetCounterclockwiseEdge(*m_boundary);
b = (LegoPathBoundary*) local14->OtherFace(m_boundary); b = (LegoPathBoundary*) local14->OtherFace(m_boundary);
} else { }
else {
b = NULL; b = NULL;
} }
@ -601,7 +596,8 @@ MxS32 LegoPathActor::CheckIntersections(Vector3& p_rayOrigin, Vector3& p_rayEnd,
float radius = m_roi->GetWorldBoundingSphere().Radius(); float radius = m_roi->GetWorldBoundingSphere().Radius();
list<LegoPathBoundary*> boundaries; list<LegoPathBoundary*> boundaries;
// TODO: Looks like this function is inlined by one level. The outer one may get fixed by getting the inner one straight // This function is inlined once. The recursion calls into the actual function.
// Matching `CheckIntersectionBothFaces` will likely match `CheckIntersections` as well.
return CheckIntersectionBothFaces( return CheckIntersectionBothFaces(
boundaries, boundaries,
m_boundary, m_boundary,
@ -687,7 +683,6 @@ inline MxU32 LegoPathActor::CheckIntersectionBothFaces(
return 0; return 0;
} }
// FUNCTION: LEGO1 0x1002f020 // FUNCTION: LEGO1 0x1002f020
// FUNCTION: BETA10 0x100af54a // FUNCTION: BETA10 0x100af54a
void LegoPathActor::ParseAction(char* p_extra) void LegoPathActor::ParseAction(char* p_extra)