isledecomp/isle
1
0
Fork 0
mirror of https://github.com/isledecomp/isle.git synced 2026-01-23 16:21:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Implement more functions

Browse Source
This commit is contained in:
jonschz 2024-09-14 15:02:24 +02:00
parent e265ac9023
commit 3233d76b7a
9 changed files with 187 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
LEGO1/lego/legoomni/include/legoact2.h
View File

@ -47,6 +47,7 @@ class LegoAct2State : public LegoState {
};
// VTABLE: LEGO1 0x100d82e0
// VTABLE: BETA10 0x101ba898
// SIZE 0x1154
class LegoAct2 : public LegoWorld {
public:

17
LEGO1/lego/legoomni/include/legocarbuild.h
View File

@ -120,6 +120,7 @@ class LegoCarBuild : public LegoWorld {
void SetPresentersEnabled(MxBool p_enabled);
void TogglePresentersEnabled();
void FUN_100250e0(MxBool p_param);
void FUN_10025450();
undefined4 FUN_10025720(undefined4 p_param1);
MxS32 FUN_10025d70();
void FUN_10025db0(const char* p_param1, undefined4 p_param2);
@ -140,26 +141,22 @@ class LegoCarBuild : public LegoWorld {
MxU16 m_unk0x10a; // 0x10a
DWORD m_unk0x10c; // 0x10c
LegoROI* m_unk0x110; // 0x110
Mx3DPointFloat m_unk0x114; // 0x114
undefined4 m_unk0x128; // 0x128
BoundingSphere m_unk0x114; // 0x114
MxMatrix m_unk0x12c; // 0x12c
undefined m_unk0x174; // 0x174
MxMatrix m_unk0x178; // 0x178
MxMatrix m_unk0x1c0; // 0x1c0
MxMatrix m_unk0x208; // 0x208
// These are likely locations in pixel space
MxS32 m_unk0x250; // 0x250
MxS32 m_unk0x254; // 0x254
// This is likely a location in pixel space
MxS32 m_unk0x250[2]; // 0x250
LegoCarBuildAnimPresenter* m_unk0x258; // 0x258
UnknownMx4DPointFloat m_unk0x25c; // 0x25c
// These four are likely locations in pixel space
MxS32 m_unk0x290; // 0x290
MxS32 m_unk0x294; // 0x294
MxS32 m_unk0x298; // 0x298
MxS32 m_unk0x29c; // 0x29c
// These two are likely locations in pixel space
MxS32 m_unk0x290[2]; // 0x290
MxS32 m_unk0x298[2]; // 0x298
MxFloat m_unk0x2a0; // 0x2a0
Mx4DPointFloat m_unk0x2a4; // 0x2a4

5
LEGO1/lego/legoomni/include/legocarbuildpresenter.h
View File

@ -46,8 +46,9 @@ class LegoCarBuildAnimPresenter : public LegoAnimPresenter {
void PutFrame() override; // vtable+0x6c
void FUN_10079920(float p_param1);
MxBool FUN_10079ca0(const char* p_param1);
MxBool FUN_10079cf0(const LegoChar* p_name);
MxBool FUN_10079c30(const LegoChar* p_name);
MxBool FUN_10079ca0(const LegoChar* p_name);
MxBool FUN_10079cf0(const LegoChar* p_string);
// FUNCTION: BETA10 0x10070180
void SetUnknown0xbc(undefined2 p_unk0xbc) { m_unk0xbc = p_unk0xbc; }

206
LEGO1/lego/legoomni/src/build/legocarbuild.cpp
View File

@ -16,6 +16,7 @@
#include "mxticklemanager.h"
#include "mxtransitionmanager.h"
#include "scripts.h"
#include "vec.h"
DECOMP_SIZE_ASSERT(LegoCarBuild, 0x34c)
DECOMP_SIZE_ASSERT(LegoVehicleBuildState, 0x50)
@ -29,46 +30,45 @@ MxFloat LegoCarBuild::g_unk0x100d65a8 = 0.07;
// GLOBAL: LEGO1 0x100f11cc
MxS16 LegoCarBuild::g_unk0x100f11cc = -1;
// STUB: LEGO1 0x100226d0
// FUNCTION: LEGO1 0x100226d0
// FUNCTION: BETA10 0x1006ac10
LegoCarBuild::LegoCarBuild()
{
// Not close yet - might be getting there when more of this class is implemented
m_unk0x100 = 0;
m_unk0x110 = 0;
m_unk0xf8 = 0xffffffff;
m_unk0x2d4 = '\0';
m_unk0x2d4 = FALSE;
m_unk0x258 = 0;
m_ColorBook_Bitmap = 0;
m_Yellow_Ctl = 0;
m_Red_Ctl = 0;
m_Blue_Ctl = 0;
m_Green_Ctl = 0;
m_Gray_Ctl = 0;
m_Black_Ctl = 0;
m_Shelf_Sound = 0;
m_PlaceBrick_Sound = 0;
m_GetBrick_Sound = 0;
m_Paint_Sound = 0;
m_Decal_Sound = 0;
m_Decal_Bitmap = 0;
m_Decals_Ctl = 0;
m_Decals_Ctl1 = 0;
m_Decals_Ctl2 = 0;
m_Decals_Ctl3 = 0;
m_Decals_Ctl4 = 0;
m_Decals_Ctl5 = 0;
m_Decals_Ctl6 = 0;
m_ColorBook_Bitmap = NULL;
m_Yellow_Ctl = NULL;
m_Red_Ctl = NULL;
m_Blue_Ctl = NULL;
m_Green_Ctl = NULL;
m_Gray_Ctl = NULL;
m_Black_Ctl = NULL;
m_Shelf_Sound = NULL;
m_PlaceBrick_Sound = NULL;
m_GetBrick_Sound = NULL;
m_Paint_Sound = NULL;
m_Decal_Sound = NULL;
m_Decal_Bitmap = NULL;
m_Decals_Ctl = NULL;
m_Decals_Ctl1 = NULL;
m_Decals_Ctl2 = NULL;
m_Decals_Ctl3 = NULL;
m_Decals_Ctl4 = NULL;
m_Decals_Ctl5 = NULL;
m_Decals_Ctl6 = NULL;
m_Decals_Ctl7 = NULL;
m_unk0x33c = 0;
m_buildState = 0;
m_unk0x33c = NULL;
m_buildState = NULL;
m_unk0x104 = 0;
m_unk0x109 = '\0';
m_unk0x108 = '\0';
m_unk0x109 = 0;
m_unk0x108 = 0;
m_unk0x338 = 0;
m_destLocation = LegoGameState::e_undefined;
m_unk0x344 = 0xffffffff;
m_unk0x174 = '\0';
m_unk0x174 = 0;
NotificationManager()->Register(this);
}
@ -229,7 +229,7 @@ void LegoCarBuild::VTable0x6c()
VTable0x70();
}
// STUB: LEGO1 0x10023020
// FUNCTION: LEGO1 0x10023020
// FUNCTION: BETA10 0x1006b991
void LegoCarBuild::VTable0x70()
{
@ -242,8 +242,8 @@ void LegoCarBuild::VTable0x70()
TransformWorldToScreen(worldPos, screenPos);
m_unk0x290 = screenPos[0] / screenPos[3];
m_unk0x294 = screenPos[1] / screenPos[3];
m_unk0x290[0] = screenPos[0] / screenPos[3];
m_unk0x290[1] = screenPos[1] / screenPos[3];
worldPos[0] = m_unk0x2bc[0];
worldPos[1] = m_unk0x2bc[1];
@ -251,22 +251,69 @@ void LegoCarBuild::VTable0x70()
TransformWorldToScreen(worldPos, screenPos);
m_unk0x298 = screenPos[0] / screenPos[3];
m_unk0x29c = screenPos[1] / screenPos[3];
m_unk0x298[0] = screenPos[0] / screenPos[3];
m_unk0x298[1] = screenPos[1] / screenPos[3];
m_unk0x2a0 = sqrt(
(MxFloat) (m_unk0x298 - m_unk0x290) * (m_unk0x298 - m_unk0x290) +
(m_unk0x29c - m_unk0x294) * (m_unk0x29c - m_unk0x294)
);
m_unk0x2a0 = sqrt((MxDouble) DISTSQRD2(m_unk0x290, m_unk0x298));
m_unk0x25c.Unknown1(m_unk0x178, m_unk0x208);
}
// STUB: LEGO1 0x10023130
// STUB: BETA10 0x1006bb22
// FUNCTION: LEGO1 0x10023130
// FUNCTION: BETA10 0x1006bb22
void LegoCarBuild::FUN_10023130(MxLong p_x, MxLong p_y)
{
// TODO
if (m_unk0x110) {
MxFloat pfVar3[2];
MxFloat local_30[3];
MxFloat local_84[3];
p_x += (m_unk0x290[0] - m_unk0x250[0]);
p_y += (m_unk0x290[1] - m_unk0x250[1]);
pfVar3[0] = p_x;
pfVar3[1] = p_y;
if (FUN_1003ded0(pfVar3, local_30, local_84)) {
MxFloat local_18[3];
MxFloat local_8c[2];
local_8c[0] = p_x;
local_8c[1] = p_y;
local_18[0] = 0;
local_18[1] = 0;
local_18[2] = 0;
MxMatrix local_78;
if (p_y < m_unk0x290[1]) {
VTable0x74(local_8c, local_18);
}
else if (p_y > m_unk0x298[1]) {
VTable0x7c(local_8c, local_18);
}
else if (p_y >= m_unk0x290[1]) {
VTable0x78(local_8c, local_18);
}
MxS32 local_20[2];
local_20[0] = p_x - m_unk0x290[0];
local_20[1] = p_y - m_unk0x290[1];
MxFloat local_1c = sqrt((double) (NORMSQRD2(local_20))) / m_unk0x2a0;
m_unk0x25c.Unknown6(local_78, local_1c);
local_78[3][0] = m_unk0x178[3][0] + local_18[0];
local_78[3][1] = m_unk0x178[3][1] + local_18[1];
local_78[3][2] = m_unk0x178[3][2] + local_18[2];
local_78[3][3] = 1.0;
m_unk0x110->WrappedSetLocalTransform(local_78);
}
}
}
// FUNCTION: LEGO1 0x10023500
@ -295,8 +342,8 @@ void LegoCarBuild::VTable0x78(MxFloat p_param1[2], MxFloat p_param2[3])
FUN_1003ded0(p_param1, local18, localc);
p_param2[2] =
m_unk0x2a4[2] + (m_unk0x2bc[2] - m_unk0x2a4[2]) * ((p_param1[1] - m_unk0x294) / (m_unk0x29c - m_unk0x294));
p_param2[2] = m_unk0x2a4[2] +
(m_unk0x2bc[2] - m_unk0x2a4[2]) * ((p_param1[1] - m_unk0x290[1]) / (m_unk0x298[1] - m_unk0x290[1]));
fVar1 = (p_param2[2] - localc[2]) / local18[2];
p_param2[0] = fVar1 * local18[0] - m_unk0x2a4[0] + localc[0];
p_param2[1] = fVar1 * local18[1] - m_unk0x2a4[1] + localc[1];
@ -551,17 +598,16 @@ undefined4 LegoCarBuild::FUN_10024250(LegoEventNotificationParam* p_param)
return 0;
}
// STUB: LEGO1 0x100242c0
// FUNCTION: LEGO1 0x100242c0
void LegoCarBuild::ReadyWorld()
{
m_presentersEnabled = FALSE;
InitPresenters();
if (BackgroundAudioManager()->GetEnabled()) {
InvokeAction(Extra::ActionType::e_start, *g_jukeboxScript, FUN_10025ee0(m_unk0x330), NULL);
m_buildState->m_animationState = 2;
MxNotificationParam param;
param.SetNotification(c_notificationStartAction);
NotificationManager()->Send(this, param);
NotificationManager()->Send(this, MxNotificationParam());
}
else {
FUN_10024ef0();
@ -619,12 +665,65 @@ undefined4 LegoCarBuild::FUN_10024480(MxActionNotificationParam* p_param)
return result;
}
// STUB: LEGO1 0x100244e0
// STUB: BETA10 0x1006cfb6
// FUNCTION: LEGO1 0x100244e0
// FUNCTION: BETA10 0x1006cfb6
undefined4 LegoCarBuild::FUN_100244e0(MxLong p_x, MxLong p_y)
{
// TODO
return 0;
m_unk0x250[0] = p_x;
m_unk0x250[1] = p_y;
LegoROI* roi = PickROI(p_x, p_y);
if (!roi || !m_unk0x258->StringEndsOnYOrN(roi->GetName())) {
return 0;
}
if (m_unk0x110 != roi) {
FUN_10022f30();
m_unk0x110 = roi;
FUN_10024f70(TRUE);
FUN_100250e0(TRUE);
}
if (m_unk0x100 == 5 && m_unk0x258->FUN_10079ca0(m_unk0x110->GetName())) {
m_unk0x2d4 = TRUE;
}
else {
m_unk0x2d4 = FALSE;
}
FUN_10025450();
VTable0x70();
if (m_unk0x258->FUN_10079ca0(m_unk0x110->GetName())) {
if (m_unk0x100 != 5) {
m_unk0x250[0] += m_unk0x290[0] - m_unk0x298[0];
m_unk0x250[1] += m_unk0x290[1] - m_unk0x298[1];
}
if (m_unk0x100 == 0) {
m_unk0x114 = m_unk0x110->GetWorldBoundingSphere();
}
}
else {
if (m_unk0x258->FUN_10079c30(m_unk0x110->GetName())) {
m_unk0x114 = m_unk0x258->FUN_10079e20();
}
}
switch (m_unk0x100) {
case 0:
m_unk0x100 = 4;
break;
case 5:
m_unk0x100 = 3;
break;
}
m_GetBrick_Sound->Enable(FALSE);
m_GetBrick_Sound->Enable(TRUE);
m_unk0x258->SetUnknown0xbc(0);
return 1;
}
// STUB: LEGO1 0x100246e0
@ -728,6 +827,13 @@ void LegoCarBuild::FUN_100250e0(MxBool p_enabled)
// TODO
}
// STUB: LEGO1 0x10025450
// STUB: BETA10 0x1006e599
void LegoCarBuild::FUN_10025450()
{
// TODO
}
// FUNCTION: LEGO1 0x100256c0
// FUNCTION: BETA10 0x1006e96c
void LegoCarBuild::Enable(MxBool p_enable)

13
LEGO1/lego/legoomni/src/build/legocarbuildpresenter.cpp
View File

@ -98,12 +98,20 @@ MxBool LegoCarBuildAnimPresenter::StringEndsOnYOrN(const LegoChar* p_string)
(p_string[strlen(p_string) - 2] == 'Y') || (p_string[strlen(p_string) - 2] == 'y');
}
// STUB: LEGO1 0x10079c30
// STUB: BETA10 0x100726a6
MxBool LegoCarBuildAnimPresenter::FUN_10079c30(const LegoChar* p_name)
{
// TODO
return FALSE;
}
// FUNCTION: LEGO1 0x10079ca0
// FUNCTION: BETA10 0x10072740
MxBool LegoCarBuildAnimPresenter::FUN_10079ca0(const char* p_param1)
MxBool LegoCarBuildAnimPresenter::FUN_10079ca0(const LegoChar* p_name)
{
for (MxS16 i = 0; i < m_unk0xc0; i++) {
if (strcmpi(p_param1, m_unk0x128[i].m_unk0x00) == 0) {
if (strcmpi(p_name, m_unk0x128[i].m_unk0x00) == 0) {
return TRUE;
}
}
@ -119,6 +127,7 @@ MxBool LegoCarBuildAnimPresenter::FUN_10079cf0(const LegoChar* p_string)
}
// FUNCTION: LEGO1 0x10079e20
// FUNCTION: BETA10 0x10072959
const BoundingSphere& LegoCarBuildAnimPresenter::FUN_10079e20()
{
LegoROI* roi = m_unk0x140->GetROI();

1
LEGO1/lego/legoomni/src/common/legoutils.cpp
View File

@ -32,6 +32,7 @@
#include <vec.h>
// FUNCTION: LEGO1 0x1003dd70
// FUNCTION: BETA10 0x100d3410
LegoROI* PickROI(MxLong p_a, MxLong p_b)
{
LegoVideoManager* videoManager = VideoManager();

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

@ -11,6 +11,7 @@ DECOMP_SIZE_ASSERT(LegoAct2, 0x1154)
DECOMP_SIZE_ASSERT(LegoAct2State, 0x10)
// STUB: LEGO1 0x1004fce0
// STUB: BETA10 0x1003a5a0
LegoAct2::LegoAct2()
{
// TODO

4
LEGO1/library_msvc.h
View File

@ -52,6 +52,7 @@
// _sprintf
// LIBRARY: LEGO1 0x1008b608
// LIBRARY: BETA10 0x100f9660
// __ftol
// LIBRARY: LEGO1 0x1008b630
@ -702,4 +703,7 @@
// LIBRARY: BETA10 0x100fe5a0
// abort
// LIBRARY: BETA10 0x100ff82b
// __ctrandisp1
#endif

3
LEGO1/realtime/roi.h
View File

@ -36,6 +36,9 @@ class BoundingSphere {
const float& Radius() const { return radius; }
float& Radius() { return radius; }
// SYNTHETIC: BETA10 0x1001fb90
// BoundingSphere::operator=
private:
Mx3DPointFloat center; // 0x00
float radius; // 0x14