mirrors/isle
1
0
Fork 0
mirror of https://github.com/isledecomp/isle.git synced 2025-10-25 17:34:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Match LegoPathActor::VTable0x8c (#1303)

Browse Source 
* Match `LegoPathActor::VTable0x8c`

* Fix
This commit is contained in:
Christian Semmler
2024-12-29 12:46:03 -07:00
committed by GitHub
parent d97ce96768
commit 795d6e144d
4 changed files with 37 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -16,6 +16,7 @@
#include "mxutilities.h"
#include "mxvariabletable.h"
#include <mxdebug.h>
#include <vec.h>
DECOMP_SIZE_ASSERT(LegoPathActor, 0x154)
@@ -233,7 +234,7 @@ MxResult LegoPathActor::VTable0x84(
// FUNCTION: LEGO1 0x1002e100
// FUNCTION: BETA10 0x100b0520
MxS32 LegoPathActor::VTable0x8c(float p_time, Matrix4& p_transform)
MxS32 LegoPathActor::VTable0x8c(float p_time, MxMatrix& p_transform)
{
if (m_userNavFlag && m_actorState == c_initial) {
m_lastTime = p_time;
@@ -243,22 +244,27 @@ MxS32 LegoPathActor::VTable0x8c(float p_time, Matrix4& p_transform)
p4 = Vector3(m_roi->GetWorldPosition());
LegoNavController* nav = NavController();
assert(nav);
m_worldSpeed = nav->GetLinearVel();
if (nav->CalculateNewPosDir(p4, p5, p2, p1, m_boundary->GetUnknown0x14())) {
Mx3DPointFloat p6;
p6 = p2;
MxS32 result = 0;
m_unk0xe9 = m_boundary->Intersect(m_roi->GetWorldBoundingSphere().Radius(), p4, p2, p3, m_destEdge);
if (m_unk0xe9 == -1) {
MxTrace("Intersect returned -1\n");
return -1;
}
if (m_unk0xe9 != 0) {
p2 = p3;
else {
if (m_unk0xe9 != 0) {
p2 = p3;
}
}
MxS32 result = VTable0x68(p4, p2, p3);
result = VTable0x68(p4, p2, p3);
if (result > 0) {
p2 = p4;
@@ -309,11 +315,17 @@ MxS32 LegoPathActor::VTable0x8c(float p_time, Matrix4& p_transform)
dir = p1;
up = *m_boundary->GetUnknown0x14();
right.EqualsCross(up, dir);
right.Unitize();
MxS32 res = right.Unitize();
assert(res == 0);
dir.EqualsCross(right, up);
pos = p2;
return result;
}
else {
return -1;
}
}
else if (p_time >= 0 && m_worldSpeed > 0) {
float f = (m_BADuration - m_unk0x7c) / m_worldSpeed + m_lastTime;
@@ -332,13 +344,16 @@ MxS32 LegoPathActor::VTable0x8c(float p_time, Matrix4& p_transform)
m_lastTime = f;
p_transform.SetIdentity();
LegoResult r;
if (m_userNavFlag) {
m_unk0x8c.FUN_1009a1e0(m_unk0x7c / m_BADuration, p_transform, *m_boundary->GetUnknown0x14(), 0);
r = m_unk0x8c.FUN_1009a1e0(m_unk0x7c / m_BADuration, p_transform, *m_boundary->GetUnknown0x14(), 0);
}
else {
m_unk0x8c.FUN_1009a1e0(m_unk0x7c / m_BADuration, p_transform, *m_boundary->GetUnknown0x14(), 1);
r = m_unk0x8c.FUN_1009a1e0(m_unk0x7c / m_BADuration, p_transform, *m_boundary->GetUnknown0x14(), 1);
}
assert(r == 0); // SUCCESS
Vector3 pos1(p_transform[3]);
Vector3 pos2(m_unk0xec[3]);
Mx3DPointFloat p1;
@@ -350,16 +365,17 @@ MxS32 LegoPathActor::VTable0x8c(float p_time, Matrix4& p_transform)
else {
m_boundary->FUN_100575b0(pos2, pos1, this);
pos2 = pos1;
}
if (m_unk0xe9 != 0) {
VTable0x9c();
}
return 0;
if (m_unk0xe9 != 0) {
VTable0x9c();
}
}
else {
return -1;
}
return -1;
return 0;
}
// FUNCTION: LEGO1 0x1002e740