fix: Route GameLogic trig calls and base trig functions through WWMath

Author: Okladnoj

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

@@ -752,8 +752,8 @@ Bool BuildAssistant::isLocationClearOfObjects( const Coord3D *worldPos,
 	if (myFactoryExitWidth>0) {
 		myExitPos = *worldPos;
 		checkMyExit = true;
-		Real c = (Real)cos(angle);
-		Real s = (Real)sin(angle);
+		Real c = (Real)Cos(angle);
+		Real s = (Real)Sin(angle);
 		Real offset = build->getTemplateGeometryInfo().getMajorRadius() + myFactoryExitWidth/2.0f;
 		myExitPos.x += c*offset;
 		myExitPos.y += s*offset;
@@ -787,8 +787,8 @@ Bool BuildAssistant::isLocationClearOfObjects( const Coord3D *worldPos,
 		if (themFactoryExitWidth>0) {
 			hisExitPos = *them->getPosition();
 			checkHisExit = true;
-			Real c = (Real)cos(them->getOrientation());
-			Real s = (Real)sin(them->getOrientation());
+			Real c = (Real)Cos(them->getOrientation());
+			Real s = (Real)Sin(them->getOrientation());
 			Real offset = them->getGeometryInfo().getMajorRadius() + themFactoryExitWidth/2.0f;
 			hisExitPos.x += c*offset;
 			hisExitPos.y += s*offset;
@@ -1405,7 +1405,7 @@ Bool BuildAssistant::moveObjectsForConstruction( const ThingTemplate *whatToBuil
 	Bool anyUnmovables = false;
 	MemoryPoolObjectHolder hold( iter );
 
-	Real radius = sqrt(pow(gi.getMajorRadius(), 2) + pow(gi.getMinorRadius(), 2));
+	Real radius = Sqrt(pow(gi.getMajorRadius(), 2) + pow(gi.getMinorRadius(), 2));
 	radius *= 1.4f;	// Fudge the distance,
 
 	for( Object *them = iter->first(); them; them = iter->next() )

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

@@ -173,17 +173,17 @@ void GeometryInfo::calcPitches(const Coord3D& thisPos, const GeometryInfo& that,
 	Coord3D thisCenter;
 	getCenterPosition(thisPos, thisCenter);
 
-	Real dxy = sqrt(sqr(thatPos.x - thisCenter.x) + sqr(thatPos.y - thisCenter.y));
+	Real dxy = Sqrt(sqr(thatPos.x - thisCenter.x) + sqr(thatPos.y - thisCenter.y));
 
 	Real dz;
 
 	/** @todo srj -- this could be better, by calcing it for all the corners, not just top-center
 		and bottom-center... oh well */
 	dz = (thatPos.z + that.getMaxHeightAbovePosition()) - thisCenter.z;
-	maxPitch = atan2(dz, dxy);
+	maxPitch = Atan2(dz, dxy);
 
 	dz = (thatPos.z - that.getMaxHeightBelowPosition()) - thisCenter.z;
-	minPitch = atan2(dz, dxy);
+	minPitch = Atan2(dz, dxy);
 }
 
 //=============================================================================
@@ -279,8 +279,8 @@ void GeometryInfo::get2DBounds(const Coord3D& geomCenter, Real angle, Region2D&
 
 		case GEOMETRY_BOX:
 		{
-			Real c = (Real)cos(angle);
-			Real s = (Real)sin(angle);
+			Real c = (Real)Cos(angle);
+			Real s = (Real)Sin(angle);
 			Real exc = m_majorRadius*c;
 			Real eyc = m_minorRadius*c;
 			Real exs = m_majorRadius*s;
@@ -329,7 +329,7 @@ void GeometryInfo::clipPointToFootprint(const Coord3D& geomCenter, Coord3D& ptTo
 		{
 			Real dx = ptToClip.x - geomCenter.x;
 			Real dy = ptToClip.y - geomCenter.y;
-			Real radius = sqrt(sqr(dx) + sqr(dy));
+			Real radius = Sqrt(sqr(dx) + sqr(dy));
 			if (radius > m_majorRadius)
 			{
 				Real ratio = m_majorRadius / radius;
@@ -361,7 +361,7 @@ Bool GeometryInfo::isPointInFootprint(const Coord3D& geomCenter, const Coord3D&
 		{
 			Real dx = pt.x - geomCenter.x;
 			Real dy = pt.y - geomCenter.y;
-			Real radius = sqrt(sqr(dx) + sqr(dy));
+			Real radius = Sqrt(sqr(dx) + sqr(dy));
 			return (radius <= m_majorRadius);
 			break;
 		}
@@ -506,8 +506,8 @@ void GeometryInfo::calcBoundingStuff()
 
 		case GEOMETRY_BOX:
 		{
-			m_boundingCircleRadius = sqrt(sqr(m_majorRadius) + sqr(m_minorRadius));
-			m_boundingSphereRadius = sqrt(sqr(m_majorRadius) + sqr(m_minorRadius) + sqr(m_height*0.5));
+			m_boundingCircleRadius = Sqrt(sqr(m_majorRadius) + sqr(m_minorRadius));
+			m_boundingSphereRadius = Sqrt(sqr(m_majorRadius) + sqr(m_minorRadius) + sqr(m_height*0.5));
 			break;
 		}
 	};

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

@@ -34,6 +34,7 @@
 
 #include "Lib/BaseType.h"
 #include "Lib/trig.h"
+#include "WWMath/wwmath.h"
 
 #define TWOPI			6.28318530718f
 #define DEG2RAD 	0.0174532925199f
@@ -48,32 +49,37 @@
 
 Real Sin(Real x)
 {
-	return sinf(x);
+	return WWMath::Sin(x);
 }
 
 Real Cos(Real x)
 {
-	return cosf(x);
+	return WWMath::Cos(x);
 }
 
 Real Tan(Real x)
 {
-	return tanf(x);
+	return WWMath::Tan(x);
 }
 
 Real ACos(Real x)
 {
-	return acosf(x);
+	return WWMath::Acos(x);
 }
 
 Real ASin(Real x)
 {
-	return asinf(x);
+	return WWMath::Asin(x);
 }
 
 Real Atan2(Real y, Real x)
 {
-	return atan2f(y, x);
+	return WWMath::Atan2(y, x);
+}
+
+Real Sqrt(Real x)
+{
+	return WWMath::Sqrt(x);
 }
 
 #ifdef REGENERATE_TRIG_TABLES

Generals/Code/GameEngine/Source/GameLogic/AI/AI.cpp

@@ -709,7 +709,7 @@ Object *AI::findClosestEnemy( const Object *me, Real range, UnsignedInt qualifie
 		}
 
 		Real distSqr = ThePartitionManager->getDistanceSquared(me, theEnemy, FROM_BOUNDINGSPHERE_2D);
-		Real dist = sqrt(distSqr);
+		Real dist = Sqrt(distSqr);
 		Int modifier = dist/getAiData()->m_attackPriorityDistanceModifier;
 		Int modPriority = curPriority-modifier;
 		if (modPriority < 1)

Generals/Code/GameEngine/Source/GameLogic/AI/AIGroup.cpp

@@ -1839,8 +1839,8 @@ void getHelicopterOffset( Coord3D& posOut, Int idx )
   }
 
   Coord3D tempCtr = posOut;
-  posOut.x = tempCtr.x + (sin(angle) * radius);
-  posOut.y = tempCtr.y + (cos(angle) * radius);
+  posOut.x = tempCtr.x + (Sin(angle) * radius);
+  posOut.y = tempCtr.y + (Cos(angle) * radius);
 
 }
 

Generals/Code/GameEngine/Source/GameLogic/AI/AIPlayer.cpp

@@ -640,7 +640,7 @@ Object *AIPlayer::buildStructureWithDozer(const ThingTemplate *bldgPlan, BuildLi
 		dx = dozer->getPosition()->x - pos.x;
 		dy = dozer->getPosition()->y - pos.y;
 
-		Int count = sqrt(dx*dx+dy*dy)/(PATHFIND_CELL_SIZE_F/2);
+		Int count = Sqrt(dx*dx+dy*dy)/(PATHFIND_CELL_SIZE_F/2);
 		if (count<2) count = 2;
 		Int i;
 		color.green = 1;
@@ -1245,7 +1245,7 @@ Int AIPlayer::getPlayerSuperweaponValue(Coord3D *center, Int playerNdx, Real rad
 				Real dx = center->x - pos.x;
 				Real dy = center->y - pos.y;
 				if (dx*dx+dy*dy<radSqr) {
-					Real dist = sqrt(dx*dx+dy*dy);
+					Real dist = Sqrt(dx*dx+dy*dy);
 					Real factor = 1.0f - (dist/(2*radius)); // 1.0 in center, 0.5 on edges.
 					Real value = pObj->getTemplate()->calcCostToBuild(pPlayer);
 					if (pObj->isKindOf(KINDOF_COMMANDCENTER)) {
@@ -2807,7 +2807,7 @@ void AIPlayer::computeCenterAndRadiusOfBase(Coord3D *center, Real *radius)
 		Real radSqr = dx*dx+dy*dy;
 		if (radSqr>maxRadSqr) maxRadSqr=radSqr;
 	}
-	*radius = sqrt(maxRadSqr);
+	*radius = Sqrt(maxRadSqr);
 }
 
 //----------------------------------------------------------------------------------------------------------

Generals/Code/GameEngine/Source/GameLogic/AI/AISkirmishPlayer.cpp

@@ -663,8 +663,8 @@ void AISkirmishPlayer::buildAIBaseDefenseStructure(const AsciiString &thingName,
 		}
 
 		if (angle > PI/3) break;
-		Real s = sin(angle);
-		Real c = cos(angle);
+		Real s = Sin(angle);
+		Real c = Cos(angle);
 
 // TheSuperHackers @info helmutbuhler 21/04/2025 This debug mutates the code to become CRC incompatible
 #if defined(RTS_DEBUG) || !RETAIL_COMPATIBLE_CRC
@@ -1029,8 +1029,8 @@ void AISkirmishPlayer::adjustBuildList(BuildListInfo *list)
 
 	angle += 3*PI/4;
 
-	Real s = sin(angle);
-	Real c = cos(angle);
+	Real s = Sin(angle);
+	Real c = Cos(angle);
 
 	cur = list;
 	while (cur) {

Generals/Code/GameEngine/Source/GameLogic/AI/AIStates.cpp

@@ -3575,7 +3575,7 @@ StateReturnType AIAttackMoveToState::update()
 		if (distSqr < sqr(ATTACK_CLOSE_ENOUGH_CELLS*PATHFIND_CELL_SIZE_F)) {
 			return ret;
 		}
-		DEBUG_LOG(("AIAttackMoveToState::update Distance from goal %f, retrying.", sqrt(distSqr)));
+		DEBUG_LOG(("AIAttackMoveToState::update Distance from goal %f, retrying.", Sqrt(distSqr)));
 
 		ret = STATE_CONTINUE;
 		m_retryCount--;
@@ -3805,16 +3805,16 @@ void AIFollowWaypointPathState::computeGoal(Bool useGroupOffsets)
 	if (m_priorWaypoint) {
 		dx = dest.x - m_priorWaypoint->getLocation()->x;
 		dy = dest.y - m_priorWaypoint->getLocation()->y;
-		angle = atan2(dy, dx);
+		angle = Atan2(dy, dx);
 		Real deltaAngle = angle - m_angle;
-		Real s = sin(deltaAngle);
-		Real c = cos(deltaAngle);
+		Real s = Sin(deltaAngle);
+		Real c = Cos(deltaAngle);
 		Real x = m_groupOffset.x * c - m_groupOffset.y * s;
 		Real y = m_groupOffset.y * c + m_groupOffset.x * s;
 		m_groupOffset.x = x;
 		m_groupOffset.y = y;
 	}	else {
-		angle = atan2(dy, dx);
+		angle = Atan2(dy, dx);
 	}
 	m_angle = angle;
 #endif

Generals/Code/GameEngine/Source/GameLogic/Map/PolygonTrigger.cpp

@@ -270,7 +270,7 @@ void PolygonTrigger::updateBounds()	const
 	Real halfWidth = (m_bounds.hi.x - m_bounds.lo.x) / 2.0f;
 	Real halfHeight = (m_bounds.hi.y + m_bounds.lo.y) / 2.0f;
 
-	m_radius = sqrt(halfHeight*halfHeight + halfWidth*halfWidth);
+	m_radius = Sqrt(halfHeight*halfHeight + halfWidth*halfWidth);
 }
 
 

Generals/Code/GameEngine/Source/GameLogic/Map/TerrainLogic.cpp

@@ -1468,7 +1468,7 @@ void makeAlignToNormalMatrix( Real angle, const Coord3D& pos, const Coord3D& nor
 	/*
 		It is extremely important that the resulting matrix is such that
 		the xvector points in the angle we specified; specifically,
-		that atan2(xvec.y, xvec.x) == angle. So we must construct
+		that Atan2(xvec.y, xvec.x) == angle. So we must construct
 		the matrix carefully to ensure this!
 	*/
 	x.x = Cos( angle );
@@ -2369,7 +2369,7 @@ void TerrainLogic::setWaterHeight( const WaterHandle *water, Real height, Real d
 		center.z = 0.0f;  // irrelavant
 
 		// the max radius to scan around us is the diagonal of the bounding region
-		Real maxDist = sqrt( affectedRegion.width() * affectedRegion.width() +
+		Real maxDist = Sqrt( affectedRegion.width() * affectedRegion.width() +
 												 affectedRegion.height() * affectedRegion.height() );
 
 		// scan the objects in the area of the water affected