From f9ff09a6b58cd7b44efeb2c36f009ce32a0be33e Mon Sep 17 00:00:00 2001 From: Jelle Date: Wed, 24 Oct 2018 17:20:25 +0200 Subject: [PATCH 1/3] Added extern declaration The extern declaration was missing from this file. --- .../CollisionDispatch/btCompoundCompoundCollisionAlgorithm.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/BulletCollision/CollisionDispatch/btCompoundCompoundCollisionAlgorithm.h b/src/BulletCollision/CollisionDispatch/btCompoundCompoundCollisionAlgorithm.h index 14e8a7ada..a940d840e 100644 --- a/src/BulletCollision/CollisionDispatch/btCompoundCompoundCollisionAlgorithm.h +++ b/src/BulletCollision/CollisionDispatch/btCompoundCompoundCollisionAlgorithm.h @@ -34,6 +34,8 @@ class btCollisionObject; class btCollisionShape; +extern btShapePairCallback gCompoundCompoundChildShapePairCallback; + /// btCompoundCompoundCollisionAlgorithm supports collision between two btCompoundCollisionShape shapes class btCompoundCompoundCollisionAlgorithm : public btCompoundCollisionAlgorithm { From fc4d531e3cd9249a4731e391921e8000ecd1c162 Mon Sep 17 00:00:00 2001 From: Max Argus Date: Sat, 27 Oct 2018 21:54:33 +0200 Subject: [PATCH 2/3] pip egl install: added btThreads.cpp --- setup.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/setup.py b/setup.py index 86b07206a..826e90b39 100644 --- a/setup.py +++ b/setup.py @@ -463,15 +463,16 @@ egl_renderer_sources = \ +["src/BulletCollision/CollisionShapes/btConvexInternalShape.cpp"]\ +["src/Bullet3Common/b3Logging.cpp"]\ +["src/LinearMath/btAlignedAllocator.cpp"]\ -+["src/LinearMath/btGeometryUtil.cpp"]\ +["src/LinearMath/btConvexHull.cpp"]\ -+["src/LinearMath/btConvexHullComputer.cpp"]\ ++["src/LinearMath/btConvexHullComputer.cpp"] \ ++["src/LinearMath/btGeometryUtil.cpp"]\ ++["src/LinearMath/btQuickprof.cpp"] \ ++["src/LinearMath/btThreads.cpp"] \ +["src/Bullet3Common/b3AlignedAllocator.cpp"] \ +["examples/ThirdPartyLibs/glad/gl.c"]\ +["examples/OpenGLWindow/GLInstancingRenderer.cpp"]\ +["examples/OpenGLWindow/GLRenderToTexture.cpp"] \ -+["examples/OpenGLWindow/LoadShader.cpp"] \ -+["src/LinearMath/btQuickprof.cpp"] ++["examples/OpenGLWindow/LoadShader.cpp"] if 'BT_USE_EGL' in CXX_FLAGS: sources += ['examples/ThirdPartyLibs/glad/egl.c'] From 5b90e7e0b7d790a943240a46e902da3125196280 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Janiszewski?= Date: Sun, 28 Oct 2018 21:50:28 +0100 Subject: [PATCH 3/3] Update include guard in btGImpactBvh.h --- src/BulletCollision/Gimpact/btGImpactBvh.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/BulletCollision/Gimpact/btGImpactBvh.h b/src/BulletCollision/Gimpact/btGImpactBvh.h index 79dcda957..3cd8fa24e 100644 --- a/src/BulletCollision/Gimpact/btGImpactBvh.h +++ b/src/BulletCollision/Gimpact/btGImpactBvh.h @@ -1,5 +1,5 @@ -#ifndef GIM_BOX_SET_H_INCLUDED -#define GIM_BOX_SET_H_INCLUDED +#ifndef BT_GIMPACT_BVH_H_INCLUDED +#define BT_GIMPACT_BVH_H_INCLUDED /*! \file gim_box_set.h \author Francisco Leon Najera @@ -306,4 +306,4 @@ public: btPairSet& collision_pairs); }; -#endif // GIM_BOXPRUNING_H_INCLUDED +#endif // BT_GIMPACT_BVH_H_INCLUDED