mirror of
https://github.com/panda3d/panda3d.git
synced 2025-10-17 20:23:47 -04:00
build on osx
This commit is contained in:
parent
728ad3922a
commit
9de1a052ad
@ -348,7 +348,8 @@ test_intersection_from_sphere(const CollisionEntry &entry) const {
|
||||
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);
|
||||
|
||||
if (t1 < 0.0) {
|
||||
|
@ -198,7 +198,8 @@ test_intersection_from_sphere(const CollisionEntry &entry) const {
|
||||
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);
|
||||
|
||||
if (collide_cat.is_debug()) {
|
||||
|
Loading…
x
Reference in New Issue
Block a user