added 'ode_includes.h' to resolve #define collisions

2025-10-03 02:15:43 -04:00 · 2007-01-30 21:27:15 +00:00 · 2007-01-30 21:27:15 +00:00 · de15a48d44
commit de15a48d44
parent 1882da9ca3
37 changed files with 40 additions and 39 deletions
--- a/panda/src/ode/Sources.pp
+++ b/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 \
--- a/panda/src/ode/odeAMotorJoint.h
+++ b/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"

--- a/panda/src/ode/odeBallJoint.h
+++ b/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"

--- a/panda/src/ode/odeBody.h
+++ b/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"

--- a/panda/src/ode/odeBoxGeom.h
+++ b/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"

 ////////////////////////////////////////////////////////////////////
--- a/panda/src/ode/odeCappedCylinderGeom.h
+++ b/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"

 ////////////////////////////////////////////////////////////////////
--- a/panda/src/ode/odeContact.h
+++ b/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"

--- a/panda/src/ode/odeContactGeom.h
+++ b/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"

 ////////////////////////////////////////////////////////////////////
--- a/panda/src/ode/odeContactJoint.h
+++ b/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"
--- a/panda/src/ode/odeConvexGeom.h
+++ b/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"

 ////////////////////////////////////////////////////////////////////
--- a/panda/src/ode/odeCylinderGeom.h
+++ b/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"

 ////////////////////////////////////////////////////////////////////
--- a/panda/src/ode/odeFixedJoint.h
+++ b/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"

--- a/panda/src/ode/odeGeom.h
+++ b/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"

--- a/panda/src/ode/odeHashSpace.h
+++ b/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"


--- a/panda/src/ode/odeHeightFieldGeom.h
+++ b/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"

 ////////////////////////////////////////////////////////////////////
--- a/panda/src/ode/odeHinge2Joint.h
+++ b/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"

--- a/panda/src/ode/odeHingeJoint.h
+++ b/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"

--- a/panda/src/ode/odeJoint.h
+++ b/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"

--- a/panda/src/ode/odeJointGroup.h
+++ b/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
--- a/panda/src/ode/odeLMotorJoint.h
+++ b/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"

--- a/panda/src/ode/odeMass.h
+++ b/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
--- a/panda/src/ode/odeNullJoint.h
+++ b/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"

--- a/panda/src/ode/odePlane2dJoint.h
+++ b/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"

--- a/panda/src/ode/odePlaneGeom.h
+++ b/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"

 ////////////////////////////////////////////////////////////////////
--- a/panda/src/ode/odeQuadTreeSpace.h
+++ b/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"


--- a/panda/src/ode/odeRayGeom.h
+++ b/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"

 ////////////////////////////////////////////////////////////////////
--- a/panda/src/ode/odeSimpleSpace.h
+++ b/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"


--- a/panda/src/ode/odeSliderJoint.h
+++ b/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"

--- a/panda/src/ode/odeSpace.h
+++ b/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;
--- a/panda/src/ode/odeSphereGeom.h
+++ b/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"

 ////////////////////////////////////////////////////////////////////
--- a/panda/src/ode/odeSurfaceParameters.h
+++ b/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;

--- a/panda/src/ode/odeTriMeshData.h
+++ b/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"
--- a/panda/src/ode/odeTriMeshGeom.I
+++ b/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);
-}
+}
+
--- a/panda/src/ode/odeTriMeshGeom.h
+++ b/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"

--- a/panda/src/ode/odeUniversalJoint.h
+++ b/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"

--- a/panda/src/ode/odeUtil.h
+++ b/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;

--- a/panda/src/ode/odeWorld.h
+++ b/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;