Mirrors/openrw
1
0
Fork 0
mirror of https://github.com/rwengine/openrw.git synced 2024-09-18 16:32:32 +02:00
Code Issues Projects Releases Activity

Merge pull request #525 from dracc/349-fix

Browse Source 
Fix #349 "Smooth vehicle steering"
This commit is contained in:
Daniel Evans 2018-06-25 23:54:45 +01:00 committed by GitHub
commit 146b42d510
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
rwengine/src/objects/VehicleObject.cpp
View File

@ -310,6 +310,8 @@ void VehicleObject::tick(float dt) {
void VehicleObject::tickPhysics(float dt) {
RW_UNUSED(dt);
static constexpr float steeringWeight = 1.f/0.35f;
if (physVehicle) {
// todo: a real engine function
float velFac = info->handling.maxVelocity;
@ -338,19 +340,20 @@ void VehicleObject::tickPhysics(float dt) {
if (wi.m_bIsFrontWheel) {
float currentVal = physVehicle->getSteeringValue(w);
float currentSign = std::signbit(currentVal) ? -1.f : 1.f;
float currentSign = std::copysign(1.0f, currentVal);
float newVal;
if (std::abs(steerAngle) < 0.001f) { // no steering?
newVal = std::max(0.0f,std::abs(currentVal) - 4.f * dt) *
currentSign;
newVal = std::max(0.0f,std::abs(currentVal) -
steeringWeight * dt) * currentSign;
} else {
newVal = currentVal + steerAngle * dt * 4.f;
newVal = currentVal + steerAngle * dt * steeringWeight;
float limit = glm::radians(info->handling.steeringLock);
if (std::abs(newVal) > limit)
if (std::abs(newVal) > limit) {
newVal = limit * currentSign;
}
}
physVehicle->setSteeringValue(newVal,w);
@ -376,7 +379,7 @@ void VehicleObject::tickPhysics(float dt) {
if (getVehicle()->vehicletype_ == VehicleModelInfo::BOAT) {
if (isInWater()) {
float sign = std::signbit(steerAngle) ? -1.f : 1.f;
float sign = std::copysign(1.0f, steerAngle);
float steer =
std::min(glm::radians(info->handling.steeringLock),
std::abs(steerAngle)) *