Skip to content

Locomotor: Use explicit turning physics via rotateTowardsPosition for angle-based movement #171

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

Open
seer-by-sentry wants to merge 1 commit into
base: main
Choose a base branch
from
+24 −4
Open

Locomotor: Use explicit turning physics via rotateTowardsPosition for angle-based movement #171

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
14 changes: 12 additions & 2 deletions Generals/Code/GameEngine/Source/GameLogic/Object/Locomotor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1617,7 +1617,12 @@ void Locomotor::moveTowardsPositionLegs(Object* obj, PhysicsBehavior *physics, c
}

Real relAngle = stdAngleDiff(desiredAngle, angle);
locoUpdate_moveTowardsAngle(obj, desiredAngle);
Coord3D desiredPos;
desiredPos.x = obj->getPosition()->x + Cos(desiredAngle) * 1000.0f;
desiredPos.y = obj->getPosition()->y + Sin(desiredAngle) * 1000.0f;
desiredPos.z = obj->getPosition()->z;
PhysicsTurningType rotating = rotateTowardsPosition(obj, desiredPos);
physics->setTurning(rotating);

//
// Modulate speed according to turning. The more we have to turn, the slower we go
Expand Down Expand Up @@ -1738,7 +1743,12 @@ void Locomotor::moveTowardsPositionClimb(Object* obj, PhysicsBehavior *physics,
relAngle = stdAngleDiff(desiredAngle, angle);
}

locoUpdate_moveTowardsAngle(obj, desiredAngle);
Coord3D desiredPos;
desiredPos.x = obj->getPosition()->x + Cos(desiredAngle) * 1000.0f;
desiredPos.y = obj->getPosition()->y + Sin(desiredAngle) * 1000.0f;
desiredPos.z = obj->getPosition()->z;
PhysicsTurningType rotating = rotateTowardsPosition(obj, desiredPos);
physics->setTurning(rotating);

//
// Modulate speed according to turning. The more we have to turn, the slower we go
Expand Down
14 changes: 12 additions & 2 deletions GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Locomotor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1647,7 +1647,12 @@ void Locomotor::moveTowardsPositionLegs(Object* obj, PhysicsBehavior *physics, c
}

Real relAngle = stdAngleDiff(desiredAngle, angle);
locoUpdate_moveTowardsAngle(obj, desiredAngle);
Coord3D desiredPos;
desiredPos.x = obj->getPosition()->x + Cos(desiredAngle) * 1000.0f;
desiredPos.y = obj->getPosition()->y + Sin(desiredAngle) * 1000.0f;
desiredPos.z = obj->getPosition()->z;
PhysicsTurningType rotating = rotateTowardsPosition(obj, desiredPos);
physics->setTurning(rotating);

//
// Modulate speed according to turning. The more we have to turn, the slower we go
Expand Down Expand Up @@ -1768,7 +1773,12 @@ void Locomotor::moveTowardsPositionClimb(Object* obj, PhysicsBehavior *physics,
relAngle = stdAngleDiff(desiredAngle, angle);
}

locoUpdate_moveTowardsAngle(obj, desiredAngle);
Coord3D desiredPos;
desiredPos.x = obj->getPosition()->x + Cos(desiredAngle) * 1000.0f;
desiredPos.y = obj->getPosition()->y + Sin(desiredAngle) * 1000.0f;
desiredPos.z = obj->getPosition()->z;
PhysicsTurningType rotating = rotateTowardsPosition(obj, desiredPos);
physics->setTurning(rotating);

//
// Modulate speed according to turning. The more we have to turn, the slower we go
Expand Down
Loading