More build fixes

novusengine · Jul 30, 2024 · d6ed925 · d6ed925
1 parent 05ded3e
commit d6ed925
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 19 deletions.
diff --git a/Source/FileFormat/FileFormat/Novus/ClientDB/ClientDB.cpp b/Source/FileFormat/FileFormat/Novus/ClientDB/ClientDB.cpp
@@ -1,4 +1,3 @@
-#pragma once
 #include "ClientDB.h"
 
 #include <Base/Util/StringUtils.h>

diff --git a/Source/FileFormat/FileFormat/Novus/Model/ComplexModel.h b/Source/FileFormat/FileFormat/Novus/Model/ComplexModel.h
@@ -236,27 +236,13 @@ namespace Model
 
         struct CullingData
         {
-            union
-            {
-                struct
-                {
-                    hvec3 center;
-                    hvec3 extents;
-                };
-                struct
-                {
-                    hvec3 min;
-                    hvec3 max;
-                };
-            };
+        public:
+            hvec3 center;
+            hvec3 extents;
 
             f32 boundingSphereRadius;
 
-            CullingData() : boundingSphereRadius(0.0f)
-            {
-                center = hvec3(0.0f, 0.0f, 0.0f);
-                extents = hvec3(0.0f, 0.0f, 0.0f);
-            }
+            CullingData() : center(f16(0.0f)), extents(f16(0.0f)), boundingSphereRadius(0.0f) { }
         };
 
         struct Material