diff --git a/Demos/AllBulletDemos/Main.cpp b/Demos/AllBulletDemos/Main.cpp index e740ab1ee..eac46e1cc 100644 --- a/Demos/AllBulletDemos/Main.cpp +++ b/Demos/AllBulletDemos/Main.cpp @@ -180,6 +180,7 @@ void Timer(int) void SimulationLoop() { + Resize(width, height); @@ -461,7 +462,7 @@ int main(int argc, char** argv) glui->add_button("Toggle Pause", 0,(GLUI_Update_CB)TogglePause); glui->add_button("Single Step", 0,(GLUI_Update_CB)SingleSimulationStep); -// glui->add_button("Reset Scene", 0,(GLUI_Update_CB)ResetScene); + glui->add_button("Reset Scene", 0,(GLUI_Update_CB)ResetScene); glui->add_button("Restart Scene", 0,(GLUI_Update_CB)RestartScene); glui->add_separator(); diff --git a/Demos/ConcaveDemo/ConcavePhysicsDemo.cpp b/Demos/ConcaveDemo/ConcavePhysicsDemo.cpp index faf3278dd..ab0078444 100644 --- a/Demos/ConcaveDemo/ConcavePhysicsDemo.cpp +++ b/Demos/ConcaveDemo/ConcavePhysicsDemo.cpp @@ -140,7 +140,7 @@ void ConcaveDemo::initPhysics() { setTexturing(true); - setShadows(true); + setShadows(false);//true); #define TRISIZE 10.f diff --git a/Demos/ForkLiftDemo/ForkLiftDemo.cpp b/Demos/ForkLiftDemo/ForkLiftDemo.cpp index 9eaec45e8..6da2a4cae 100644 --- a/Demos/ForkLiftDemo/ForkLiftDemo.cpp +++ b/Demos/ForkLiftDemo/ForkLiftDemo.cpp @@ -209,128 +209,10 @@ void ForkLiftDemo::initPhysics() //m_dynamicsWorld->setGravity(btVector3(0,0,0)); btTransform tr; tr.setIdentity(); +tr.setOrigin(btVector3(0,-10,0)); //either use heightfield or triangle mesh -#define USE_TRIMESH_GROUND 1 -#ifdef USE_TRIMESH_GROUND - int i; -const float TRIANGLE_SIZE=20.f; - - //create a triangle-mesh ground - int vertStride = sizeof(btVector3); - int indexStride = 3*sizeof(int); - - 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); - - m_vertices = new btVector3[totalVerts]; - int* gIndices = new int[totalTriangles*3]; - - - - for ( i=0;isetUseDiamondSubdivision(true); - - btVector3 localScaling(20,20,20); - localScaling[upIndex]=1.f; - groundShape->setLocalScaling(localScaling); - - tr.setOrigin(btVector3(0,-64.5f,0)); - -#endif // - - m_collisionShapes.push_back(groundShape); //create ground object localCreateRigidBody(0,tr,groundShape);