TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-04 10:54:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

changed _coef use; added asserts

Browse Source
This commit is contained in:
Dave Schuyler 2003-08-06 21:45:34 +00:00
parent df1a85e306
commit 977fc1c38a
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
panda/src/physics/linearFrictionForce.cxx
View File

@ -28,14 +28,7 @@ TypeHandle LinearFrictionForce::_type_handle;
LinearFrictionForce:: LinearFrictionForce::
LinearFrictionForce(float coef, float a, bool m) : LinearFrictionForce(float coef, float a, bool m) :
LinearForce(a, m) { LinearForce(a, m) {
set_coef(coef);
// friction REALLY shouldn't be outside of [0, 1]
if (coef < 0.0f)
coef = 0.0f;
else if (coef > 1.0f)
coef = 1.0f;
_coef = coef;
} }
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
@ -55,7 +48,7 @@ LinearFrictionForce(const LinearFrictionForce &copy) :
// Description : destructor // Description : destructor
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
LinearFrictionForce:: LinearFrictionForce::
~LinearFrictionForce(void) { ~LinearFrictionForce() {
} }
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
@ -64,7 +57,7 @@ LinearFrictionForce::
// Description : copier // Description : copier
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
LinearForce *LinearFrictionForce:: LinearForce *LinearFrictionForce::
make_copy(void) { make_copy() {
return new LinearFrictionForce(*this); return new LinearFrictionForce(*this);
} }
@ -76,8 +69,14 @@ make_copy(void) {
LVector3f LinearFrictionForce:: LVector3f LinearFrictionForce::
get_child_vector(const PhysicsObject* po) { get_child_vector(const PhysicsObject* po) {
LVector3f v = po->get_velocity(); LVector3f v = po->get_velocity();
LVector3f friction = -v * (1.0f - _coef); assert(_coef>=0.0f && _coef<=1.0f);
// Create a force vector in the opposite direction of v:
LVector3f friction = v * -_coef;
physics_debug(" v "<<v<<" len "<<v.length()
<<" friction "<<friction<<" len "<<friction.length()
<<" dot "<<(normalize(v).dot(normalize(friction))));
assert(friction.almostEqual(LVector3f::zero())
|| IS_NEARLY_EQUAL(normalize(v).dot(normalize(friction)), -1.0f));
// cary said to cap this at zero so that friction can't reverse // cary said to cap this at zero so that friction can't reverse
// your direction, but it seems to me that if you're computing: // your direction, but it seems to me that if you're computing:
// v + (-v * _coef), _coef in [0, 1] // v + (-v * _coef), _coef in [0, 1]