From e2daa1c2774c6e3ff62d5c573f9f7d0430061eec Mon Sep 17 00:00:00 2001 From: "erwin.coumans" Date: Fri, 1 Aug 2008 02:19:26 +0000 Subject: [PATCH] fixes to compile on OSX, minor addition to ChangeLog --- ChangeLog.txt | 9 +++++++++ Demos/Jamfile | 1 + Demos/MultiMaterialDemo/MultiMaterialDemo.cpp | 8 ++++---- Demos/OpenGL/GL_ShapeDrawer.cpp | 4 ++-- src/BulletCollision/CMakeLists.txt | 5 +++++ 5 files changed, 21 insertions(+), 6 deletions(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index e3f86e80f..34269b4d5 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,6 +1,15 @@ Bullet Continuous Collision Detection and Physics Library Primary author and maintainer: Erwin Coumans +todo: update changelog from April - July 2008 + +2008 July 10 + - Added btMultimaterialTriangleMeshShape and MultiMaterialDemo + Thanks to Alex Silverman for the contribution + +2008 June 30 + - Added initial support for kinematic character controller + Thanks to John McCutchan 2008 April 14 - Added ray cast support for Soft Bodies diff --git a/Demos/Jamfile b/Demos/Jamfile index e7617581b..39b59fcb8 100644 --- a/Demos/Jamfile +++ b/Demos/Jamfile @@ -92,6 +92,7 @@ SubInclude TOP Demos CollisionInterfaceDemo ; SubInclude TOP Demos GimpactTestDemo ; SubInclude TOP Demos MovingConcaveDemo ; SubInclude TOP Demos ConcaveDemo ; +SubInclude TOP Demos MultiMaterialDemo ; SubInclude TOP Demos ConstraintDemo ; SubInclude TOP Demos SliderConstraintDemo ; SubInclude TOP Demos RagdollDemo ; diff --git a/Demos/MultiMaterialDemo/MultiMaterialDemo.cpp b/Demos/MultiMaterialDemo/MultiMaterialDemo.cpp index eb65f0b5d..e5b9655c4 100644 --- a/Demos/MultiMaterialDemo/MultiMaterialDemo.cpp +++ b/Demos/MultiMaterialDemo/MultiMaterialDemo.cpp @@ -20,10 +20,10 @@ subject to the following restrictions: #include "GL_ShapeDrawer.h" #include "GlutStuff.h" -#include "BulletCollision\CollisionShapes\btTriangleShape.h" -#include "BulletCollision\CollisionShapes\btTriangleIndexVertexMaterialArray.h" -#include "BulletCollision\CollisionShapes\btMultimaterialTriangleMeshShape.h" -#include "BulletCollision\CollisionShapes\btMaterial.h" +#include "BulletCollision/CollisionShapes/btTriangleShape.h" +#include "BulletCollision/CollisionShapes/btTriangleIndexVertexMaterialArray.h" +#include "BulletCollision/CollisionShapes/btMultimaterialTriangleMeshShape.h" +#include "BulletCollision/CollisionShapes/btMaterial.h" // Create a custom material, just because we can class CustomMaterial : public btMaterial diff --git a/Demos/OpenGL/GL_ShapeDrawer.cpp b/Demos/OpenGL/GL_ShapeDrawer.cpp index 2a3633aa7..deba10c99 100644 --- a/Demos/OpenGL/GL_ShapeDrawer.cpp +++ b/Demos/OpenGL/GL_ShapeDrawer.cpp @@ -413,7 +413,7 @@ void GL_ShapeDrawer::drawOpenGL(btScalar* m, const btCollisionShape* shape, cons pi[0]=pi[1]=pi[2]=c;pi+=3; } } - glGenTextures(1,&m_texturehandle); + glGenTextures(1,(GLuint*)&m_texturehandle); glBindTexture(GL_TEXTURE_2D,m_texturehandle); glTexEnvf(GL_TEXTURE_ENV,GL_TEXTURE_ENV_MODE,GL_MODULATE); glTexParameterf(GL_TEXTURE_2D,GL_TEXTURE_MIN_FILTER,GL_LINEAR_MIPMAP_LINEAR); @@ -839,7 +839,7 @@ GL_ShapeDrawer::~GL_ShapeDrawer() m_shapecaches.clear(); if(m_textureinitialized) { - glDeleteTextures(1,&m_texturehandle); + glDeleteTextures(1,(const GLuint*) &m_texturehandle); } } diff --git a/src/BulletCollision/CMakeLists.txt b/src/BulletCollision/CMakeLists.txt index c0a4b1ead..6ef982702 100644 --- a/src/BulletCollision/CMakeLists.txt +++ b/src/BulletCollision/CMakeLists.txt @@ -89,6 +89,9 @@ ADD_LIBRARY(LibBulletCollision CollisionShapes/btHeightfieldTerrainShape.h CollisionShapes/btMinkowskiSumShape.cpp CollisionShapes/btMinkowskiSumShape.h + CollisionShapes/btMaterial.h + CollisionShapes/btMultiMaterialTriangleMeshShape.cpp + CollisionShapes/btMultiMaterialTriangleMeshShape.h CollisionShapes/btMultiSphereShape.cpp CollisionShapes/btMultiSphereShape.h CollisionShapes/btOptimizedBvh.cpp @@ -111,6 +114,8 @@ ADD_LIBRARY(LibBulletCollision CollisionShapes/btTriangleBuffer.h CollisionShapes/btTriangleIndexVertexArray.cpp CollisionShapes/btTriangleIndexVertexArray.h + CollisionShapes/btTriangleIndexVertexMaterialArray.h + CollisionShapes/btTriangleIndexVertexMaterialArray.cpp CollisionShapes/btTriangleMesh.cpp CollisionShapes/btTriangleMesh.h CollisionShapes/btTriangleMeshShape.cpp