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

Match LegoActor and LegoPathActor in BETA10 (#1524)

Browse Source 
* Match `LegoActor` in BETA10

* Cleanup

---------

Co-authored-by: jonschz <jonschz@users.noreply.github.com>
This commit is contained in:
jonschz
2025-05-27 22:04:01 +02:00
committed by GitHub
parent 4186bae786
commit b7090bd838
8 changed files with 50 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
LEGO1/define.cpp
View File

@@ -10,6 +10,7 @@ const char* g_strANIMATION = "ANIMATION";
// GLOBAL: LEGO1 0x10102050 // GLOBAL: LEGO1 0x10102050
// STRING: LEGO1 0x10102024 // STRING: LEGO1 0x10102024
// GLOBAL: BETA10 0x102028b4
const char* g_strATTACH_CAMERA = "ATTACH_CAMERA"; const char* g_strATTACH_CAMERA = "ATTACH_CAMERA";
// GLOBAL: LEGO1 0x10102054 // GLOBAL: LEGO1 0x10102054
@@ -138,6 +139,7 @@ const char* g_strBMP_ISMAP = "BMP_ISMAP";
// GLOBAL: LEGO1 0x101020e4 // GLOBAL: LEGO1 0x101020e4
// STRING: LEGO1 0x10101eac // STRING: LEGO1 0x10101eac
// GLOBAL: BETA10 0x10202948
const char* g_parseExtraTokens = ":;"; const char* g_parseExtraTokens = ":;";
// GLOBAL: LEGO1 0x100f0c14 // GLOBAL: LEGO1 0x100f0c14

7
LEGO1/lego/legoomni/include/legoactor.h
View File

@@ -34,6 +34,7 @@ public:
} }
// FUNCTION: LEGO1 0x1002d220 // FUNCTION: LEGO1 0x1002d220
// FUNCTION: BETA10 0x10012530
MxBool IsA(const char* p_name) const override // vtable+0x10 MxBool IsA(const char* p_name) const override // vtable+0x10
{ {
return !strcmp(p_name, LegoActor::ClassName()) || LegoEntity::IsA(p_name); return !strcmp(p_name, LegoActor::ClassName()) || LegoEntity::IsA(p_name);
@@ -43,18 +44,22 @@ public:
void SetROI(LegoROI* p_roi, MxBool p_bool1, MxBool p_bool2) override; // vtable+0x24 void SetROI(LegoROI* p_roi, MxBool p_bool1, MxBool p_bool2) override; // vtable+0x24
// FUNCTION: LEGO1 0x10002cc0 // FUNCTION: LEGO1 0x10002cc0
// FUNCTION: BETA10 0x1000f3e0
virtual MxFloat GetSoundFrequencyFactor() { return m_frequencyFactor; } // vtable+0x50 virtual MxFloat GetSoundFrequencyFactor() { return m_frequencyFactor; } // vtable+0x50
// FUNCTION: LEGO1 0x10002cd0 // FUNCTION: LEGO1 0x10002cd0
// FUNCTION: BETA10 0x1000f410
virtual void SetSoundFrequencyFactor(MxFloat p_frequencyFactor) virtual void SetSoundFrequencyFactor(MxFloat p_frequencyFactor)
{ {
m_frequencyFactor = p_frequencyFactor; m_frequencyFactor = p_frequencyFactor;
} // vtable+0x54 } // vtable+0x54
// FUNCTION: LEGO1 0x10002ce0 // FUNCTION: LEGO1 0x10002ce0
// FUNCTION: BETA10 0x1000f440
virtual void VTable0x58(MxFloat p_unk0x70) { m_unk0x70 = p_unk0x70; } // vtable+0x58 virtual void VTable0x58(MxFloat p_unk0x70) { m_unk0x70 = p_unk0x70; } // vtable+0x58
// FUNCTION: LEGO1 0x10002cf0 // FUNCTION: LEGO1 0x10002cf0
// FUNCTION: BETA10 0x1000f470
virtual MxFloat VTable0x5c() { return m_unk0x70; } // vtable+0x5c virtual MxFloat VTable0x5c() { return m_unk0x70; } // vtable+0x5c
// FUNCTION: LEGO1 0x10002d00 // FUNCTION: LEGO1 0x10002d00
@@ -62,6 +67,7 @@ public:
virtual MxU8 GetActorId() { return m_actorId; } // vtable+0x60 virtual MxU8 GetActorId() { return m_actorId; } // vtable+0x60
// FUNCTION: LEGO1 0x10002d10 // FUNCTION: LEGO1 0x10002d10
// FUNCTION: BETA10 0x1000f4d0
virtual void SetActorId(MxU8 p_actorId) { m_actorId = p_actorId; } // vtable+0x64 virtual void SetActorId(MxU8 p_actorId) { m_actorId = p_actorId; } // vtable+0x64
static const char* GetActorName(MxU8 p_id); static const char* GetActorName(MxU8 p_id);
@@ -76,6 +82,7 @@ protected:
}; };
// SYNTHETIC: LEGO1 0x1002d300 // SYNTHETIC: LEGO1 0x1002d300
// SYNTHETIC: BETA10 0x1003d900
// LegoActor::`scalar deleting destructor' // LegoActor::`scalar deleting destructor'
#endif // LEGOACTOR_H #endif // LEGOACTOR_H

16
LEGO1/lego/legoomni/include/legopathactor.h
View File

@@ -51,9 +51,11 @@ public:
virtual void VTable0x74(Matrix4& p_transform); // vtable+0x74 virtual void VTable0x74(Matrix4& p_transform); // vtable+0x74
// FUNCTION: LEGO1 0x10002d20 // FUNCTION: LEGO1 0x10002d20
// FUNCTION: BETA10 0x1000f500
virtual void SetUserNavFlag(MxBool p_userNavFlag) { m_userNavFlag = p_userNavFlag; } // vtable+0x78 virtual void SetUserNavFlag(MxBool p_userNavFlag) { m_userNavFlag = p_userNavFlag; } // vtable+0x78
// FUNCTION: LEGO1 0x10002d30 // FUNCTION: LEGO1 0x10002d30
// FUNCTION: BETA10 0x1000f530
virtual MxBool GetUserNavFlag() { return m_userNavFlag; } // vtable+0x7c virtual MxBool GetUserNavFlag() { return m_userNavFlag; } // vtable+0x7c
virtual MxResult VTable0x80( virtual MxResult VTable0x80(
@@ -67,7 +69,7 @@ public:
float p_time, float p_time,
Vector3& p_p1, Vector3& p_p1,
Vector3& p_p4, Vector3& p_p4,
LegoOrientedEdge& p_destEdge, LegoOrientedEdge* p_destEdge,
float p_destScale float p_destScale
); // vtable+0x84 ); // vtable+0x84
virtual MxResult VTable0x88( virtual MxResult VTable0x88(
@@ -81,9 +83,11 @@ public:
virtual MxS32 VTable0x8c(float p_time, Matrix4& p_transform); // vtable+0x8c virtual MxS32 VTable0x8c(float p_time, Matrix4& p_transform); // vtable+0x8c
// FUNCTION: LEGO1 0x10002d40 // FUNCTION: LEGO1 0x10002d40
// FUNCTION: BETA10 0x1000f560
virtual MxU32 VTable0x90(float, Matrix4&) { return FALSE; } // vtable+0x90 virtual MxU32 VTable0x90(float, Matrix4&) { return FALSE; } // vtable+0x90
// FUNCTION: LEGO1 0x10002d50 // FUNCTION: LEGO1 0x10002d50
// FUNCTION: BETA10 0x1000f800
virtual MxResult HitActor(LegoPathActor*, MxBool) { return 0; } // vtable+0x94 virtual MxResult HitActor(LegoPathActor*, MxBool) { return 0; } // vtable+0x94
virtual void SwitchBoundary( virtual void SwitchBoundary(
@@ -94,30 +98,38 @@ public:
virtual MxResult VTable0x9c(); // vtable+0x9c virtual MxResult VTable0x9c(); // vtable+0x9c
// FUNCTION: LEGO1 0x10002d60 // FUNCTION: LEGO1 0x10002d60
// FUNCTION: BETA10 0x1000f820
virtual MxS32 VTable0xa0() { return 0; } // vtable+0xa0 virtual MxS32 VTable0xa0() { return 0; } // vtable+0xa0
virtual void VTable0xa4(MxBool& p_und1, MxS32& p_und2); // vtable+0xa4 virtual void VTable0xa4(MxBool& p_und1, MxS32& p_und2); // vtable+0xa4
virtual void VTable0xa8(); // vtable+0xa8 virtual void VTable0xa8(); // vtable+0xa8
// FUNCTION: LEGO1 0x10002d70 // FUNCTION: LEGO1 0x10002d70
// FUNCTION: BETA10 0x1000f580
virtual void SetMaxLinearVel(MxFloat p_maxLinearVel) { m_maxLinearVel = p_maxLinearVel; } // vtable+0xac virtual void SetMaxLinearVel(MxFloat p_maxLinearVel) { m_maxLinearVel = p_maxLinearVel; } // vtable+0xac
// FUNCTION: LEGO1 0x10002d80 // FUNCTION: LEGO1 0x10002d80
// FUNCTION: BETA10 0x1000f5b0
virtual MxFloat GetMaxLinearVel() { return m_maxLinearVel; } // vtable+0xb0 virtual MxFloat GetMaxLinearVel() { return m_maxLinearVel; } // vtable+0xb0
// FUNCTION: LEGO1 0x10002d90 // FUNCTION: LEGO1 0x10002d90
// FUNCTION: BETA10 0x1000f5e0
virtual MxFloat VTable0xb4() { return m_unk0x140; } // vtable+0xb4 virtual MxFloat VTable0xb4() { return m_unk0x140; } // vtable+0xb4
// FUNCTION: LEGO1 0x10002da0 // FUNCTION: LEGO1 0x10002da0
// FUNCTION: BETA10 0x1000f610
virtual MxFloat VTable0xb8() { return m_unk0x144; } // vtable+0xb8 virtual MxFloat VTable0xb8() { return m_unk0x144; } // vtable+0xb8
// FUNCTION: LEGO1 0x10002db0 // FUNCTION: LEGO1 0x10002db0
// FUNCTION: BETA10 0x1000f640
virtual void VTable0xbc(MxFloat p_unk0x140) { m_unk0x140 = p_unk0x140; } // vtable+0xbc virtual void VTable0xbc(MxFloat p_unk0x140) { m_unk0x140 = p_unk0x140; } // vtable+0xbc
// FUNCTION: LEGO1 0x10002dc0 // FUNCTION: LEGO1 0x10002dc0
// FUNCTION: BETA10 0x1000f670
virtual void VTable0xc0(MxFloat p_unk0x144) { m_unk0x144 = p_unk0x144; } // vtable+0xc0 virtual void VTable0xc0(MxFloat p_unk0x144) { m_unk0x144 = p_unk0x144; } // vtable+0xc0
// FUNCTION: LEGO1 0x10002dd0 // FUNCTION: LEGO1 0x10002dd0
// FUNCTION: BETA10 0x1000f6a0
virtual void VTable0xc4() {} // vtable+0xc4 virtual void VTable0xc4() {} // vtable+0xc4
// FUNCTION: LEGO1 0x10002de0 // FUNCTION: LEGO1 0x10002de0
@@ -132,6 +144,7 @@ public:
} }
// FUNCTION: LEGO1 0x1000c440 // FUNCTION: LEGO1 0x1000c440
// FUNCTION: BETA10 0x100124c0
MxBool IsA(const char* p_name) const override // vtable+0x10 MxBool IsA(const char* p_name) const override // vtable+0x10
{ {
return !strcmp(p_name, LegoPathActor::ClassName()) || LegoActor::IsA(p_name); return !strcmp(p_name, LegoPathActor::ClassName()) || LegoActor::IsA(p_name);
@@ -161,6 +174,7 @@ public:
void PlaceActor(LegoNamedPlane& p_namedPlane); void PlaceActor(LegoNamedPlane& p_namedPlane);
// SYNTHETIC: LEGO1 0x1002d800 // SYNTHETIC: LEGO1 0x1002d800
// SYNTHETIC: BETA10 0x100b04d0
// LegoPathActor::`scalar deleting destructor' // LegoPathActor::`scalar deleting destructor'
protected: protected:

1
LEGO1/lego/legoomni/src/actors/act2actor.cpp
View File

@@ -133,7 +133,6 @@ Act2Actor::Act2Actor()
} }
// FUNCTION: LEGO1 0x10018940 // FUNCTION: LEGO1 0x10018940
// FUNCTION: BETA10 0x1003d65f
void Act2Actor::SetROI(LegoROI* p_roi, MxBool p_bool1, MxBool p_bool2) void Act2Actor::SetROI(LegoROI* p_roi, MxBool p_bool1, MxBool p_bool2)
{ {
LegoAnimActor::SetROI(p_roi, p_bool1, p_bool2); LegoAnimActor::SetROI(p_roi, p_bool1, p_bool2);

5
LEGO1/lego/legoomni/src/entity/legoactor.cpp
View File

@@ -23,6 +23,7 @@ LegoActor::LegoActor()
} }
// FUNCTION: LEGO1 0x1002d320 // FUNCTION: LEGO1 0x1002d320
// FUNCTION: BETA10 0x1003d08b
LegoActor::~LegoActor() LegoActor::~LegoActor()
{ {
if (m_sound) { if (m_sound) {
@@ -31,6 +32,7 @@ LegoActor::~LegoActor()
} }
// FUNCTION: LEGO1 0x1002d390 // FUNCTION: LEGO1 0x1002d390
// FUNCTION: BETA10 0x1003d10b
void LegoActor::ParseAction(char* p_extra) void LegoActor::ParseAction(char* p_extra)
{ {
MxFloat speed = 0.0F; MxFloat speed = 0.0F;
@@ -90,6 +92,8 @@ void LegoActor::ParseAction(char* p_extra)
up[2] = atof(token); up[2] = atof(token);
} }
assert(token);
SetWorldTransform(location, direction, up); SetWorldTransform(location, direction, up);
} }
else { else {
@@ -122,6 +126,7 @@ const char* LegoActor::GetActorName(MxU8 p_id)
} }
// FUNCTION: LEGO1 0x1002d670 // FUNCTION: LEGO1 0x1002d670
// FUNCTION: BETA10 0x1003d65f
void LegoActor::SetROI(LegoROI* p_roi, MxBool p_bool1, MxBool p_bool2) void LegoActor::SetROI(LegoROI* p_roi, MxBool p_bool1, MxBool p_bool2)
{ {
if (p_roi) { if (p_roi) {

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

@@ -68,6 +68,7 @@ LegoPathActor::~LegoPathActor()
} }
// FUNCTION: LEGO1 0x1002d8d0 // FUNCTION: LEGO1 0x1002d8d0
// FUNCTION: BETA10 0x100ae8cd
MxResult LegoPathActor::VTable0x80(const Vector3& p_point1, Vector3& p_point2, Vector3& p_point3, Vector3& p_point4) MxResult LegoPathActor::VTable0x80(const Vector3& p_point1, Vector3& p_point2, Vector3& p_point3, Vector3& p_point4)
{ {
Mx3DPointFloat p1, p2, p3; Mx3DPointFloat p1, p2, p3;
@@ -84,8 +85,10 @@ MxResult LegoPathActor::VTable0x80(const Vector3& p_point1, Vector3& p_point2, V
m_BADuration /= 0.001; m_BADuration /= 0.001;
return SUCCESS; return SUCCESS;
} }
else {
return FAILURE; MxTrace("Warning: m_BADuration = %g, roi = %s\n", m_BADuration, m_roi->GetName());
return FAILURE;
}
} }
// FUNCTION: LEGO1 0x1002d9c0 // FUNCTION: LEGO1 0x1002d9c0
@@ -167,17 +170,22 @@ MxResult LegoPathActor::VTable0x88(
} }
// FUNCTION: LEGO1 0x1002de10 // FUNCTION: LEGO1 0x1002de10
// FUNCTION: BETA10 0x100aee61
MxResult LegoPathActor::VTable0x84( MxResult LegoPathActor::VTable0x84(
LegoPathBoundary* p_boundary, LegoPathBoundary* p_boundary,
float p_time, float p_time,
Vector3& p_p1, Vector3& p_p1,
Vector3& p_p4, Vector3& p_p4,
LegoOrientedEdge& p_destEdge, LegoOrientedEdge* p_destEdge,
float p_destScale float p_destScale
) )
{ {
Vector3* v3 = p_destEdge.CWVertex(*p_boundary); assert(p_destEdge);
Vector3* v4 = p_destEdge.CCWVertex(*p_boundary);
Vector3* v3 = p_destEdge->CWVertex(*p_boundary);
Vector3* v4 = p_destEdge->CCWVertex(*p_boundary);
assert(v3 && v4);
Mx3DPointFloat p2, p3, p5; Mx3DPointFloat p2, p3, p5;
@@ -187,12 +195,12 @@ MxResult LegoPathActor::VTable0x84(
p2 += *v3; p2 += *v3;
m_boundary = p_boundary; m_boundary = p_boundary;
m_destEdge = &p_destEdge; m_destEdge = p_destEdge;
m_unk0xe4 = p_destScale; m_unk0xe4 = p_destScale;
m_unk0x7c = 0; m_unk0x7c = 0;
m_lastTime = p_time; m_lastTime = p_time;
m_actorTime = p_time; m_actorTime = p_time;
p_destEdge.GetFaceNormal(*p_boundary, p3); p_destEdge->GetFaceNormal(*p_boundary, p3);
MxMatrix matrix; MxMatrix matrix;
Vector3 pos(matrix[3]); Vector3 pos(matrix[3]);
@@ -217,6 +225,7 @@ MxResult LegoPathActor::VTable0x84(
p5.Unitize(); p5.Unitize();
if (VTable0x80(p_p1, p_p4, p2, p5) == SUCCESS) { if (VTable0x80(p_p1, p_p4, p2, p5) == SUCCESS) {
MxTrace("Warning: m_BADuration = %g, roi = %s\n", m_BADuration, m_roi->GetName());
m_boundary->AddActor(this); m_boundary->AddActor(this);
} }
else { else {
@@ -379,6 +388,7 @@ MxS32 LegoPathActor::VTable0x8c(float p_time, Matrix4& p_transform)
} }
// FUNCTION: LEGO1 0x1002e740 // FUNCTION: LEGO1 0x1002e740
// FUNCTION: BETA10 0x100b0f70
void LegoPathActor::VTable0x74(Matrix4& p_transform) void LegoPathActor::VTable0x74(Matrix4& p_transform)
{ {
if (m_userNavFlag) { if (m_userNavFlag) {

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

@@ -298,7 +298,7 @@ MxResult LegoPathController::PlaceActor(
return FAILURE; return FAILURE;
} }
if (p_actor->VTable0x84(boundary, time, p_position, p_direction, *edge, 0.5f) == SUCCESS) { if (p_actor->VTable0x84(boundary, time, p_position, p_direction, edge, 0.5f) == SUCCESS) {
p_actor->SetController(this); p_actor->SetController(this);
m_actors.insert(p_actor); m_actors.insert(p_actor);
return SUCCESS; return SUCCESS;

3
LEGO1/library_msvc.h
View File

@@ -840,6 +840,9 @@
// LIBRARY: BETA10 0x100f8ad0 // LIBRARY: BETA10 0x100f8ad0
// strcmp // strcmp
// LIBRARY: BETA10 0x100f9f60
// strtok
// LIBRARY: BETA10 0x100f9610 // LIBRARY: BETA10 0x100f9610
// rand // rand