From d9855047de95ed443ea3cad38666a5229e253b5d Mon Sep 17 00:00:00 2001 From: Misha <106913236+MishaProductions@users.noreply.github.com> Date: Mon, 8 Jan 2024 18:23:25 -0500 Subject: [PATCH] fixes --- .../legoomni/include/legopointofviewcontroller.h | 10 +++++----- .../legoomni/src/entity/legocameracontroller.cpp | 14 +++++++------- .../lego/legoomni/src/entity/legopovcontroller.cpp | 12 ++++++------ 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/LEGO1/lego/legoomni/include/legopointofviewcontroller.h b/LEGO1/lego/legoomni/include/legopointofviewcontroller.h index f020acfd..497d5486 100644 --- a/LEGO1/lego/legoomni/include/legopointofviewcontroller.h +++ b/LEGO1/lego/legoomni/include/legopointofviewcontroller.h @@ -11,7 +11,7 @@ class LegoNavController; // // LegoMouseController -// VTABLE: LEGO1 0x10065550 +// VTABLE: LEGO1 0x100d8dd8 class LegoMouseController : public MxCore { public: LegoMouseController(); @@ -75,15 +75,15 @@ class LegoPointOfViewController : public LegoMouseController { LegoMouseController::RightUp(x, y); AffectPointOfView(); } - override; // vtable+0x28 - virtual void SetEntity(LegoEntity* p_entity); // vtable+0x2c + override; // vtable+0x28 + virtual void SetEntity(LegoEntity* p_entity); // vtable+0x2c LegoEntity* GetEntity() { return m_entity; } protected: void AffectPointOfView(); Lego3DView* m_lego3DView; // 0x20 - LegoEntity* m_entity; // 0x24 - double m_entityOffsetUp; // 0x28 + LegoEntity* m_entity; // 0x24 + double m_entityOffsetUp; // 0x28 LegoNavController* m_nav; // 0x30 }; #endif /* LEGOPOINTOFVIEWCONTROLLER_H */ diff --git a/LEGO1/lego/legoomni/src/entity/legocameracontroller.cpp b/LEGO1/lego/legoomni/src/entity/legocameracontroller.cpp index d066e08a..e3a907a1 100644 --- a/LEGO1/lego/legoomni/src/entity/legocameracontroller.cpp +++ b/LEGO1/lego/legoomni/src/entity/legocameracontroller.cpp @@ -29,6 +29,13 @@ MxResult LegoCameraController::Initialize() return LegoPointOfViewController::Create(VideoManager()->Get3DManager()->GetLego3DView()); } +// STUB: LEGO1 0x10012020 +MxLong LegoCameraController::Notify(MxParam& p_param) +{ + // TODO + return 0; +} + // FUNCTION: LEGO1 0x10012260 void LegoCameraController::LookAt(Vector3Impl& p_at, Vector3Impl& p_dir, Vector3Impl& p_up) { @@ -65,13 +72,6 @@ Vector3Data& LegoCameraController::FUN_100128a0() return g_v; } -// STUB: LEGO1 0x10012020 -MxLong LegoCameraController::Notify(MxParam& p_param) -{ - // TODO - return 0; -} - // FUNCTION: LEGO1 0x100121b0 void LegoCameraController::OnLButtonDown(MxPoint32 p_point) { diff --git a/LEGO1/lego/legoomni/src/entity/legopovcontroller.cpp b/LEGO1/lego/legoomni/src/entity/legopovcontroller.cpp index 12adcd37..7c4eb897 100644 --- a/LEGO1/lego/legoomni/src/entity/legopovcontroller.cpp +++ b/LEGO1/lego/legoomni/src/entity/legopovcontroller.cpp @@ -116,15 +116,15 @@ void LegoPointOfViewController::AffectPointOfView() // TODO } -// STUB: LEGO1 0x10065ae0 -void LegoPointOfViewController::SetEntity(LegoEntity* p_entity) -{ - // TODO -} - // STUB: LEGO1 0x10065930 MxResult LegoPointOfViewController::Tickle() { // TODO return SUCCESS; } + +// STUB: LEGO1 0x10065ae0 +void LegoPointOfViewController::SetEntity(LegoEntity* p_entity) +{ + // TODO +}