From 3a7f821a7628d903ae3d27fa90f3ce61b843cf43 Mon Sep 17 00:00:00 2001 From: Erwin Coumans Date: Thu, 23 May 2013 19:15:07 -0700 Subject: [PATCH] use monastry mesh --- Demos3/GpuDemos/rigidbody/ConcaveScene.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Demos3/GpuDemos/rigidbody/ConcaveScene.cpp b/Demos3/GpuDemos/rigidbody/ConcaveScene.cpp index 40b8516ba..26fdafa2c 100644 --- a/Demos3/GpuDemos/rigidbody/ConcaveScene.cpp +++ b/Demos3/GpuDemos/rigidbody/ConcaveScene.cpp @@ -246,12 +246,12 @@ void ConcaveScene::setupScene(const ConstructionInfo& ci) //char* fileName = "data/slopedPlane100.obj"; //char* fileName = "data/plane100.obj"; - char* fileName = "data/plane100.obj"; +// char* fileName = "data/plane100.obj"; //char* fileName = "data/teddy.obj";//"plane.obj"; // char* fileName = "data/sponza_closed.obj";//"plane.obj"; //char* fileName = "data/leoTest1.obj"; -// char* fileName = "data/samurai_monastry.obj"; + char* fileName = "data/samurai_monastry.obj"; // char* fileName = "data/teddy2_VHACD_CHs.obj"; b3Vector3 shift1(0,-50,0);//0,230,80);//150,-100,-120); @@ -265,8 +265,8 @@ void ConcaveScene::setupScene(const ConstructionInfo& ci) createConcaveMesh(ci,"data/teddy.obj",shift2,scaling); b3Vector3 shift3(130,-150,-75);//0,230,80);//150,-100,-120); - createConcaveMesh(ci,"data/leoTest1.obj",shift3,scaling); - + // createConcaveMesh(ci,"data/leoTest1.obj",shift3,scaling); + createConcaveMesh(ci,"data/samurai_monastry.obj",shift3,scaling); } else {