diff --git a/Demos3/AllBullet2Demos/BulletDemoEntries.h b/Demos3/AllBullet2Demos/BulletDemoEntries.h index 38b6c65ab..e1fb78105 100644 --- a/Demos3/AllBullet2Demos/BulletDemoEntries.h +++ b/Demos3/AllBullet2Demos/BulletDemoEntries.h @@ -27,7 +27,7 @@ #include "../bullet2/CollisionDetection/SupportFuncDemo.h" #include "../bullet2/BasicConcepts/CoordinateSystemDemo.h" #include "../../Demos3/FiniteElementMethod/FiniteElementDemo.h" -#include "../../Demos3/bullet2/SoftDemo/SoftDemo.h" +//#include "../../Demos3/bullet2/SoftDemo/SoftDemo.h" static BulletDemoInterface* TestJointTorqueCreateFunc(CommonGraphicsApp* app) { @@ -125,9 +125,9 @@ static BulletDemoEntry allDemos[]= { 1, "COLLADA", MyImportColladaCreateFunc}, {0,"Experiments", 0}, {1, "Finite Element Demo", FiniteElementDemo::CreateFunc}, - {0,"Soft Body", 0}, +// {0,"Soft Body", 0}, - {1,"Cloth1", SoftDemo::CreateFunc}, +// {1,"Cloth1", SoftDemo::CreateFunc}, /* {1,"ChainDemo",ChainDemo::MyCreateFunc}, // {0, "Stress tests", 0 }, diff --git a/Demos3/AllBullet2Demos/CMakeLists.txt b/Demos3/AllBullet2Demos/CMakeLists.txt index f641337b0..f2302168f 100644 --- a/Demos3/AllBullet2Demos/CMakeLists.txt +++ b/Demos3/AllBullet2Demos/CMakeLists.txt @@ -31,7 +31,7 @@ SET(App_AllBullet2Demos_SRCS ../bullet2/FeatherstoneMultiBodyDemo/MultiDofDemo.h ../bullet2/BasicDemo/BasicDemo.cpp ../bullet2/BasicDemo/BasicDemo.h - ../bullet2/SoftDemo/SoftDemo.cpp +# ../bullet2/SoftDemo/SoftDemo.cpp # the next few demos are not converted to 'newer' structure yet # target is to convert all Bullet 2 demos in new structure but need to settle down on features # ../bullet2/BasicDemo/HingeDemo.cpp diff --git a/Demos3/AllBullet2Demos/premake4.lua b/Demos3/AllBullet2Demos/premake4.lua index b12a42ab0..0b2038f57 100644 --- a/Demos3/AllBullet2Demos/premake4.lua +++ b/Demos3/AllBullet2Demos/premake4.lua @@ -62,7 +62,7 @@ "../../Extras/Serialize/BulletWorldImporter/btWorldImporter.cpp", "../bullet2/ConstraintDemo/ConstraintPhysicsSetup.cpp", "../bullet2/ConstraintDemo/ConstraintPhysicsSetup.h", - "../bullet2/SoftDemo/SoftDemo.cpp", +-- "../bullet2/SoftDemo/SoftDemo.cpp", "../ImportColladaDemo/LoadMeshFromCollada.cpp", "../ImportColladaDemo/ImportColladaSetup.cpp", "../ImportURDFDemo/ImportURDFSetup.cpp",