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

Clear unknowns in LegoPathBoundary, LegoWEEdge, LegoWEGEdge and LegoPathController (#1546)

Browse Source
This commit is contained in:
Florian Kaiser
2025-06-08 20:04:58 +02:00
committed by GitHub
parent 06af7d25c6
commit 36c1093c88
15 changed files with 114 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
LEGO1/lego/legoomni/include/legopathboundary.h
View File

@@ -39,7 +39,7 @@ public:
MxResult AddActor(LegoPathActor* p_actor);
MxResult RemoveActor(LegoPathActor* p_actor);
void FUN_100575b0(Vector3& p_point1, Vector3& p_point2, LegoPathActor* p_actor);
void CheckAndCallPathTriggers(Vector3& p_point1, Vector3& p_point2, LegoPathActor* p_actor);
void SwitchBoundary(
LegoPathActor* p_actor,
LegoPathBoundary*& p_boundary,
@@ -47,8 +47,8 @@ public:
float& p_unk0xe4
);
MxU32 Intersect(float p_scale, Vector3& p_point1, Vector3& p_point2, Vector3& p_point3, LegoOrientedEdge*& p_edge);
MxU32 FUN_10057fe0(LegoAnimPresenter* p_presenter);
MxU32 FUN_100586e0(LegoAnimPresenter* p_presenter);
MxU32 AddPresenterIfInRange(LegoAnimPresenter* p_presenter);
MxU32 RemovePresenter(LegoAnimPresenter* p_presenter);
// FUNCTION: BETA10 0x1001ffb0
LegoPathActorSet& GetActors() { return m_actors; }

12
LEGO1/lego/legoomni/include/legopathcontroller.h
View File

@@ -105,7 +105,7 @@ public:
MxResult PlaceActor(LegoPathActor* p_actor);
MxResult RemoveActor(LegoPathActor* p_actor);
void FUN_100468f0(LegoAnimPresenter* p_presenter);
void FUN_10046930(LegoAnimPresenter* p_presenter);
void RemovePresenterFromBoundaries(LegoAnimPresenter* p_presenter);
MxResult FUN_10046b30(LegoPathBoundary*& p_boundaries, MxS32& p_numL);
LegoPathBoundary* GetPathBoundary(const char* p_name);
void Enable(MxBool p_enable);
@@ -189,12 +189,12 @@ private:
LegoPathBoundary* m_boundaries; // 0x08
LegoPathCtrlEdge* m_edges; // 0x0c
Mx3DPointFloat* m_unk0x10; // 0x10
Mx3DPointFloat* m_nodes; // 0x10
LegoPathStruct* m_structs; // 0x14
MxU16 m_numL; // 0x18
MxU16 m_numE; // 0x1a
MxU16 m_numN; // 0x1c
MxU16 m_numT; // 0x1e
MxU16 m_numL; // 0x18 Number of boundaries
MxU16 m_numE; // 0x1a Number of edges
MxU16 m_numN; // 0x1c Number of nodes
MxU16 m_numT; // 0x1e Number of structs
LegoPathCtrlEdgeSet m_pfsE; // 0x20
LegoPathActorSet m_actors; // 0x30

2
LEGO1/lego/legoomni/src/actors/act3actors.cpp
View File

@@ -244,7 +244,7 @@ void Act3Cop::ParseAction(char* p_extra)
}
}
Mx4DPointFloat* boundary0x14 = boundary->GetUnknown0x14();
Mx4DPointFloat* boundary0x14 = boundary->GetUp();
if (point.Dot(point, *boundary0x14) + boundary0x14->index_operator(3) <= 0.001 &&
point.Dot(point, *boundary0x14) + boundary0x14->index_operator(3) >= -0.001) {

4
LEGO1/lego/legoomni/src/actors/act3ammo.cpp
View File

@@ -337,7 +337,7 @@ void Act3Ammo::Animate(float p_time)
Vector3 local174(local104[2]);
if (IsPizza()) {
local184 = *m_boundary->GetUnknown0x14();
local184 = *m_boundary->GetUp();
local17c[0] = 1.0f;
local17c[1] = local17c[2] = 0.0f;
local174.EqualsCross(local17c, local184);
@@ -345,7 +345,7 @@ void Act3Ammo::Animate(float p_time)
local17c.EqualsCross(local184, local174);
}
else {
local17c = *m_boundary->GetUnknown0x14();
local17c = *m_boundary->GetUp();
local184[0] = 1.0f;
local184[1] = local184[2] = 0.0f;
local174.EqualsCross(local17c, local184);

2
LEGO1/lego/legoomni/src/common/legobuildingmanager.cpp
View File

@@ -827,7 +827,7 @@ MxResult LegoBuildingManager::FUN_10030630()
}
if (g_buildingInfo[i].m_boundary != NULL) {
Mx4DPointFloat& unk0x14 = *g_buildingInfo[i].m_boundary->GetUnknown0x14();
Mx4DPointFloat& unk0x14 = *g_buildingInfo[i].m_boundary->GetUp();
if (position.Dot(position, unk0x14) + unk0x14.index_operator(3) > 0.001 ||
position.Dot(position, unk0x14) + unk0x14.index_operator(3) < -0.001) {

2
LEGO1/lego/legoomni/src/common/legoplantmanager.cpp
View File

@@ -160,7 +160,7 @@ MxResult LegoPlantManager::FUN_10026410()
}
if (g_plantInfo[i].m_boundary != NULL) {
Mx4DPointFloat& unk0x14 = *g_plantInfo[i].m_boundary->GetUnknown0x14();
Mx4DPointFloat& unk0x14 = *g_plantInfo[i].m_boundary->GetUp();
if (position.Dot(position, unk0x14) + unk0x14.index_operator(3) > 0.001 ||
position.Dot(position, unk0x14) + unk0x14.index_operator(3) < -0.001) {

2
LEGO1/lego/legoomni/src/entity/legoworld.cpp
View File

@@ -369,7 +369,7 @@ void LegoWorld::FUN_1001fe90(LegoAnimPresenter* p_presenter)
LegoPathController* controller;
while (cursor.Next(controller)) {
controller->FUN_10046930(p_presenter);
controller->RemovePresenterFromBoundaries(p_presenter);
}
}

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

@@ -140,7 +140,7 @@ MxResult LegoPathActor::VTable0x88(
matrix.SetIdentity();
pos = p1;
dir = p4;
up = *m_boundary->GetUnknown0x14();
up = *m_boundary->GetUp();
if (!m_cameraFlag || !m_userNavFlag) {
dir *= -1.0f;
@@ -150,7 +150,7 @@ MxResult LegoPathActor::VTable0x88(
m_roi->UpdateTransformationRelativeToParent(matrix);
if (!m_cameraFlag || !m_userNavFlag) {
p5.EqualsCross(*p_boundary->GetUnknown0x14(), p3);
p5.EqualsCross(*p_boundary->GetUp(), p3);
p5.Unitize();
if (VTable0x80(p1, p4, p2, p5) == SUCCESS) {
@@ -211,7 +211,7 @@ MxResult LegoPathActor::VTable0x84(
matrix.SetIdentity();
pos = p_p1;
dir = p_p4;
up = *m_boundary->GetUnknown0x14();
up = *m_boundary->GetUp();
if (!m_cameraFlag || !m_userNavFlag) {
dir *= -1.0f;
@@ -225,7 +225,7 @@ MxResult LegoPathActor::VTable0x84(
FUN_10010c30();
}
else {
p5.EqualsCross(*p_boundary->GetUnknown0x14(), p3);
p5.EqualsCross(*p_boundary->GetUp(), p3);
p5.Unitize();
if (VTable0x80(p_p1, p_p4, p2, p5) != SUCCESS) {
@@ -256,7 +256,7 @@ MxS32 LegoPathActor::VTable0x8c(float p_time, Matrix4& p_transform)
m_worldSpeed = nav->GetLinearVel();
if (nav->CalculateNewPosDir(p4, p5, p2, p1, m_boundary->GetUnknown0x14())) {
if (nav->CalculateNewPosDir(p4, p5, p2, p1, m_boundary->GetUp())) {
Mx3DPointFloat p6;
p6 = p2;
MxS32 result = 0;
@@ -280,7 +280,7 @@ MxS32 LegoPathActor::VTable0x8c(float p_time, Matrix4& p_transform)
result = 0;
}
else {
m_boundary->FUN_100575b0(p4, p2, this);
m_boundary->CheckAndCallPathTriggers(p4, p2, this);
}
LegoPathBoundary* oldBoundary = m_boundary;
@@ -321,7 +321,7 @@ MxS32 LegoPathActor::VTable0x8c(float p_time, Matrix4& p_transform)
Vector3 pos(p_transform[3]);
dir = p1;
up = *m_boundary->GetUnknown0x14();
up = *m_boundary->GetUp();
right.EqualsCross(up, dir);
MxS32 res = right.Unitize();
@@ -354,10 +354,10 @@ MxS32 LegoPathActor::VTable0x8c(float p_time, Matrix4& p_transform)
LegoResult r;
if (m_userNavFlag) {
r = 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->GetUp(), 0);
}
else {
r = 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->GetUp(), 1);
}
assert(r == 0); // SUCCESS
@@ -371,7 +371,7 @@ MxS32 LegoPathActor::VTable0x8c(float p_time, Matrix4& p_transform)
return 1;
}
else {
m_boundary->FUN_100575b0(pos2, pos1, this);
m_boundary->CheckAndCallPathTriggers(pos2, pos1, this);
pos2 = pos1;
}
@@ -662,7 +662,7 @@ MxResult LegoPathActor::VTable0x9c()
LERP3(local34, v1, v2, m_unk0xe4);
m_destEdge->GetFaceNormal(*m_boundary, local78);
local48.EqualsCross(*m_boundary->GetUnknown0x14(), local78);
local48.EqualsCross(*m_boundary->GetUp(), local78);
local48.Unitize();
}
@@ -670,7 +670,7 @@ MxResult LegoPathActor::VTable0x9c()
Vector3 upRef(m_unk0xec[1]);
Vector3 dirRef(m_unk0xec[2]);
upRef = *m_boundary->GetUnknown0x14();
upRef = *m_boundary->GetUp();
rightRef.EqualsCross(upRef, dirRef);
rightRef.Unitize();

24
LEGO1/lego/legoomni/src/paths/legopathboundary.cpp
View File

@@ -44,27 +44,27 @@ MxResult LegoPathBoundary::RemoveActor(LegoPathActor* p_actor)
// FUNCTION: LEGO1 0x100575b0
// FUNCTION: BETA10 0x100b1598
void LegoPathBoundary::FUN_100575b0(Vector3& p_point1, Vector3& p_point2, LegoPathActor* p_actor)
void LegoPathBoundary::CheckAndCallPathTriggers(Vector3& p_from, Vector3& p_to, LegoPathActor* p_actor)
{
Vector3* ccwV = NULL;
if (m_numTriggers > 0 && m_unk0x50 != NULL) {
if (m_numTriggers > 0 && m_direction != NULL) {
ccwV = m_edges[0]->CCWVertex(*this);
Mx3DPointFloat v;
v = p_point1;
v = p_from;
v -= *ccwV;
float dot1 = v.Dot(v, *m_unk0x50);
float dot1 = v.Dot(v, *m_direction);
v = p_point2;
v = p_to;
v -= *ccwV;
float dot2 = v.Dot(v, *m_unk0x50);
float dot2 = v.Dot(v, *m_direction);
if (dot2 > dot1) {
for (MxS32 i = 0; i < m_numTriggers; i++) {
LegoPathStruct* s = m_pathTrigger[i].m_pathStruct;
if (m_pathTrigger[i].m_unk0x08 >= dot1 && m_pathTrigger[i].m_unk0x08 < dot2) {
if (m_pathTrigger[i].m_triggerLength >= dot1 && m_pathTrigger[i].m_triggerLength < dot2) {
s->HandleTrigger(p_actor, TRUE, m_pathTrigger[i].m_data);
}
}
@@ -73,7 +73,7 @@ void LegoPathBoundary::FUN_100575b0(Vector3& p_point1, Vector3& p_point2, LegoPa
for (MxS32 i = 0; i < m_numTriggers; i++) {
LegoPathStruct* s = m_pathTrigger[i].m_pathStruct;
if (m_pathTrigger[i].m_unk0x08 >= dot2 && m_pathTrigger[i].m_unk0x08 < dot1) {
if (m_pathTrigger[i].m_triggerLength >= dot2 && m_pathTrigger[i].m_triggerLength < dot1) {
s->HandleTrigger(p_actor, FALSE, m_pathTrigger[i].m_data);
}
}
@@ -339,15 +339,15 @@ MxU32 LegoPathBoundary::Intersect(
// FUNCTION: LEGO1 0x10057fe0
// FUNCTION: BETA10 0x100b2220
MxU32 LegoPathBoundary::FUN_10057fe0(LegoAnimPresenter* p_presenter)
MxU32 LegoPathBoundary::AddPresenterIfInRange(LegoAnimPresenter* p_presenter)
{
Mx3DPointFloat unk0x30;
unk0x30 = m_unk0x30;
unk0x30 = m_centerPoint;
unk0x30 -= p_presenter->m_unk0xa8;
float len = unk0x30.LenSquared();
float local20 = p_presenter->m_unk0xa4 + m_unk0x44;
float local20 = p_presenter->m_unk0xa4 + m_boundingRadius;
if (len > 0.001 && len > local20 * local20) {
return 0;
@@ -362,7 +362,7 @@ MxU32 LegoPathBoundary::FUN_10057fe0(LegoAnimPresenter* p_presenter)
// FUNCTION: LEGO1 0x100586e0
// FUNCTION: BETA10 0x100b22d1
MxU32 LegoPathBoundary::FUN_100586e0(LegoAnimPresenter* p_presenter)
MxU32 LegoPathBoundary::RemovePresenter(LegoAnimPresenter* p_presenter)
{
if (p_presenter != NULL) {
// TODO: This only seems to match if the type is not the same as the type of the

42
LEGO1/lego/legoomni/src/paths/legopathcontroller.cpp
View File

@@ -71,7 +71,7 @@ LegoPathController::LegoPathController()
{
m_boundaries = NULL;
m_edges = NULL;
m_unk0x10 = NULL;
m_nodes = NULL;
m_structs = NULL;
m_numL = 0;
m_numE = 0;
@@ -94,7 +94,7 @@ MxResult LegoPathController::Create(MxU8* p_data, const Vector3& p_location, con
}
for (i = 0; i < m_numN; i++) {
m_unk0x10[i] += p_location;
m_nodes[i] += p_location;
}
for (i = 0; i < m_numL; i++) {
@@ -144,10 +144,10 @@ void LegoPathController::Destroy()
m_boundaries = NULL;
m_numL = 0;
if (m_unk0x10 != NULL) {
delete[] m_unk0x10;
if (m_nodes != NULL) {
delete[] m_nodes;
}
m_unk0x10 = NULL;
m_nodes = NULL;
m_numN = 0;
if (m_structs != NULL) {
@@ -347,17 +347,17 @@ void LegoPathController::FUN_100468f0(LegoAnimPresenter* p_presenter)
{
for (MxS32 i = 0; i < m_numL; i++) {
if (!(m_boundaries[i].m_flags & LegoWEGEdge::c_bit3)) {
m_boundaries[i].FUN_10057fe0(p_presenter);
m_boundaries[i].AddPresenterIfInRange(p_presenter);
}
}
}
// FUNCTION: LEGO1 0x10046930
// FUNCTION: BETA10 0x100b737b
void LegoPathController::FUN_10046930(LegoAnimPresenter* p_presenter)
void LegoPathController::RemovePresenterFromBoundaries(LegoAnimPresenter* p_presenter)
{
for (MxS32 i = 0; i < m_numL; i++) {
m_boundaries[i].FUN_100586e0(p_presenter);
m_boundaries[i].RemovePresenter(p_presenter);
}
}
@@ -471,7 +471,7 @@ MxResult LegoPathController::Read(LegoStorage* p_storage)
return FAILURE;
}
if (m_numN > 0) {
m_unk0x10 = new Mx3DPointFloat[m_numN];
m_nodes = new Mx3DPointFloat[m_numN];
}
if (p_storage->Read(&m_numE, sizeof(MxU16)) != SUCCESS) {
@@ -494,7 +494,7 @@ MxResult LegoPathController::Read(LegoStorage* p_storage)
if (m_numN > 0) {
for (MxS32 i = 0; i < m_numN; i++) {
if (ReadVector(p_storage, m_unk0x10[i]) != SUCCESS) {
if (ReadVector(p_storage, m_nodes[i]) != SUCCESS) {
return FAILURE;
}
}
@@ -559,12 +559,12 @@ MxResult LegoPathController::ReadEdges(LegoStorage* p_storage)
if (p_storage->Read(&s, sizeof(MxU16)) != SUCCESS) {
return FAILURE;
}
edge.m_pointA = &m_unk0x10[s];
edge.m_pointA = &m_nodes[s];
if (p_storage->Read(&s, sizeof(MxU16)) != SUCCESS) {
return FAILURE;
}
edge.m_pointB = &m_unk0x10[s];
edge.m_pointB = &m_nodes[s];
if (edge.m_flags & LegoOrientedEdge::c_hasFaceA) {
if (p_storage->Read(&s, sizeof(MxU16)) != SUCCESS) {
@@ -662,7 +662,7 @@ MxResult LegoPathController::ReadBoundaries(LegoStorage* p_storage)
boundary.m_name[length] = '\0';
}
if (ReadVector(p_storage, boundary.m_unk0x14) != SUCCESS) {
if (ReadVector(p_storage, boundary.m_up) != SUCCESS) {
return FAILURE;
}
@@ -672,11 +672,11 @@ MxResult LegoPathController::ReadBoundaries(LegoStorage* p_storage)
}
}
if (ReadVector(p_storage, boundary.m_unk0x30) != SUCCESS) {
if (ReadVector(p_storage, boundary.m_centerPoint) != SUCCESS) {
return FAILURE;
}
if (p_storage->Read(&boundary.m_unk0x44, sizeof(boundary.m_unk0x44)) != SUCCESS) {
if (p_storage->Read(&boundary.m_boundingRadius, sizeof(boundary.m_boundingRadius)) != SUCCESS) {
return FAILURE;
}
@@ -685,7 +685,7 @@ MxResult LegoPathController::ReadBoundaries(LegoStorage* p_storage)
}
if (boundary.m_numTriggers > 0) {
boundary.m_unk0x50 = new Mx3DPointFloat;
boundary.m_direction = new Mx3DPointFloat;
boundary.m_pathTrigger = new PathWithTrigger[boundary.m_numTriggers];
for (j = 0; j < boundary.m_numTriggers; j++) {
@@ -701,14 +701,14 @@ MxResult LegoPathController::ReadBoundaries(LegoStorage* p_storage)
}
if (p_storage->Read(
&boundary.m_pathTrigger[j].m_unk0x08,
sizeof(boundary.m_pathTrigger[j].m_unk0x08)
&boundary.m_pathTrigger[j].m_triggerLength,
sizeof(boundary.m_pathTrigger[j].m_triggerLength)
) != SUCCESS) {
return FAILURE;
}
}
if (ReadVector(p_storage, *boundary.m_unk0x50) != SUCCESS) {
if (ReadVector(p_storage, *boundary.m_direction) != SUCCESS) {
return FAILURE;
}
}
@@ -956,7 +956,7 @@ MxS32 LegoPathController::FUN_1004a240(
p_v1 *= p_f1;
p_v1 += *p_edge->CWVertex(*p_boundary);
p_edge->GetFaceNormal(*p_boundary, vec);
p_v2.EqualsCross(*p_boundary->GetUnknown0x14(), vec);
p_v2.EqualsCross(*p_boundary->GetUp(), vec);
return 0;
}
@@ -980,7 +980,7 @@ MxResult LegoPathController::FUN_1004a380(
}
LegoPathBoundary* b = &m_boundaries[i];
Mx4DPointFloat* unk0x14 = b->GetUnknown0x14();
Mx4DPointFloat* unk0x14 = b->GetUp();
float local28 = p_param3[0].Dot(p_param3[0], *unk0x14);
if (local28 < 0.001 && local28 > -0.001) {

8
LEGO1/lego/legoomni/src/race/legoracespecial.cpp
View File

@@ -171,7 +171,7 @@ MxS32 LegoCarRaceActor::VTable0x1c(LegoPathBoundary* p_boundary, LegoEdge* p_edg
m_destEdge->GetFaceNormal(*m_boundary, destEdgeUnknownVector);
crossProduct.EqualsCross(*m_boundary->GetUnknown0x14(), destEdgeUnknownVector);
crossProduct.EqualsCross(*m_boundary->GetUp(), destEdgeUnknownVector);
crossProduct.Unitize();
Mx3DPointFloat worldDirection(Vector3(m_roi->GetWorldDirection()));
@@ -265,8 +265,8 @@ MxResult LegoCarRaceActor::VTable0x9c()
d->GetFaceNormal(*b, point2);
m_destEdge->GetFaceNormal(*m_boundary, point3);
point4.EqualsCross(point2, *m_boundary->GetUnknown0x14());
point5.EqualsCross(*m_boundary->GetUnknown0x14(), point3);
point4.EqualsCross(point2, *m_boundary->GetUp());
point5.EqualsCross(*m_boundary->GetUp(), point3);
point4.Unitize();
point5.Unitize();
@@ -365,7 +365,7 @@ MxS32 LegoJetskiRaceActor::VTable0x1c(LegoPathBoundary* p_boundary, LegoEdge* p_
LERP3(a, *v1, *v2, m_unk0xe4);
m_destEdge->GetFaceNormal(*m_boundary, bbb);
c.EqualsCross(bbb, *m_boundary->GetUnknown0x14());
c.EqualsCross(bbb, *m_boundary->GetUp());
c.Unitize();
Mx3DPointFloat worldDirection(m_roi->GetWorldDirection());