Cleanup

src/gameobject.hh

@@ -10,15 +10,13 @@ namespace psxsplash {
 
 class GameObject final {
   public:
-    psyqo::Vec3 position;                  // 12 bytes
-    psyqo::Matrix33 rotation;              // 36 bytes
-    uint16_t polyCount;                    // 2 bytes
-    psyqo::PrimPieces::TPageAttr texture;  // 2 bytes
-    uint16_t clutX, clutY;
-    uint16_t clut[256];
-    union {  // 4 bytes
+    psyqo::Vec3 position;
+    psyqo::Matrix33 rotation;
+    union {
         Tri *polygons;
         uint32_t polygonsOffset;
     };
+    int polyCount;
 };
+static_assert(sizeof(GameObject) == 56, "GameObject is not 56 bytes");
 }  // namespace psxsplash