diff --git a/Demos/VehicleDemo/VehicleDemo.cpp b/Demos/VehicleDemo/VehicleDemo.cpp index 3441eb195..c4e1f41e1 100644 --- a/Demos/VehicleDemo/VehicleDemo.cpp +++ b/Demos/VehicleDemo/VehicleDemo.cpp @@ -135,7 +135,7 @@ btTransform tr; tr.setIdentity(); //either use heightfield or triangle mesh -//#define USE_TRIMESH_GROUND 1 +#define USE_TRIMESH_GROUND 1 #ifdef USE_TRIMESH_GROUND int i; @@ -145,8 +145,8 @@ const float TRIANGLE_SIZE=20.f; int vertStride = sizeof(btVector3); int indexStride = 3*sizeof(int); - const int NUM_VERTS_X = 50; - const int NUM_VERTS_Y = 50; + const int NUM_VERTS_X = 20; + const int NUM_VERTS_Y = 20; const int totalVerts = NUM_VERTS_X*NUM_VERTS_Y; const int totalTriangles = 2*(NUM_VERTS_X-1)*(NUM_VERTS_Y-1); diff --git a/Extras/ConvexDecomposition/ConvexDecomposition.h b/Extras/ConvexDecomposition/ConvexDecomposition.h index 0e5db4132..85bd74355 100644 --- a/Extras/ConvexDecomposition/ConvexDecomposition.h +++ b/Extras/ConvexDecomposition/ConvexDecomposition.h @@ -150,7 +150,7 @@ namespace ConvexDecomposition class ConvexDecompInterface { public: - + virtual ~ConvexDecompInterface() {}; 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 ConvexDebugBound(const float *bmin,const float *bmax,unsigned int color) { }; diff --git a/Extras/Jamfile b/Extras/Jamfile index 8b24b18dd..612d393f1 100644 --- a/Extras/Jamfile +++ b/Extras/Jamfile @@ -4,7 +4,7 @@ SubInclude TOP Extras ConvexDecomposition ; SubInclude TOP Extras COLLADA_DOM ; SubInclude TOP Extras LibXML ; SubInclude TOP Extras BulletColladaConverter ; -SubInclude TOP Extras BulletMultiThreaded ; +#SubInclude TOP Extras BulletMultiThreaded ; #SubInclude TOP Extras EPA ; #SubInclude TOP Extras ExtraSolid35 ; SubInclude TOP Extras quickstep ; @@ -12,4 +12,4 @@ SubInclude TOP Extras AlternativeCollisionAlgorithms ; SubInclude TOP Extras GIMPACT ; SubInclude TOP Extras GIMPACTUtils ; #GPUphysics needs 'make', not jam compatible build yet: -SubInclude TOP Extras GPUphysics ; +#SubInclude TOP Extras GPUphysics ;