David Rose 18 år sedan
förälder
incheckning
9de1a052ad
2 ändrade filer med 4 tillägg och 2 borttagningar
  1. 2 1
      panda/src/collide/collisionSphere.cxx
  2. 2 1
      panda/src/collide/collisionTube.cxx

+ 2 - 1
panda/src/collide/collisionSphere.cxx

@@ -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) {

+ 2 - 1
panda/src/collide/collisionTube.cxx

@@ -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()) {