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

fixes to compile on OSX, minor addition to ChangeLog

Browse Source
This commit is contained in:
erwin.coumans
2008-08-01 02:19:26 +00:00
parent 4894f24c9a
commit e2daa1c277
5 changed files with 21 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Demos/Jamfile
View File

@@ -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 ;

8
Demos/MultiMaterialDemo/MultiMaterialDemo.cpp
View File

@@ -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

4
Demos/OpenGL/GL_ShapeDrawer.cpp
View File

@@ -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);
}
}