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

fix confusion between into_depth and from_depth

This commit is contained in:
David Rose 2003-09-24 23:20:33 +00:00
parent 952e119a55
commit b1827d12e7
2 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
panda/src/collide/collisionPolygon.cxx
View File

@ -397,18 +397,21 @@ test_intersection_from_sphere(const CollisionEntry &entry) const {
}
PT(CollisionEntry) new_entry = new CollisionEntry(entry);
LVector3f from_normal = get_normal() * entry.get_inv_wrt_space();
float from_depth = from_radius - dist;
float into_depth = from_radius - dist;
if (moved_from_center) {
// We have to base the depth of intersection on the sphere's final
// resting point, not the point from which we tested the
// intersection.
from_depth = from_radius - dist_to_plane(orig_center);
into_depth = from_radius - dist_to_plane(orig_center);
}
new_entry->set_into_surface_normal(get_normal());
new_entry->set_into_depth(into_depth);
LVector3f from_normal = get_normal() * entry.get_inv_wrt_space();
LVector3f from_depth_vec = (get_normal() * into_depth) * entry.get_inv_wrt_space();
new_entry->set_from_surface_normal(from_normal);
new_entry->set_from_depth(from_depth);
new_entry->set_from_depth(from_depth_vec.length());
new_entry->set_into_intersection_point(from_center - get_normal() * dist);

18
panda/src/collide/collisionSphere.cxx
View File

@ -144,7 +144,16 @@ test_intersection_from_sphere(const CollisionEntry &entry) const {
PT(CollisionEntry) new_entry = new CollisionEntry(entry);
float dist = sqrtf(dist2);
LVector3f into_normal = normalize(vec);
LVector3f into_normal;
float vec_length = vec.length();
if (IS_NEARLY_ZERO(vec_length)) {
// If we don't have a collision normal (e.g. the centers are
// exactly coincident), then make up an arbitrary normal--any one
// is as good as any other.
into_normal.set(1.0, 0.0, 0.0);
} else {
into_normal = vec / vec_length;
}
LPoint3f into_intersection_point = into_normal * (dist - from_radius);
float into_depth = into_radius + from_radius - dist;
@ -152,11 +161,8 @@ test_intersection_from_sphere(const CollisionEntry &entry) const {
new_entry->set_into_intersection_point(into_intersection_point);
new_entry->set_into_depth(into_depth);
// This is a bit of a hack. This result is incorrect if there is a
// scale between the colliding object and this sphere. We need to
// account for that scale, but to account for it correctly
// (especially including non-uniform scales) is rather complicated.
new_entry->set_from_depth(into_depth);
LVector3f from_depth_vec = (into_normal * into_depth) * entry.get_inv_wrt_space();
new_entry->set_from_depth(from_depth_vec.length());
return new_entry;
}