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

Fixed visual position of chassis, wheels and shadow.

Browse Source
This commit is contained in:
hiker 2015-07-15 16:35:09 +10:00
parent 8c842fb2e8
commit 68cea42648
2 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/karts/kart.cpp
View File

@ -2476,11 +2476,12 @@ void Kart::kartIsInRestNow()
for(int i=0; i<m_vehicle->getNumWheels(); i++) for(int i=0; i<m_vehicle->getNumWheels(); i++)
{ {
const btWheelInfo &wi = m_vehicle->getWheelInfo(i); const btWheelInfo &wi = m_vehicle->getWheelInfo(i);
f += wi.m_chassisConnectionPointCS.getY() f += wi.m_raycastInfo.m_suspensionLength;
- wi.m_raycastInfo.m_suspensionLength - wi.m_wheelsRadius;
} }
m_terrain_info->update(getTrans());
m_graphical_y_offset = f/m_vehicle->getNumWheels() m_graphical_y_offset = f/m_vehicle->getNumWheels()
+ getKartProperties()->getGraphicalYOffset(); + getKartProperties()->getGraphicalYOffset();
m_graphical_y_offset = m_kart_model->getLowestPoint() - (getXYZ().getY() - m_terrain_info->getHoT());
m_kart_model->setDefaultSuspension(); m_kart_model->setDefaultSuspension();
} // kartIsInRestNow } // kartIsInRestNow
@ -2595,11 +2596,6 @@ void Kart::updateGraphics(float dt, const Vec3& offset_xyz,
} // for i<num_wheels } // for i<num_wheels
const btWheelInfo &w = getVehicle()->getWheelInfo(0); const btWheelInfo &w = getVehicle()->getWheelInfo(0);
// Determine the shadow position from the terrain Y position. This
// leaves the shadow on the ground even if the kart is jumping because
// of skidding (shadows are disabled when wheel are not on the track).
m_shadow->update(m_terrain_info->getHoT() - getXYZ().getY()
-m_skidding->getGraphicalJumpOffset());
// Recompute the default average suspension length, see // Recompute the default average suspension length, see
// kartIsInRestNow() how to get from y-offset to susp. len. // kartIsInRestNow() how to get from y-offset to susp. len.
float av_sus_len = -m_graphical_y_offset float av_sus_len = -m_graphical_y_offset
@ -2628,6 +2624,9 @@ void Kart::updateGraphics(float dt, const Vec3& offset_xyz,
+ lean_height + lean_height
- m_kart_model->getLowestPoint()); - m_kart_model->getLowestPoint());
center_shift.setY(m_skidding->getGraphicalJumpOffset()
+ lean_height
+m_graphical_y_offset);
center_shift = getTrans().getBasis() * center_shift; center_shift = getTrans().getBasis() * center_shift;
Moveable::updateGraphics(dt, center_shift, Moveable::updateGraphics(dt, center_shift,
@ -2637,6 +2636,14 @@ void Kart::updateGraphics(float dt, const Vec3& offset_xyz,
// how much the wheels need to rotate. // how much the wheels need to rotate.
m_kart_model->update(dt, m_speed*dt, getSteerPercent(), m_speed); m_kart_model->update(dt, m_speed*dt, getSteerPercent(), m_speed);
// Determine the shadow position from the terrain Y position. This
// leaves the shadow on the ground even if the kart is jumping because
// of skidding (shadows are disabled when wheel are not on the track).
m_shadow->update( m_terrain_info->getHoT() - getXYZ().getY()
- m_skidding->getGraphicalJumpOffset()
- m_graphical_y_offset
- m_kart_model->getLowestPoint());
#ifdef XX #ifdef XX
// cheap wheelie effect // cheap wheelie effect
if (m_controls.m_nitro) if (m_controls.m_nitro)

4
src/karts/kart_model.cpp
View File

@ -813,7 +813,9 @@ void KartModel::update(float dt, float distance, float steer, float speed)
core::vector3df pos = m_wheel_graphics_position[i].toIrrVector(); core::vector3df pos = m_wheel_graphics_position[i].toIrrVector();
const btWheelInfo &wi = m_kart->getVehicle()->getWheelInfo(i); const btWheelInfo &wi = m_kart->getVehicle()->getWheelInfo(i);
pos.Y = -wi.m_raycastInfo.m_suspensionLength + m_wheel_graphics_radius[i] + getLowestPoint(); pos.Y += m_default_physics_suspension[i]
- wi.m_raycastInfo.m_suspensionLength
- getLowestPoint();
m_wheel_node[i]->setPosition(pos); m_wheel_node[i]->setPosition(pos);
// Now calculate the new rotation: (old + change) mod 360 // Now calculate the new rotation: (old + change) mod 360