From 34d69e558383ec67180812b9e4a3db0c2fbcb063 Mon Sep 17 00:00:00 2001 From: Christian Semmler Date: Wed, 10 Jan 2024 12:52:12 -0500 Subject: [PATCH] Fixes --- LEGO1/lego/sources/3dmanager/lego3dmanager.h | 6 ++++-- LEGO1/lego/sources/3dmanager/lego3dview.h | 8 +++----- LEGO1/lego/sources/3dmanager/legoview1.h | 6 +++--- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/LEGO1/lego/sources/3dmanager/lego3dmanager.h b/LEGO1/lego/sources/3dmanager/lego3dmanager.h index d54fe45b..ab2bdefc 100644 --- a/LEGO1/lego/sources/3dmanager/lego3dmanager.h +++ b/LEGO1/lego/sources/3dmanager/lego3dmanager.h @@ -4,10 +4,12 @@ #include "assert.h" #include "lego3dview.h" -namespace Tgl { +namespace Tgl +{ class Renderer; class Group; -} +} // namespace Tgl + class ViewROI; // ??? for now diff --git a/LEGO1/lego/sources/3dmanager/lego3dview.h b/LEGO1/lego/sources/3dmanager/lego3dview.h index cde67b9a..f02e7d31 100644 --- a/LEGO1/lego/sources/3dmanager/lego3dview.h +++ b/LEGO1/lego/sources/3dmanager/lego3dview.h @@ -35,11 +35,9 @@ class Lego3DView : public LegoView1 { private: ViewManager* m_pViewManager; // 0x88 - double m_previousRenderTime; // 0x8c FIXME: incorrect tags: sizeof(double) = 8 -> 0x8c + 08 = 0x94 > offsetof(Lego3dView, m_pPointOfView) - - ViewROI* m_pPointOfView; // 0x90 - - undefined m_unk0x94[0x0c]; // 0x94 + double m_previousRenderTime; // 0x8c + ViewROI* m_pPointOfView; // 0x94 + undefined m_unk0x98[0x0c]; // 0x98 }; // SYNTHETIC: LEGO1 0x100aaf10 diff --git a/LEGO1/lego/sources/3dmanager/legoview1.h b/LEGO1/lego/sources/3dmanager/legoview1.h index eeb6ccc2..bfee4e3d 100644 --- a/LEGO1/lego/sources/3dmanager/legoview1.h +++ b/LEGO1/lego/sources/3dmanager/legoview1.h @@ -1,11 +1,12 @@ #ifndef _LegoView1_h #define _LegoView1_h -#include "decomp.h" #include "compat.h" +#include "decomp.h" #include "tglsurface.h" -namespace tgl { +namespace Tgl +{ class Camera; } @@ -67,7 +68,6 @@ class LegoView1 : public LegoView { Tgl::Light* m_pSunLight; // 0x78 Tgl::Light* m_pDirectionalLight; // 0x7c Tgl::Light* m_pAmbientLight; // 0x80 - undefined m_unk0x84[4]; // 0x84 }; // SYNTHETIC: LEGO1 0x100ab7a0