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

add InverseDynamics test/lib to premake

Browse Source
This commit is contained in:
Erwin Coumans
2015-11-17 08:26:27 -08:00
parent ad29d27700
commit 7d9365319c
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Extras/premake4.lua
View File

@@ -1,7 +1,7 @@
include "HACD" include "HACD"
include "ConvexDecomposition" include "ConvexDecomposition"
include "InverseDynamics"
include "Serialize/BulletFileLoader" include "Serialize/BulletFileLoader"
include "Serialize/BulletWorldImporter" include "Serialize/BulletWorldImporter"
include "Serialize/BulletXmlWorldImporter" include "Serialize/BulletXmlWorldImporter"

4
build3/premake4.lua
View File

@@ -189,12 +189,14 @@ if not _OPTIONS["ios"] then
include "../test/gtest-1.7.0" include "../test/gtest-1.7.0"
-- include "../test/hello_gtest" -- include "../test/hello_gtest"
include "../test/collision" include "../test/collision"
include "../test/InverseDynamics"
include "../test/TestBullet3OpenCL" include "../test/TestBullet3OpenCL"
include "../test/GwenOpenGLTest" include "../test/GwenOpenGLTest"
end end
end end
include "../test/Bullet2" include "../test/Bullet2"
include "../src/BulletInverseDynamics"
include "../src/BulletSoftBody" include "../src/BulletSoftBody"
include "../src/BulletDynamics" include "../src/BulletDynamics"
include "../src/BulletCollision" include "../src/BulletCollision"

4
examples/InverseDynamics/InverseDynamicsExample.cpp
View File

@@ -19,7 +19,7 @@ subject to the following restrictions:
#include "BulletDynamics/Featherstone/btMultiBodyJointMotor.h" #include "BulletDynamics/Featherstone/btMultiBodyJointMotor.h"
#include "BulletDynamics/Featherstone/btMultiBodyDynamicsWorld.h" #include "BulletDynamics/Featherstone/btMultiBodyDynamicsWorld.h"
#include "../CommonInterfaces/CommonParameterInterface.h" #include "../CommonInterfaces/CommonParameterInterface.h"
#include "../../Utils/b3ResourcePath.h" #include "../Utils/b3ResourcePath.h"
#include "../Importers/ImportURDFDemo/BulletUrdfImporter.h" #include "../Importers/ImportURDFDemo/BulletUrdfImporter.h"
#include "../Importers/ImportURDFDemo/URDF2Bullet.h" #include "../Importers/ImportURDFDemo/URDF2Bullet.h"
#include "../Importers/ImportURDFDemo/MyMultiBodyCreator.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 //temporarily set some extreme damping factors until we have some joint control or constraints
m_multiBody->setAngularDamping(0.99); m_multiBody->setAngularDamping(0.99);
m_multiBody->setLinearDamping(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; break;