nothing interesting to see here, just a bit of cleanup

panda/src/collide/Sources.pp

@@ -6,10 +6,11 @@
   #define LOCAL_LIBS \
     tform gobj pgraph putil \
     pstatclient
-    
-  #define COMBINED_SOURCES $[TARGET]_composite1.cxx $[TARGET]_composite2.cxx    
+
+  #define COMBINED_SOURCES $[TARGET]_composite1.cxx $[TARGET]_composite2.cxx
 
   #define SOURCES \
+    collisionBox.I collisionBox.h \
     collisionEntry.I collisionEntry.h \
     collisionGeom.I collisionGeom.h \
     collisionHandler.I collisionHandler.h  \
@@ -36,13 +37,13 @@
     collisionSegment.I collisionSegment.h  \
     collisionSolid.I collisionSolid.h \
     collisionSphere.I collisionSphere.h \
-    collisionBox.I collisionBox.h \
     collisionTraverser.I collisionTraverser.h  \
     collisionTube.I collisionTube.h \
     collisionVisualizer.I collisionVisualizer.h \
     config_collide.h
-    
+
  #define INCLUDED_SOURCES \
+    collisionBox.cxx \
     collisionEntry.cxx \
     collisionGeom.cxx \
     collisionHandler.cxx \
@@ -69,13 +70,13 @@
     collisionSegment.cxx  \
     collisionSolid.cxx \
     collisionSphere.cxx  \
-    collisionBox.cxx  \
     collisionTraverser.cxx \
-    collisionTube.cxx  \
+    collisionTube.cxx \
     collisionVisualizer.cxx \
-    config_collide.cxx 
+    config_collide.cxx
 
   #define INSTALL_HEADERS \
+    collisionBox.I collisionBox.h \
     collisionEntry.I collisionEntry.h \
     collisionGeom.I collisionGeom.h \
     collisionHandler.I collisionHandler.h \
@@ -102,7 +103,6 @@
     collisionSegment.I collisionSegment.h \
     collisionSolid.I collisionSolid.h \
     collisionSphere.I collisionSphere.h \
-    collisionBox.I collisionBox.h \
     collisionTraverser.I collisionTraverser.h \
     collisionTube.I collisionTube.h \
     collisionVisualizer.I collisionVisualizer.h \
@@ -123,4 +123,3 @@
     test_collide.cxx
 
 #end test_bin_target
-

panda/src/collide/collide_composite1.cxx

@@ -1,4 +1,5 @@
 #include "config_collide.cxx"
+#include "collisionBox.cxx"
 #include "collisionEntry.cxx"
 #include "collisionGeom.cxx"
 #include "collisionHandler.cxx"
@@ -14,5 +15,3 @@
 #include "collisionInvSphere.cxx"
 #include "collisionLevelStateBase.cxx"
 #include "collisionLevelState.cxx"
-#include "collisionLine.cxx"
-

panda/src/collide/collide_composite2.cxx

@@ -1,3 +1,4 @@
+#include "collisionLine.cxx"
 #include "collisionNode.cxx"
 #include "collisionParabola.cxx"
 #include "collisionPlane.cxx"
@@ -11,4 +12,3 @@
 #include "collisionTraverser.cxx"
 #include "collisionTube.cxx"
 #include "collisionVisualizer.cxx"
-#include "collisionBox.cxx"

panda/src/collide/collisionBox.cxx

@@ -19,7 +19,7 @@
 #include "collisionHandler.h"
 #include "collisionEntry.h"
 #include "config_collide.h"
-#include "boundingBox.h"
+#include "boundingSphere.h"
 #include "datagram.h"
 #include "datagramIterator.h"
 #include "bamReader.h"
@@ -28,7 +28,7 @@
 #include "cmath.h"
 #include "mathNumbers.h"
 #include "geom.h"
-#include "geomTristrips.h"
+#include "geomTrifans.h"
 #include "geomVertexWriter.h"
 #include "config_mathutil.h"
 #include "dcast.h"

panda/src/collide/config_collide.cxx

@@ -13,6 +13,7 @@
 ////////////////////////////////////////////////////////////////////
 
 #include "config_collide.h"
+#include "collisionBox.h"
 #include "collisionEntry.h"
 #include "collisionHandler.h"
 #include "collisionHandlerEvent.h"
@@ -40,7 +41,6 @@
 #include "collisionSphere.h"
 #include "collisionTraverser.h"
 #include "collisionTube.h"
-#include "collisionBox.h"
 #include "collisionVisualizer.h"
 #include "dconfig.h"
 
@@ -99,7 +99,7 @@ ConfigVariableInt collision_parabola_bounds_sample
  PRC_DESC("This is the number of points along a CollisionParabola to "
           "sample in order to determine an accurate bounding box."));
 
-ConfigVariableInt fluid_cap_amount 
+ConfigVariableInt fluid_cap_amount
 ("fluid-cap-amount", 100,
  PRC_DESC("ensures that fluid pos doesn't check beyond X feet"));
 
@@ -119,6 +119,7 @@ init_libcollide() {
   }
   initialized = true;
 
+  CollisionBox::init_type();
   CollisionEntry::init_type();
   CollisionHandler::init_type();
   CollisionHandlerEvent::init_type();
@@ -145,13 +146,13 @@ init_libcollide() {
   CollisionSphere::init_type();
   CollisionTraverser::init_type();
   CollisionTube::init_type();
-  CollisionBox::init_type();
 
 #ifdef DO_COLLISION_RECORDING
   CollisionRecorder::init_type();
   CollisionVisualizer::init_type();
 #endif
 
+  CollisionBox::register_with_read_factory();
   CollisionDSSolid::register_with_read_factory();
   CollisionInvSphere::register_with_read_factory();
   CollisionLine::register_with_read_factory();
@@ -164,5 +165,4 @@ init_libcollide() {
   CollisionSegment::register_with_read_factory();
   CollisionSphere::register_with_read_factory();
   CollisionTube::register_with_read_factory();
-  CollisionBox::register_with_read_factory();
 }