From a93704889c99158463cf0f047c8ea73f97bc5b08 Mon Sep 17 00:00:00 2001 From: Erwin Coumans Date: Thu, 12 Jan 2017 11:40:43 -0800 Subject: [PATCH 1/3] add a default empty implementation for a few pure virtual calls (in interface classes) for backward compatibility in some code base --- examples/CommonInterfaces/CommonGUIHelperInterface.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/examples/CommonInterfaces/CommonGUIHelperInterface.h b/examples/CommonInterfaces/CommonGUIHelperInterface.h index 01f7b3728..eb1cf6cbb 100644 --- a/examples/CommonInterfaces/CommonGUIHelperInterface.h +++ b/examples/CommonInterfaces/CommonGUIHelperInterface.h @@ -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( ){}; }; From 7b7d897e3ba2232a7fc6dbbd6f994dbe53ae1aeb Mon Sep 17 00:00:00 2001 From: Erwin Coumans Date: Thu, 12 Jan 2017 12:29:15 -0800 Subject: [PATCH 2/3] explicitly mark dead code --- .../Importers/ImportMJCFDemo/ImportMJCFSetup.cpp | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/examples/Importers/ImportMJCFDemo/ImportMJCFSetup.cpp b/examples/Importers/ImportMJCFDemo/ImportMJCFSetup.cpp index eb62a2826..3840b5c87 100644 --- a/examples/Importers/ImportMJCFDemo/ImportMJCFSetup.cpp +++ b/examples/Importers/ImportMJCFDemo/ImportMJCFSetup.cpp @@ -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 From e738d1ffde3f6599f64e7fadde4e9fdbfc582956 Mon Sep 17 00:00:00 2001 From: erwincoumans Date: Fri, 13 Jan 2017 12:06:13 -0800 Subject: [PATCH 3/3] fix for iOS, add #include --- src/LinearMath/btQuickprof.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/LinearMath/btQuickprof.cpp b/src/LinearMath/btQuickprof.cpp index 8233daa57..16ca88cdc 100644 --- a/src/LinearMath/btQuickprof.cpp +++ b/src/LinearMath/btQuickprof.cpp @@ -30,6 +30,7 @@ #endif #ifdef __APPLE__ #include +#include #endif #if defined(WIN32) || defined(_WIN32)