fix(math): Enforce USE_DETERMINISTIC_MATH and complete deterministic coverage

Author: Okladnoj

Core/GameEngine/Source/Common/Diagnostic/SimulationMathCrc.cpp

@@ -39,16 +39,16 @@ static void appendSimulationMathCrc(XferCRC &xfer)
     factorsMatrix.Set(
         WWMath::Sin(0.7f) * log10f(2.3f),
         WWMath::Cos(1.1f) * powf(1.1f, 2.0f),
-        tanf(0.3f),
-        asinf(0.967302263f),
-        acosf(0.967302263f),
+        WWMath::TanfOrigin(0.3f),
+        WWMath::ASinfOrigin(0.967302263f),
+        WWMath::ACosfOrigin(0.967302263f),
         WWMath::AtanfOrigin(0.967302263f) * WWMath::PowfOrigin(1.1f, 2.0f),
         WWMath::Atan2fOrigin(0.4f, 1.3f),
-        sinhf(0.2f),
-        coshf(0.4f) * tanhf(0.5f),
+        WWMath::SinhfOrigin(0.2f),
+        WWMath::CoshfOrigin(0.4f) * WWMath::TanhfOrigin(0.5f),
         WWMath::SqrtfOrigin(55788.84375f),
         WWMath::ExpfOrigin(0.1f) * WWMath::Log10fOrigin(2.3f),
-        logf(1.4f));
+        WWMath::LogfOrigin(1.4f));
 
     Matrix3D::Multiply(matrix, factorsMatrix, &matrix);
     matrix.Get_Inverse(matrix);

Core/Libraries/Source/WWVegas/WWMath/wwmath.h

@@ -46,23 +46,26 @@
 #if !(defined(_MSC_VER) && _MSC_VER < 1300)
 #if defined(__has_include) && __has_include("gmath.h")
 #include "gmath.h"
-#define USE_DETERMINISTIC_MATH
 #endif
 #endif
 
+#if !(defined(_MSC_VER) && _MSC_VER < 1300)
+#define USE_DETERMINISTIC_MATH
+#endif
+
 /*
 ** Some global constants.
 */
-#define WWMATH_EPSILON		0.0001f
-#define WWMATH_EPSILON2		WWMATH_EPSILON * WWMATH_EPSILON
+#define WWMATH_EPSILON				0.0001f
+#define WWMATH_EPSILON2				WWMATH_EPSILON * WWMATH_EPSILON
 #define WWMATH_PI					3.141592654f
-#define WWMATH_TWO_PI			6.283185308f
-#define WWMATH_FLOAT_MAX	(FLT_MAX)
-#define WWMATH_FLOAT_MIN	(FLT_MIN)
-#define WWMATH_SQRT2			1.414213562f
-#define WWMATH_SQRT3			1.732050808f
-#define WWMATH_OOSQRT2		0.707106781f
-#define WWMATH_OOSQRT3		0.577350269f
+#define WWMATH_TWO_PI				6.283185308f
+#define WWMATH_FLOAT_MAX			(FLT_MAX)
+#define WWMATH_FLOAT_MIN			(FLT_MIN)
+#define WWMATH_SQRT2				1.414213562f
+#define WWMATH_SQRT3				1.732050808f
+#define WWMATH_OOSQRT2				0.707106781f
+#define WWMATH_OOSQRT3				0.577350269f
 
 /*
 **	Macros to convert between degrees and radians
@@ -168,6 +171,9 @@ static WWINLINE float		Atan2(float y,float x) { return static_cast<float>(atan2(
 
 // Origin wrappers: replace bare CRT math calls in GameLogic.
 // Each wrapper preserves the exact type (float vs double) of the vanilla CRT call.
+// Note: double overloads narrow to float before calling GameMath (gm_*f).
+// GameMath only provides float-precision functions. All call sites pass float-width
+// values, so the narrowing is lossless in practice.
 #ifdef USE_DETERMINISTIC_MATH
 	static WWINLINE double		SqrtOrigin(double x) { return (double)gm_sqrtf((float)x); }
 	static WWINLINE float		SqrtfOrigin(float x) { return gm_sqrtf(x); }
@@ -189,6 +195,10 @@ static WWINLINE float		Atan2(float y,float x) { return static_cast<float>(atan2(
 	static WWINLINE float		CeilfOrigin(float x) { return gm_ceilf(x); }
 	static WWINLINE float		ExpfOrigin(float x) { return gm_expf(x); }
 	static WWINLINE float		Log10fOrigin(float x) { return gm_log10f(x); }
+	static WWINLINE float		LogfOrigin(float x) { return gm_logf(x); }
+	static WWINLINE float		SinhfOrigin(float x) { return gm_sinhf(x); }
+	static WWINLINE float		CoshfOrigin(float x) { return gm_coshf(x); }
+	static WWINLINE float		TanhfOrigin(float x) { return gm_tanhf(x); }
 #else
 	static WWINLINE double		SqrtOrigin(double x) { return sqrt(x); }
 	static WWINLINE float		SqrtfOrigin(float x) { return sqrtf(x); }
@@ -210,6 +220,10 @@ static WWINLINE float		Atan2(float y,float x) { return static_cast<float>(atan2(
 	static WWINLINE float		CeilfOrigin(float x) { return ceilf(x); }
 	static WWINLINE float		ExpfOrigin(float x) { return expf(x); }
 	static WWINLINE float		Log10fOrigin(float x) { return log10f(x); }
+	static WWINLINE float		LogfOrigin(float x) { return logf(x); }
+	static WWINLINE float		SinhfOrigin(float x) { return sinhf(x); }
+	static WWINLINE float		CoshfOrigin(float x) { return coshf(x); }
+	static WWINLINE float		TanhfOrigin(float x) { return tanhf(x); }
 #endif
 static WWINLINE float		Sign(float val);
 static WWINLINE float		Ceil(float val) { return ceilf(val); }

Generals/Code/GameEngine/Source/Common/System/Trig.cpp

@@ -1,5 +1,5 @@
 /*
-**	Command & Conquer Generals Zero Hour(tm)
+**	Command & Conquer Generals(tm)
 **	Copyright 2025 Electronic Arts Inc.
 **
 **	This program is free software: you can redistribute it and/or modify

cmake/gamemath.cmake

@@ -1,3 +1,5 @@
+# FORCE is required to guarantee cross-platform bit-exact determinism.
+# Intrinsics would use platform-specific SIMD, breaking CRC parity between architectures.
 set(GM_ENABLE_INTRINSICS OFF CACHE BOOL "Disable intrinsics for cross-arch determinism" FORCE)
 set(GM_ENABLE_TESTS OFF CACHE BOOL "Disable GameMath tests" FORCE)