change precomp hdrs

panda/src/collide/collide_headers.h

@@ -20,39 +20,16 @@
 #include <bamWriter.h>
 #include <boundingLine.h>
 #include <boundingSphere.h>
-#include <clockObject.h>
-#include <colorTransition.h>
-#include <cullFaceTransition.h>
 #include <datagram.h>
 #include <datagramIterator.h>
-#include <dconfig.h>
-#include <dftraverser.h>
-#include <eventParameter.h>
 #include <geom.h>
-#include <geometricBoundingVolume.h>
-#include <geomLine.h>
 #include <geomLinestrip.h>
 #include <geomNode.h>
-#include <geomPolygon.h>
-#include <geomQuad.h>
-#include <geomSphere.h>
-#include <get_rel_pos.h>
-#include <indent.h>
-#include <lightTransition.h>
-#include <nearly_zero.h>
-#include <nodePath.h>
-#include <omniBoundingVolume.h>
 #include <pointerToArray.h>
 #include <projection.h>
 #include <projectionNode.h>
-#include <pStatTimer.h>
-#include <renderModeTransition.h>
 #include <renderRelation.h>
-#include <textureTransition.h>
-#include <throw_event.h>
 #include <transformTransition.h>
-#include <transparencyTransition.h>
-#include <wrt.h>
 
 #include "collisionEntry.h"
 #include "collisionHandler.h"
@@ -61,7 +38,6 @@
 #include "collisionHandlerPhysical.h"
 #include "collisionHandlerPusher.h"
 #include "collisionHandlerQueue.h"
-#include "collisionLevelState.h"
 #include "collisionNode.h"
 #include "collisionPlane.h"
 #include "collisionPolygon.h"
@@ -69,7 +45,6 @@
 #include "collisionSegment.h"
 #include "collisionSolid.h"
 #include "collisionSphere.h"
-#include "collisionTraverser.h"
 #include "config_collide.h"
 
 #pragma hdrstop

panda/src/collide/collisionEntry.cxx

@@ -16,9 +16,16 @@
 //
 ////////////////////////////////////////////////////////////////////
 
+#if defined(WIN32_VC) && !defined(NO_PCH)
 #include "collide_headers.h"
+#endif
+
 #pragma hdrstop
 
+#if !defined(WIN32_VC) || defined(NO_PCH)
+#include "collisionEntry.h"
+#endif
+
 TypeHandle CollisionEntry::_type_handle;
 
 ////////////////////////////////////////////////////////////////////

panda/src/collide/collisionHandler.cxx

@@ -16,9 +16,16 @@
 //
 ////////////////////////////////////////////////////////////////////
 
+#if defined(WIN32_VC) && !defined(NO_PCH)
 #include "collide_headers.h"
+#endif
+
 #pragma hdrstop
 
+#if !defined(WIN32_VC) || defined(NO_PCH)
+#include "collisionHandler.h"
+#endif
+
 TypeHandle CollisionHandler::_type_handle;
 
 ////////////////////////////////////////////////////////////////////

panda/src/collide/collisionHandlerEvent.cxx

@@ -16,9 +16,21 @@
 //
 ////////////////////////////////////////////////////////////////////
 
+#if defined(WIN32_VC) && !defined(NO_PCH)
 #include "collide_headers.h"
+#endif
+
 #pragma hdrstop
 
+#if !defined(WIN32_VC) || defined(NO_PCH)
+#include "collisionHandlerEvent.h"
+#include "config_collide.h"
+#endif
+
+#include <eventParameter.h>
+#include <throw_event.h>
+
+
 TypeHandle CollisionHandlerEvent::_type_handle;
 
 ////////////////////////////////////////////////////////////////////

panda/src/collide/collisionHandlerFloor.cxx

@@ -16,9 +16,22 @@
 //
 ////////////////////////////////////////////////////////////////////
 
+#if defined(WIN32_VC) && !defined(NO_PCH)
 #include "collide_headers.h"
+#endif
+
 #pragma hdrstop
 
+#if !defined(WIN32_VC) || defined(NO_PCH)
+#include "collisionHandlerFloor.h"
+#include "config_collide.h"
+
+#include <renderRelation.h>
+#include <transformTransition.h>
+#endif
+
+#include <clockObject.h>
+
 TypeHandle CollisionHandlerFloor::_type_handle;
 
 ////////////////////////////////////////////////////////////////////

panda/src/collide/collisionHandlerPhysical.cxx

@@ -16,9 +16,20 @@
 //
 ////////////////////////////////////////////////////////////////////
 
+#if defined(WIN32_VC) && !defined(NO_PCH)
 #include "collide_headers.h"
+#endif
+
 #pragma hdrstop
 
+#if !defined(WIN32_VC) || defined(NO_PCH)
+#include "collisionHandlerPhysical.h"
+#include "config_collide.h"
+
+#include <renderRelation.h>
+#include <transformTransition.h>
+#endif
+
 TypeHandle CollisionHandlerPhysical::_type_handle;
 
 

panda/src/collide/collisionHandlerPusher.cxx

@@ -16,9 +16,17 @@
 //
 ////////////////////////////////////////////////////////////////////
 
+#if defined(WIN32_VC) && !defined(NO_PCH)
 #include "collide_headers.h"
+#endif
+
 #pragma hdrstop
 
+#if !defined(WIN32_VC) || defined(NO_PCH)
+#include "collisionHandlerPusher.h"
+#include "config_collide.h"
+#endif
+
 TypeHandle CollisionHandlerPusher::_type_handle;
 
 ///////////////////////////////////////////////////////////////////

panda/src/collide/collisionHandlerQueue.cxx

@@ -16,9 +16,17 @@
 //
 ////////////////////////////////////////////////////////////////////
 
+#if defined(WIN32_VC) && !defined(NO_PCH)
 #include "collide_headers.h"
+#endif
+
 #pragma hdrstop
 
+#if !defined(WIN32_VC) || defined(NO_PCH)
+#include "collisionHandlerQueue.h"
+#include "config_collide.h"
+#endif
+
 TypeHandle CollisionHandlerQueue::_type_handle;
 
 // This class is used in sort_entries(), below.

panda/src/collide/collisionLevelState.cxx

@@ -16,9 +16,19 @@
 //
 ////////////////////////////////////////////////////////////////////
 
+#if defined(WIN32_VC) && !defined(NO_PCH)
 #include "collide_headers.h"
+#endif
+
 #pragma hdrstop
 
+#if !defined(WIN32_VC) || defined(NO_PCH)
+#include "collisionSolid.h"
+#include "collisionNode.h"
+#endif
+
+#include "collisionLevelState.h"
+
 ////////////////////////////////////////////////////////////////////
 //     Function: CollisionLevelState::clear
 //       Access: Public

panda/src/collide/collisionNode.cxx

@@ -16,9 +16,22 @@
 //
 ////////////////////////////////////////////////////////////////////
 
+#if defined(WIN32_VC) && !defined(NO_PCH)
 #include "collide_headers.h"
+#endif
+
 #pragma hdrstop
 
+#if !defined(WIN32_VC) || defined(NO_PCH)
+#include "collisionNode.h"
+#include "config_collide.h"
+
+#include <datagram.h>
+#include <datagramIterator.h>
+#include <bamReader.h>
+#include <bamWriter.h>
+#endif
+
 TypeHandle CollisionNode::_type_handle;
 
 

panda/src/collide/collisionPlane.cxx

@@ -16,9 +16,32 @@
 //
 ////////////////////////////////////////////////////////////////////
 
+#if defined(WIN32_VC) && !defined(NO_PCH)
 #include "collide_headers.h"
+#endif
+
 #pragma hdrstop
 
+#if !defined(WIN32_VC) || defined(NO_PCH)
+#include "collisionPlane.h"
+#include "collisionHandler.h"
+#include "collisionEntry.h"
+#include "collisionSphere.h"
+#include "collisionRay.h"
+#include "config_collide.h"
+
+#include <pointerToArray.h>
+#include <geomNode.h>
+#include <geom.h>
+#include <datagram.h>
+#include <datagramIterator.h>
+#include <bamReader.h>
+#include <bamWriter.h>
+#endif
+
+#include <omniBoundingVolume.h>
+#include <geomQuad.h>
+
 TypeHandle CollisionPlane::_type_handle;
 
 ////////////////////////////////////////////////////////////////////

panda/src/collide/collisionPolygon.cxx

@@ -16,13 +16,38 @@
 //
 ////////////////////////////////////////////////////////////////////
 
+#if defined(WIN32_VC) && !defined(NO_PCH)
 #include "collide_headers.h"
+#endif
+
 #pragma hdrstop
 
+#if !defined(WIN32_VC) || defined(NO_PCH)
+#include "collisionPolygon.h"
+#include "collisionHandler.h"
+#include "collisionEntry.h"
+#include "collisionSphere.h"
+#include "collisionRay.h"
+#include "collisionSegment.h"
+#include "config_collide.h"
+
+#include <boundingSphere.h>
+#include <pointerToArray.h>
+#include <geomNode.h>
+#include <geom.h>
+#include <datagram.h>
+#include <datagramIterator.h>
+#include <bamReader.h>
+#include <bamWriter.h>
+#endif
+
 #include <algorithm>
+#include <geomPolygon.h>
 
 TypeHandle CollisionPolygon::_type_handle;
 
+
+
 ////////////////////////////////////////////////////////////////////
 //     Function: is_right
 //  Description: Returns true if the 2-d v1 is to the right of v2.

panda/src/collide/collisionRay.cxx

@@ -16,9 +16,26 @@
 //
 ////////////////////////////////////////////////////////////////////
 
+#if defined(WIN32_VC) && !defined(NO_PCH)
 #include "collide_headers.h"
+#endif
+
 #pragma hdrstop
 
+#if !defined(WIN32_VC) || defined(NO_PCH)
+#include "collisionRay.h"
+#include "collisionHandler.h"
+#include "collisionEntry.h"
+#include "config_collide.h"
+
+#include <geom.h>
+#include <geomNode.h>
+#include <geomLinestrip.h>
+#include <boundingLine.h>
+#include <projectionNode.h>
+#include <projection.h>
+#endif
+
 TypeHandle CollisionRay::_type_handle;
 
 

panda/src/collide/collisionSegment.cxx

@@ -16,9 +16,27 @@
 //
 ////////////////////////////////////////////////////////////////////
 
+#if defined(WIN32_VC) && !defined(NO_PCH)
 #include "collide_headers.h"
+#endif
+
 #pragma hdrstop
 
+#if !defined(WIN32_VC) || defined(NO_PCH)
+#include "collisionSegment.h"
+#include "collisionHandler.h"
+#include "collisionEntry.h"
+#include "config_collide.h"
+
+#include <geom.h>
+#include <geomNode.h>
+#include <projectionNode.h>
+#include <projection.h>
+#endif
+
+#include <geomLine.h>
+#include <geometricBoundingVolume.h>
+
 TypeHandle CollisionSegment::_type_handle;
 
 

panda/src/collide/collisionSolid.cxx

@@ -16,9 +16,36 @@
 //
 ////////////////////////////////////////////////////////////////////
 
+#if defined(WIN32_VC) && !defined(NO_PCH)
 #include "collide_headers.h"
+#endif
+
 #pragma hdrstop
 
+#if !defined(WIN32_VC) || defined(NO_PCH)
+#include "collisionSolid.h"
+#include "config_collide.h"
+#include "collisionEntry.h"
+#include "collisionSphere.h"
+#include "collisionRay.h"
+#include "collisionSegment.h"
+
+#include <renderRelation.h>
+#include <geomNode.h>
+#include <datagram.h>
+#include <datagramIterator.h>
+#include <bamReader.h>
+#include <bamWriter.h>
+#endif
+
+#include <indent.h>
+#include <cullFaceTransition.h>
+#include <colorTransition.h>
+#include <renderModeTransition.h>
+#include <lightTransition.h>
+#include <transparencyTransition.h>
+#include <textureTransition.h>
+
 TypeHandle CollisionSolid::_type_handle;
 
 ////////////////////////////////////////////////////////////////////

panda/src/collide/collisionSphere.cxx

@@ -16,9 +16,31 @@
 //
 ////////////////////////////////////////////////////////////////////
 
+#if defined(WIN32_VC) && !defined(NO_PCH)
 #include "collide_headers.h"
+#endif
+
 #pragma hdrstop
 
+#if !defined(WIN32_VC) || defined(NO_PCH)
+#include "collisionSphere.h"
+#include "collisionRay.h"
+#include "collisionSegment.h"
+#include "collisionHandler.h"
+#include "collisionEntry.h"
+#include "config_collide.h"
+
+#include <boundingSphere.h>
+#include <geomNode.h>
+#include <datagram.h>
+#include <datagramIterator.h>
+#include <bamReader.h>
+#include <bamWriter.h>
+#endif
+
+#include <geomSphere.h>
+#include <nearly_zero.h>
+
 TypeHandle CollisionSphere::_type_handle;
 
 ////////////////////////////////////////////////////////////////////

panda/src/collide/collisionTraverser.cxx

@@ -16,9 +16,30 @@
 //
 ////////////////////////////////////////////////////////////////////
 
+#if defined(WIN32_VC) && !defined(NO_PCH)
 #include "collide_headers.h"
+#endif
+
 #pragma hdrstop
 
+#if !defined(WIN32_VC) || defined(NO_PCH)
+#include "collisionNode.h"
+#include "collisionEntry.h"
+#include "collisionPolygon.h"
+#include "config_collide.h"
+
+#include <transformTransition.h>
+#include <geomNode.h>
+#include <geom.h>
+#endif
+
+#include "collisionTraverser.h"
+#include <nodePath.h>
+#include <dftraverser.h>
+#include <wrt.h>
+#include <get_rel_pos.h>
+#include <pStatTimer.h>
+
 #ifndef CPPPARSER
 PStatCollector CollisionTraverser::_collisions_pcollector("App:Collisions");
 #endif
@@ -602,15 +623,9 @@ compare_collider_to_geom(CollisionEntry &entry, Geom *geom,
         // triangle in the Geom.
         CollisionPolygon poly(coords[tris[i]], coords[tris[i + 1]],
                               coords[tris[i + 2]]);
-        /*
         if (entry.get_from()->test_intersection((*ci).second, entry, &poly) != 0) {
           return;
         }
-        */
-
-        // Don't short-circuit the intersection test, as above, but
-        // instead keep testing until all the collisions are detected.
-        entry.get_from()->test_intersection((*ci).second, entry, &poly);
       }
     }
   }

panda/src/collide/config_collide.cxx

@@ -16,9 +16,33 @@
 //
 ////////////////////////////////////////////////////////////////////
 
+#if defined(WIN32_VC) && !defined(NO_PCH)
 #include "collide_headers.h"
+#endif
+
 #pragma hdrstop
 
+#if !defined(WIN32_VC) || defined(NO_PCH)
+#include "config_collide.h"
+#include "collisionEntry.h"
+#include "collisionHandler.h"
+#include "collisionHandlerEvent.h"
+#include "collisionHandlerFloor.h"
+#include "collisionHandlerPhysical.h"
+#include "collisionHandlerPusher.h"
+#include "collisionHandlerQueue.h"
+#include "collisionNode.h"
+#include "collisionPlane.h"
+#include "collisionPolygon.h"
+#include "collisionRay.h"
+#include "collisionSegment.h"
+#include "collisionSolid.h"
+#include "collisionSphere.h"
+
+#endif
+
+#include <dconfig.h>
+
 Configure(config_collide);
 NotifyCategoryDef(collide, "");