RomanNum3ral
/
open_toontown_panda3d
mirror of https://github.com/open-toontown/panda3d.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

modified vortex force calculations to be more safe and yield more reasonable results

This commit is contained in:
Darren Ranalli 2001-06-28 02:31:46 +00:00
parent 8bf309e898
commit f73843e695
1 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
panda/src/physics/linearCylinderVortexForce.cxx
View File

@ -18,6 +18,7 @@
#include "config_physics.h"
#include "linearCylinderVortexForce.h"
#include <nearly_zero.h>
TypeHandle LinearCylinderVortexForce::_type_handle;
@ -98,17 +99,34 @@ get_child_vector(const PhysicsObject *po) {
if (dist_squared > radius_squared)
return force_vec;
if IS_NEARLY_ZERO(dist_squared)
return force_vec;
float r = sqrtf(dist_squared);
LVector3f tangential = po->get_velocity();
if IS_NEARLY_ZERO(r)
return force_vec;
LVector3f tangential = point;
tangential[2] = 0.0f;
tangential.normalize();
tangential = tangential.cross(LVector3f(0,0,1));
LVector3f centripetal = -point;
centripetal[2] = 0.0f;
centripetal.normalize();
LVector3f combined = tangential + centripetal;
combined.normalize();
// a = v^2 / r
centripetal = centripetal * _coef * (tangential.length_squared() / r);
//centripetal = centripetal * _coef * (tangential.length_squared() /
// (r + get_nearly_zero_value(r)));
centripetal = combined * _coef * po->get_velocity().length();
//centripetal = combined * _coef * (po->get_velocity().length() /
// (r + get_nearly_zero_value(r)));
return centripetal;
}