mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-26 09:35:28 +00:00
Code Issues Projects Releases Wiki Activity

Remove an unneeded parameter

Browse Source
This commit is contained in:
Chris Robinson 2013-02-07 17:45:41 -08:00
parent d47d2216f2
commit f5afa43db5
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
apps/openmw/mwworld/physicssystem.cpp
View File

@ -56,20 +56,17 @@ namespace MWWorld
return false; return false;
} }
static void clipVelocity(const Ogre::Vector3& in, const Ogre::Vector3& normal, Ogre::Vector3& out, static void clipVelocity(Ogre::Vector3& inout, const Ogre::Vector3& normal, float overbounce)
const float overbounce)
{ {
//Math stuff. Basically just project the velocity vector onto the plane represented by the normal. //Math stuff. Basically just project the velocity vector onto the plane represented by the normal.
//More specifically, it projects velocity onto the normal, takes that result, multiplies it by overbounce and then subtracts it from velocity. //More specifically, it projects velocity onto the normal, takes that result, multiplies it by overbounce and then subtracts it from velocity.
float backoff; float backoff = inout.dotProduct(normal);
backoff = in.dotProduct(normal);
if(backoff < 0.0f) if(backoff < 0.0f)
backoff *= overbounce; backoff *= overbounce;
else else
backoff /= overbounce; backoff /= overbounce;
out = in - (normal*backoff); inout -= normal*backoff;
} }
static void projectVelocity(Ogre::Vector3& velocity, const Ogre::Vector3& direction) static void projectVelocity(Ogre::Vector3& velocity, const Ogre::Vector3& direction)
@ -134,7 +131,7 @@ namespace MWWorld
if(trace.fraction < 1.0f && getSlope(trace.planenormal) <= sMaxSlope) if(trace.fraction < 1.0f && getSlope(trace.planenormal) <= sMaxSlope)
{ {
// if we're within 10 units of the ground, force velocity to track the ground // if we're within 10 units of the ground, force velocity to track the ground
clipVelocity(clippedVelocity, trace.planenormal, clippedVelocity, 1.0f); clipVelocity(clippedVelocity, trace.planenormal, 1.0f);
} }
} }
@ -171,7 +168,7 @@ namespace MWWorld
// std::cout<< "stepped" <<std::endl; // std::cout<< "stepped" <<std::endl;
} }
else else
clipVelocity(clippedVelocity, currentNormal, clippedVelocity, 1.0f); clipVelocity(clippedVelocity, currentNormal, 1.0f);
} }
lastNormal = currentNormal; lastNormal = currentNormal;