diff --git a/panda/src/ode/odeTriMeshData.I b/panda/src/ode/odeTriMeshData.I index 32c62846e2..68a50b9a3c 100755 --- a/panda/src/ode/odeTriMeshData.I +++ b/panda/src/ode/odeTriMeshData.I @@ -50,15 +50,19 @@ build_double1(const void* vertices, int vertex_stride, int vertex_count, const v dGeomTriMeshDataBuildDouble1(_id, vertices, vertex_stride, vertex_count, indices, index_count, tri_stride, normals); } +/* INLINE void OdeTriMeshData:: build_simple(const dReal* vertices, int vertex_count, const int* indices, int index_count) { dGeomTriMeshDataBuildSimple(_id, vertices, vertex_count, indices, index_count); } +*/ +/* INLINE void OdeTriMeshData:: build_simple1(const dReal* vertices, int vertex_count, const int* indices, int index_count, const int* normals) { dGeomTriMeshDataBuildSimple1(_id, vertices, vertex_count, indices, index_count, normals); } +*/ INLINE void OdeTriMeshData:: preprocess() { diff --git a/panda/src/ode/odeTriMeshData.h b/panda/src/ode/odeTriMeshData.h index 5672338b3e..c1fdd81d20 100755 --- a/panda/src/ode/odeTriMeshData.h +++ b/panda/src/ode/odeTriMeshData.h @@ -73,11 +73,20 @@ public: INLINE void build_double1(const void* vertices, int vertex_stride, int vertex_count, \ const void* indices, int index_count, int tri_stride, \ const void* normals); + + // Temporarily commenting these two out--ODE had an API change from + // (int *indices) to (dTriIndex *indices). But since there's no + // #define that indicates the ODE version, we don't have any way to + // automatically put the right symbol in here. However, we're not + // using these methods right now anyway. + + /* INLINE void build_simple(const dReal* vertices, int vertex_count, \ const int* indices, int index_count); INLINE void build_simple1(const dReal* vertices, int vertex_count, \ const int* indices, int index_count, \ const int* normals); + */ INLINE void preprocess(); INLINE dTriMeshDataID get_id() const;