diff --git a/panda/src/physics/physicsCollisionHandler.cxx b/panda/src/physics/physicsCollisionHandler.cxx index d32679e4a4..4b67c727c9 100755 --- a/panda/src/physics/physicsCollisionHandler.cxx +++ b/panda/src/physics/physicsCollisionHandler.cxx @@ -54,7 +54,8 @@ PhysicsCollisionHandler:: // account for friction. //////////////////////////////////////////////////////////////////// void PhysicsCollisionHandler:: -apply_friction(ColliderDef &def, LVector3f& vel, const LVector3f& force, float angle) { +apply_friction(ColliderDef &def, LVector3f& vel, const LVector3f& force, + float angle) { if (vel!=LVector3f::zero()) { float friction_coefficient=0.0f; // Determine the friction: @@ -97,7 +98,8 @@ apply_linear_force(ColliderDef &def, const LVector3f &force) { // Description: //////////////////////////////////////////////////////////////////// void PhysicsCollisionHandler:: -apply_net_shove(ColliderDef &def, const LVector3f& net_shove, const LVector3f &force) { +apply_net_shove(ColliderDef &def, const LVector3f& net_shove, + const LVector3f &force) { CollisionHandlerPusher::apply_net_shove(def, net_shove, force); if (force == LVector3f::zero()) { return; @@ -140,6 +142,12 @@ apply_net_shove(ColliderDef &def, const LVector3f& net_shove, const LVector3f &f // Are we in contact with something: if (angle>0.0f) { physics_debug(" positive contact"); + #if 0 + cerr<<"vel "<get_physics_object()->add_impact(-force, -vel); + #else adjustment*=adjustmentLength; physics_debug(" adjustment mul "< "< 10.0f) {