isledecomp/isle
1
0
Fork 0
mirror of https://github.com/isledecomp/isle.git synced 2024-11-22 15:48:09 -05:00
Code Issues Projects Releases Packages Wiki Activity

Implement LegoPathActor::Vtable0x84 (#790)

Browse source 
* Implement LegoPathActor::Vtable0x84

* fix condition

---------

Co-authored-by: Christian Semmler <mail@csemmler.com>
This commit is contained in:
Nathan M Gilbert 2024-04-13 08:05:20 -04:00 committed by GitHub
parent dc3259bb17
commit e8b61d5a1d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 72 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
LEGO1/lego/legoomni/include/legopathactor.h
View file

@ -47,8 +47,15 @@ class LegoPathActor : public LegoActor {
Vector3& p_point2, Vector3& p_point2,
Vector3& p_point3, Vector3& p_point3,
Vector3& p_point4 Vector3& p_point4
); // vtable+0x80 ); // vtable+0x80
virtual void VTable0x84(); // vtable+0x84 virtual MxResult VTable0x84(
LegoPathBoundary* p_boundary,
float p_time,
Vector3& p_p1,
Vector3& p_p4,
LegoUnknown100db7f4& p_destEdge,
float p_destScale
); // vtable+0x84
virtual MxResult VTable0x88( virtual MxResult VTable0x88(
LegoPathBoundary* p_boundary, LegoPathBoundary* p_boundary,
float p_time, float p_time,

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

@ -129,10 +129,70 @@ MxResult LegoPathActor::VTable0x88(
return SUCCESS; return SUCCESS;
} }
// STUB: LEGO1 0x1002de10 // FUNCTION: LEGO1 0x1002de10
void LegoPathActor::VTable0x84() MxResult LegoPathActor::VTable0x84(
LegoPathBoundary* p_boundary,
float p_time,
Vector3& p_p1,
Vector3& p_p4,
LegoUnknown100db7f4& p_destEdge,
float p_destScale
)
{ {
// TODO Vector3* v3 = p_destEdge.GetOpposingPoint(p_boundary);
Vector3* v4 = p_destEdge.GetPoint(p_boundary);
Mx3DPointFloat p2, p3, p5;
p2 = *v4;
((Vector3&) p2).Sub(v3);
((Vector3&) p2).Mul(p_destScale);
((Vector3&) p2).Add(v3);
m_boundary = p_boundary;
m_destEdge = &p_destEdge;
m_unk0xe4 = p_destScale;
m_unk0x7c = 0;
m_lastTime = p_time;
m_actorTime = p_time;
p_destEdge.FUN_1002ddc0(*p_boundary, p3);
MxMatrix matrix;
Vector3 pos(matrix[3]);
Vector3 dir(matrix[2]);
Vector3 up(matrix[1]);
Vector3 right(matrix[0]);
matrix.SetIdentity();
pos = p_p1;
dir = p_p4;
up = *m_boundary->GetUnknown0x14();
if (!m_cameraFlag || !m_userNavFlag) {
((Vector3&) dir).Mul(-1.0f);
}
right.EqualsCross(&up, &dir);
m_roi->FUN_100a46b0(matrix);
if (!m_cameraFlag || !m_userNavFlag) {
p5.EqualsCross(p_boundary->GetUnknown0x14(), &p3);
p5.Unitize();
if (VTable0x80(p_p1, p_p4, p2, p5) == SUCCESS) {
m_boundary->AddActor(this);
}
else {
return FAILURE;
}
}
else {
m_boundary->AddActor(this);
FUN_10010c30();
}
m_unk0xec = m_roi->GetLocal2World();
return SUCCESS;
} }
// STUB: LEGO1 0x1002e100 // STUB: LEGO1 0x1002e100