minor fixes for Mac OS X compilation
This commit is contained in:
@@ -192,6 +192,7 @@ void ConcaveDemo::initPhysics()
|
|||||||
|
|
||||||
bool useQuantizedAabbCompression = true;
|
bool useQuantizedAabbCompression = true;
|
||||||
|
|
||||||
|
//comment out the next line to read the BVH from disk (first run the demo once to create the BVH)
|
||||||
#define SERIALIZE_TO_DISK 1
|
#define SERIALIZE_TO_DISK 1
|
||||||
#ifdef SERIALIZE_TO_DISK
|
#ifdef SERIALIZE_TO_DISK
|
||||||
trimeshShape = new btBvhTriangleMeshShape(indexVertexArrays,useQuantizedAabbCompression);
|
trimeshShape = new btBvhTriangleMeshShape(indexVertexArrays,useQuantizedAabbCompression);
|
||||||
@@ -225,7 +226,7 @@ void ConcaveDemo::initPhysics()
|
|||||||
fseek(file, 0, SEEK_SET);
|
fseek(file, 0, SEEK_SET);
|
||||||
|
|
||||||
void* buffer = btAlignedAlloc(size,16);
|
void* buffer = btAlignedAlloc(size,16);
|
||||||
memset(buffer,0xcc,size);
|
//memset(buffer,0xcc,size);
|
||||||
int read = fread(buffer,1,size,file);
|
int read = fread(buffer,1,size,file);
|
||||||
fclose(file);
|
fclose(file);
|
||||||
bool swapEndian = true;
|
bool swapEndian = true;
|
||||||
|
|||||||
@@ -41,7 +41,7 @@ GLDebugDrawer debugDrawer;
|
|||||||
int main(int argc,char* argv[])
|
int main(int argc,char* argv[])
|
||||||
{
|
{
|
||||||
GenericJointDemo demoApp;
|
GenericJointDemo demoApp;
|
||||||
demoApp.configDebugDrawer(&debugDrawer);
|
// demoApp.configDebugDrawer(&debugDrawer);
|
||||||
|
|
||||||
demoApp.initPhysics();
|
demoApp.initPhysics();
|
||||||
demoApp.setCameraDistance(btScalar(10.));
|
demoApp.setCameraDistance(btScalar(10.));
|
||||||
|
|||||||
@@ -47,6 +47,7 @@ SubInclude TOP Demos MovingConcaveDemo ;
|
|||||||
SubInclude TOP Demos ConcaveDemo ;
|
SubInclude TOP Demos ConcaveDemo ;
|
||||||
SubInclude TOP Demos ConstraintDemo ;
|
SubInclude TOP Demos ConstraintDemo ;
|
||||||
SubInclude TOP Demos RagdollDemo ;
|
SubInclude TOP Demos RagdollDemo ;
|
||||||
|
#SubInclude TOP Demos GenericJointDemo ;
|
||||||
SubInclude TOP Demos ContinuousConvexCollision ;
|
SubInclude TOP Demos ContinuousConvexCollision ;
|
||||||
SubInclude TOP Demos GjkConvexCastDemo ;
|
SubInclude TOP Demos GjkConvexCastDemo ;
|
||||||
SubInclude TOP Demos Raytracer ;
|
SubInclude TOP Demos Raytracer ;
|
||||||
|
|||||||
Reference in New Issue
Block a user