From 711b737293f5e1ca3ed1a86523a1f731aa4a4355 Mon Sep 17 00:00:00 2001 From: ejcoumans Date: Sun, 12 Nov 2006 07:54:27 +0000 Subject: [PATCH] =?UTF-8?q?Added=20GIMPACT=20integration=20for=20moving=20?= =?UTF-8?q?concave=20meshes=20(interaction=20with=20all=20other=20Bullet?= =?UTF-8?q?=20collision=20shapes)=20Thanks=20a=20lot=20to=20Francisco=20Le?= =?UTF-8?q?=C3=B3n=20N=C3=A1jera=20for=20the=20contribution!?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Demos/MovingConcaveDemo/ConcavePhysicsDemo.cpp | 2 +- Demos/OpenGL/GL_ShapeDrawer.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Demos/MovingConcaveDemo/ConcavePhysicsDemo.cpp b/Demos/MovingConcaveDemo/ConcavePhysicsDemo.cpp index 230f4e040..c4dd5da16 100644 --- a/Demos/MovingConcaveDemo/ConcavePhysicsDemo.cpp +++ b/Demos/MovingConcaveDemo/ConcavePhysicsDemo.cpp @@ -1830,7 +1830,7 @@ btGIMPACTMeshShape * createMesh() { btGIMPACTMeshShape * newtrimeshShape = new btGIMPACTMeshShape(g_trimeshData ); newtrimeshShape->setLocalScaling(btVector3(4.f,4.f,4.f)); - OGL_displaylist_register_shape(newtrimeshShape); +// OGL_displaylist_register_shape(newtrimeshShape); return newtrimeshShape; } diff --git a/Demos/OpenGL/GL_ShapeDrawer.cpp b/Demos/OpenGL/GL_ShapeDrawer.cpp index d55662c54..277a4e9f6 100644 --- a/Demos/OpenGL/GL_ShapeDrawer.cpp +++ b/Demos/OpenGL/GL_ShapeDrawer.cpp @@ -44,7 +44,7 @@ subject to the following restrictions: #include "BMF_Api.h" #include //printf debugging -#define USE_DISPLAY_LISTS 1 +//#define USE_DISPLAY_LISTS 1 #ifdef USE_DISPLAY_LISTS #include