|
@@ -35,8 +35,10 @@
|
|
|
#include "transparencyAttrib.h"
|
|
#include "transparencyAttrib.h"
|
|
|
#include "geomNode.h"
|
|
#include "geomNode.h"
|
|
|
|
|
|
|
|
-PStatCollector CollisionSolid::_volume_pcollector("Collision Volumes:CollisionSolid");
|
|
|
|
|
-PStatCollector CollisionSolid::_test_pcollector("Collision Tests:CollisionSolid");
|
|
|
|
|
|
|
+PStatCollector CollisionSolid::_volume_pcollector(
|
|
|
|
|
+ "Collision Volumes:CollisionSolid");
|
|
|
|
|
+PStatCollector CollisionSolid::_test_pcollector(
|
|
|
|
|
+ "Collision Tests:CollisionSolid");
|
|
|
TypeHandle CollisionSolid::_type_handle;
|
|
TypeHandle CollisionSolid::_type_handle;
|
|
|
|
|
|
|
|
////////////////////////////////////////////////////////////////////
|
|
////////////////////////////////////////////////////////////////////
|
|
@@ -203,6 +205,20 @@ compute_internal_bounds() const {
|
|
|
return new BoundingSphere;
|
|
return new BoundingSphere;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
+////////////////////////////////////////////////////////////////////
|
|
|
|
|
+// Function: CollisionSolid::test_intersection_from_ds_solid
|
|
|
|
|
+// Access: Protected, Virtual
|
|
|
|
|
+// Description: This is part of the double-dispatch implementation of
|
|
|
|
|
+// test_intersection(). It is called when the "from"
|
|
|
|
|
+// object is a DSSolid.
|
|
|
|
|
+////////////////////////////////////////////////////////////////////
|
|
|
|
|
+PT(CollisionEntry) CollisionSolid::
|
|
|
|
|
+test_intersection_from_ds_solid(const CollisionEntry &) const {
|
|
|
|
|
+ report_undefined_intersection_test(CollisionSphere::get_class_type(),
|
|
|
|
|
+ get_type());
|
|
|
|
|
+ return NULL;
|
|
|
|
|
+}
|
|
|
|
|
+
|
|
|
////////////////////////////////////////////////////////////////////
|
|
////////////////////////////////////////////////////////////////////
|
|
|
// Function: CollisionSolid::test_intersection_from_sphere
|
|
// Function: CollisionSolid::test_intersection_from_sphere
|
|
|
// Access: Protected, Virtual
|
|
// Access: Protected, Virtual
|