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

added contact_vector

Browse Source
This commit is contained in:
Dave Schuyler 2003-07-12 01:24:35 +00:00
parent 05ac2f527e
commit afe8501ff7
3 changed files with 74 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
panda/src/physics/actorNode.I
View File

@ -15,3 +15,23 @@
// panda3d@yahoogroups.com .
//
////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////
// Function : set_contact_vector
// Access : Public
// Description :
////////////////////////////////////////////////////////////////////
INLINE void ActorNode::
set_contact_vector(const LVector3f &contact_vector) {
_contact_vector=contact_vector;
}
////////////////////////////////////////////////////////////////////
// Function : get_contact_vector
// Access : Public
// Description :
////////////////////////////////////////////////////////////////////
INLINE const LVector3f &ActorNode::
get_contact_vector() const {
return _contact_vector;
}

4
panda/src/physics/actorNode.h
View File

@ -39,6 +39,9 @@ PUBLISHED:
PhysicsObject *get_physics_object() { return _mass_center; }
void set_contact_vector(const LVector3f &contact_vector);
const LVector3f &get_contact_vector() const;
// update the parent scene graph node with PhysicsObject information
// i.e. copy from PhysicsObject to PandaNode
void update_transform();
@ -48,6 +51,7 @@ PUBLISHED:
private:
PhysicsObject *_mass_center;
LVector3f _contact_vector;
bool _ok_to_callback;
// node hook if the client changes the node's transform.

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

@ -55,10 +55,11 @@ apply_linear_force(ColliderDef &def, const LVector3f &force) {
if (force == LVector3f::zero()) {
return;
}
if (def._node) {
if (!def._node) {
return;
}
ActorNode *actor=DCAST(ActorNode, def._node);
float friction=1.0f;
float friction=0.9f;
LVector3f vel=actor->get_physics_object()->get_velocity();
LVector3f old_vel=vel;
LVector3f adjustment=force;
@ -69,14 +70,13 @@ apply_linear_force(ColliderDef &def, const LVector3f &force) {
float temp=((vel-c)*friction).length();
if ((vel-c)[2]) {
cerr<<"\n\napply_linear_force"
<<"\n vel "<<vel<<" mag "<<initialVelMag
<<"\n force "<<force<<" mag "<<force.length()
<<"\n unitForce "<<unitForce<<" mag "<<unitForce.length()
<<"\n c "<<c<<" mag "<<c.length()
<<"\n vel "<<vel-c<<" mag "<<(vel-c).length()
<<"\n old_vel "<<old_vel<<" len "<<old_vel.length()
<<"\n force "<<force<<" len "<<force.length()
<<"\n adjustment "<<adjustment<<" len"<<adjustment.length()
<<"\n vel "<<vel-c<<" len "<<(vel-c).length()
<<"\n friction "<<friction
<<"\n vel "<<((vel-c)*friction)<<" mag "<<temp
<<"\n initialVelMag > "<<(initialVelMag>temp)
<<"\n vel "<<((vel-c)*friction)<<" len "<<temp
<<"\n initialVelLen > "<<(initialVelMag>temp)
<<endl;
if (initialVelMag<temp) {
cerr<<"\n*************************************"<<endl;
@ -104,6 +104,6 @@ apply_linear_force(ColliderDef &def, const LVector3f &force) {
cerr<<"\nvel.length() > 10.0f "<<vel.length()<<endl;
}
actor->set_contact_vector(force);
actor->get_physics_object()->set_velocity(vel);
}
}