diff --git a/examples/ReducedDeformableDemo/ConservationTest.cpp b/examples/ReducedDeformableDemo/ConservationTest.cpp index 8566707e0..e362a9298 100644 --- a/examples/ReducedDeformableDemo/ConservationTest.cpp +++ b/examples/ReducedDeformableDemo/ConservationTest.cpp @@ -15,9 +15,9 @@ ///btBulletDynamicsCommon.h is the main Bullet include file, contains most common include files. #include "btBulletDynamicsCommon.h" #include "BulletSoftBody/btDeformableMultiBodyDynamicsWorld.h" -#include "BulletSoftBody/BulletReducedSoftBody/btReducedDeformableBody.h" -#include "BulletSoftBody/BulletReducedSoftBody/btReducedDeformableBodyHelpers.h" -#include "BulletSoftBody/BulletReducedSoftBody/btReducedDeformableBodySolver.h" +#include "BulletSoftBody/BulletReducedDeformableBody/btReducedDeformableBody.h" +#include "BulletSoftBody/BulletReducedDeformableBody/btReducedDeformableBodyHelpers.h" +#include "BulletSoftBody/BulletReducedDeformableBody/btReducedDeformableBodySolver.h" #include "BulletSoftBody/btSoftBodyRigidBodyCollisionConfiguration.h" #include "BulletDynamics/Featherstone/btMultiBodyConstraintSolver.h" #include "../CommonInterfaces/CommonParameterInterface.h" diff --git a/examples/ReducedDeformableDemo/FreeFall.cpp b/examples/ReducedDeformableDemo/FreeFall.cpp index faa805b0d..8122d336a 100644 --- a/examples/ReducedDeformableDemo/FreeFall.cpp +++ b/examples/ReducedDeformableDemo/FreeFall.cpp @@ -15,9 +15,9 @@ ///btBulletDynamicsCommon.h is the main Bullet include file, contains most common include files. #include "btBulletDynamicsCommon.h" #include "BulletSoftBody/btDeformableMultiBodyDynamicsWorld.h" -#include "BulletSoftBody/BulletReducedSoftBody/btReducedDeformableBody.h" -#include "BulletSoftBody/BulletReducedSoftBody/btReducedDeformableBodyHelpers.h" -#include "BulletSoftBody/BulletReducedSoftBody/btReducedDeformableBodySolver.h" +#include "BulletSoftBody/BulletReducedDeformableBody/btReducedDeformableBody.h" +#include "BulletSoftBody/BulletReducedDeformableBody/btReducedDeformableBodyHelpers.h" +#include "BulletSoftBody/BulletReducedDeformableBody/btReducedDeformableBodySolver.h" #include "BulletSoftBody/btSoftBodyRigidBodyCollisionConfiguration.h" #include "BulletDynamics/Featherstone/btMultiBodyConstraintSolver.h" #include "../CommonInterfaces/CommonParameterInterface.h" diff --git a/examples/ReducedDeformableDemo/FrictionSlope.cpp b/examples/ReducedDeformableDemo/FrictionSlope.cpp index c20be4bff..cbfa43be0 100644 --- a/examples/ReducedDeformableDemo/FrictionSlope.cpp +++ b/examples/ReducedDeformableDemo/FrictionSlope.cpp @@ -15,9 +15,9 @@ ///btBulletDynamicsCommon.h is the main Bullet include file, contains most common include files. #include "btBulletDynamicsCommon.h" #include "BulletSoftBody/btDeformableMultiBodyDynamicsWorld.h" -#include "BulletSoftBody/BulletReducedSoftBody/btReducedDeformableBody.h" -#include "BulletSoftBody/BulletReducedSoftBody/btReducedDeformableBodyHelpers.h" -#include "BulletSoftBody/BulletReducedSoftBody/btReducedDeformableBodySolver.h" +#include "BulletSoftBody/BulletReducedDeformableBody/btReducedDeformableBody.h" +#include "BulletSoftBody/BulletReducedDeformableBody/btReducedDeformableBodyHelpers.h" +#include "BulletSoftBody/BulletReducedDeformableBody/btReducedDeformableBodySolver.h" #include "BulletSoftBody/btSoftBodyRigidBodyCollisionConfiguration.h" #include "BulletDynamics/Featherstone/btMultiBodyConstraintSolver.h" #include "../CommonInterfaces/CommonParameterInterface.h" diff --git a/examples/ReducedDeformableDemo/ModeVisualizer.cpp b/examples/ReducedDeformableDemo/ModeVisualizer.cpp index 84414418e..ee3620b13 100644 --- a/examples/ReducedDeformableDemo/ModeVisualizer.cpp +++ b/examples/ReducedDeformableDemo/ModeVisualizer.cpp @@ -15,9 +15,9 @@ ///btBulletDynamicsCommon.h is the main Bullet include file, contains most common include files. #include "btBulletDynamicsCommon.h" #include "BulletSoftBody/btDeformableMultiBodyDynamicsWorld.h" -#include "BulletSoftBody/BulletReducedSoftBody/btReducedDeformableBody.h" -#include "BulletSoftBody/BulletReducedSoftBody/btReducedDeformableBodyHelpers.h" -#include "BulletSoftBody/BulletReducedSoftBody/btReducedDeformableBodySolver.h" +#include "BulletSoftBody/BulletReducedDeformableBody/btReducedDeformableBody.h" +#include "BulletSoftBody/BulletReducedDeformableBody/btReducedDeformableBodyHelpers.h" +#include "BulletSoftBody/BulletReducedDeformableBody/btReducedDeformableBodySolver.h" #include "BulletSoftBody/btSoftBodyRigidBodyCollisionConfiguration.h" #include "BulletDynamics/Featherstone/btMultiBodyConstraintSolver.h" #include "../CommonInterfaces/CommonParameterInterface.h" diff --git a/examples/ReducedDeformableDemo/ReducedCollide.cpp b/examples/ReducedDeformableDemo/ReducedCollide.cpp index a44e9d31e..d670998ce 100644 --- a/examples/ReducedDeformableDemo/ReducedCollide.cpp +++ b/examples/ReducedDeformableDemo/ReducedCollide.cpp @@ -15,9 +15,9 @@ ///btBulletDynamicsCommon.h is the main Bullet include file, contains most common include files. #include "btBulletDynamicsCommon.h" #include "BulletSoftBody/btDeformableMultiBodyDynamicsWorld.h" -#include "BulletSoftBody/BulletReducedSoftBody/btReducedDeformableBody.h" -#include "BulletSoftBody/BulletReducedSoftBody/btReducedDeformableBodyHelpers.h" -#include "BulletSoftBody/BulletReducedSoftBody/btReducedDeformableBodySolver.h" +#include "BulletSoftBody/BulletReducedDeformableBody/btReducedDeformableBody.h" +#include "BulletSoftBody/BulletReducedDeformableBody/btReducedDeformableBodyHelpers.h" +#include "BulletSoftBody/BulletReducedDeformableBody/btReducedDeformableBodySolver.h" #include "BulletSoftBody/btSoftBodyRigidBodyCollisionConfiguration.h" #include "BulletDynamics/Featherstone/btMultiBodyConstraintSolver.h" #include "../CommonInterfaces/CommonParameterInterface.h" diff --git a/examples/ReducedDeformableDemo/ReducedGrasp.cpp b/examples/ReducedDeformableDemo/ReducedGrasp.cpp index 3fc320f87..0a332452a 100644 --- a/examples/ReducedDeformableDemo/ReducedGrasp.cpp +++ b/examples/ReducedDeformableDemo/ReducedGrasp.cpp @@ -15,9 +15,9 @@ ///btBulletDynamicsCommon.h is the main Bullet include file, contains most common include files. #include "btBulletDynamicsCommon.h" #include "BulletSoftBody/btDeformableMultiBodyDynamicsWorld.h" -#include "BulletSoftBody/BulletReducedSoftBody/btReducedDeformableBody.h" -#include "BulletSoftBody/BulletReducedSoftBody/btReducedDeformableBodyHelpers.h" -#include "BulletSoftBody/BulletReducedSoftBody/btReducedDeformableBodySolver.h" +#include "BulletSoftBody/BulletReducedDeformableBody/btReducedDeformableBody.h" +#include "BulletSoftBody/BulletReducedDeformableBody/btReducedDeformableBodyHelpers.h" +#include "BulletSoftBody/BulletReducedDeformableBody/btReducedDeformableBodySolver.h" #include "BulletSoftBody/btSoftBodyRigidBodyCollisionConfiguration.h" #include "BulletDynamics/Featherstone/btMultiBodyConstraintSolver.h" #include "../CommonInterfaces/CommonParameterInterface.h" diff --git a/examples/ReducedDeformableDemo/ReducedGraspBenchmark.cpp b/examples/ReducedDeformableDemo/ReducedGraspBenchmark.cpp index 96361123a..e535fdd7f 100644 --- a/examples/ReducedDeformableDemo/ReducedGraspBenchmark.cpp +++ b/examples/ReducedDeformableDemo/ReducedGraspBenchmark.cpp @@ -15,9 +15,9 @@ ///btBulletDynamicsCommon.h is the main Bullet include file, contains most common include files. #include "btBulletDynamicsCommon.h" #include "BulletSoftBody/btDeformableMultiBodyDynamicsWorld.h" -#include "BulletSoftBody/BulletReducedSoftBody/btReducedDeformableBody.h" -#include "BulletSoftBody/BulletReducedSoftBody/btReducedDeformableBodyHelpers.h" -#include "BulletSoftBody/BulletReducedSoftBody/btReducedDeformableBodySolver.h" +#include "BulletSoftBody/BulletReducedDeformableBody/btReducedDeformableBody.h" +#include "BulletSoftBody/BulletReducedDeformableBody/btReducedDeformableBodyHelpers.h" +#include "BulletSoftBody/BulletReducedDeformableBody/btReducedDeformableBodySolver.h" #include "BulletSoftBody/btSoftBodyRigidBodyCollisionConfiguration.h" #include "BulletDynamics/Featherstone/btMultiBodyConstraintSolver.h" #include "../CommonInterfaces/CommonParameterInterface.h" diff --git a/examples/ReducedDeformableDemo/ReducedMotorGrasp.cpp b/examples/ReducedDeformableDemo/ReducedMotorGrasp.cpp index 0efe31d3a..35368aed8 100644 --- a/examples/ReducedDeformableDemo/ReducedMotorGrasp.cpp +++ b/examples/ReducedDeformableDemo/ReducedMotorGrasp.cpp @@ -15,9 +15,9 @@ ///btBulletDynamicsCommon.h is the main Bullet include file, contains most common include files. #include "btBulletDynamicsCommon.h" #include "BulletSoftBody/btDeformableMultiBodyDynamicsWorld.h" -#include "BulletSoftBody/BulletReducedSoftBody/btReducedDeformableBody.h" -#include "BulletSoftBody/BulletReducedSoftBody/btReducedDeformableBodyHelpers.h" -#include "BulletSoftBody/BulletReducedSoftBody/btReducedDeformableBodySolver.h" +#include "BulletSoftBody/BulletReducedDeformableBody/btReducedDeformableBody.h" +#include "BulletSoftBody/BulletReducedDeformableBody/btReducedDeformableBodyHelpers.h" +#include "BulletSoftBody/BulletReducedDeformableBody/btReducedDeformableBodySolver.h" #include "BulletSoftBody/btSoftBodyRigidBodyCollisionConfiguration.h" #include "BulletDynamics/Featherstone/btMultiBodyConstraintSolver.h" #include "BulletDynamics/Featherstone/btMultiBodyJointMotor.h" diff --git a/examples/ReducedDeformableDemo/ReducedPress.cpp b/examples/ReducedDeformableDemo/ReducedPress.cpp index 3ffd1273a..8b0098fec 100644 --- a/examples/ReducedDeformableDemo/ReducedPress.cpp +++ b/examples/ReducedDeformableDemo/ReducedPress.cpp @@ -15,9 +15,9 @@ ///btBulletDynamicsCommon.h is the main Bullet include file, contains most common include files. #include "btBulletDynamicsCommon.h" #include "BulletSoftBody/btDeformableMultiBodyDynamicsWorld.h" -#include "BulletSoftBody/BulletReducedSoftBody/btReducedDeformableBody.h" -#include "BulletSoftBody/BulletReducedSoftBody/btReducedDeformableBodyHelpers.h" -#include "BulletSoftBody/BulletReducedSoftBody/btReducedDeformableBodySolver.h" +#include "BulletSoftBody/BulletReducedDeformableBody/btReducedDeformableBody.h" +#include "BulletSoftBody/BulletReducedDeformableBody/btReducedDeformableBodyHelpers.h" +#include "BulletSoftBody/BulletReducedDeformableBody/btReducedDeformableBodySolver.h" #include "BulletSoftBody/btSoftBodyRigidBodyCollisionConfiguration.h" #include "BulletDynamics/Featherstone/btMultiBodyConstraintSolver.h" #include "../CommonInterfaces/CommonParameterInterface.h" diff --git a/examples/ReducedDeformableDemo/Springboard.cpp b/examples/ReducedDeformableDemo/Springboard.cpp index b44343cfa..8b426a690 100644 --- a/examples/ReducedDeformableDemo/Springboard.cpp +++ b/examples/ReducedDeformableDemo/Springboard.cpp @@ -15,9 +15,9 @@ ///btBulletDynamicsCommon.h is the main Bullet include file, contains most common include files. #include "btBulletDynamicsCommon.h" #include "BulletSoftBody/btDeformableMultiBodyDynamicsWorld.h" -#include "BulletSoftBody/BulletReducedSoftBody/btReducedDeformableBody.h" -#include "BulletSoftBody/BulletReducedSoftBody/btReducedDeformableBodyHelpers.h" -#include "BulletSoftBody/BulletReducedSoftBody/btReducedDeformableBodySolver.h" +#include "BulletSoftBody/BulletReducedDeformableBody/btReducedDeformableBody.h" +#include "BulletSoftBody/BulletReducedDeformableBody/btReducedDeformableBodyHelpers.h" +#include "BulletSoftBody/BulletReducedDeformableBody/btReducedDeformableBodySolver.h" #include "BulletSoftBody/btSoftBodyRigidBodyCollisionConfiguration.h" #include "BulletDynamics/Featherstone/btMultiBodyConstraintSolver.h" #include "../CommonInterfaces/CommonParameterInterface.h" diff --git a/examples/SharedMemory/PhysicsServerCommandProcessor.cpp b/examples/SharedMemory/PhysicsServerCommandProcessor.cpp index 48c4d520e..813b3ff86 100644 --- a/examples/SharedMemory/PhysicsServerCommandProcessor.cpp +++ b/examples/SharedMemory/PhysicsServerCommandProcessor.cpp @@ -121,9 +121,9 @@ #include "BulletSoftBody/btDeformableBodySolver.h" #include "BulletSoftBody/btDeformableMultiBodyConstraintSolver.h" -#include "BulletSoftBody/BulletReducedSoftBody/btReducedDeformableBody.h" -#include "BulletSoftBody/BulletReducedSoftBody/btReducedDeformableBodyHelpers.h" -#include "BulletSoftBody/BulletReducedSoftBody/btReducedDeformableBodySolver.h" +#include "BulletSoftBody/BulletReducedDeformableBody/btReducedDeformableBody.h" +#include "BulletSoftBody/BulletReducedDeformableBody/btReducedDeformableBodyHelpers.h" +#include "BulletSoftBody/BulletReducedDeformableBody/btReducedDeformableBodySolver.h" #endif //SKIP_DEFORMABLE_BODY #include "BulletDynamics/Featherstone/btMultiBodyDynamicsWorld.h" diff --git a/src/BulletSoftBody/BulletReducedSoftBody/btReducedDeformableBody.cpp b/src/BulletSoftBody/BulletReducedDeformableBody/btReducedDeformableBody.cpp similarity index 100% rename from src/BulletSoftBody/BulletReducedSoftBody/btReducedDeformableBody.cpp rename to src/BulletSoftBody/BulletReducedDeformableBody/btReducedDeformableBody.cpp diff --git a/src/BulletSoftBody/BulletReducedSoftBody/btReducedDeformableBody.h b/src/BulletSoftBody/BulletReducedDeformableBody/btReducedDeformableBody.h similarity index 100% rename from src/BulletSoftBody/BulletReducedSoftBody/btReducedDeformableBody.h rename to src/BulletSoftBody/BulletReducedDeformableBody/btReducedDeformableBody.h diff --git a/src/BulletSoftBody/BulletReducedSoftBody/btReducedDeformableBodyHelpers.cpp b/src/BulletSoftBody/BulletReducedDeformableBody/btReducedDeformableBodyHelpers.cpp similarity index 100% rename from src/BulletSoftBody/BulletReducedSoftBody/btReducedDeformableBodyHelpers.cpp rename to src/BulletSoftBody/BulletReducedDeformableBody/btReducedDeformableBodyHelpers.cpp diff --git a/src/BulletSoftBody/BulletReducedSoftBody/btReducedDeformableBodyHelpers.h b/src/BulletSoftBody/BulletReducedDeformableBody/btReducedDeformableBodyHelpers.h similarity index 100% rename from src/BulletSoftBody/BulletReducedSoftBody/btReducedDeformableBodyHelpers.h rename to src/BulletSoftBody/BulletReducedDeformableBody/btReducedDeformableBodyHelpers.h diff --git a/src/BulletSoftBody/BulletReducedSoftBody/btReducedDeformableBodySolver.cpp b/src/BulletSoftBody/BulletReducedDeformableBody/btReducedDeformableBodySolver.cpp similarity index 100% rename from src/BulletSoftBody/BulletReducedSoftBody/btReducedDeformableBodySolver.cpp rename to src/BulletSoftBody/BulletReducedDeformableBody/btReducedDeformableBodySolver.cpp diff --git a/src/BulletSoftBody/BulletReducedSoftBody/btReducedDeformableBodySolver.h b/src/BulletSoftBody/BulletReducedDeformableBody/btReducedDeformableBodySolver.h similarity index 100% rename from src/BulletSoftBody/BulletReducedSoftBody/btReducedDeformableBodySolver.h rename to src/BulletSoftBody/BulletReducedDeformableBody/btReducedDeformableBodySolver.h diff --git a/src/BulletSoftBody/BulletReducedSoftBody/btReducedDeformableContactConstraint.cpp b/src/BulletSoftBody/BulletReducedDeformableBody/btReducedDeformableContactConstraint.cpp similarity index 100% rename from src/BulletSoftBody/BulletReducedSoftBody/btReducedDeformableContactConstraint.cpp rename to src/BulletSoftBody/BulletReducedDeformableBody/btReducedDeformableContactConstraint.cpp diff --git a/src/BulletSoftBody/BulletReducedSoftBody/btReducedDeformableContactConstraint.h b/src/BulletSoftBody/BulletReducedDeformableBody/btReducedDeformableContactConstraint.h similarity index 100% rename from src/BulletSoftBody/BulletReducedSoftBody/btReducedDeformableContactConstraint.h rename to src/BulletSoftBody/BulletReducedDeformableBody/btReducedDeformableContactConstraint.h diff --git a/src/BulletSoftBody/CMakeLists.txt b/src/BulletSoftBody/CMakeLists.txt index b607e5e95..c12eef5fe 100644 --- a/src/BulletSoftBody/CMakeLists.txt +++ b/src/BulletSoftBody/CMakeLists.txt @@ -25,10 +25,10 @@ SET(BulletSoftBody_SRCS btDeformableContactConstraint.cpp poly34.cpp - BulletReducedSoftBody/btReducedDeformableBody.cpp - BulletReducedSoftBody/btReducedDeformableBodyHelpers.cpp - BulletReducedSoftBody/btReducedDeformableBodySolver.cpp - BulletReducedSoftBody/btReducedDeformableContactConstraint.cpp + BulletReducedDeformableBody/btReducedDeformableBody.cpp + BulletReducedDeformableBody/btReducedDeformableBodyHelpers.cpp + BulletReducedDeformableBody/btReducedDeformableBodySolver.cpp + BulletReducedDeformableBody/btReducedDeformableContactConstraint.cpp ) @@ -69,10 +69,10 @@ SET(BulletSoftBody_HDRS btSoftBodySolverVertexBuffer.h - BulletReducedSoftBody/btReducedDeformableBody.h - BulletReducedSoftBody/btReducedDeformableBodyHelpers.h - BulletReducedSoftBody/btReducedDeformableBodySolver.h - BulletReducedSoftBody/btReducedDeformableContactConstraint.h + BulletReducedDeformableBody/btReducedDeformableBody.h + BulletReducedDeformableBody/btReducedDeformableBodyHelpers.h + BulletReducedDeformableBody/btReducedDeformableBodySolver.h + BulletReducedDeformableBody/btReducedDeformableContactConstraint.h )