Skip to content

fix(draw): Fix wheel rotation math #1507

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

Merged
xezon merged 2 commits into from
Sep 10, 2025
Merged

fix(draw): Fix wheel rotation math #1507

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
403ef22
fix(draw): Fix wheel rotation math
xezon Aug 30, 2025
d4fe0b9
Replicate in Generals
xezon Sep 10, 2025
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
9 changes: 8 additions & 1 deletion Core/Libraries/Source/WWVegas/WWMath/wwmath.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,8 @@
*/
#define WWMATH_EPSILON 0.0001f
#define WWMATH_EPSILON2 WWMATH_EPSILON * WWMATH_EPSILON
#define WWMATH_PI 3.141592654f
#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
Expand Down Expand Up @@ -171,6 +172,8 @@ static WWINLINE float Byte_To_Unit_Float(unsigned char byte) { return ((float)
static WWINLINE bool Is_Valid_Float(float x);
static WWINLINE bool Is_Valid_Double(double x);

static WWINLINE float Normalize_Angle(float angle); // Normalizes the angle to the range -PI..PI

};

WWINLINE float WWMath::Sign(float val)
Expand Down Expand Up @@ -653,5 +656,9 @@ WWINLINE float WWMath::Inv_Sqrt(float val)
}
#endif

WWINLINE float WWMath::Normalize_Angle(float angle)
{
return angle - (WWMATH_TWO_PI * Floor((angle + WWMATH_PI) / WWMATH_TWO_PI));
}

#endif
1 change: 1 addition & 0 deletions Generals/Code/GameEngine/Include/Common/GameCommon.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -468,6 +468,7 @@ enum WhichTurretType CPP_11(: Int)

// ------------------------------------------------------------------------
// this normalizes an angle to the range -PI...PI.
// TheSuperHackers @todo DO NOT USE THIS FUNCTION! Use WWMath::Normalize_Angle instead. Delete this.
extern Real normalizeAngle(Real angle);

// ------------------------------------------------------------------------
Expand Down
1 change: 1 addition & 0 deletions Generals/Code/GameEngine/Source/Common/System/GameCommon.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ const char *TheRelationshipNames[] =
};

//-------------------------------------------------------------------------------------------------
// TheSuperHackers @todo DO NOT USE THIS FUNCTION! Use WWMath::Normalize_Angle instead. Delete this.
Real normalizeAngle(Real angle)
{
DEBUG_ASSERTCRASH(!_isnan(angle), ("Angle is NAN in normalizeAngle!"));
Expand Down
16 changes: 6 additions & 10 deletions ...rals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DTankTruckDraw.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -540,21 +540,17 @@ void W3DTankTruckDraw::doDrawModule(const Matrix3D* transformMtx)
const Coord3D *vel = physics->getVelocity();
Real speed = physics->getVelocityMagnitude();


const TWheelInfo *wheelInfo = getDrawable()->getWheelInfo(); // note, can return null!
if (wheelInfo && (m_frontLeftTireBone || m_rearLeftTireBone))
{
static Real rotation = 0;
const Real rotationFactor = getW3DTankTruckDrawModuleData()->m_rotationSpeedMultiplier;
const Real powerslideRotationAddition = getW3DTankTruckDrawModuleData()->m_powerslideRotationAddition * m_isPowersliding;

m_frontWheelRotation += rotationFactor*speed;
if (m_isPowersliding)
{
m_rearWheelRotation += rotationFactor*(speed+getW3DTankTruckDrawModuleData()->m_powerslideRotationAddition);
}
else
{
m_rearWheelRotation += rotationFactor*speed;
}
m_rearWheelRotation += rotationFactor*(speed+powerslideRotationAddition);
m_frontWheelRotation = WWMath::Normalize_Angle(m_frontWheelRotation);
m_rearWheelRotation = WWMath::Normalize_Angle(m_rearWheelRotation);

Matrix3D wheelXfrm(1);
if (m_frontLeftTireBone)
{
Expand Down
17 changes: 7 additions & 10 deletions Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DTruckDraw.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -463,7 +463,9 @@ void W3DTruckDraw::doDrawModule(const Matrix3D* transformMtx)

if (m_frontLeftTireBone || m_rearLeftTireBone)
{
Real powerslideRotationAddition = moduleData->m_powerslideRotationAddition;
const Real rotationFactor = moduleData->m_rotationSpeedMultiplier;
Real powerslideRotationAddition = moduleData->m_powerslideRotationAddition * m_isPowersliding;

if (ai) {
Locomotor *loco = ai->getCurLocomotor();
if (loco) {
Expand All @@ -473,16 +475,11 @@ void W3DTruckDraw::doDrawModule(const Matrix3D* transformMtx)
}
}
}
const Real rotationFactor = moduleData->m_rotationSpeedMultiplier;

m_frontWheelRotation += rotationFactor*speed;
if (m_isPowersliding)
{
m_rearWheelRotation += rotationFactor*(speed + powerslideRotationAddition);
}
else
{
m_rearWheelRotation += rotationFactor*speed;
}
m_rearWheelRotation += rotationFactor*(speed + powerslideRotationAddition);
m_frontWheelRotation = WWMath::Normalize_Angle(m_frontWheelRotation);
m_rearWheelRotation = WWMath::Normalize_Angle(m_rearWheelRotation);

// For now, just use the same values for mid wheels -- may want to do independent calcs later...
m_midFrontWheelRotation = m_frontWheelRotation;
Expand Down
1 change: 1 addition & 0 deletions GeneralsMD/Code/GameEngine/Include/Common/GameCommon.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -487,6 +487,7 @@ enum WhichTurretType CPP_11(: Int)

// ------------------------------------------------------------------------
// this normalizes an angle to the range -PI...PI.
// TheSuperHackers @todo DO NOT USE THIS FUNCTION! Use WWMath::Normalize_Angle instead. Delete this.
extern Real normalizeAngle(Real angle);

// ------------------------------------------------------------------------
Expand Down
1 change: 1 addition & 0 deletions GeneralsMD/Code/GameEngine/Source/Common/System/GameCommon.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ const char *TheRelationshipNames[] =
};

//-------------------------------------------------------------------------------------------------
// TheSuperHackers @todo DO NOT USE THIS FUNCTION! Use WWMath::Normalize_Angle instead. Delete this.
Real normalizeAngle(Real angle)
{
DEBUG_ASSERTCRASH(!_isnan(angle), ("Angle is NAN in normalizeAngle!"));
Expand Down
16 changes: 6 additions & 10 deletions ...lsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DTankTruckDraw.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -540,21 +540,17 @@ void W3DTankTruckDraw::doDrawModule(const Matrix3D* transformMtx)
const Coord3D *vel = physics->getVelocity();
Real speed = physics->getVelocityMagnitude();


const TWheelInfo *wheelInfo = getDrawable()->getWheelInfo(); // note, can return null!
if (wheelInfo && (m_frontLeftTireBone || m_rearLeftTireBone))
{
static Real rotation = 0;
const Real rotationFactor = getW3DTankTruckDrawModuleData()->m_rotationSpeedMultiplier;
const Real powerslideRotationAddition = getW3DTankTruckDrawModuleData()->m_powerslideRotationAddition * m_isPowersliding;

m_frontWheelRotation += rotationFactor*speed;
if (m_isPowersliding)
{
m_rearWheelRotation += rotationFactor*(speed+getW3DTankTruckDrawModuleData()->m_powerslideRotationAddition);
}
else
{
m_rearWheelRotation += rotationFactor*speed;
}
m_rearWheelRotation += rotationFactor*(speed+powerslideRotationAddition);
m_frontWheelRotation = WWMath::Normalize_Angle(m_frontWheelRotation);
m_rearWheelRotation = WWMath::Normalize_Angle(m_rearWheelRotation);

Matrix3D wheelXfrm(1);
if (m_frontLeftTireBone)
{
Expand Down
17 changes: 7 additions & 10 deletions GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DTruckDraw.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -463,7 +463,9 @@ void W3DTruckDraw::doDrawModule(const Matrix3D* transformMtx)

if (m_frontLeftTireBone || m_rearLeftTireBone)
{
Real powerslideRotationAddition = moduleData->m_powerslideRotationAddition;
const Real rotationFactor = moduleData->m_rotationSpeedMultiplier;
Real powerslideRotationAddition = moduleData->m_powerslideRotationAddition * m_isPowersliding;

if (ai) {
Locomotor *loco = ai->getCurLocomotor();
if (loco) {
Expand All @@ -473,16 +475,11 @@ void W3DTruckDraw::doDrawModule(const Matrix3D* transformMtx)
}
}
}
const Real rotationFactor = moduleData->m_rotationSpeedMultiplier;

m_frontWheelRotation += rotationFactor*speed;
if (m_isPowersliding)
{
m_rearWheelRotation += rotationFactor*(speed + powerslideRotationAddition);
}
else
{
m_rearWheelRotation += rotationFactor*speed;
}
m_rearWheelRotation += rotationFactor*(speed + powerslideRotationAddition);
m_frontWheelRotation = WWMath::Normalize_Angle(m_frontWheelRotation);
m_rearWheelRotation = WWMath::Normalize_Angle(m_rearWheelRotation);

// For now, just use the same values for mid wheels -- may want to do independent calcs later...
m_midFrontWheelRotation = m_frontWheelRotation;
Expand Down
Loading