Bart/bullet3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Browse Source
This commit is contained in:
ejcoumans
2007-10-14 00:39:01 +00:00
parent 71abe4aeca
commit 43b0ecd71a
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Demos/VehicleDemo/VehicleDemo.cpp
View File

@@ -135,7 +135,7 @@ btTransform tr;
tr.setIdentity(); tr.setIdentity();
//either use heightfield or triangle mesh //either use heightfield or triangle mesh
//#define USE_TRIMESH_GROUND 1 #define USE_TRIMESH_GROUND 1
#ifdef USE_TRIMESH_GROUND #ifdef USE_TRIMESH_GROUND
int i; int i;
@@ -145,8 +145,8 @@ const float TRIANGLE_SIZE=20.f;
int vertStride = sizeof(btVector3); int vertStride = sizeof(btVector3);
int indexStride = 3*sizeof(int); int indexStride = 3*sizeof(int);
const int NUM_VERTS_X = 50; const int NUM_VERTS_X = 20;
const int NUM_VERTS_Y = 50; const int NUM_VERTS_Y = 20;
const int totalVerts = NUM_VERTS_X*NUM_VERTS_Y; const int totalVerts = NUM_VERTS_X*NUM_VERTS_Y;
const int totalTriangles = 2*(NUM_VERTS_X-1)*(NUM_VERTS_Y-1); const int totalTriangles = 2*(NUM_VERTS_X-1)*(NUM_VERTS_Y-1);

2
Extras/ConvexDecomposition/ConvexDecomposition.h
View File

@@ -150,7 +150,7 @@ namespace ConvexDecomposition
class ConvexDecompInterface class ConvexDecompInterface
{ {
public: public:
virtual ~ConvexDecompInterface() {};
virtual void ConvexDebugTri(const float *p1,const float *p2,const float *p3,unsigned int color) { }; virtual void ConvexDebugTri(const float *p1,const float *p2,const float *p3,unsigned int color) { };
virtual void ConvexDebugPoint(const float *p,float dist,unsigned int color) { }; virtual void ConvexDebugPoint(const float *p,float dist,unsigned int color) { };
virtual void ConvexDebugBound(const float *bmin,const float *bmax,unsigned int color) { }; virtual void ConvexDebugBound(const float *bmin,const float *bmax,unsigned int color) { };

4
Extras/Jamfile
View File

@@ -4,7 +4,7 @@ SubInclude TOP Extras ConvexDecomposition ;
SubInclude TOP Extras COLLADA_DOM ; SubInclude TOP Extras COLLADA_DOM ;
SubInclude TOP Extras LibXML ; SubInclude TOP Extras LibXML ;
SubInclude TOP Extras BulletColladaConverter ; SubInclude TOP Extras BulletColladaConverter ;
SubInclude TOP Extras BulletMultiThreaded ; #SubInclude TOP Extras BulletMultiThreaded ;
#SubInclude TOP Extras EPA ; #SubInclude TOP Extras EPA ;
#SubInclude TOP Extras ExtraSolid35 ; #SubInclude TOP Extras ExtraSolid35 ;
SubInclude TOP Extras quickstep ; SubInclude TOP Extras quickstep ;
@@ -12,4 +12,4 @@ SubInclude TOP Extras AlternativeCollisionAlgorithms ;
SubInclude TOP Extras GIMPACT ; SubInclude TOP Extras GIMPACT ;
SubInclude TOP Extras GIMPACTUtils ; SubInclude TOP Extras GIMPACTUtils ;
#GPUphysics needs 'make', not jam compatible build yet: #GPUphysics needs 'make', not jam compatible build yet:
SubInclude TOP Extras GPUphysics ; #SubInclude TOP Extras GPUphysics ;