From 7cd75e8f7b01a45ca8c72facfd5b4a3c1906c0e1 Mon Sep 17 00:00:00 2001 From: LagoLunatic Date: Sat, 24 May 2025 18:54:46 -0400 Subject: Demo matches (#767) --- include/SSystem/SComponent/c_m3d_g_aab.h | 12 ++++++------ include/SSystem/SComponent/c_m3d_g_sph.h | 11 ++++++++--- 2 files changed, 14 insertions(+), 9 deletions(-) (limited to 'include/SSystem') diff --git a/include/SSystem/SComponent/c_m3d_g_aab.h b/include/SSystem/SComponent/c_m3d_g_aab.h index f1e89556..b4ece970 100644 --- a/include/SSystem/SComponent/c_m3d_g_aab.h +++ b/include/SSystem/SComponent/c_m3d_g_aab.h @@ -53,12 +53,12 @@ public: VECScale(pOut, pOut, 0.5f); } void ClearForMinMax() { - mMin.z = 1000000000.0f; - mMin.y = 1000000000.0f; - mMin.x = 1000000000.0f; - mMax.z = -1000000000.0f; - mMax.y = -1000000000.0f; - mMax.x = -1000000000.0f; + mMin.z = G_CM3D_F_INF; + mMin.y = G_CM3D_F_INF; + mMin.x = G_CM3D_F_INF; + mMax.z = -G_CM3D_F_INF; + mMax.y = -G_CM3D_F_INF; + mMax.x = -G_CM3D_F_INF; } void ClearForMinMaxY() { mMin.y = G_CM3D_F_INF; diff --git a/include/SSystem/SComponent/c_m3d_g_sph.h b/include/SSystem/SComponent/c_m3d_g_sph.h index b4a642d6..9a84623d 100644 --- a/include/SSystem/SComponent/c_m3d_g_sph.h +++ b/include/SSystem/SComponent/c_m3d_g_sph.h @@ -21,9 +21,14 @@ public: cM3dGSph() {} virtual ~cM3dGSph() {} - void SetC(const cXyz&); - void SetC(f32, f32, f32) {} - void SetR(f32); +#if VERSION == VERSION_DEMO + void SetC(const cXyz& p) { mCenter = p; } + void SetR(f32 r) { mRadius = r; } +#else + void SetC(const cXyz& p); + void SetR(f32 r); +#endif + void SetC(f32, f32, f32) {} // TODO void Set(const cM3dGSphS & src) { SetC(src.mCenter); SetR(src.mRadius); -- cgit v1.2.3