Order symbols until end of LegoOmni (#1371)

* Order

* Improve

* Move function

* Order until end of LegoOmni

* Remove header

LEGO1/lego/legoomni/src/common/legoobjectfactory.cpp

@@ -72,7 +72,6 @@
 #include "legoentitypresenter.h"
 #include "legoflctexturepresenter.h"
 #include "legohideanimpresenter.h"
-#include "legojetskiraceactor.h"
 #include "legoloadcachesoundpresenter.h"
 #include "legolocomotionanimpresenter.h"
 #include "legoloopinganimpresenter.h"

LEGO1/lego/legoomni/src/entity/legojetskiraceactor.cpp

@@ -1,186 +0,0 @@
-#include "legojetskiraceactor.h"
-
-#include "legonavcontroller.h"
-#include "legopathcontroller.h"
-#include "misc.h"
-#include "mxmisc.h"
-#include "mxvariabletable.h"
-
-#include <vec.h>
-
-DECOMP_SIZE_ASSERT(LegoJetskiRaceActor, 0x1a8)
-
-// GLOBAL: LEGO1 0x100da044
-// GLOBAL: BETA10 0x101be9fc
-MxFloat g_unk0x100da044 = 8.0f;
-
-// FUNCTION: LEGO1 0x10080ef0
-// FUNCTION: BETA10 0x100a8990
-LegoJetskiRaceActor::LegoJetskiRaceActor()
-{
-	m_unk0x10 = 0.95f;
-	m_unk0x14 = 0.04f;
-	m_unk0x18 = 0.5f;
-	m_unk0x150 = 1.5f;
-}
-
-// FUNCTION: LEGO1 0x10081120
-// FUNCTION: BETA10 0x100ce19f
-MxS32 LegoJetskiRaceActor::VTable0x1c(LegoPathBoundary* p_boundary, LegoEdge* p_edge)
-{
-	// These are almost certainly not the correct names, but they produce the correct BETA10 stack
-	Mx3DPointFloat a;
-	Mx3DPointFloat bbb;
-	Mx3DPointFloat c;
-
-	// These names are verified by an assertion below
-	Vector3* v1 = NULL;
-	Vector3* v2 = NULL;
-
-	if (m_actorState == c_one) {
-		if (m_destEdge == LegoPathController::GetControlEdgeA(13)) {
-			m_boundary = (LegoPathBoundary*) m_destEdge->OtherFace(LegoPathController::GetControlBoundaryA(13));
-		}
-		else if (m_destEdge == LegoPathController::GetControlEdgeA(15)) {
-			m_boundary = (LegoPathBoundary*) m_destEdge->OtherFace(LegoPathController::GetControlBoundaryA(15));
-		}
-
-		m_actorState = c_initial;
-		m_unk0x7c = 0;
-
-		if (m_userNavFlag) {
-			NavController()->SetLinearVel(m_worldSpeed);
-			return 0;
-		}
-		else {
-			return 1;
-		}
-	}
-	else {
-		if (p_edge == LegoPathController::GetControlEdgeA(12)) {
-			m_actorState = c_one;
-
-			if (m_worldSpeed < g_unk0x100da044) {
-				m_worldSpeed = g_unk0x100da044;
-			}
-
-			m_destEdge = LegoPathController::GetControlEdgeA(13);
-			m_boundary = LegoPathController::GetControlBoundaryA(13);
-		}
-		else if (p_edge == LegoPathController::GetControlEdgeA(14)) {
-			m_actorState = c_one;
-
-			if (m_worldSpeed < g_unk0x100da044) {
-				m_worldSpeed = g_unk0x100da044;
-			}
-
-			m_destEdge = LegoPathController::GetControlEdgeA(15);
-			m_boundary = LegoPathController::GetControlBoundaryA(15);
-		}
-
-		if (m_actorState == c_one) {
-			if (m_userNavFlag) {
-				m_unk0xe4 = 0.5f;
-			}
-
-			v1 = m_destEdge->CCWVertex(*m_boundary);
-			v2 = m_destEdge->CWVertex(*m_boundary);
-			assert(v1 && v2);
-
-			LERP3(a, *v1, *v2, m_unk0xe4);
-
-			m_destEdge->FUN_1002ddc0(*m_boundary, bbb);
-			c.EqualsCross(bbb, *m_boundary->GetUnknown0x14());
-			c.Unitize();
-
-			Mx3DPointFloat worldDirection(m_roi->GetWorldDirection());
-
-			if (!m_userNavFlag) {
-				worldDirection *= -1.0f;
-			}
-
-			if (VTable0x80(m_roi->GetWorldPosition(), worldDirection, a, c)) {
-#ifndef BETA10
-				m_unk0x7c = 0;
-				return 0;
-#else
-				assert(0);
-				return -1;
-#endif
-			}
-
-			m_unk0x7c = 0;
-			return 0;
-		}
-		else {
-			return 1;
-		}
-	}
-}
-
-// FUNCTION: LEGO1 0x10081550
-void LegoJetskiRaceActor::Animate(float p_time)
-{
-	if (m_unk0x0c == 0) {
-		const LegoChar* raceState = VariableTable()->GetVariable(g_raceState);
-		if (!stricmp(raceState, g_racing)) {
-			m_unk0x0c = 1;
-			m_lastTime = p_time - 1.0f;
-			m_unk0x1c = p_time;
-		}
-		else if (!m_userNavFlag) {
-			LegoAnimActor::Animate(m_lastTime + 1.0f);
-		}
-	}
-
-	if (m_unk0x0c == 1) {
-		LegoAnimActor::Animate(p_time);
-	}
-}
-
-// FUNCTION: LEGO1 0x10081fd0
-MxU32 LegoJetskiRaceActor::VTable0x6c(
-	LegoPathBoundary* p_boundary,
-	Vector3& p_v1,
-	Vector3& p_v2,
-	float p_f1,
-	float p_f2,
-	Vector3& p_v3
-)
-{
-	LegoAnimPresenterSet& presenters = p_boundary->GetPresenters();
-
-	for (LegoAnimPresenterSet::iterator itap = presenters.begin(); itap != presenters.end(); itap++) {
-		if ((*itap)->VTable0x94(p_v1, p_v2, p_f1, p_f2, p_v3)) {
-			return 1;
-		}
-	}
-
-	LegoPathActorSet& plpas = p_boundary->GetActors();
-	LegoPathActorSet lpas(plpas);
-
-	for (LegoPathActorSet::iterator itpa = lpas.begin(); itpa != lpas.end(); itpa++) {
-		if (plpas.find(*itpa) != plpas.end()) {
-			LegoPathActor* actor = *itpa;
-
-			if (this != actor) {
-				LegoROI* roi = actor->GetROI();
-
-				if (roi != NULL && (roi->GetVisibility() || actor->GetCameraFlag())) {
-					if (roi->FUN_100a9410(p_v1, p_v2, p_f1, p_f2, p_v3, m_collideBox && actor->GetCollideBox())) {
-						HitActor(actor, TRUE);
-
-						if (actor->HitActor(this, FALSE) < 0) {
-							return 0;
-						}
-						else {
-							return 2;
-						}
-					}
-				}
-			}
-		}
-	}
-
-	return 0;
-}

LEGO1/lego/legoomni/src/paths/legoextraactor.cpp

@@ -420,3 +420,105 @@ MxS32 LegoExtraActor::VTable0x68(Vector3& p_point1, Vector3& p_point2, Vector3&
 {
 	return LegoPathActor::VTable0x68(p_point1, p_point2, p_point3);
 }
+
+// FUNCTION: LEGO1 0x1002b980
+inline MxU32 LegoExtraActor::VTable0x6c(
+	LegoPathBoundary* p_boundary,
+	Vector3& p_v1,
+	Vector3& p_v2,
+	float p_f1,
+	float p_f2,
+	Vector3& p_v3
+)
+{
+	LegoAnimPresenterSet& presenters = p_boundary->GetPresenters();
+
+	for (LegoAnimPresenterSet::iterator itap = presenters.begin(); itap != presenters.end(); itap++) {
+		if ((*itap)->VTable0x94(p_v1, p_v2, p_f1, p_f2, p_v3)) {
+			return 1;
+		}
+	}
+
+	LegoPathActorSet& plpas = p_boundary->GetActors();
+	LegoPathActorSet lpas(plpas);
+
+	for (LegoPathActorSet::iterator itpa = lpas.begin(); itpa != lpas.end(); itpa++) {
+		if (plpas.find(*itpa) != plpas.end()) {
+			LegoPathActor* actor = *itpa;
+
+			if (this != actor && !(actor->GetActorState() & LegoPathActor::c_noCollide)) {
+				LegoROI* roi = actor->GetROI();
+
+				if ((roi != NULL && roi->GetVisibility()) || actor->GetCameraFlag()) {
+					if (actor->GetUserNavFlag()) {
+						MxMatrix local2world = roi->GetLocal2World();
+						Vector3 local60(local2world[3]);
+						Mx3DPointFloat local54(p_v1);
+
+						local54 -= local60;
+						float local1c = p_v2.Dot(p_v2, p_v2);
+						float local24 = p_v2.Dot(p_v2, local54) * 2.0f;
+						float local20 = local54.Dot(local54, local54);
+
+						if (m_unk0x15 != 0 && local20 < 10.0f) {
+							return 0;
+						}
+
+						local20 -= 1.0f;
+
+						if (local1c >= 0.001 || local1c <= -0.001) {
+							float local40 = (local24 * local24) + (local20 * local1c * -4.0f);
+
+							if (local40 >= -0.001) {
+								local1c *= 2.0f;
+								local24 = -local24;
+
+								if (local40 < 0.0f) {
+									local40 = 0.0f;
+								}
+
+								local40 = sqrt(local40);
+								float local20X = (local24 + local40) / local1c;
+								float local1cX = (local24 - local40) / local1c;
+
+								if (local1cX < local20X) {
+									local40 = local20X;
+									local20X = local1cX;
+									local1cX = local40;
+								}
+
+								if ((local20X >= 0.0f && local20X <= p_f1) || (local1cX >= 0.0f && local1cX <= p_f1) ||
+									(local20X <= -0.01 && p_f1 + 0.01 <= local1cX)) {
+									p_v3 = p_v1;
+
+									if (HitActor(actor, TRUE) < 0) {
+										return 0;
+									}
+
+									actor->HitActor(this, FALSE);
+									return 2;
+								}
+							}
+						}
+					}
+					else {
+						if (roi->FUN_100a9410(p_v1, p_v2, p_f1, p_f2, p_v3, m_collideBox && actor->GetCollideBox())) {
+							if (HitActor(actor, TRUE) < 0) {
+								return 0;
+							}
+
+							actor->HitActor(this, FALSE);
+							return 2;
+						}
+					}
+				}
+			}
+		}
+	}
+
+	if (m_unk0x15 != 0) {
+		m_unk0x15--;
+	}
+
+	return 0;
+}

LEGO1/lego/legoomni/src/race/legoracespecial.cpp

@@ -13,6 +13,7 @@
 // File name verified by BETA10 0x100cedf7
 
 DECOMP_SIZE_ASSERT(LegoCarRaceActor, 0x1a0)
+DECOMP_SIZE_ASSERT(LegoJetskiRaceActor, 0x1a8)
 
 // GLOBAL: LEGO1 0x100f0c68
 // STRING: LEGO1 0x100f0c5c
@@ -33,6 +34,10 @@ const char* g_racing = "RACING";
 // GLOBAL: LEGO1 0x100f7aec
 MxFloat LegoCarRaceActor::g_unk0x100f7aec = 8.0f;
 
+// GLOBAL: LEGO1 0x100da044
+// GLOBAL: BETA10 0x101be9fc
+MxFloat g_unk0x100da044 = 8.0f;
+
 // FUNCTION: LEGO1 0x10080350
 // FUNCTION: BETA10 0x100cd6b0
 LegoCarRaceActor::LegoCarRaceActor()
@@ -284,9 +289,133 @@ MxResult LegoCarRaceActor::VTable0x9c()
 	return SUCCESS;
 }
 
+// FUNCTION: LEGO1 0x10080ef0
+// FUNCTION: BETA10 0x100a8990
+LegoJetskiRaceActor::LegoJetskiRaceActor()
+{
+	m_unk0x10 = 0.95f;
+	m_unk0x14 = 0.04f;
+	m_unk0x18 = 0.5f;
+	m_unk0x150 = 1.5f;
+}
+
+// FUNCTION: LEGO1 0x10081120
+// FUNCTION: BETA10 0x100ce19f
+MxS32 LegoJetskiRaceActor::VTable0x1c(LegoPathBoundary* p_boundary, LegoEdge* p_edge)
+{
+	// These are almost certainly not the correct names, but they produce the correct BETA10 stack
+	Mx3DPointFloat a;
+	Mx3DPointFloat bbb;
+	Mx3DPointFloat c;
+
+	// These names are verified by an assertion below
+	Vector3* v1 = NULL;
+	Vector3* v2 = NULL;
+
+	if (m_actorState == c_one) {
+		if (m_destEdge == LegoPathController::GetControlEdgeA(13)) {
+			m_boundary = (LegoPathBoundary*) m_destEdge->OtherFace(LegoPathController::GetControlBoundaryA(13));
+		}
+		else if (m_destEdge == LegoPathController::GetControlEdgeA(15)) {
+			m_boundary = (LegoPathBoundary*) m_destEdge->OtherFace(LegoPathController::GetControlBoundaryA(15));
+		}
+
+		m_actorState = c_initial;
+		m_unk0x7c = 0;
+
+		if (m_userNavFlag) {
+			NavController()->SetLinearVel(m_worldSpeed);
+			return 0;
+		}
+		else {
+			return 1;
+		}
+	}
+	else {
+		if (p_edge == LegoPathController::GetControlEdgeA(12)) {
+			m_actorState = c_one;
+
+			if (m_worldSpeed < g_unk0x100da044) {
+				m_worldSpeed = g_unk0x100da044;
+			}
+
+			m_destEdge = LegoPathController::GetControlEdgeA(13);
+			m_boundary = LegoPathController::GetControlBoundaryA(13);
+		}
+		else if (p_edge == LegoPathController::GetControlEdgeA(14)) {
+			m_actorState = c_one;
+
+			if (m_worldSpeed < g_unk0x100da044) {
+				m_worldSpeed = g_unk0x100da044;
+			}
+
+			m_destEdge = LegoPathController::GetControlEdgeA(15);
+			m_boundary = LegoPathController::GetControlBoundaryA(15);
+		}
+
+		if (m_actorState == c_one) {
+			if (m_userNavFlag) {
+				m_unk0xe4 = 0.5f;
+			}
+
+			v1 = m_destEdge->CCWVertex(*m_boundary);
+			v2 = m_destEdge->CWVertex(*m_boundary);
+			assert(v1 && v2);
+
+			LERP3(a, *v1, *v2, m_unk0xe4);
+
+			m_destEdge->FUN_1002ddc0(*m_boundary, bbb);
+			c.EqualsCross(bbb, *m_boundary->GetUnknown0x14());
+			c.Unitize();
+
+			Mx3DPointFloat worldDirection(m_roi->GetWorldDirection());
+
+			if (!m_userNavFlag) {
+				worldDirection *= -1.0f;
+			}
+
+			if (VTable0x80(m_roi->GetWorldPosition(), worldDirection, a, c)) {
+#ifndef BETA10
+				m_unk0x7c = 0;
+				return 0;
+#else
+				assert(0);
+				return -1;
+#endif
+			}
+
+			m_unk0x7c = 0;
+			return 0;
+		}
+		else {
+			return 1;
+		}
+	}
+}
+
+// FUNCTION: LEGO1 0x10081550
+void LegoJetskiRaceActor::Animate(float p_time)
+{
+	if (m_unk0x0c == 0) {
+		const LegoChar* raceState = VariableTable()->GetVariable(g_raceState);
+		if (!stricmp(raceState, g_racing)) {
+			m_unk0x0c = 1;
+			m_lastTime = p_time - 1.0f;
+			m_unk0x1c = p_time;
+		}
+		else if (!m_userNavFlag) {
+			LegoAnimActor::Animate(m_lastTime + 1.0f);
+		}
+	}
+
+	if (m_unk0x0c == 1) {
+		LegoAnimActor::Animate(p_time);
+	}
+}
+
 // FUNCTION: LEGO1 0x10081840
 // FUNCTION: BETA10 0x100cf680
-MxU32 LegoCarRaceActor::VTable0x6c(
+inline MxU32 LegoCarRaceActor::VTable0x6c(
 	LegoPathBoundary* p_boundary,
 	Vector3& p_v1,
 	Vector3& p_v2,
@@ -383,3 +512,50 @@ MxU32 LegoCarRaceActor::VTable0x6c(
 
 	return 0;
 }
+
+// FUNCTION: LEGO1 0x10081fd0
+inline MxU32 LegoJetskiRaceActor::VTable0x6c(
+	LegoPathBoundary* p_boundary,
+	Vector3& p_v1,
+	Vector3& p_v2,
+	float p_f1,
+	float p_f2,
+	Vector3& p_v3
+)
+{
+	LegoAnimPresenterSet& presenters = p_boundary->GetPresenters();
+
+	for (LegoAnimPresenterSet::iterator itap = presenters.begin(); itap != presenters.end(); itap++) {
+		if ((*itap)->VTable0x94(p_v1, p_v2, p_f1, p_f2, p_v3)) {
+			return 1;
+		}
+	}
+
+	LegoPathActorSet& plpas = p_boundary->GetActors();
+	LegoPathActorSet lpas(plpas);
+
+	for (LegoPathActorSet::iterator itpa = lpas.begin(); itpa != lpas.end(); itpa++) {
+		if (plpas.find(*itpa) != plpas.end()) {
+			LegoPathActor* actor = *itpa;
+
+			if (this != actor) {
+				LegoROI* roi = actor->GetROI();
+
+				if (roi != NULL && (roi->GetVisibility() || actor->GetCameraFlag())) {
+					if (roi->FUN_100a9410(p_v1, p_v2, p_f1, p_f2, p_v3, m_collideBox && actor->GetCollideBox())) {
+						HitActor(actor, TRUE);
+
+						if (actor->HitActor(this, FALSE) < 0) {
+							return 0;
+						}
+						else {
+							return 2;
+						}
+					}
+				}
+			}
+		}
+	}
+
+	return 0;
+}