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

Fixes

Browse Source
This commit is contained in:
Christian Semmler 2024-01-09 04:12:18 -05:00
parent 038d93fff4
commit 48d0097494
8 changed files with 58 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -34,7 +34,6 @@ add_library(lego1 SHARED
LEGO1/lego/legoomni/src/common/legobackgroundcolor.cpp LEGO1/lego/legoomni/src/common/legobackgroundcolor.cpp
LEGO1/lego/legoomni/src/common/legofullscreenmovie.cpp LEGO1/lego/legoomni/src/common/legofullscreenmovie.cpp
LEGO1/lego/legoomni/src/common/legogamestate.cpp LEGO1/lego/legoomni/src/common/legogamestate.cpp
LEGO1/lego/legoomni/src/common/legonavcontroller.cpp
LEGO1/lego/legoomni/src/common/legoobjectfactory.cpp LEGO1/lego/legoomni/src/common/legoobjectfactory.cpp
LEGO1/lego/legoomni/src/common/legoplantmanager.cpp LEGO1/lego/legoomni/src/common/legoplantmanager.cpp
LEGO1/lego/legoomni/src/common/legostate.cpp LEGO1/lego/legoomni/src/common/legostate.cpp
@ -49,6 +48,7 @@ add_library(lego1 SHARED
LEGO1/lego/legoomni/src/entity/legoentity.cpp LEGO1/lego/legoomni/src/entity/legoentity.cpp
LEGO1/lego/legoomni/src/entity/legoentitypresenter.cpp LEGO1/lego/legoomni/src/entity/legoentitypresenter.cpp
LEGO1/lego/legoomni/src/entity/legojetski.cpp LEGO1/lego/legoomni/src/entity/legojetski.cpp
LEGO1/lego/legoomni/src/entity/legonavcontroller.cpp
LEGO1/lego/legoomni/src/entity/legopathactor.cpp LEGO1/lego/legoomni/src/entity/legopathactor.cpp
LEGO1/lego/legoomni/src/entity/legopovcontroller.cpp LEGO1/lego/legoomni/src/entity/legopovcontroller.cpp
LEGO1/lego/legoomni/src/entity/legorace.cpp LEGO1/lego/legoomni/src/entity/legorace.cpp

24
LEGO1/lego/legoomni/include/legocameracontroller.h
View File

@ -14,7 +14,7 @@ class LegoCameraController : public LegoPointOfViewController {
LegoCameraController(); LegoCameraController();
virtual ~LegoCameraController() override; // vtable+0x0 virtual ~LegoCameraController() override; // vtable+0x0
virtual MxLong Notify(MxParam& p_param); // vtable+04 virtual MxLong Notify(MxParam& p_param) override; // vtable+04
// FUNCTION: LEGO1 0x10011ec0 // FUNCTION: LEGO1 0x10011ec0
inline virtual const char* ClassName() const override // vtable+0x0c inline virtual const char* ClassName() const override // vtable+0x0c
@ -29,14 +29,14 @@ class LegoCameraController : public LegoPointOfViewController {
return !strcmp(p_name, ClassName()) || MxCore::IsA(p_name); return !strcmp(p_name, ClassName()) || MxCore::IsA(p_name);
} }
virtual void OnLButtonDown(MxPoint32 p_point); // vtable+0x30 virtual void OnLButtonDown(MxPoint32 p_point) override; // vtable+0x30
virtual void OnLButtonUp(MxPoint32 p_point); // vtable+0x34 virtual void OnLButtonUp(MxPoint32 p_point) override; // vtable+0x34
virtual void OnRButtonDown(MxPoint32 p_point); // vtable+0x38 virtual void OnRButtonDown(MxPoint32 p_point) override; // vtable+0x38
virtual void OnRButtonUp(MxPoint32 p_point); // vtable+0x3c virtual void OnRButtonUp(MxPoint32 p_point) override; // vtable+0x3c
virtual void OnMouseMove(MxU8 p_modifier, MxPoint32 p_point); // vtable+0x40 virtual void OnMouseMove(MxU8 p_modifier, MxPoint32 p_point) override; // vtable+0x40
virtual MxResult Initialize(); // vtable+0x44 virtual MxResult Create(); // vtable+0x44
void LookAt(Vector3Impl& p_at, Vector3Impl& p_dir, Vector3Impl& p_up); void SetWorldTransform(Vector3Impl& p_at, Vector3Impl& p_dir, Vector3Impl& p_up);
void FUN_100123e0(Matrix4Data& p_transform, MxU32); void FUN_100123e0(Matrix4Data& p_transform, MxU32);
Vector3Data& FUN_10012740(); Vector3Data& FUN_10012740();
Vector3Data& FUN_100127f0(); Vector3Data& FUN_100127f0();
@ -47,12 +47,4 @@ class LegoCameraController : public LegoPointOfViewController {
Matrix4Data m_matrix2; // 0x80 Matrix4Data m_matrix2; // 0x80
}; };
// todo: move to legonotify.h
enum LegoEventNotificationParamType {
c_lButtonState = 1,
c_rButtonState = 2,
c_modKey1 = 4,
c_modKey2 = 8,
};
#endif // LEGOCAMERACONTROLLER_H #endif // LEGOCAMERACONTROLLER_H

11
LEGO1/lego/legoomni/include/legonotify.h Normal file
View File

@ -0,0 +1,11 @@
#ifndef LEGONOTIFY_H
#define LEGONOTIFY_H
enum LegoEventNotificationParamType {
c_lButtonState = 1,
c_rButtonState = 2,
c_modKey1 = 4,
c_modKey2 = 8,
};
#endif // LEGONOTIFY_H

42
LEGO1/lego/legoomni/include/legopointofviewcontroller.h
View File

@ -1,8 +1,11 @@
#ifndef LEGOPOINTOFVIEWCONTROLLER_H #ifndef LEGOPOINTOFVIEWCONTROLLER_H
#define LEGOPOINTOFVIEWCONTROLLER_H #define LEGOPOINTOFVIEWCONTROLLER_H
#include "decomp.h" #include "decomp.h"
#include "mxcore.h" #include "mxcore.h"
#include <windows.h>
class Lego3DView; class Lego3DView;
class LegoEntity; class LegoEntity;
class LegoNavController; class LegoNavController;
@ -12,10 +15,11 @@ class LegoNavController;
// LegoMouseController // LegoMouseController
// VTABLE: LEGO1 0x100d8dd8 // VTABLE: LEGO1 0x100d8dd8
// SIZE 0x20
class LegoMouseController : public MxCore { class LegoMouseController : public MxCore {
public: public:
LegoMouseController(); LegoMouseController();
~LegoMouseController(); virtual ~LegoMouseController() override;
virtual void LeftDown(int, int); // vtable+0x14 virtual void LeftDown(int, int); // vtable+0x14
virtual void LeftDrag(int, int); // vtable+0x18 virtual void LeftDrag(int, int); // vtable+0x18
@ -25,25 +29,22 @@ class LegoMouseController : public MxCore {
virtual void RightUp(int, int); // vtable+0x28 virtual void RightUp(int, int); // vtable+0x28
private: private:
// note: in the leaked source code, this is a bool (which is typedefed to int) BOOL m_isButtonDown; // 0x08
MxU32 m_isButtonDown; // 0x08 undefined4 m_unk0xc; // 0x0c
undefined4 m_unk0xc; // 0x0c MxDouble m_buttonX; // 0x10
MxDouble m_buttonX; // 0x10 MxDouble m_buttonY; // 0x18
MxDouble m_buttonY; // 0x18
}; };
// VTABLE: LEGO1 0x100d8e08 // VTABLE: LEGO1 0x100d8e08
// SIZE 0x38
class LegoPointOfViewController : public LegoMouseController { class LegoPointOfViewController : public LegoMouseController {
public: public:
LegoPointOfViewController(); LegoPointOfViewController();
~LegoPointOfViewController(); virtual ~LegoPointOfViewController() override;
virtual MxResult Tickle(); // vtable+0x08 virtual MxResult Tickle() override; // vtable+0x08
virtual void LeftDown(int p_x, int p_y) override; // vtable+0x0c
MxResult Create(Lego3DView* p_lego3DView); virtual void LeftDrag(int p_x, int p_y) override; // vtable+0x10
void LeftDown(int p_x, int p_y);
void LeftDrag(int p_x, int p_y);
// FUNCTION: LEGO1 0x10011e40 // FUNCTION: LEGO1 0x10011e40
virtual void LeftUp(int p_x, int p_y) override virtual void LeftUp(int p_x, int p_y) override
@ -76,13 +77,18 @@ class LegoPointOfViewController : public LegoMouseController {
AffectPointOfView(); AffectPointOfView();
} // vtable+0x28 } // vtable+0x28
virtual void SetEntity(LegoEntity* p_entity); // vtable+0x2c virtual void SetEntity(LegoEntity* p_entity); // vtable+0x2c
LegoEntity* GetEntity() { return m_entity; }
MxResult Create(Lego3DView* p_lego3DView);
inline LegoEntity* GetEntity() { return m_entity; }
protected: protected:
void AffectPointOfView(); void AffectPointOfView();
Lego3DView* m_lego3DView; // 0x20
LegoEntity* m_entity; // 0x24 Lego3DView* m_lego3DView; // 0x20
double m_entityOffsetUp; // 0x28 LegoEntity* m_entity; // 0x24
LegoNavController* m_nav; // 0x30 MxDouble m_entityOffsetUp; // 0x28
LegoNavController* m_nav; // 0x30
}; };
#endif /* LEGOPOINTOFVIEWCONTROLLER_H */ #endif /* LEGOPOINTOFVIEWCONTROLLER_H */

4
LEGO1/lego/legoomni/src/build/helicopter.cpp
View File

@ -238,7 +238,7 @@ MxU32 Helicopter::VTable0xd8(MxType18NotificationParam& p_param)
mat.GetMatrix()[i][2] = mat2[i][2] * c + mat2[i][1] * s; mat.GetMatrix()[i][2] = mat2[i][2] * c + mat2[i][1] * s;
} }
Vector3Impl at(mat.GetMatrix()[3]), dir(mat.GetMatrix()[2]), up(mat.GetMatrix()[1]); Vector3Impl at(mat.GetMatrix()[3]), dir(mat.GetMatrix()[2]), up(mat.GetMatrix()[1]);
m_world->GetCamera()->LookAt(at, dir, up); m_world->GetCamera()->SetWorldTransform(at, dir, up);
FUN_10010c30(); FUN_10010c30();
break; break;
} }
@ -247,7 +247,7 @@ MxU32 Helicopter::VTable0xd8(MxType18NotificationParam& p_param)
mat.SetIdentity(); mat.SetIdentity();
Vector3Impl at(mat.GetMatrix()[3]), dir(mat.GetMatrix()[2]), up(mat.GetMatrix()[1]); Vector3Impl at(mat.GetMatrix()[3]), dir(mat.GetMatrix()[2]), up(mat.GetMatrix()[1]);
at[1] = 1.25; at[1] = 1.25;
m_world->GetCamera()->LookAt(at, dir, up); m_world->GetCamera()->SetWorldTransform(at, dir, up);
if (GameState()->GetUnknown10() == 0) { if (GameState()->GetUnknown10() == 0) {
((Act1State*) GameState()->GetState("Act1State"))->SetUnknown18(0); ((Act1State*) GameState()->GetState("Act1State"))->SetUnknown18(0);
VTable0xe8(0x29, TRUE, 7); VTable0xe8(0x29, TRUE, 7);

7
LEGO1/lego/legoomni/src/entity/legocameracontroller.cpp
View File

@ -1,6 +1,7 @@
#include "legocameracontroller.h" #include "legocameracontroller.h"
#include "legoinputmanager.h" #include "legoinputmanager.h"
#include "legonotify.h"
#include "legoomni.h" #include "legoomni.h"
#include "legovideomanager.h" #include "legovideomanager.h"
@ -9,7 +10,7 @@ DECOMP_SIZE_ASSERT(LegoCameraController, 0xc8);
// FUNCTION: LEGO1 0x10011d50 // FUNCTION: LEGO1 0x10011d50
LegoCameraController::LegoCameraController() LegoCameraController::LegoCameraController()
{ {
LookAt(Vector3Data(0, 0, 0), Vector3Data(0, 0, 1), Vector3Data(0, 1, 0)); SetWorldTransform(Vector3Data(0, 0, 0), Vector3Data(0, 0, 1), Vector3Data(0, 1, 0));
} }
// FUNCTION: LEGO1 0x10011f70 // FUNCTION: LEGO1 0x10011f70
@ -23,7 +24,7 @@ LegoCameraController::~LegoCameraController()
} }
// FUNCTION: LEGO1 0x10011ff0 // FUNCTION: LEGO1 0x10011ff0
MxResult LegoCameraController::Initialize() MxResult LegoCameraController::Create()
{ {
InputManager()->SetCamera(this); InputManager()->SetCamera(this);
return LegoPointOfViewController::Create(VideoManager()->Get3DManager()->GetLego3DView()); return LegoPointOfViewController::Create(VideoManager()->Get3DManager()->GetLego3DView());
@ -70,7 +71,7 @@ void LegoCameraController::OnMouseMove(MxU8 p_modifier, MxPoint32 p_point)
} }
// FUNCTION: LEGO1 0x10012260 // FUNCTION: LEGO1 0x10012260
void LegoCameraController::LookAt(Vector3Impl& p_at, Vector3Impl& p_dir, Vector3Impl& p_up) void LegoCameraController::SetWorldTransform(Vector3Impl& p_at, Vector3Impl& p_dir, Vector3Impl& p_up)
{ {
CalcLocalTransform(p_at, p_dir, p_up, m_matrix1); CalcLocalTransform(p_at, p_dir, p_up, m_matrix1);
m_matrix2 = m_matrix1; m_matrix2 = m_matrix1;

0
LEGO1/lego/legoomni/src/common/legonavcontroller.cpp → LEGO1/lego/legoomni/src/entity/legonavcontroller.cpp
View File

13
LEGO1/lego/legoomni/src/entity/legopovcontroller.cpp
View File

@ -3,12 +3,15 @@
#include "legopointofviewcontroller.h" #include "legopointofviewcontroller.h"
#include "mxticklemanager.h" #include "mxticklemanager.h"
DECOMP_SIZE_ASSERT(LegoMouseController, 0x20);
DECOMP_SIZE_ASSERT(LegoPointOfViewController, 0x38);
////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////
// FUNCTION: LEGO1 0x10065550 // FUNCTION: LEGO1 0x10065550
LegoMouseController::LegoMouseController() LegoMouseController::LegoMouseController()
{ {
m_isButtonDown = 0; m_isButtonDown = FALSE;
} }
// FUNCTION: LEGO1 0x100655d0 // FUNCTION: LEGO1 0x100655d0
@ -19,7 +22,7 @@ LegoMouseController::~LegoMouseController()
// FUNCTION: LEGO1 0x10065620 // FUNCTION: LEGO1 0x10065620
void LegoMouseController::LeftDown(int p_x, int p_y) void LegoMouseController::LeftDown(int p_x, int p_y)
{ {
m_isButtonDown = 1; m_isButtonDown = TRUE;
m_buttonX = p_x; m_buttonX = p_x;
m_buttonY = p_y; m_buttonY = p_y;
} }
@ -27,7 +30,7 @@ void LegoMouseController::LeftDown(int p_x, int p_y)
// FUNCTION: LEGO1 0x10065640 // FUNCTION: LEGO1 0x10065640
void LegoMouseController::LeftUp(int p_x, int p_y) void LegoMouseController::LeftUp(int p_x, int p_y)
{ {
m_isButtonDown = 0; m_isButtonDown = FALSE;
m_buttonX = p_x; m_buttonX = p_x;
m_buttonY = p_y; m_buttonY = p_y;
} }
@ -42,7 +45,7 @@ void LegoMouseController::LeftDrag(int p_x, int p_y)
// FUNCTION: LEGO1 0x10065680 // FUNCTION: LEGO1 0x10065680
void LegoMouseController::RightDown(int p_x, int p_y) void LegoMouseController::RightDown(int p_x, int p_y)
{ {
m_isButtonDown = 1; m_isButtonDown = TRUE;
m_buttonX = p_x; m_buttonX = p_x;
m_buttonY = p_y; m_buttonY = p_y;
} }
@ -50,7 +53,7 @@ void LegoMouseController::RightDown(int p_x, int p_y)
// FUNCTION: LEGO1 0x100656a0 // FUNCTION: LEGO1 0x100656a0
void LegoMouseController::RightUp(int p_x, int p_y) void LegoMouseController::RightUp(int p_x, int p_y)
{ {
m_isButtonDown = 0; m_isButtonDown = FALSE;
m_buttonX = p_x; m_buttonX = p_x;
m_buttonY = p_y; m_buttonY = p_y;
} }