Browse Source

build on Linux

David Rose 19 years ago
parent
commit
aa60d44d6d

+ 1 - 1
panda/src/ode/odeContactGeom.h

@@ -24,7 +24,7 @@
 #include "luse.h"
 
 #include "ode_includes.h"
-#include "OdeGeom.h"
+#include "odeGeom.h"
 
 ////////////////////////////////////////////////////////////////////
 //       Class : OdeContactGeom

+ 2 - 2
panda/src/ode/odeSpace.h

@@ -48,8 +48,8 @@ PUBLISHED:
 
   INLINE void set_cleanup(int mode);
   INLINE int get_cleanup() const;
-  INLINE int query(const OdeGeom& geom) const;
-  INLINE int query(const OdeSpace& space) const;
+  int query(const OdeGeom& geom) const;
+  int query(const OdeSpace& space) const;
   INLINE int get_num_geoms() const;
   INLINE void get_AABB(LVecBase3f &min, LVecBase3f &max) const;
   INLINE int is_space();

+ 1 - 1
panda/src/ode/odeTriMeshData.I

@@ -85,4 +85,4 @@ update() {
   dGeomTriMeshDataUpdate(_id);
 }
 
-*/
+*/

+ 2 - 2
panda/src/ode/odeTriMeshData.cxx

@@ -74,9 +74,9 @@ OdeTriMeshData(const NodePath& model, bool use_normals) :
   _id(dGeomTriMeshDataCreate()),
   _vertices(0),
   _faces(0),
+  _normals(false),
   _num_vertices(0),
-  _num_faces(0),
-  _normals(false) {
+  _num_faces(0) {
   odetrimeshdata_cat.debug() << get_type() << "(" << _id << ")" << "\n";
   
   process_model(model, use_normals);