diff --git a/src/karts/patch b/src/karts/patch deleted file mode 100644 index 92c80793c..000000000 --- a/src/karts/patch +++ /dev/null @@ -1,71 +0,0 @@ -diff --git a/src/karts/kart.cpp b/src/karts/kart.cpp -index de14bbe..47bbee9 100644 ---- a/src/karts/kart.cpp -+++ b/src/karts/kart.cpp -@@ -2476,11 +2476,12 @@ void Kart::kartIsInRestNow() - for(int i=0; igetNumWheels(); i++) - { - const btWheelInfo &wi = m_vehicle->getWheelInfo(i); -- f += wi.m_chassisConnectionPointCS.getY() -- - wi.m_raycastInfo.m_suspensionLength - wi.m_wheelsRadius; -+ f += wi.m_raycastInfo.m_suspensionLength; - } -+ m_terrain_info->update(getTrans()); - m_graphical_y_offset = f/m_vehicle->getNumWheels() - + getKartProperties()->getGraphicalYOffset(); -+ m_graphical_y_offset = m_kart_model->getLowestPoint() - (getXYZ().getY() - m_terrain_info->getHoT()); - - m_kart_model->setDefaultSuspension(); - } // kartIsInRestNow -@@ -2595,11 +2596,6 @@ void Kart::updateGraphics(float dt, const Vec3& offset_xyz, - } // for igetWheelInfo(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 - // kartIsInRestNow() how to get from y-offset to susp. len. - float av_sus_len = -m_graphical_y_offset -@@ -2628,6 +2624,9 @@ void Kart::updateGraphics(float dt, const Vec3& offset_xyz, - + lean_height - - m_kart_model->getLowestPoint()); - -+ center_shift.setY(m_skidding->getGraphicalJumpOffset() -+ + lean_height -+ +m_graphical_y_offset); - center_shift = getTrans().getBasis() * 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. - 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 - // cheap wheelie effect - if (m_controls.m_nitro) -diff --git a/src/karts/kart_model.cpp b/src/karts/kart_model.cpp -index 65879d3..36b03b7 100644 ---- a/src/karts/kart_model.cpp -+++ b/src/karts/kart_model.cpp -@@ -813,7 +813,9 @@ void KartModel::update(float dt, float distance, float steer, float speed) - core::vector3df pos = m_wheel_graphics_position[i].toIrrVector(); - - 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); - - // Now calculate the new rotation: (old + change) mod 360