mirror of
https://github.com/panda3d/panda3d.git
synced 2025-10-04 10:54:24 -04:00
ode version compatibility
This commit is contained in:
parent
5722e37160
commit
fac9c4982d
@ -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);
|
dGeomTriMeshDataBuildDouble1(_id, vertices, vertex_stride, vertex_count, indices, index_count, tri_stride, normals);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
INLINE void OdeTriMeshData::
|
INLINE void OdeTriMeshData::
|
||||||
build_simple(const dReal* vertices, int vertex_count, const int* indices, int index_count) {
|
build_simple(const dReal* vertices, int vertex_count, const int* indices, int index_count) {
|
||||||
dGeomTriMeshDataBuildSimple(_id, vertices, vertex_count, indices, index_count);
|
dGeomTriMeshDataBuildSimple(_id, vertices, vertex_count, indices, index_count);
|
||||||
}
|
}
|
||||||
|
*/
|
||||||
|
|
||||||
|
/*
|
||||||
INLINE void OdeTriMeshData::
|
INLINE void OdeTriMeshData::
|
||||||
build_simple1(const dReal* vertices, int vertex_count, const int* indices, int index_count, const int* normals) {
|
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);
|
dGeomTriMeshDataBuildSimple1(_id, vertices, vertex_count, indices, index_count, normals);
|
||||||
}
|
}
|
||||||
|
*/
|
||||||
|
|
||||||
INLINE void OdeTriMeshData::
|
INLINE void OdeTriMeshData::
|
||||||
preprocess() {
|
preprocess() {
|
||||||
|
@ -73,11 +73,20 @@ public:
|
|||||||
INLINE void build_double1(const void* vertices, int vertex_stride, int vertex_count, \
|
INLINE void build_double1(const void* vertices, int vertex_stride, int vertex_count, \
|
||||||
const void* indices, int index_count, int tri_stride, \
|
const void* indices, int index_count, int tri_stride, \
|
||||||
const void* normals);
|
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, \
|
INLINE void build_simple(const dReal* vertices, int vertex_count, \
|
||||||
const int* indices, int index_count);
|
const int* indices, int index_count);
|
||||||
INLINE void build_simple1(const dReal* vertices, int vertex_count, \
|
INLINE void build_simple1(const dReal* vertices, int vertex_count, \
|
||||||
const int* indices, int index_count, \
|
const int* indices, int index_count, \
|
||||||
const int* normals);
|
const int* normals);
|
||||||
|
*/
|
||||||
INLINE void preprocess();
|
INLINE void preprocess();
|
||||||
|
|
||||||
INLINE dTriMeshDataID get_id() const;
|
INLINE dTriMeshDataID get_id() const;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user