Implement more functions in Act2Actor (#1183)

* Implement `Act2Actor::VTable0xa0`

* Implement `Act2Actor::FUN_10019520()`

* Implement/match `Act2Actor::FUN_100192a0()`

* Fix clang32 issue

* Address review comments

---------

Co-authored-by: jonschz <jonschz@users.noreply.github.com>
This commit is contained in:
jonschz 2024-12-01 18:21:59 +01:00 committed by GitHub
parent f066e2ee2e
commit 8b9f6f1007
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 212 additions and 18 deletions

View file

@ -11,9 +11,10 @@
class Act2Actor : public LegoAnimActor { class Act2Actor : public LegoAnimActor {
public: public:
struct UnknownListStructure { struct UnknownListStructure {
undefined m_unk0x00[28]; MxFloat m_unk0x00[3]; // 0x00
undefined m_unk0x1c; MxFloat m_unk0x0c[3]; // 0x0c
undefined m_unk0x1d[3]; const char* m_unk0x18; // 0x18
undefined m_unk0x1c; // 0x1c
}; };
Act2Actor(); Act2Actor();
@ -27,6 +28,7 @@ class Act2Actor : public LegoAnimActor {
MxS32 VTable0xa0() override; // vtable+0xa0 MxS32 VTable0xa0() override; // vtable+0xa0
void FUN_10019520(); void FUN_10019520();
void FUN_100192a0(undefined4 p_param);
// SYNTHETIC: LEGO1 0x1001a0a0 // SYNTHETIC: LEGO1 0x1001a0a0
// Act2Actor::`scalar deleting destructor' // Act2Actor::`scalar deleting destructor'
@ -37,12 +39,12 @@ class Act2Actor : public LegoAnimActor {
private: private:
undefined m_unk0x1c; // 0x1c undefined m_unk0x1c; // 0x1c
undefined m_unk0x1d; // 0x1d MxS8 m_unk0x1d; // 0x1d
undefined m_unk0x1e; // 0x1e undefined m_unk0x1e; // 0x1e
MxBool m_unk0x1f; // 0x1f MxBool m_unk0x1f; // 0x1f
undefined4 m_unk0x20; // 0x20 undefined4 m_unk0x20; // 0x20
undefined4 m_unk0x24; // 0x24 undefined4 m_unk0x24; // 0x24
undefined m_unk0x28; // 0x28 MxS8 m_unk0x28; // 0x28
undefined4 m_unk0x2c; // 0x2c undefined4 m_unk0x2c; // 0x2c
undefined4 m_unk0x30; // 0x30 undefined4 m_unk0x30; // 0x30
undefined4 m_unk0x34; // 0x34 undefined4 m_unk0x34; // 0x34
@ -50,8 +52,11 @@ class Act2Actor : public LegoAnimActor {
undefined4 m_unk0x3c; // 0x3c undefined4 m_unk0x3c; // 0x3c
undefined m_unk0x40; // 0x40 undefined m_unk0x40; // 0x40
undefined4 m_unk0x44; // 0x44 undefined4 m_unk0x44; // 0x44
undefined m_unk0x48; // 0x48 MxS8 m_unk0x48; // 0x48
undefined4 m_unk0x4c; // 0x4c undefined4 m_unk0x4c; // 0x4c
}; };
// TEMPLATE: LEGO1 0x100194f0
// list<LegoBoundaryEdge,allocator<LegoBoundaryEdge> >::list<LegoBoundaryEdge,allocator<LegoBoundaryEdge> >
#endif // ACT2ACTOR_H #endif // ACT2ACTOR_H

View file

@ -117,6 +117,17 @@ class LegoPathController : public MxCore {
LegoUnknown100db7f4*& p_edge, LegoUnknown100db7f4*& p_edge,
LegoPathBoundary*& p_boundary LegoPathBoundary*& p_boundary
); );
MxResult FUN_10048310(
LegoPathEdgeContainer* p_grec,
const Vector3& p_position,
const Vector3& p_direction,
LegoPathBoundary* p_boundary1,
const Vector3& p_param5,
const Vector3& p_param6,
LegoPathBoundary* p_boundary2,
MxBool p_param8,
MxFloat* p_param9
);
static MxResult Init(); static MxResult Init();
static MxResult Reset(); static MxResult Reset();

View file

@ -1,6 +1,8 @@
#include "act2actor.h" #include "act2actor.h"
#include "legocachesoundmanager.h" #include "legocachesoundmanager.h"
#include "legopathcontroller.h"
#include "legopathedgecontainer.h"
#include "legosoundmanager.h" #include "legosoundmanager.h"
#include "misc.h" #include "misc.h"
#include "roi/legoroi.h" #include "roi/legoroi.h"
@ -8,9 +10,21 @@
DECOMP_SIZE_ASSERT(Act2Actor, 0x1a8) DECOMP_SIZE_ASSERT(Act2Actor, 0x1a8)
DECOMP_SIZE_ASSERT(Act2Actor::UnknownListStructure, 0x20) DECOMP_SIZE_ASSERT(Act2Actor::UnknownListStructure, 0x20)
// TODO: Copy the data once we know more about its fields. Total: 10 entries // GLOBAL: LEGO1 0x100f0db8
// // GLOBAL: LEGO1 0x100f0db8 // GLOBAL: BETA10 0x101dbd00
Act2Actor::UnknownListStructure g_unk0x100f0db8[] = {{{0}, 0, {0}}}; Act2Actor::UnknownListStructure g_unk0x100f0db8[] = {
{{-47.92, 7.0699968, -31.58}, {-0.999664, 0.0, -0.025916}, "edg01_27", FALSE},
{{-70.393349, 8.07, 3.151935}, {-0.90653503, 0.0, 0.422131}, "int06", FALSE},
{{-47.74, 4.079995, -52.3}, {-0.98293, 0.0, -0.18398}, "edg01_08", FALSE},
{{-26.273487, 0.069, 12.170015}, {0.987199, 0.0, -0.159491}, "INT14", FALSE},
{{26.16499, 0.069, 5.61}, {0.027719, 0.0, 0.999616}, "INT22", FALSE},
{{66.383446, 4.07, 32.387417}, {0.979487, 0.0, -0.201506}, "edg02_27", FALSE},
{{71.843285, 0.069, -49.524852}, {0.99031502, 0.0, 0.13884}, "edg02_39", FALSE},
{{26.470566, 0.069, -44.670845}, {0.004602, 0.0, -0.99998897}, "int26", FALSE},
{{-6.323625, 0.069, -47.96045}, {-0.982068, 0.0, 0.188529}, "edg02_53", FALSE},
{{-36.689, -0.978409, 31.449}, {0.083792, -0.94303, -0.66398698}, "edg00_157", FALSE},
{{-44.6, 0.1, 45.3}, {0.95, 0.0, -0.3}, "edg00_154", FALSE},
};
// FUNCTION: LEGO1 0x100187e0 // FUNCTION: LEGO1 0x100187e0
// FUNCTION: BETA10 0x1000c7fb // FUNCTION: BETA10 0x1000c7fb
@ -33,7 +47,7 @@ Act2Actor::Act2Actor()
m_unk0x38 = 0; m_unk0x38 = 0;
m_unk0x3c = 0; m_unk0x3c = 0;
// TODO replace 10 by sizeOfArray once the data are there // Odd: The code says < 10, but there are 11 entries in the array
for (MxS32 i = 0; i < 10; i++) { for (MxS32 i = 0; i < 10; i++) {
g_unk0x100f0db8[i].m_unk0x1c = 0; g_unk0x100f0db8[i].m_unk0x1c = 0;
} }
@ -82,19 +96,165 @@ void Act2Actor::SetWorldSpeed(MxFloat p_worldSpeed)
m_unk0x44 = 0; m_unk0x44 = 0;
} }
// STUB: LEGO1 0x10019520 // FUNCTION: LEGO1 0x100192a0
// STUB: BETA10 0x1000d4d6 // FUNCTION: BETA10 0x1000d4d6
void Act2Actor::FUN_10019520() void Act2Actor::FUN_100192a0(undefined4 p_param)
{ {
// TODO Mx3DPointFloat local38(0.0, 0.0, 0.0);
Mx3DPointFloat local4c(0.0, 0.0, 0.0);
if (m_grec) {
delete m_grec;
} }
// STUB: LEGO1 0x100195a0 m_grec = new LegoPathEdgeContainer();
// STUB: BETA10 0x1000d7d3 assert(m_grec);
local38 = g_unk0x100f0db8[p_param].m_unk0x00;
local4c = g_unk0x100f0db8[p_param].m_unk0x0c;
LegoPathBoundary* otherBoundary = m_controller->GetPathBoundary(g_unk0x100f0db8[p_param].m_unk0x18);
MxResult sts = m_controller->FUN_10048310(
m_grec,
m_roi->GetWorldPosition(),
m_roi->GetWorldDirection(),
m_boundary,
local38,
local4c,
otherBoundary,
TRUE,
NULL
);
assert(!sts);
if (sts) {
delete m_grec;
m_grec = NULL;
}
}
// FUNCTION: LEGO1 0x10019520
void Act2Actor::FUN_10019520()
{
m_unk0x1e = 4;
SetWorldSpeed(m_unk0x28 + 3);
FUN_100192a0(10);
}
// FUNCTION: LEGO1 0x100195a0
// FUNCTION: BETA10 0x1000d7d3
MxS32 Act2Actor::VTable0xa0() MxS32 Act2Actor::VTable0xa0()
{ {
// TODO undefined4 newLocation;
return 0;
CurrentWorld();
MxU16 randomVal = rand() / (RAND_MAX / 2) + 1;
if (m_unk0x48 == 8 && m_unk0x1d != 8) {
newLocation = 8;
}
else {
switch (m_unk0x1d) {
case 0:
if (randomVal == 1) {
newLocation = 3;
}
else {
newLocation = 7;
}
break;
case 1:
if (randomVal == 1) {
newLocation = 2;
}
else {
newLocation = 4;
}
break;
case 2:
if (randomVal == 1) {
newLocation = 3;
}
else {
newLocation = 6;
}
break;
case 3:
if (randomVal == 1) {
newLocation = 5;
}
else {
newLocation = 1;
}
break;
case 4:
if (randomVal == 1) {
newLocation = 7;
}
else {
newLocation = 0;
}
break;
case 5:
if (randomVal == 1) {
newLocation = 6;
}
else {
newLocation = 1;
}
break;
case 6:
if (randomVal == 1) {
newLocation = 0;
}
else {
newLocation = 4;
}
break;
case 7:
if (randomVal == 1) {
newLocation = 2;
}
else {
newLocation = 5;
}
break;
case 8:
if (randomVal == 1) {
newLocation = 0;
}
else {
newLocation = 4;
}
}
}
undefined4 firstChoice = newLocation;
if (m_unk0x48 < 7 || g_unk0x100f0db8[m_unk0x1d].m_unk0x1c) {
while (g_unk0x100f0db8[newLocation].m_unk0x1c || m_unk0x1d == newLocation) {
if (newLocation == 7) {
newLocation = 0;
}
else {
newLocation++;
}
assert(newLocation != firstChoice);
}
}
m_unk0x1d = newLocation;
FUN_100192a0(newLocation);
if (m_grec) {
return SUCCESS;
}
else {
return FAILURE;
}
} }
// FUNCTION: LEGO1 0x1001a180 // FUNCTION: LEGO1 0x1001a180

View file

@ -733,6 +733,24 @@ MxResult LegoPathController::ReadVector(LegoStorage* p_storage, Mx4DPointFloat&
return SUCCESS; return SUCCESS;
} }
// STUB: LEGO1 0x10048310
// STUB: BETA10 0x100b8911
MxResult LegoPathController::FUN_10048310(
LegoPathEdgeContainer* p_grec,
const Vector3& p_position,
const Vector3& p_direction,
LegoPathBoundary* p_boundary1,
const Vector3& p_param5,
const Vector3& p_param6,
LegoPathBoundary* p_boundary2,
MxBool p_param8,
MxFloat* p_param9
)
{
// TODO
return SUCCESS;
}
// FUNCTION: LEGO1 0x1004a240 // FUNCTION: LEGO1 0x1004a240
// FUNCTION: BETA10 0x100b9160 // FUNCTION: BETA10 0x100b9160
MxS32 LegoPathController::FUN_1004a240( MxS32 LegoPathController::FUN_1004a240(