isledecomp/isle-portable
1
0
Fork 0
mirror of https://github.com/isledecomp/isle-portable.git synced 2024-11-26 09:28:01 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Implement/Match LegoPathActor::VTable0x74 (#805)

Browse source 
* Implement/Match LegoPathActor::VTable0x74

* Remove superfluous early returns

* fix

---------

Co-authored-by: Christian Semmler <mail@csemmler.com>
This commit is contained in:
Nathan M Gilbert 2024-04-15 07:38:30 -04:00 committed by GitHub
parent c8840117be
commit dcbad318e0
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 71 additions and 66 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

137
LEGO1/lego/legoomni/src/paths/legopathactor.cpp
View file

@ -221,83 +221,77 @@ MxS32 LegoPathActor::VTable0x8c(float p_time, Matrix4& p_transform)
LegoNavController* nav = NavController(); LegoNavController* nav = NavController();
m_worldSpeed = nav->GetLinearVel(); m_worldSpeed = nav->GetLinearVel();
if (!nav->CalculateNewPosDir(p4, p5, p2, p1, m_boundary->GetUnknown0x14())) { if (nav->CalculateNewPosDir(p4, p5, p2, p1, m_boundary->GetUnknown0x14())) {
return -1; Mx3DPointFloat p6;
} p6 = p2;
Mx3DPointFloat p6; m_unk0xe9 = m_boundary->Intersect(m_roi->GetWorldBoundingSphere().Radius(), p4, p2, p3, m_destEdge);
p6 = p2; if (m_unk0xe9 == -1) {
return -1;
}
m_unk0xe9 = m_boundary->Intersect(m_roi->GetWorldBoundingSphere().Radius(), p4, p2, p3, m_destEdge); if (m_unk0xe9 != 0) {
if (m_unk0xe9 == -1) { p2 = p3;
return -1; }
}
if (m_unk0xe9 != 0) { MxS32 result = VTable0x68(p4, p2, p3);
p2 = p3;
}
MxS32 result = VTable0x68(p4, p2, p3); if (result > 0) {
p2 = p4;
m_unk0xe9 = 0;
result = 0;
}
else {
m_boundary->FUN_100575b0(p4, p2, this);
}
if (result > 0) { LegoPathBoundary* oldBoundary = m_boundary;
p2 = p4;
m_unk0xe9 = 0;
result = 0;
}
else {
m_boundary->FUN_100575b0(p4, p2, this);
}
LegoPathBoundary* oldBoundary = m_boundary; if (m_unk0xe9 != 0) {
WaitForAnimation();
if (m_unk0xe9 != 0) { if (m_boundary == oldBoundary) {
WaitForAnimation(); MxLong time = Timer()->GetTime();
if (m_boundary == oldBoundary) { if (time - g_unk0x100f3308 > 1000) {
MxLong time = Timer()->GetTime(); g_unk0x100f3308 = time;
const char* var = VariableTable()->GetVariable(g_strHIT_WALL_SOUND);
if (time - g_unk0x100f3308 > 1000) { if (var && var[0] != 0) {
g_unk0x100f3308 = time; SoundManager()->GetCacheSoundManager()->FUN_1003dae0(var, NULL, FALSE);
const char* var = VariableTable()->GetVariable(g_strHIT_WALL_SOUND); }
}
if (var && var[0] != 0) { m_worldSpeed *= m_unk0x144;
SoundManager()->GetCacheSoundManager()->FUN_1003dae0(var, NULL, FALSE); nav->SetLinearVel(m_worldSpeed);
Mx3DPointFloat p7(p2);
((Vector3&) p7).Sub(&p6);
if (p7.Unitize() == 0) {
float f = sqrt(p1.LenSquared()) * m_unk0x140;
((Vector3&) p7).Mul(f);
((Vector3&) p1).Add(&p7);
} }
} }
m_worldSpeed *= m_unk0x144;
nav->SetLinearVel(m_worldSpeed);
Mx3DPointFloat p7(p2);
((Vector3&) p7).Sub(&p6);
if (p7.Unitize() == 0) {
float f = sqrt(p1.LenSquared()) * m_unk0x140;
((Vector3&) p7).Mul(f);
((Vector3&) p1).Add(&p7);
}
} }
p_transform.SetIdentity();
Vector3 right(p_transform[0]);
Vector3 up(p_transform[1]);
Vector3 dir(p_transform[2]);
Vector3 pos(p_transform[3]);
dir = p1;
up = *m_boundary->GetUnknown0x14();
right.EqualsCross(&up, &dir);
right.Unitize();
dir.EqualsCross(&right, &up);
pos = p2;
return result;
} }
p_transform.SetIdentity();
Vector3 right(p_transform[0]);
Vector3 up(p_transform[1]);
Vector3 dir(p_transform[2]);
Vector3 pos(p_transform[3]);
dir = p1;
up = *m_boundary->GetUnknown0x14();
right.EqualsCross(&up, &dir);
right.Unitize();
dir.EqualsCross(&right, &up);
pos = p2;
return result;
} }
else { else if (p_time >= 0 && m_worldSpeed > 0) {
if (p_time < 0 || m_worldSpeed <= 0) {
return -1;
}
float f = (m_BADuration - m_unk0x7c) / m_worldSpeed + m_lastTime; float f = (m_BADuration - m_unk0x7c) / m_worldSpeed + m_lastTime;
if (f < p_time) { if (f < p_time) {
@ -315,10 +309,10 @@ MxS32 LegoPathActor::VTable0x8c(float p_time, Matrix4& p_transform)
p_transform.SetIdentity(); p_transform.SetIdentity();
if (m_userNavFlag) { if (m_userNavFlag) {
m_unk0x8c.FUN_1009a1e0(m_BADuration / m_unk0x7c, p_transform, *m_boundary->GetUnknown0x14(), 0); m_unk0x8c.FUN_1009a1e0(m_unk0x7c / m_BADuration, p_transform, *m_boundary->GetUnknown0x14(), 0);
} }
else { else {
m_unk0x8c.FUN_1009a1e0(m_BADuration / m_unk0x7c, p_transform, *m_boundary->GetUnknown0x14(), 1); m_unk0x8c.FUN_1009a1e0(m_unk0x7c / m_BADuration, p_transform, *m_boundary->GetUnknown0x14(), 1);
} }
Vector3 pos1(p_transform[3]); Vector3 pos1(p_transform[3]);
@ -344,10 +338,21 @@ MxS32 LegoPathActor::VTable0x8c(float p_time, Matrix4& p_transform)
return -1; return -1;
} }
// STUB: LEGO1 0x1002e740 // FUNCTION: LEGO1 0x1002e740
void LegoPathActor::VTable0x74(Matrix4& p_transform) void LegoPathActor::VTable0x74(Matrix4& p_transform)
{ {
// TODO if (m_userNavFlag) {
m_roi->WrappedSetLocalTransform(p_transform);
FUN_10010c30();
}
else {
m_roi->WrappedSetLocalTransform(p_transform);
m_roi->VTable0x14();
if (m_cameraFlag) {
FUN_10010c30();
}
}
} }
// STUB: LEGO1 0x1002e790 // STUB: LEGO1 0x1002e790