fix MSVC 2013 compilation (std::min needs #include <algorithm>

add example use of GJK+MPR in VoronoiFractureDemo
This commit is contained in:
erwin coumans
2014-11-05 08:58:24 -08:00
parent ba0dd676aa
commit eafbf817c3
7 changed files with 429 additions and 7 deletions

View File

@@ -29,6 +29,8 @@ ADD_EXECUTABLE(AppVoronoiFractureDemo
main.cpp
VoronoiFractureDemo.cpp
VoronoiFractureDemo.h
btConvexConvexMprAlgorithm.cpp
btConvexConvexMprAlgorithm.h
${BULLET_PHYSICS_SOURCE_DIR}/build3/bullet.rc
)
ELSE()
@@ -36,6 +38,8 @@ ELSE()
main.cpp
VoronoiFractureDemo.cpp
VoronoiFractureDemo.h
btConvexConvexMprAlgorithm.cpp
btConvexConvexMprAlgorithm.h
)
ENDIF()
@@ -57,6 +61,8 @@ ELSE (USE_GLUT)
Win32VoronoiFractureDemo.cpp
VoronoiFractureDemo.cpp
VoronoiFractureDemo.h
btConvexConvexMprAlgorithm.cpp
btConvexConvexMprAlgorithm.h
${BULLET_PHYSICS_SOURCE_DIR}/build3/bullet.rc
)