ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Undo lean angle applied by parent using matrix instead of setting height

Browse Source 
This fixes adiumy rear wheel leaving ground when turning
This commit is contained in:
Benau 2019-03-23 11:47:15 +08:00
parent ee1fede8d8
commit 6e97c976f5
2 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/karts/kart.cpp
View File

@ -3337,9 +3337,10 @@ void Kart::updateGraphics(float dt)
}
#endif
// m_speed*dt is the distance the kart has moved, which determines
// m_speed * dt is the distance the kart has moved, which determines
// how much the wheels need to rotate.
m_kart_model->update(dt, m_speed*dt, getSteerPercent(), m_speed, lean_height);
m_kart_model->update(dt, m_speed * dt, getSteerPercent(), m_speed,
m_current_lean);
#ifndef SERVER_ONLY
// Determine the shadow position from the terrain Y position. This

23
src/karts/kart_model.cpp
View File

@ -1066,19 +1066,6 @@ void KartModel::update(float dt, float distance, float steer, float speed,
- suspension_length
- m_kart_lowest_point;
// Adjust the wheel position for lean: the lean can cause the 'leaned
// to' side to be partly in the ground - which looks ok (like the tyres
// being compressed), but the other side will be in the air. To avoid
// this, increase the position of the wheels on the side that are
// higher in the ground so that the wheel still touch the ground.
if(current_lean_angle > 0 && (i&1) == 1) // i&1 == 0: left side
{
pos.Y -= 2*current_lean_angle;
}
else if (current_lean_angle < 0 && (i&1) == 0) // i&1 == 1: right side
{
pos.Y += 2*current_lean_angle;
}
m_wheel_node[i]->setPosition(pos);
// Now calculate the new rotation: (old + change) mod 360
@ -1090,6 +1077,16 @@ void KartModel::update(float dt, float distance, float steer, float speed,
if (i < 2)
wheel_rotation += wheel_steer;
m_wheel_node[i]->setRotation(wheel_rotation);
// Undo lean angle applied by parent
core::matrix4 parent_m;
parent_m.setInverseTranslation(core::vector3df
(0, fabsf(tanf(current_lean_angle)) * m_kart_width * 0.5f, 0));
parent_m.setInverseRotationRadians(core::vector3df
(0, 0, -current_lean_angle));
core::matrix4 final_m = parent_m * m_wheel_node[i]->getRelativeTransformation();
m_wheel_node[i]->setPosition(final_m.getTranslation());
} // for (i < 4)
// Update the speed-weighted objects' animations