From 1af8939fd2622bb1185b91722143e5f3dd19df3c Mon Sep 17 00:00:00 2001 From: Erwin Coumans Date: Wed, 24 May 2017 16:44:43 -0700 Subject: [PATCH 1/3] fix unused variables --- examples/SimpleOpenGL3/main.cpp | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/examples/SimpleOpenGL3/main.cpp b/examples/SimpleOpenGL3/main.cpp index c05f113d5..0422c96cc 100644 --- a/examples/SimpleOpenGL3/main.cpp +++ b/examples/SimpleOpenGL3/main.cpp @@ -97,14 +97,7 @@ int main(int argc, char* argv[]) int textureHandle = app->m_renderer->registerTexture(image, textureWidth, textureHeight); - int cubeIndex = app->registerCubeShape(1, 1, 1); - b3Vector3 pos = b3MakeVector3(0, 0, 0); - b3Quaternion orn(0, 0, 0, 1); - b3Vector4 color = b3MakeVector4(1, 0, 0,1); - b3Vector3 scaling = b3MakeVector3 (1, 1, 1); - //app->m_renderer->registerGraphicsInstance(cubeIndex, pos, orn, color, scaling); - app->m_renderer->writeTransforms(); do { @@ -151,7 +144,6 @@ int main(int argc, char* argv[]) float yellow[4] = {1,1,0,1}; app->drawText(bla, 10, 10, 1, yellow); - int optionFlag = 0; float position[3] = {1,1,1}; float position2[3] = {0,0,5}; @@ -188,4 +180,4 @@ int main(int argc, char* argv[]) delete[] image; } return 0; -} \ No newline at end of file +} From 9743bb387c661f1dcba929969be9a9320a82d69e Mon Sep 17 00:00:00 2001 From: Erwin Coumans Date: Wed, 24 May 2017 19:30:06 -0700 Subject: [PATCH 2/3] give some pure-virtual methods default empty implementation, avoid breaking some internal research code --- examples/CommonInterfaces/CommonGUIHelperInterface.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/CommonInterfaces/CommonGUIHelperInterface.h b/examples/CommonInterfaces/CommonGUIHelperInterface.h index a5121548e..24b4a301c 100644 --- a/examples/CommonInterfaces/CommonGUIHelperInterface.h +++ b/examples/CommonInterfaces/CommonGUIHelperInterface.h @@ -84,8 +84,8 @@ struct GUIHelperInterface virtual void autogenerateGraphicsObjects(btDiscreteDynamicsWorld* rbWorld) =0; - virtual void drawText3D( const char* txt, float posX, float posY, float posZ, float size)=0; - virtual void drawText3D( const char* txt, float position[3], float orientation[4], float color[4], float size, int optionFlag)=0; + virtual void drawText3D( const char* txt, float posX, float posY, float posZ, float size){} + virtual void drawText3D( const char* txt, float position[3], float orientation[4], float color[4], float size, int optionFlag){} virtual int addUserDebugText3D( const char* txt, const double positionXYZ[3], const double orientation[4], const double textColorRGB[3], double size, double lifeTime, int trackingVisualShapeIndex, int optionFlags){return -1;} virtual int addUserDebugLine(const double debugLineFromXYZ[3], const double debugLineToXYZ[3], const double debugLineColorRGB[3], double lineWidth, double lifeTime , int trackingVisualShapeIndex){return -1;}; From f090752cbbe29a6506eba3352da5d93ae2644f97 Mon Sep 17 00:00:00 2001 From: Erwin Coumans Date: Thu, 25 May 2017 10:56:01 -0700 Subject: [PATCH 3/3] bump up VISUAL_SHAPE_MAX_PATH_LEN from 128 to 1024, some google3 directories are loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong :-) --- examples/SharedMemory/SharedMemoryPublic.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/SharedMemory/SharedMemoryPublic.h b/examples/SharedMemory/SharedMemoryPublic.h index 97e462825..27a44fc8c 100644 --- a/examples/SharedMemory/SharedMemoryPublic.h +++ b/examples/SharedMemory/SharedMemoryPublic.h @@ -4,7 +4,7 @@ #define SHARED_MEMORY_KEY 12347 ///increase the SHARED_MEMORY_MAGIC_NUMBER whenever incompatible changes are made in the structures ///my convention is year/month/day/rev -#define SHARED_MEMORY_MAGIC_NUMBER 201705023 +#define SHARED_MEMORY_MAGIC_NUMBER 201705025 //#define SHARED_MEMORY_MAGIC_NUMBER 201703024 enum EnumSharedMemoryClientCommand @@ -425,7 +425,7 @@ struct b3RaycastInformation }; -#define VISUAL_SHAPE_MAX_PATH_LEN 128 +#define VISUAL_SHAPE_MAX_PATH_LEN 1024 struct b3VisualShapeData {