diff --git a/Demos3/AllBullet2Demos/BulletDemoEntries.h b/Demos3/AllBullet2Demos/BulletDemoEntries.h index c0c4cb36e..38b6c65ab 100644 --- a/Demos3/AllBullet2Demos/BulletDemoEntries.h +++ b/Demos3/AllBullet2Demos/BulletDemoEntries.h @@ -27,6 +27,7 @@ #include "../bullet2/CollisionDetection/SupportFuncDemo.h" #include "../bullet2/BasicConcepts/CoordinateSystemDemo.h" #include "../../Demos3/FiniteElementMethod/FiniteElementDemo.h" +#include "../../Demos3/bullet2/SoftDemo/SoftDemo.h" static BulletDemoInterface* TestJointTorqueCreateFunc(CommonGraphicsApp* app) { @@ -124,6 +125,9 @@ static BulletDemoEntry allDemos[]= { 1, "COLLADA", MyImportColladaCreateFunc}, {0,"Experiments", 0}, {1, "Finite Element Demo", FiniteElementDemo::CreateFunc}, + {0,"Soft Body", 0}, + + {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 06fbe615f..f641337b0 100644 --- a/Demos3/AllBullet2Demos/CMakeLists.txt +++ b/Demos3/AllBullet2Demos/CMakeLists.txt @@ -22,6 +22,7 @@ SET(App_AllBullet2Demos_SRCS ../../Extras/Serialize/BulletWorldImporter/btBulletWorldImporter.cpp ../../Extras/Serialize/BulletWorldImporter/btWorldImporter.cpp ../bullet2/MultiBodyDemo/TestJointTorqueSetup.cpp + ../bullet2/MultiBodyDemo/MultiBodyVehicle.cpp ../bullet2/ConstraintDemo/ConstraintPhysicsSetup.cpp ../bullet2/ConstraintDemo/ConstraintPhysicsSetup.h ../bullet2/FeatherstoneMultiBodyDemo/BulletMultiBodyDemos.cpp @@ -30,6 +31,7 @@ SET(App_AllBullet2Demos_SRCS ../bullet2/FeatherstoneMultiBodyDemo/MultiDofDemo.h ../bullet2/BasicDemo/BasicDemo.cpp ../bullet2/BasicDemo/BasicDemo.h + ../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 8030462e1..b12a42ab0 100644 --- a/Demos3/AllBullet2Demos/premake4.lua +++ b/Demos3/AllBullet2Demos/premake4.lua @@ -62,6 +62,7 @@ "../../Extras/Serialize/BulletWorldImporter/btWorldImporter.cpp", "../bullet2/ConstraintDemo/ConstraintPhysicsSetup.cpp", "../bullet2/ConstraintDemo/ConstraintPhysicsSetup.h", + "../bullet2/SoftDemo/SoftDemo.cpp", "../ImportColladaDemo/LoadMeshFromCollada.cpp", "../ImportColladaDemo/ImportColladaSetup.cpp", "../ImportURDFDemo/ImportURDFSetup.cpp",