xMath2: enable match (#388)

bfbbdecomp · Oct 11, 2024 · 0281478 · 0281478
1 parent d164463
commit 0281478
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/configure.py b/configure.py
@@ -306,7 +306,7 @@ def Rel(lib_name: str, objects: List[Object]) -> Dict[str, Any]:
             Object(NonMatching, "SB/Core/x/xHudUnitMeter.cpp"),
             Object(Matching, "SB/Core/x/xIni.cpp"),
             Object(NonMatching, "SB/Core/x/xMath.cpp"),
-            Object(NonMatching, "SB/Core/x/xMath2.cpp"),
+            Object(Matching, "SB/Core/x/xMath2.cpp"),
             Object(NonMatching, "SB/Core/x/xMath3.cpp"),
             Object(NonMatching, "SB/Core/x/xMemMgr.cpp"),
             Object(NonMatching, "SB/Core/x/xModel.cpp"),

diff --git a/src/SB/Core/x/xMath2.cpp b/src/SB/Core/x/xMath2.cpp
@@ -1 +1,4 @@
-#include "xMath2.h"
+#include "xMath2.h"
+
+const basic_rect<F32> basic_rect<F32>::m_Null = { 0.0f, 0.0f, 0.0f, 0.0f };
+const basic_rect<F32> basic_rect<F32>::m_Unit = { 0.0f, 0.0f, 1.0f, 1.0f };
diff --git a/src/SB/Core/x/xMath2.h b/src/SB/Core/x/xMath2.h
@@ -10,8 +10,8 @@ template <class T> struct basic_rect
     T w;
     T h;
 
-    static basic_rect m_Null;
-    static basic_rect m_Unit;
+    const static basic_rect m_Null;
+    const static basic_rect m_Unit;
 
     basic_rect& assign(T x, T y, T w, T h);
     basic_rect& contract(T x, T y, T w, T h);