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

Changed minimum and maximum visual suspension, and fixed

Browse Source 
algorithm to compute visual suspension - this should fix
#794 (wheels sometimes in kart).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12054 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
hikerstk 2012-11-23 11:38:56 +00:00
parent 7189a83f91
commit 701ed00dbc
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/karts/kart_model.cpp
View File

@ -76,8 +76,8 @@ KartModel::KartModel(bool is_master)
// default value for kart suspensions. move to config file later // default value for kart suspensions. move to config file later
// if we find each kart needs custom values // if we find each kart needs custom values
m_min_suspension[i] = -1.3f; m_min_suspension[i] = -0.59f;
m_max_suspension[i] = 1.3f; m_max_suspension[i] = 0.59f;
m_dampen_suspension_amplitude[i] = 2.5f; m_dampen_suspension_amplitude[i] = 2.5f;
} }
m_wheel_filename[0] = ""; m_wheel_filename[0] = "";
@ -514,15 +514,16 @@ void KartModel::update(float rotation_dt, float steer, const float suspension[4]
// limit amplitude between set limits, first dividing it by a // limit amplitude between set limits, first dividing it by a
// somewhat arbitrary constant to reduce visible wheel movement // somewhat arbitrary constant to reduce visible wheel movement
clamped_suspension[i] = std::min(std::max(suspension[i]/m_dampen_suspension_amplitude[i], clamped_suspension[i] = suspension[i]/m_dampen_suspension_amplitude[i];
m_min_suspension[i]),
m_max_suspension[i]);
float ratio = clamped_suspension[i] / suspension_length; float ratio = clamped_suspension[i] / suspension_length;
const int sign = ratio < 0 ? -1 : 1; const int sign = ratio < 0 ? -1 : 1;
// expanded form of 1 - (1 - x)^2, i.e. making suspension display // expanded form of 1 - (1 - x)^2, i.e. making suspension display
// quadratic and not linear // quadratic and not linear
ratio = sign * fabsf(ratio*(2-ratio)); ratio = sign * fabsf(ratio*(2-ratio));
clamped_suspension[i] = ratio*suspension_length; // clamped_suspension[i] = ratio*suspension_length;
clamped_suspension[i] = std::min(std::max(ratio*suspension_length,
m_min_suspension[i]),
m_max_suspension[i]);
} // for i<4 } // for i<4
core::vector3df wheel_steer(0, steer*30.0f, 0); core::vector3df wheel_steer(0, steer*30.0f, 0);