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

Merge pull request #916 from erwincoumans/master

Browse Source 
fix some warnings
This commit is contained in:
erwincoumans
2017-01-13 12:06:51 -08:00
committed by GitHub
parent 6ad616b29c e738d1ffde
commit 42ef8f538e
3 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
examples/CommonInterfaces/CommonGUIHelperInterface.h
View File

@@ -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 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 )=0; 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)=0; virtual void removeUserDebugItem( int debugItemUniqueId){};
virtual void removeAllUserDebugItems( )=0; virtual void removeAllUserDebugItems( ){};
}; };

12
examples/Importers/ImportMJCFDemo/ImportMJCFSetup.cpp
View File

@@ -238,11 +238,13 @@ void ImportMJCFSetup::initPhysics()
ConvertURDF2Bullet(importer,creation, rootTrans,m_dynamicsWorld,m_useMultiBody,importer.getPathPrefix(),CUF_USE_MJCF); ConvertURDF2Bullet(importer,creation, rootTrans,m_dynamicsWorld,m_useMultiBody,importer.getPathPrefix(),CUF_USE_MJCF);
mb = creation.getBulletMultiBody(); mb = creation.getBulletMultiBody();
if (0)//mb) if (/* DISABLES CODE */ (0)) // mb)
{ {
printf("first MJCF file converted!\n"); printf("first MJCF file converted!\n");
std::string* name = new std::string(importer.getLinkName(importer.getRootLinkIndex())); std::string* name =
m_nameMemory.push_back(name); new std::string(importer.getLinkName(
importer.getRootLinkIndex()));
m_nameMemory.push_back(name);
#ifdef TEST_MULTIBODY_SERIALIZATION #ifdef TEST_MULTIBODY_SERIALIZATION
s->registerNameForPointer(name->c_str(),name->c_str()); s->registerNameForPointer(name->c_str(),name->c_str());
#endif//TEST_MULTIBODY_SERIALIZATION #endif//TEST_MULTIBODY_SERIALIZATION

1
src/LinearMath/btQuickprof.cpp
View File

@@ -30,6 +30,7 @@
#endif #endif
#ifdef __APPLE__ #ifdef __APPLE__
#include <mach/mach_time.h> #include <mach/mach_time.h>
#include <TargetConditionals.h>
#endif #endif
#if defined(WIN32) || defined(_WIN32) #if defined(WIN32) || defined(_WIN32)