added workaround for OpenGL bug in Mac OS X 10.5.0 (Leopard)

added concave raycast demo
Thanks to John Rowe (JMC)
This commit is contained in:
ejcoumans 2007-12-05 20:34:32 +00:00
parent a64cc39faf
commit d2973ed48a
5 changed files with 3891 additions and 3365 deletions

View File

@ -19,7 +19,7 @@ subject to the following restrictions:
#include "../BspDemo/BspDemo.h"
#include "../BasicDemo/BasicDemo.h"
#include "../ConcaveDemo/ConcaveDemo.h"
//#include "../ConcaveRaycastDemo/ConcaveRaycastDemo.h"
#include "../ConcaveRaycastDemo/ConcaveRaycastDemo.h"
#include "../ConvexDecompositionDemo/ConvexDecompositionDemo.h"
#include "../RagdollDemo/RagdollDemo.h"
#include "../GimpactTestDemo/GimpactTestDemo.h"
@ -97,7 +97,7 @@ btDemoEntry g_demoEntries[] =
{"RagdollDemo",RagdollDemo::Create},
{"CcdPhysicsDemo", CcdPhysicsDemo::Create},
{"ConcaveDemo",ConcaveDemo::Create},
// {"ConcaveRaycastDemo",ConcaveRaycastDemo::Create},
{"ConcaveRaycastDemo",ConcaveRaycastDemo::Create},
{"ConvexDecomposition",ConvexDecompositionDemo::Create},
{"BasicDemo", BasicDemo::Create},
{"BspDemo", BspDemo::Create},

View File

@ -8,6 +8,7 @@ FrameWorkDemo AllBulletDemos :
../BspDemo/BspConverter.cpp
../BspDemo/BspLoader.cpp
../ConcaveDemo/ConcavePhysicsDemo.cpp
../ConcaveRaycastDemo/ConcaveRaycastDemo.cpp
../ConvexDecompositionDemo/ConvexDecompositionDemo.cpp
../RagdollDemo/RagdollDemo.cpp
../GimpactTestDemo/GimpactTestDemo.cpp

7169
configure vendored

File diff suppressed because it is too large Load Diff

View File

@ -69,7 +69,7 @@ CS_CHECK_HOST
#----------------------------------------------------------------------------
AS_IF([test $cs_host_family = windows],
[# Tack the GLUT that comes with bullet onto compiler & linker flags.
_AC_SRCPATHS(["."])
_AC_SRCDIRS(["."])
glut_cflags="-I$ac_top_srcdir/Glut"
glut_lflags="-L$ac_top_srcdir/Glut"
CFLAGS="$CFLAGS $glut_cflags"

View File

@ -112,6 +112,8 @@ AC_DEFUN([CS_CHECK_OPENGL],
# MacOS/X or Darwin?
AS_IF([test "x$cs_host_macosx" = "xyes"],
[cs_osx_gl=CS_CREATE_TUPLE([-DCS_OPENGL_PATH=OpenGL],[],[-framework OpenGL])])
AS_IF([test "x$cs_host_macosx" = "xyes"],
[cs_gl_plat_lflags="$cs_plat_lflags -Wl,-dylib_file,/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib"])
# Windows?
AS_IF([test $cs_host_family = windows],