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

move deformable examples to a single folder and rename them; change license to google 2016

Browse Source
This commit is contained in:
Xuchen Han
2019-08-08 15:00:55 -07:00
parent 02c5b99b2f
commit 9a7e30d09f
17 changed files with 157 additions and 175 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
examples/ExampleBrowser/CMakeLists.txt
View File

@@ -359,14 +359,14 @@ SET(BulletExampleBrowser_SRCS
../MultiBody/MultiBodyConstraintFeedback.cpp
../SoftDemo/SoftDemo.cpp
../SoftDemo/SoftDemo.h
../Pinch/Pinch.cpp
../Pinch/Pinch.h
../DeformableContact/DeformableContact.cpp
../DeformableContact/DeformableContact.h
../DeformableDemo/DeformableDemo.cpp
../DeformableDemo/DeformableDemo.h
../VolumetricDeformable/VolumetricDeformable.cpp
../VolumetricDeformable/VolumetricDeformable.h
../DeformableDemo/Pinch.cpp
../DeformableDemo/Pinch.h
../DeformableDemo/DeformableMultibody.cpp
../DeformableDemo/DeformableMultibody.h
../DeformableDemo/DeformableRigid.cpp
../DeformableDemo/DeformableRigid.h
../DeformableDemo/VolumetricDeformable.cpp
../DeformableDemo/VolumetricDeformable.h
../MultiBody/MultiDofDemo.cpp
../MultiBody/MultiDofDemo.h
../RigidBody/RigidBodySoftContact.cpp

13
examples/ExampleBrowser/ExampleEntries.cpp
View File

@@ -47,11 +47,10 @@
#include "../FractureDemo/FractureDemo.h"
#include "../DynamicControlDemo/MotorDemo.h"
#include "../RollingFrictionDemo/RollingFrictionDemo.h"
#include "../DeformableDemo/DeformableDemo.h"
#include "../Pinch/Pinch.h"
#include "../DeformableContact/DeformableContact.h"
#include "../MultiBodyBaseline/MultiBodyBaseline.h"
#include "../VolumetricDeformable/VolumetricDeformable.h"
#include "../DeformableDemo/DeformableRigid.h"
#include "../DeformableDemo/Pinch.h"
#include "../DeformableDemo/DeformableMultibody.h"
#include "../DeformableDemo/VolumetricDeformable.h"
#include "../SharedMemory/PhysicsServerExampleBullet2.h"
#include "../SharedMemory/PhysicsServerExample.h"
#include "../SharedMemory/PhysicsClientExample.h"
@@ -196,10 +195,10 @@ static ExampleEntry gDefaultExamples[] =
//ExampleEntry(1, "Spheres & Plane C-API (Bullet3)", "Collision C-API using Bullet 3.x backend", CollisionTutorialBullet2CreateFunc,TUT_SPHERE_PLANE_RTB3),
ExampleEntry(0, "Deformabe Body"),
ExampleEntry(1, "Deformable-RigidBody Contact", "Deformable test", DeformableCreateFunc),
ExampleEntry(1, "Deformable-RigidBody Contact", "Deformable test", DeformableRigidCreateFunc),
ExampleEntry(1, "Grasp Deformable Cube", "Grasping test", PinchCreateFunc),
ExampleEntry(1, "Volumetric Deformable Objects", "Volumetric Deformable test", VolumetricDeformableCreateFunc),
ExampleEntry(1, "Deformable-MultiBody Contact", "MultiBody and Deformable contact", DeformableContactCreateFunc),
ExampleEntry(1, "Deformable-MultiBody Contact", "MultiBody and Deformable contact", DeformableMultibodyCreateFunc),
// ExampleEntry(1, "MultiBody Baseline", "MultiBody Baseline", MultiBodyBaselineCreateFunc),
#ifdef INCLUDE_CLOTH_DEMOS

3
examples/ExampleBrowser/premake4.lua
View File

@@ -189,9 +189,6 @@ project "App_BulletExampleBrowser"
"../VoronoiFracture/*",
"../SoftDemo/*",
"../DeformableDemo/*",
"../DeformableContact/*",
"../VolumetricDeformable/*",
"../Pinch/*",
"../RollingFrictionDemo/*",
"../rbdl/*",
"../FractureDemo/*",