TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-24 08:02:23 -04:00
Code Issues Packages Projects Releases Wiki Activity

build on osx

Browse Source
This commit is contained in:
David Rose 2007-09-20 18:17:11 +00:00
parent 728ad3922a
commit 9de1a052ad
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -348,7 +348,8 @@ test_intersection_from_sphere(const CollisionEntry &entry) const {
return NULL; return NULL;
} }
actual_t = min(1.0f, max(0.0f, t1)); // doubles, not floats, to satisfy min and max templates.
actual_t = min(1.0, max(0.0, t1));
contact_point = from_a + actual_t * (from_b - from_a); contact_point = from_a + actual_t * (from_b - from_a);
if (t1 < 0.0) { if (t1 < 0.0) {

3
panda/src/collide/collisionTube.cxx
View File

@ -198,7 +198,8 @@ test_intersection_from_sphere(const CollisionEntry &entry) const {
return NULL; return NULL;
} }
actual_t = min(1.0f, max(0.0f, t1)); // doubles, not floats, to satisfy min and max templates.
actual_t = min(1.0, max(0.0, t1));
contact_point = from_a + actual_t * (from_b - from_a); contact_point = from_a + actual_t * (from_b - from_a);
if (collide_cat.is_debug()) { if (collide_cat.is_debug()) {