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

changed how the contact vector gets calculated

Browse Source
This commit is contained in:
Dave Schuyler 2004-04-29 01:31:05 +00:00
parent 31ff26b6f4
commit a666dcbac4
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
panda/src/collide/collisionHandlerGravity.cxx
View File

@ -187,11 +187,11 @@ set_highest_collision(const NodePath &target_node_path, const NodePath &from_nod
// is colliding with relative to the avatar. A positive y valye means // is colliding with relative to the avatar. A positive y valye means
// the avatar is facing downhill and a negative y value means the // the avatar is facing downhill and a negative y value means the
// avatar is facing uphill. // avatar is facing uphill.
_contact_normal = DCAST(CollisionPlane, highest->get_into())->get_normal() * from_node_path.get_mat(highest->get_into_node_path()); //_contact_normal = DCAST(CollisionPlane, highest->get_into())->get_normal() * from_node_path.get_mat(highest->get_into_node_path());
//_contact_normal = DCAST(CollisionPlane, highest->get_into())->get_normal(); //_contact_normal = DCAST(CollisionPlane, highest->get_into())->get_normal();
// This is asking: what is the normal of the avatar that the avatar // This is asking: what is the normal of the avatar that the avatar
// is colliding with relative to the plane. // is colliding with relative to the plane.
//_contact_normal = DCAST(CollisionPlane, highest->get_into())->get_normal() * highest->get_into_node_path().get_mat(from_node_path); _contact_normal = DCAST(CollisionPlane, highest->get_into())->get_normal() * highest->get_into_node_path().get_mat(from_node_path);
} else { } else {
_contact_normal = highest->get_surface_normal(from_node_path); _contact_normal = highest->get_surface_normal(from_node_path);
} }
@ -286,6 +286,7 @@ handle_entries() {
apply_linear_force(def, LVector3f(0.0f, 0.0f, adjust)); apply_linear_force(def, LVector3f(0.0f, 0.0f, adjust));
} else { } else {
// _impact_velocity = _current_velocity;
_current_velocity = _airborne_height = 0.0f; _current_velocity = _airborne_height = 0.0f;
if (collide_cat.is_spam()) { if (collide_cat.is_spam()) {
collide_cat.spam() collide_cat.spam()