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

Clear unknowns in Act2Brick (#1675)

Browse Source
This commit is contained in:
Fabian Neundorf
2025-08-09 18:05:43 +02:00
committed by GitHub
parent 61eaea8bb4
commit 15fec495e5
4 changed files with 35 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
LEGO1/lego/legoomni/include/act2brick.h
View File

@@ -8,6 +8,13 @@
// SIZE 0x194 // SIZE 0x194
class Act2Brick : public LegoPathActor { class Act2Brick : public LegoPathActor {
public: public:
enum {
e_removed = 0,
e_created = 1,
e_placed = 2,
e_atRest = 3,
};
Act2Brick(); Act2Brick();
~Act2Brick() override; // vtable+0x00 ~Act2Brick() override; // vtable+0x00
@@ -35,7 +42,7 @@ public:
MxResult Create(MxS32 p_index); MxResult Create(MxS32 p_index);
void Remove(); void Remove();
void FUN_1007a670(MxMatrix& p_param1, MxMatrix& p_param2, LegoPathBoundary* p_boundary); void Place(MxMatrix& p_localToWorld, MxMatrix& p_endLocalToWorld, LegoPathBoundary* p_boundary);
void PlayWhistleSound(); void PlayWhistleSound();
void StopWhistleSound(); void StopWhistleSound();
void Mute(MxBool p_muted); void Mute(MxBool p_muted);
@@ -44,12 +51,12 @@ private:
static const LegoChar* g_lodNames[]; static const LegoChar* g_lodNames[];
static MxLong g_lastHitActorTime; static MxLong g_lastHitActorTime;
LegoCacheSound* m_whistleSound; // 0x154 LegoCacheSound* m_whistleSound; // 0x154
undefined m_unk0x158[0x0c]; // 0x158 undefined m_unk0x158[0x0c]; // 0x158
undefined4 m_unk0x164; // 0x164 MxU32 m_state; // 0x164
Mx3DPointFloat m_unk0x168; // 0x168 Mx3DPointFloat m_localToWorldMovementStep; // 0x168
Mx3DPointFloat m_unk0x17c; // 0x17c Mx3DPointFloat m_endLocalToWorld; // 0x17c
MxS32 m_unk0x190; // 0x190 MxS32 m_step; // 0x190
}; };
#endif // ACT2BRICK_H #endif // ACT2BRICK_H

34
LEGO1/lego/legoomni/src/entity/act2brick.cpp
View File

@@ -31,7 +31,7 @@ MxLong Act2Brick::g_lastHitActorTime = 0;
Act2Brick::Act2Brick() Act2Brick::Act2Brick()
{ {
m_whistleSound = NULL; m_whistleSound = NULL;
m_unk0x164 = 0; m_state = Act2Brick::e_removed;
} }
// FUNCTION: LEGO1 0x1007a470 // FUNCTION: LEGO1 0x1007a470
@@ -72,7 +72,7 @@ MxResult Act2Brick::Create(MxS32 p_index)
m_roi->SetEntity(this); m_roi->SetEntity(this);
CurrentWorld()->Add(this); CurrentWorld()->Add(this);
m_unk0x164 = 1; m_state = Act2Brick::e_created;
return SUCCESS; return SUCCESS;
} }
@@ -88,27 +88,27 @@ void Act2Brick::Remove()
m_roi = NULL; m_roi = NULL;
} }
m_unk0x164 = 0; m_state = Act2Brick::e_removed;
} }
// FUNCTION: LEGO1 0x1007a670 // FUNCTION: LEGO1 0x1007a670
// FUNCTION: BETA10 0x10012c04 // FUNCTION: BETA10 0x10012c04
void Act2Brick::FUN_1007a670(MxMatrix& p_param1, MxMatrix& p_param2, LegoPathBoundary* p_boundary) void Act2Brick::Place(MxMatrix& p_localToWorld, MxMatrix& p_endLocalToWorld, LegoPathBoundary* p_boundary)
{ {
m_unk0x17c = p_param2[3]; m_endLocalToWorld = p_endLocalToWorld[3];
m_unk0x168 = p_param2[3]; m_localToWorldMovementStep = p_endLocalToWorld[3];
m_unk0x168 -= p_param1[3]; m_localToWorldMovementStep -= p_localToWorld[3];
m_unk0x168 /= 8.0f; m_localToWorldMovementStep /= 8.0f;
m_unk0x190 = 0; m_step = 0;
TickleManager()->RegisterClient(this, 20); TickleManager()->RegisterClient(this, 20);
m_unk0x164 = 2; m_state = Act2Brick::e_placed;
CurrentWorld()->PlaceActor(this); CurrentWorld()->PlaceActor(this);
p_boundary->AddActor(this); p_boundary->AddActor(this);
SetActorState(c_disabled); SetActorState(c_disabled);
m_roi->SetLocal2World(p_param1); m_roi->SetLocal2World(p_localToWorld);
m_roi->WrappedUpdateWorldData(); m_roi->WrappedUpdateWorldData();
m_roi->SetVisibility(TRUE); m_roi->SetVisibility(TRUE);
} }
@@ -136,15 +136,15 @@ MxResult Act2Brick::HitActor(LegoPathActor* p_actor, MxBool)
MxResult Act2Brick::Tickle() MxResult Act2Brick::Tickle()
{ {
MxMatrix local2world(m_roi->GetLocal2World()); MxMatrix local2world(m_roi->GetLocal2World());
m_unk0x190++; m_step++;
if (m_unk0x190 >= 8) { if (m_step >= 8) {
local2world.SetTranslation(m_unk0x17c[0], m_unk0x17c[1], m_unk0x17c[2]); local2world.SetTranslation(m_endLocalToWorld[0], m_endLocalToWorld[1], m_endLocalToWorld[2]);
m_unk0x164 = 3; m_state = Act2Brick::e_atRest;
TickleManager()->UnregisterClient(this); TickleManager()->UnregisterClient(this);
} }
else { else {
VPV3(local2world[3], local2world[3], m_unk0x168); VPV3(local2world[3], local2world[3], m_localToWorldMovementStep);
} }
m_roi->SetLocal2World(local2world); m_roi->SetLocal2World(local2world);
@@ -165,7 +165,7 @@ MxLong Act2Brick::Notify(MxParam& p_param)
StopWhistleSound(); StopWhistleSound();
} }
MxNotificationParam param(c_notificationType22, this); MxNotificationParam param(c_notificationAct2Brick, this);
NotificationManager()->Send(CurrentWorld(), param); NotificationManager()->Send(CurrentWorld(), param);
return 1; return 1;
} }

6
LEGO1/lego/legoomni/src/worlds/legoact2.cpp
View File

@@ -294,7 +294,7 @@ MxLong LegoAct2::Notify(MxParam& p_param)
result = 1; result = 1;
break; break;
} }
case c_notificationType22: case c_notificationAct2Brick:
SoundManager()->GetCacheSoundManager()->Play("28bng", NULL, FALSE); SoundManager()->GetCacheSoundManager()->Play("28bng", NULL, FALSE);
m_unk0x10c1++; m_unk0x10c1++;
@@ -647,7 +647,7 @@ MxLong LegoAct2::HandlePathStruct(LegoPathStructNotificationParam& p_param)
local2world[3][1] += 1.5; local2world[3][1] += 1.5;
local2world2[3][1] -= 0.1; local2world2[3][1] -= 0.1;
m_bricks[m_nextBrick - 1].FUN_1007a670(local2world, local2world2, boundary); m_bricks[m_nextBrick - 1].Place(local2world, local2world2, boundary);
} }
return 0; return 0;
@@ -671,7 +671,7 @@ MxResult LegoAct2::FUN_100516b0()
local2world[3][1] += 1.3; local2world[3][1] += 1.3;
local2world2[3][1] -= 0.1; local2world2[3][1] -= 0.1;
brick.FUN_1007a670(local2world, local2world2, boundary); brick.Place(local2world, local2world2, boundary);
m_nextBrick++; m_nextBrick++;
m_unk0x10c4 = 9; m_unk0x10c4 = 9;
m_unk0x10d0 = 0; m_unk0x10d0 = 0;

2
LEGO1/omni/include/mxnotificationparam.h
View File

@@ -29,7 +29,7 @@ enum NotificationId {
c_notificationPathStruct = 19, // 100d6230 c_notificationPathStruct = 19, // 100d6230
c_notificationType20 = 20, c_notificationType20 = 20,
c_notificationNewPresenter = 21, c_notificationNewPresenter = 21,
c_notificationType22 = 22, c_notificationAct2Brick = 22,
c_notificationType23 = 23, c_notificationType23 = 23,
c_notificationTransitioned = 24 c_notificationTransitioned = 24
}; };