diff --git a/Extras/premake4.lua b/Extras/premake4.lua index a044468da..dd4853f6e 100644 --- a/Extras/premake4.lua +++ b/Extras/premake4.lua @@ -1,7 +1,7 @@ include "HACD" include "ConvexDecomposition" - +include "InverseDynamics" include "Serialize/BulletFileLoader" include "Serialize/BulletWorldImporter" include "Serialize/BulletXmlWorldImporter" diff --git a/build3/premake4.lua b/build3/premake4.lua index a3f020cba..569aeda48 100644 --- a/build3/premake4.lua +++ b/build3/premake4.lua @@ -189,12 +189,14 @@ if not _OPTIONS["ios"] then include "../test/gtest-1.7.0" -- include "../test/hello_gtest" include "../test/collision" + include "../test/InverseDynamics" include "../test/TestBullet3OpenCL" include "../test/GwenOpenGLTest" end end - include "../test/Bullet2" + include "../test/Bullet2" + include "../src/BulletInverseDynamics" include "../src/BulletSoftBody" include "../src/BulletDynamics" include "../src/BulletCollision" diff --git a/examples/InverseDynamics/InverseDynamicsExample.cpp b/examples/InverseDynamics/InverseDynamicsExample.cpp index 8b67ccfba..9548d8591 100644 --- a/examples/InverseDynamics/InverseDynamicsExample.cpp +++ b/examples/InverseDynamics/InverseDynamicsExample.cpp @@ -19,7 +19,7 @@ subject to the following restrictions: #include "BulletDynamics/Featherstone/btMultiBodyJointMotor.h" #include "BulletDynamics/Featherstone/btMultiBodyDynamicsWorld.h" #include "../CommonInterfaces/CommonParameterInterface.h" -#include "../../Utils/b3ResourcePath.h" +#include "../Utils/b3ResourcePath.h" #include "../Importers/ImportURDFDemo/BulletUrdfImporter.h" #include "../Importers/ImportURDFDemo/URDF2Bullet.h" #include "../Importers/ImportURDFDemo/MyMultiBodyCreator.h" @@ -129,7 +129,7 @@ void InverseDynamicsExample::initPhysics() //temporarily set some extreme damping factors until we have some joint control or constraints m_multiBody->setAngularDamping(0.99); m_multiBody->setLinearDamping(0.99); - b3Printf("Root link name = %s",u2b.getLinkName(u2b.getRootLinkIndex())); + b3Printf("Root link name = %s",u2b.getLinkName(u2b.getRootLinkIndex()).c_str()); } } break;