TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-03 10:22:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

added 'ode_includes.h' to resolve #define collisions

Browse Source
This commit is contained in:
Josh Wilson 2007-01-30 21:27:15 +00:00
parent 1882da9ca3
commit de15a48d44
37 changed files with 40 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
panda/src/ode/Sources.pp
View File

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

2
panda/src/ode/odeAMotorJoint.h
View File

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

2
panda/src/ode/odeBallJoint.h
View File

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

2
panda/src/ode/odeBody.h
View File

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

2
panda/src/ode/odeBoxGeom.h
View File

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

2
panda/src/ode/odeCappedCylinderGeom.h
View File

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

2
panda/src/ode/odeContact.h
View File

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

2
panda/src/ode/odeContactGeom.h
View File

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

2
panda/src/ode/odeContactJoint.h
View File

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

2
panda/src/ode/odeConvexGeom.h
View File

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

2
panda/src/ode/odeCylinderGeom.h
View File

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

2
panda/src/ode/odeFixedJoint.h
View File

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

2
panda/src/ode/odeGeom.h
View File

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

2
panda/src/ode/odeHashSpace.h
View File

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

2
panda/src/ode/odeHeightFieldGeom.h
View File

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

2
panda/src/ode/odeHinge2Joint.h
View File

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

2
panda/src/ode/odeHingeJoint.h
View File

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

2
panda/src/ode/odeJoint.h
View File

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

2
panda/src/ode/odeJointGroup.h
View File

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

2
panda/src/ode/odeLMotorJoint.h
View File

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

2
panda/src/ode/odeMass.h
View File

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

2
panda/src/ode/odeNullJoint.h
View File

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

2
panda/src/ode/odePlane2dJoint.h
View File

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

2
panda/src/ode/odePlaneGeom.h
View File

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

2
panda/src/ode/odeQuadTreeSpace.h
View File

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

2
panda/src/ode/odeRayGeom.h
View File

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

2
panda/src/ode/odeSimpleSpace.h
View File

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

2
panda/src/ode/odeSliderJoint.h
View File

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

2
panda/src/ode/odeSpace.h
View File

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

2
panda/src/ode/odeSphereGeom.h
View File

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

2
panda/src/ode/odeSurfaceParameters.h
View File

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

2
panda/src/ode/odeTriMeshData.h
View File

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

5
panda/src/ode/odeTriMeshGeom.I
View File

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

2
panda/src/ode/odeTriMeshGeom.h
View File

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

2
panda/src/ode/odeUniversalJoint.h
View File

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

2
panda/src/ode/odeUtil.h
View File

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

2
panda/src/ode/odeWorld.h
View File

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