Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

xMath2: enable match #388

Merged
merged 1 commit into from
Oct 11, 2024
Merged

xMath2: enable match #388

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion configure.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"),
Expand Down
5 changes: 4 additions & 1 deletion src/SB/Core/x/xMath2.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 };
4 changes: 2 additions & 2 deletions src/SB/Core/x/xMath2.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down