add alternative URDF parser that doens't use ROS urdf

This commit is contained in:
Erwin Coumans
2015-06-28 14:09:21 -07:00
parent bc8b95dd9d
commit 039174a809
14 changed files with 2309 additions and 37 deletions

View File

@@ -364,7 +364,7 @@ void PhysicsClient::createClientCommand()
void PhysicsClient::stepSimulation(float deltaTime)
{
btAssert(m_testBlock1);
// btAssert(m_testBlock1);
if (m_testBlock1)
{

View File

@@ -4,7 +4,7 @@
#include "PosixSharedMemory.h"
#include "Win32SharedMemory.h"
#include "../Importers/ImportURDFDemo/MyURDFImporter.h"
#include "../Importers/ImportURDFDemo/ROSURDFImporter.h"
#include "../Importers/ImportURDFDemo/MyMultiBodyCreator.h"
#include "../Importers/ImportURDFDemo/URDF2Bullet.h"
@@ -132,7 +132,7 @@ bool PhysicsServer::loadUrdf(const char* fileName, const btVector3& pos, const b
bool useMultiBody, bool useFixedBase)
{
MyURDFImporter u2b(m_guiHelper);
ROSURDFImporter u2b(m_guiHelper);
bool loadOk = u2b.loadURDF(fileName);
if (loadOk)
{