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

Use Joerg's Nice Formula to determine the amount of 'vertical slipperinness' to apply - quite more elegant than my approximation. hacienda shortcut still impossible to take, but I tweaked it so that we keep friction of mild slopes

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@6499 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
auria 2010-11-11 01:28:09 +00:00
parent 73b87f8540
commit dbb1f6ef86
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/karts/kart.cpp
View File

@ -1358,17 +1358,23 @@ void Kart::updatePhysics(float dt)
float friction = 1.0f; float friction = 1.0f;
if (isOnGround()) if (isOnGround())
{ {
float pitch = fabs(getPitch()); const btMatrix3x3 &m = m_vehicle->getChassisWorldTransform().getBasis();
float roll = fabsf(getRoll()); // To get the angle between up=(0,1,0), we have to do:
if (pitch > 0.25f) // m*(0,1,0) to get the up vector of the kart, then the
// scalar product between this and (0,1,0) - which is m[1][1]:
float distanceFromUp = m[1][1];
if (distanceFromUp < 0.85f)
{ {
float x = std::min((pitch - 0.25f) / 0.25f, 1.0f); friction = 0.0f;
friction = std::min( friction, 1.0f - x*x );
} }
if (roll > 0.25f) else if (distanceFromUp > 0.9f)
{ {
float x = std::min((roll - 0.25f) / 0.25f, 1.0f); friction = 1.0f;
friction = std::min( friction, 1.0f - x*x ); }
else
{
friction = (distanceFromUp - 0.85f) / 0.5f;
} }
} }