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

Merge branch 'master' of https://github.com/erwincoumans/bullet3

Browse Source
This commit is contained in:
Erwin Coumans
2018-10-29 19:24:27 -07:00
parent 44976780fa 5fbc015ba6
commit b0b8bb2023
3 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
setup.py
View File

@@ -463,15 +463,16 @@ egl_renderer_sources = \
+["src/BulletCollision/CollisionShapes/btConvexInternalShape.cpp"]\ +["src/BulletCollision/CollisionShapes/btConvexInternalShape.cpp"]\
+["src/Bullet3Common/b3Logging.cpp"]\ +["src/Bullet3Common/b3Logging.cpp"]\
+["src/LinearMath/btAlignedAllocator.cpp"]\ +["src/LinearMath/btAlignedAllocator.cpp"]\
+["src/LinearMath/btGeometryUtil.cpp"]\
+["src/LinearMath/btConvexHull.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"] \ +["src/Bullet3Common/b3AlignedAllocator.cpp"] \
+["examples/ThirdPartyLibs/glad/gl.c"]\ +["examples/ThirdPartyLibs/glad/gl.c"]\
+["examples/OpenGLWindow/GLInstancingRenderer.cpp"]\ +["examples/OpenGLWindow/GLInstancingRenderer.cpp"]\
+["examples/OpenGLWindow/GLRenderToTexture.cpp"] \ +["examples/OpenGLWindow/GLRenderToTexture.cpp"] \
+["examples/OpenGLWindow/LoadShader.cpp"] \ +["examples/OpenGLWindow/LoadShader.cpp"]
+["src/LinearMath/btQuickprof.cpp"]
if 'BT_USE_EGL' in CXX_FLAGS: if 'BT_USE_EGL' in CXX_FLAGS:
sources += ['examples/ThirdPartyLibs/glad/egl.c'] sources += ['examples/ThirdPartyLibs/glad/egl.c']

2
src/BulletCollision/CollisionDispatch/btCompoundCompoundCollisionAlgorithm.h
View File

@@ -34,6 +34,8 @@ class btCollisionObject;
class btCollisionShape; class btCollisionShape;
extern btShapePairCallback gCompoundCompoundChildShapePairCallback;
/// btCompoundCompoundCollisionAlgorithm supports collision between two btCompoundCollisionShape shapes /// btCompoundCompoundCollisionAlgorithm supports collision between two btCompoundCollisionShape shapes
class btCompoundCompoundCollisionAlgorithm : public btCompoundCollisionAlgorithm class btCompoundCompoundCollisionAlgorithm : public btCompoundCollisionAlgorithm
{ {

6
src/BulletCollision/Gimpact/btGImpactBvh.h
View File

@@ -1,5 +1,5 @@
#ifndef GIM_BOX_SET_H_INCLUDED #ifndef BT_GIMPACT_BVH_H_INCLUDED
#define GIM_BOX_SET_H_INCLUDED #define BT_GIMPACT_BVH_H_INCLUDED
/*! \file gim_box_set.h /*! \file gim_box_set.h
\author Francisco Leon Najera \author Francisco Leon Najera
@@ -306,4 +306,4 @@ public:
btPairSet& collision_pairs); btPairSet& collision_pairs);
}; };
#endif // GIM_BOXPRUNING_H_INCLUDED #endif // BT_GIMPACT_BVH_H_INCLUDED