Refactor

isledecomp · Jan 3, 2025 · 73a5b54 · 73a5b54
1 parent f7d1368
commit 73a5b54
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 7 deletions.
diff --git a/LEGO1/mxgeometry/mxgeometry3d.h b/LEGO1/mxgeometry/mxgeometry3d.h
@@ -2,8 +2,6 @@
 #define MXGEOMETRY3D_H
 
 #include "decomp.h"
-#include "realtime/vector.h"
-#include "realtime/vector2d.inl.h"
 #include "realtime/vector3d.inl.h"
 
 // VTABLE: LEGO1 0x100d4488

diff --git a/LEGO1/mxgeometry/mxgeometry4d.h b/LEGO1/mxgeometry/mxgeometry4d.h
@@ -2,8 +2,6 @@
 #define MXGEOMETRY4D_H
 
 #include "decomp.h"
-#include "realtime/matrix.h"
-#include "realtime/matrix4d.inl.h"
 #include "realtime/vector4d.inl.h"
 
 // VTABLE: LEGO1 0x100d41e8

diff --git a/LEGO1/mxgeometry/mxmatrix.h b/LEGO1/mxgeometry/mxmatrix.h
@@ -1,7 +1,6 @@
 #ifndef MXMATRIX_H
 #define MXMATRIX_H
 
-#include "realtime/matrix.h"
 #include "realtime/matrix4d.inl.h"
 
 // VTABLE: LEGO1 0x100d4300
@@ -36,7 +35,9 @@ class MxMatrix : public Matrix4 {
 	float m_elements[4][4]; // 0x08
 };
 
-// Must be included here for correct ordering in binary
+// Must be included here (not before MxMatrix) for correct ordering in binary.
+// FromQuaternion and ToQuaternion in Matrix4 depend on Vector4.
+// There's a chance they included mxgeometry4d.h after including this somewhere.
 #include "realtime/vector4d.inl.h"
 
 #endif // MXMATRIX_H
diff --git a/LEGO1/realtime/vector3d.inl.h b/LEGO1/realtime/vector3d.inl.h
@@ -1,7 +1,6 @@
 #ifndef VECTOR3D_H
 #define VECTOR3D_H
 
-#include "vector.h"
 #include "vector2d.inl.h"
 
 // FUNCTION: LEGO1 0x10002270