added 'ode_includes.h' to resolve #define collisions

panda/src/ode/Sources.pp

@@ -15,7 +15,7 @@
     $[TARGET]_composite2.cxx $[TARGET]_composite3.cxx
 
   #define SOURCES \
-    config_ode.h \
+    ode_includes.h config_ode.h \
     odeWorld.I odeWorld.h \
     odeMass.I odeMass.h \
     odeBody.I odeBody.h \
@@ -74,7 +74,7 @@
 
 
   #define INSTALL_HEADERS \
-    config_ode.h \
+    ode_includes.h config_ode.h \
     odeWorld.I odeWorld.h \
     odeMass.I odeMass.h \
     odeBody.I odeBody.h \

panda/src/ode/odeAMotorJoint.h

@@ -5,7 +5,7 @@
 #include "typedObject.h"
 #include "luse.h"
 
-#include "ode/ode.h"
+#include "ode_includes.h"
 
 #include "odeJoint.h"
 

panda/src/ode/odeBallJoint.h

@@ -5,7 +5,7 @@
 #include "typedObject.h"
 #include "luse.h"
 
-#include "ode/ode.h"
+#include "ode_includes.h"
 
 #include "odeJoint.h"
 

panda/src/ode/odeBody.h

@@ -23,7 +23,7 @@
 #include "typedObject.h"
 #include "luse.h"
 
-#include "ode/ode.h"
+#include "ode_includes.h"
 #include "odeWorld.h"
 #include "odeMass.h"
 

panda/src/ode/odeBoxGeom.h

@@ -23,7 +23,7 @@
 #include "typedObject.h"
 #include "luse.h"
 
-#include "ode/ode.h"
+#include "ode_includes.h"
 #include "odeGeom.h"
 
 ////////////////////////////////////////////////////////////////////

panda/src/ode/odeCappedCylinderGeom.h

@@ -23,7 +23,7 @@
 #include "typedObject.h"
 #include "luse.h"
 
-#include "ode/ode.h"
+#include "ode_includes.h"
 #include "odeGeom.h"
 
 ////////////////////////////////////////////////////////////////////

panda/src/ode/odeContact.h

@@ -23,7 +23,7 @@
 #include "typedReferenceCount.h"
 #include "luse.h"
 
-#include "ode/ode.h"
+#include "ode_includes.h"
 #include "odeSurfaceParameters.h"
 #include "odeContactGeom.h"
 

panda/src/ode/odeContactGeom.h

@@ -23,7 +23,7 @@
 #include "typedReferenceCount.h"
 #include "luse.h"
 
-#include "ode/ode.h"
+#include "ode_includes.h"
 #include "OdeGeom.h"
 
 ////////////////////////////////////////////////////////////////////

panda/src/ode/odeContactJoint.h

@@ -5,7 +5,7 @@
 #include "typedObject.h"
 #include "luse.h"
 
-#include "ode/ode.h"
+#include "ode_includes.h"
 
 #include "odeJoint.h"
 #include "odeContact.h"

panda/src/ode/odeConvexGeom.h

@@ -23,7 +23,7 @@
 #include "typedObject.h"
 #include "luse.h"
 
-#include "ode/ode.h"
+#include "ode_includes.h"
 #include "odeGeom.h"
 
 ////////////////////////////////////////////////////////////////////

panda/src/ode/odeCylinderGeom.h

@@ -23,7 +23,7 @@
 #include "typedObject.h"
 #include "luse.h"
 
-#include "ode/ode.h"
+#include "ode_includes.h"
 #include "odeGeom.h"
 
 ////////////////////////////////////////////////////////////////////

panda/src/ode/odeFixedJoint.h

@@ -5,7 +5,7 @@
 #include "typedObject.h"
 #include "luse.h"
 
-#include "ode/ode.h"
+#include "ode_includes.h"
 
 #include "odeJoint.h"
 

panda/src/ode/odeGeom.h

@@ -23,7 +23,7 @@
 #include "typedObject.h"
 #include "luse.h"
 
-#include "ode/ode.h"
+#include "ode_includes.h"
 #include "odeSpace.h" // Needed for derived classes
 #include "odeBody.h"
 

panda/src/ode/odeHashSpace.h

@@ -23,7 +23,7 @@
 #include "typedObject.h"
 #include "luse.h"
 
-#include "ode/ode.h"
+#include "ode_includes.h"
 #include "odeSpace.h"
 
 

panda/src/ode/odeHeightFieldGeom.h

@@ -23,7 +23,7 @@
 #include "typedObject.h"
 #include "luse.h"
 
-#include "ode/ode.h"
+#include "ode_includes.h"
 #include "odeGeom.h"
 
 ////////////////////////////////////////////////////////////////////

panda/src/ode/odeHinge2Joint.h

@@ -5,7 +5,7 @@
 #include "typedObject.h"
 #include "luse.h"
 
-#include "ode/ode.h"
+#include "ode_includes.h"
 
 #include "odeJoint.h"
 

panda/src/ode/odeHingeJoint.h

@@ -4,7 +4,7 @@
 #include "pandabase.h"
 #include "luse.h"
 
-#include "ode/ode.h"
+#include "ode_includes.h"
 
 #include "odeJoint.h"
 

panda/src/ode/odeJoint.h

@@ -23,7 +23,7 @@
 #include "typedObject.h"
 #include "luse.h"
 
-#include "ode/ode.h"
+#include "ode_includes.h"
 #include "odeWorld.h" // Needed for derived classes
 #include "odeJointGroup.h"
 

panda/src/ode/odeJointGroup.h

@@ -23,7 +23,7 @@
 #include "typedObject.h"
 #include "luse.h"
 
-#include "ode/ode.h"
+#include "ode_includes.h"
 
 ////////////////////////////////////////////////////////////////////
 //       Class : OdeJointGroup

panda/src/ode/odeLMotorJoint.h

@@ -4,7 +4,7 @@
 #include "pandabase.h"
 #include "luse.h"
 
-#include "ode/ode.h"
+#include "ode_includes.h"
 
 #include "odeJoint.h"
 

panda/src/ode/odeMass.h

@@ -23,7 +23,7 @@
 #include "typedReferenceCount.h"
 #include "luse.h"
 
-#include "ode/ode.h"
+#include "ode_includes.h"
 
 ////////////////////////////////////////////////////////////////////
 //       Class : OdeMass

panda/src/ode/odeNullJoint.h

@@ -4,7 +4,7 @@
 #include "pandabase.h"
 #include "luse.h"
 
-#include "ode/ode.h"
+#include "ode_includes.h"
 
 #include "odeJoint.h"
 

panda/src/ode/odePlane2dJoint.h

@@ -4,7 +4,7 @@
 #include "pandabase.h"
 #include "luse.h"
 
-#include "ode/ode.h"
+#include "ode_includes.h"
 
 #include "odeJoint.h"
 

panda/src/ode/odePlaneGeom.h

@@ -22,7 +22,7 @@
 #include "pandabase.h"
 #include "luse.h"
 
-#include "ode/ode.h"
+#include "ode_includes.h"
 #include "odeGeom.h"
 
 ////////////////////////////////////////////////////////////////////

panda/src/ode/odeQuadTreeSpace.h

@@ -22,7 +22,7 @@
 #include "pandabase.h"
 #include "luse.h"
 
-#include "ode/ode.h"
+#include "ode_includes.h"
 #include "odeSpace.h"
 
 

panda/src/ode/odeRayGeom.h

@@ -22,7 +22,7 @@
 #include "pandabase.h"
 #include "luse.h"
 
-#include "ode/ode.h"
+#include "ode_includes.h"
 #include "odeGeom.h"
 
 ////////////////////////////////////////////////////////////////////

panda/src/ode/odeSimpleSpace.h

@@ -22,7 +22,7 @@
 #include "pandabase.h"
 #include "luse.h"
 
-#include "ode/ode.h"
+#include "ode_includes.h"
 #include "odeSpace.h"
 
 

panda/src/ode/odeSliderJoint.h

@@ -4,7 +4,7 @@
 #include "pandabase.h"
 #include "luse.h"
 
-#include "ode/ode.h"
+#include "ode_includes.h"
 
 #include "odeJoint.h"
 

panda/src/ode/odeSpace.h

@@ -23,7 +23,7 @@
 #include "typedObject.h"
 #include "luse.h"
 
-#include "ode/ode.h"
+#include "ode_includes.h"
 
 class OdeGeom;
 class OdeTriMeshGeom;

panda/src/ode/odeSphereGeom.h

@@ -22,7 +22,7 @@
 #include "pandabase.h"
 #include "luse.h"
 
-#include "ode/ode.h"
+#include "ode_includes.h"
 #include "odeGeom.h"
 
 ////////////////////////////////////////////////////////////////////

panda/src/ode/odeSurfaceParameters.h

@@ -23,7 +23,7 @@
 #include "typedObject.h"
 #include "luse.h"
 
-#include "ode/ode.h"
+#include "ode_includes.h"
 
 class OdeContact;
 

panda/src/ode/odeTriMeshData.h

@@ -23,7 +23,7 @@
 #include "typedReferenceCount.h"
 #include "luse.h"
 
-#include "ode/ode.h"
+#include "ode_includes.h"
 
 #include "nodePathCollection.h"
 #include "geomNode.h"

panda/src/ode/odeTriMeshGeom.I

@@ -18,7 +18,7 @@
 
 INLINE void OdeTriMeshGeom::
 set_data(OdeTriMeshData &data) {
-  unlink_data(_id);
+  // unlink_data(_id); // not necessary?
   dGeomTriMeshSetData(_id, data.get_id());
   link_data(_id, data);
 }
@@ -68,4 +68,5 @@ get_num_triangles() const {
 INLINE dTriMeshDataID OdeTriMeshGeom::
 get_data_id() const {
   return dGeomTriMeshGetTriMeshDataID(_id);
-}
+}
+

panda/src/ode/odeTriMeshGeom.h

@@ -22,7 +22,7 @@
 #include "pandabase.h"
 #include "luse.h"
 
-#include "ode/ode.h"
+#include "ode_includes.h"
 #include "odeGeom.h"
 #include "odeTriMeshData.h"
 

panda/src/ode/odeUniversalJoint.h

@@ -5,7 +5,7 @@
 #include "typedObject.h"
 #include "luse.h"
 
-#include "ode/ode.h"
+#include "ode_includes.h"
 
 #include "odeJoint.h"
 

panda/src/ode/odeUtil.h

@@ -23,7 +23,7 @@
 #include "typedObject.h"
 #include "luse.h"
 
-#include "ode/ode.h"
+#include "ode_includes.h"
 class OdeBody;
 class OdeJoint;
 

panda/src/ode/odeWorld.h

@@ -23,7 +23,7 @@
 #include "typedObject.h"
 #include "luse.h"
 
-#include "ode/ode.h"
+#include "ode_includes.h"
 class OdeBody;
 class OdeJoint;