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

fix various warning

Browse Source 
add b3ResourcePath utility, to locate resources relative to executable
This commit is contained in:
Erwin Coumans (Google)
2015-07-03 18:17:14 -07:00
parent 4a9441c5fd
commit 8517e85b21
18 changed files with 176 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
examples/Importers/ImportURDFDemo/ImportURDFSetup.cpp
View File

@@ -9,7 +9,9 @@
#include "BulletDynamics/Featherstone/btMultiBodyJointMotor.h"
#include "BulletDynamics/Featherstone/btMultiBodyDynamicsWorld.h"
#include "../CommonInterfaces/CommonParameterInterface.h"
#ifdef ENABLE_ROS_URDF
#include "ROSURDFImporter.h"
#endif
#include "BulletUrdfImporter.h"
@@ -197,18 +199,20 @@ void ImportUrdfSetup::initPhysics()
//now print the tree using the new interface
URDFImporterInterface* bla=0;
static bool newURDF = false;
newURDF = !newURDF;
static bool newURDF = true;
if (newURDF)
{
b3Printf("using new URDF\n");
bla = new BulletURDFImporter(m_guiHelper);
} else
}
#ifdef USE_ROS_URDF
else
{
b3Printf("using ROS URDF\n");
bla = new ROSURDFImporter(m_guiHelper);
}
newURDF = !newURDF;
#endif//USE_ROS_URDF
URDFImporterInterface& u2b = *bla;
bool loadOk = u2b.loadURDF(m_fileName);