diff options
| author | erwincoumans <erwin.coumans@gmail.com> | 2022-03-07 16:35:07 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-07 16:35:07 -0800 |
| commit | 4fbecfeddc448eba12da3b38b3449fa6c7a6ec19 (patch) | |
| tree | 221e6968b52467a0af06695932fe666ad143e986 /examples/ExampleBrowser | |
| parent | aee1ab63fe459ad0d6c209cc3c9cffacab2b5854 (diff) | |
| download | bullet3-revert-4194-revert-4069-master.tar.gz | |
Revert "Revert "Reduced Deformable Model""revert-4194-revert-4069-master
Diffstat (limited to 'examples/ExampleBrowser')
| -rw-r--r-- | examples/ExampleBrowser/CMakeLists.txt | 18 | ||||
| -rw-r--r-- | examples/ExampleBrowser/ExampleEntries.cpp | 21 |
2 files changed, 39 insertions, 0 deletions
diff --git a/examples/ExampleBrowser/CMakeLists.txt b/examples/ExampleBrowser/CMakeLists.txt index ff4cf51e1..6271ca915 100644 --- a/examples/ExampleBrowser/CMakeLists.txt +++ b/examples/ExampleBrowser/CMakeLists.txt @@ -390,6 +390,24 @@ SET(BulletExampleBrowser_SRCS ../MultiBody/MultiDofDemo.h ../RigidBody/RigidBodySoftContact.cpp ../RigidBody/KinematicRigidBodyExample.cpp + ../ReducedDeformableDemo/ConservationTest.cpp + ../ReducedDeformableDemo/ConservationTest.h + ../ReducedDeformableDemo/Springboard.cpp + ../ReducedDeformableDemo/Springboard.h + ../ReducedDeformableDemo/ModeVisualizer.cpp + ../ReducedDeformableDemo/ModeVisualizer.h + ../ReducedDeformableDemo/FreeFall.cpp + ../ReducedDeformableDemo/FreeFall.h + ../ReducedDeformableDemo/FrictionSlope.cpp + ../ReducedDeformableDemo/FrictionSlope.h + ../ReducedDeformableDemo/ReducedCollide.cpp + ../ReducedDeformableDemo/ReducedCollide.h + ../ReducedDeformableDemo/ReducedGrasp.cpp + ../ReducedDeformableDemo/ReducedGrasp.h + ../ReducedDeformableDemo/ReducedBenchmark.cpp + ../ReducedDeformableDemo/ReducedBenchmark.h + ../ReducedDeformableDemo/ReducedMotorGrasp.cpp + ../ReducedDeformableDemo/ReducedMotorGrasp.h ../Constraints/TestHingeTorque.cpp ../Constraints/TestHingeTorque.h ../Constraints/ConstraintDemo.cpp diff --git a/examples/ExampleBrowser/ExampleEntries.cpp b/examples/ExampleBrowser/ExampleEntries.cpp index 6d147f0d8..715a4396d 100644 --- a/examples/ExampleBrowser/ExampleEntries.cpp +++ b/examples/ExampleBrowser/ExampleEntries.cpp @@ -73,6 +73,15 @@ #include "../RoboticsLearning/R2D2GraspExample.h" #include "../RoboticsLearning/KukaGraspExample.h" #include "../RoboticsLearning/GripperGraspExample.h" +#include "../ReducedDeformableDemo/ConservationTest.h" +#include "../ReducedDeformableDemo/ModeVisualizer.h" +#include "../ReducedDeformableDemo/Springboard.h" +#include "../ReducedDeformableDemo/FreeFall.h" +#include "../ReducedDeformableDemo/FrictionSlope.h" +#include "../ReducedDeformableDemo/ReducedCollide.h" +#include "../ReducedDeformableDemo/ReducedGrasp.h" +#include "../ReducedDeformableDemo/ReducedMotorGrasp.h" +#include "../ReducedDeformableDemo/ReducedBenchmark.h" #include "../InverseKinematics/InverseKinematicsExample.h" #ifdef B3_ENABLE_TINY_AUDIO @@ -216,6 +225,18 @@ static ExampleEntry gDefaultExamples[] = ExampleEntry(1, "Multibody Cloth Anchor", "Deformable Multibody Anchor test", MultibodyClothAnchorCreateFunc), ExampleEntry(1, "Deformable-MultiBody Contact", "MultiBody and Deformable contact", DeformableMultibodyCreateFunc), // ExampleEntry(1, "MultiBody Baseline", "MultiBody Baseline", MultiBodyBaselineCreateFunc), + + ExampleEntry(0, "Reduced Deformabe Body"), + ExampleEntry(1, "Mode Visualizer", "Visualizer the modes for reduced deformable objects", ReducedModeVisualizerCreateFunc), + ExampleEntry(1, "Reduced Conservation Test", "Momentum conservation test for the reduced deformable objects", ReducedConservationTestCreateFunc), + ExampleEntry(1, "Reduced Springboard", "Moving rigid object colliding with a fixed reduced deformable objects", ReducedSpringboardCreateFunc), + ExampleEntry(1, "Reduced Free Fall", "Free fall ground contact test for the reduced deformable model", ReducedFreeFallCreateFunc), + ExampleEntry(1, "Reduced Collision Test", "Collision between a reduced block and the a rigid block", ReducedCollideCreateFunc), + ExampleEntry(1, "Reduced Grasp", "Grasp a reduced deformable block", ReducedGraspCreateFunc), + ExampleEntry(1, "Reduced Motor Grasp", "Grasp a reduced deformable block with motor", ReducedMotorGraspCreateFunc), + ExampleEntry(1, "Reduced Friction Slope", "Grasp a reduced deformable block", FrictionSlopeCreateFunc), + ExampleEntry(1, "Reduced Benchmark", "Reduced deformable performance benchmark example", ReducedBenchmarkCreateFunc), + // ExampleEntry(1, "Simple Reduced Deformable Test", "Simple dynamics test for the reduced deformable objects", ReducedBasicTestCreateFunc), #ifdef INCLUDE_CLOTH_DEMOS ExampleEntry(0, "Soft Body"), |