mirror of
https://github.com/bulletphysics/bullet3
synced 2024-12-13 05:10:08 +00:00
commit
42ef8f538e
@ -70,10 +70,10 @@ struct GUIHelperInterface
|
||||
|
||||
|
||||
|
||||
virtual int addUserDebugText3D( const char* txt, const double posisionXYZ[3], const double textColorRGB[3], double size, double lifeTime)=0;
|
||||
virtual int addUserDebugLine(const double debugLineFromXYZ[3], const double debugLineToXYZ[3], const double debugLineColorRGB[3], double lineWidth, double lifeTime )=0;
|
||||
virtual void removeUserDebugItem( int debugItemUniqueId)=0;
|
||||
virtual void removeAllUserDebugItems( )=0;
|
||||
virtual int addUserDebugText3D( const char* txt, const double posisionXYZ[3], const double textColorRGB[3], double size, double lifeTime){return -1;};
|
||||
virtual int addUserDebugLine(const double debugLineFromXYZ[3], const double debugLineToXYZ[3], const double debugLineColorRGB[3], double lineWidth, double lifeTime ){return -1;};
|
||||
virtual void removeUserDebugItem( int debugItemUniqueId){};
|
||||
virtual void removeAllUserDebugItems( ){};
|
||||
|
||||
};
|
||||
|
||||
|
@ -238,11 +238,13 @@ void ImportMJCFSetup::initPhysics()
|
||||
ConvertURDF2Bullet(importer,creation, rootTrans,m_dynamicsWorld,m_useMultiBody,importer.getPathPrefix(),CUF_USE_MJCF);
|
||||
|
||||
mb = creation.getBulletMultiBody();
|
||||
if (0)//mb)
|
||||
{
|
||||
printf("first MJCF file converted!\n");
|
||||
std::string* name = new std::string(importer.getLinkName(importer.getRootLinkIndex()));
|
||||
m_nameMemory.push_back(name);
|
||||
if (/* DISABLES CODE */ (0)) // mb)
|
||||
{
|
||||
printf("first MJCF file converted!\n");
|
||||
std::string* name =
|
||||
new std::string(importer.getLinkName(
|
||||
importer.getRootLinkIndex()));
|
||||
m_nameMemory.push_back(name);
|
||||
#ifdef TEST_MULTIBODY_SERIALIZATION
|
||||
s->registerNameForPointer(name->c_str(),name->c_str());
|
||||
#endif//TEST_MULTIBODY_SERIALIZATION
|
||||
|
@ -30,6 +30,7 @@
|
||||
#endif
|
||||
#ifdef __APPLE__
|
||||
#include <mach/mach_time.h>
|
||||
#include <TargetConditionals.h>
|
||||
#endif
|
||||
|
||||
#if defined(WIN32) || defined(_WIN32)
|
||||
|
Loading…
Reference in New Issue
Block a user