Bart/bullet3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

disable work-in-progress softbody demo

Browse Source
This commit is contained in:
Erwin Coumans
2014-11-02 13:26:25 -08:00
parent 5757de14d7
commit 5264fc3006
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Demos3/AllBullet2Demos/BulletDemoEntries.h
View File

@@ -27,7 +27,7 @@
#include "../bullet2/CollisionDetection/SupportFuncDemo.h" #include "../bullet2/CollisionDetection/SupportFuncDemo.h"
#include "../bullet2/BasicConcepts/CoordinateSystemDemo.h" #include "../bullet2/BasicConcepts/CoordinateSystemDemo.h"
#include "../../Demos3/FiniteElementMethod/FiniteElementDemo.h" #include "../../Demos3/FiniteElementMethod/FiniteElementDemo.h"
#include "../../Demos3/bullet2/SoftDemo/SoftDemo.h" //#include "../../Demos3/bullet2/SoftDemo/SoftDemo.h"
static BulletDemoInterface* TestJointTorqueCreateFunc(CommonGraphicsApp* app) static BulletDemoInterface* TestJointTorqueCreateFunc(CommonGraphicsApp* app)
{ {
@@ -125,9 +125,9 @@ static BulletDemoEntry allDemos[]=
{ 1, "COLLADA", MyImportColladaCreateFunc}, { 1, "COLLADA", MyImportColladaCreateFunc},
{0,"Experiments", 0}, {0,"Experiments", 0},
{1, "Finite Element Demo", FiniteElementDemo::CreateFunc}, {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}, /* {1,"ChainDemo",ChainDemo::MyCreateFunc},
// {0, "Stress tests", 0 }, // {0, "Stress tests", 0 },

2
Demos3/AllBullet2Demos/CMakeLists.txt
View File

@@ -31,7 +31,7 @@ SET(App_AllBullet2Demos_SRCS
../bullet2/FeatherstoneMultiBodyDemo/MultiDofDemo.h ../bullet2/FeatherstoneMultiBodyDemo/MultiDofDemo.h
../bullet2/BasicDemo/BasicDemo.cpp ../bullet2/BasicDemo/BasicDemo.cpp
../bullet2/BasicDemo/BasicDemo.h ../bullet2/BasicDemo/BasicDemo.h
../bullet2/SoftDemo/SoftDemo.cpp # ../bullet2/SoftDemo/SoftDemo.cpp
# the next few demos are not converted to 'newer' structure yet # 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 # target is to convert all Bullet 2 demos in new structure but need to settle down on features
# ../bullet2/BasicDemo/HingeDemo.cpp # ../bullet2/BasicDemo/HingeDemo.cpp

2
Demos3/AllBullet2Demos/premake4.lua
View File

@@ -62,7 +62,7 @@
"../../Extras/Serialize/BulletWorldImporter/btWorldImporter.cpp", "../../Extras/Serialize/BulletWorldImporter/btWorldImporter.cpp",
"../bullet2/ConstraintDemo/ConstraintPhysicsSetup.cpp", "../bullet2/ConstraintDemo/ConstraintPhysicsSetup.cpp",
"../bullet2/ConstraintDemo/ConstraintPhysicsSetup.h", "../bullet2/ConstraintDemo/ConstraintPhysicsSetup.h",
"../bullet2/SoftDemo/SoftDemo.cpp", -- "../bullet2/SoftDemo/SoftDemo.cpp",
"../ImportColladaDemo/LoadMeshFromCollada.cpp", "../ImportColladaDemo/LoadMeshFromCollada.cpp",
"../ImportColladaDemo/ImportColladaSetup.cpp", "../ImportColladaDemo/ImportColladaSetup.cpp",
"../ImportURDFDemo/ImportURDFSetup.cpp", "../ImportURDFDemo/ImportURDFSetup.cpp",