From 12a4480d0830174c585de01231e842d5ce012a87 Mon Sep 17 00:00:00 2001 From: erwincoumans Date: Thu, 18 Jul 2013 17:43:51 -0700 Subject: [PATCH] select different default demos --- Demos3/GpuDemos/main_opengl3core.cpp | 9 ++++----- Demos3/GpuDemos/rigidbody/ConcaveScene.cpp | 2 +- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/Demos3/GpuDemos/main_opengl3core.cpp b/Demos3/GpuDemos/main_opengl3core.cpp index 12e26063b..c8b607e31 100644 --- a/Demos3/GpuDemos/main_opengl3core.cpp +++ b/Demos3/GpuDemos/main_opengl3core.cpp @@ -94,12 +94,12 @@ GpuDemo::CreateFunc* allDemos[]= GpuBoxPlaneScene::MyCreateFunc, - GpuConvexPlaneScene::MyCreateFunc, - + GpuConstraintsDemo::MyCreateFunc, + //GpuConvexPlaneScene::MyCreateFunc, GpuCompoundScene::MyCreateFunc, - + GpuSphereScene::MyCreateFunc, ConcaveSphereScene::MyCreateFunc, @@ -110,9 +110,8 @@ GpuDemo::CreateFunc* allDemos[]= ConcaveCompoundScene::MyCreateFunc, - GpuCompoundPlaneScene::MyCreateFunc, +// GpuCompoundPlaneScene::MyCreateFunc, - GpuSphereScene::MyCreateFunc, GpuConstraintsDemo::MyCreateFunc, diff --git a/Demos3/GpuDemos/rigidbody/ConcaveScene.cpp b/Demos3/GpuDemos/rigidbody/ConcaveScene.cpp index d4e5ce08f..6d8bd9cb2 100644 --- a/Demos3/GpuDemos/rigidbody/ConcaveScene.cpp +++ b/Demos3/GpuDemos/rigidbody/ConcaveScene.cpp @@ -209,7 +209,7 @@ void ConcaveScene::createConcaveMesh(const ConstructionInfo& ci, const char* fil void ConcaveScene::setupScene(const ConstructionInfo& ci) { - if (0) + if (1) { //char* fileName = "slopedPlane100.obj";