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

minor fixes in GLDebugFont.cpp

Browse Source 
update automake Makefile.am, add some missing files such as btActionInterface.h
http://code.google.com/p/bullet/issues/detail?id=258
unix line endings for install-sh
This commit is contained in:
erwin.coumans
2009-09-17 22:02:11 +00:00
parent 172b87188b
commit 0d0da7ae4e
3 changed files with 333 additions and 324 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Demos/OpenGL/GLDebugFont.cpp
View File

@@ -86,7 +86,7 @@ void GLDebugDrawString(int x,int y,const char* string)
glLoadIdentity(); glLoadIdentity();
glTranslated(x,sScreenHeight - y,0); glTranslated(x,sScreenHeight - y,0);
for (int i=0;i<strlen(string);i++) for (int i=0;i<int (strlen(string));i++)
{ {
char ch = string[i]-32; char ch = string[i]-32;
if (ch>=0) if (ch>=0)
@@ -122,7 +122,7 @@ void GLDebugDrawString(int x,int y,const char* string)
glLoadIdentity(); glLoadIdentity();
glScalef(0.025,0.025,0.025); glScalef(0.025,0.025,0.025);
glMatrixMode(GL_MODELVIEW);
//glDisable(GL_TEXTURE_2D); //glDisable(GL_TEXTURE_2D);
} }

9
src/Makefile.am
View File

@@ -143,11 +143,13 @@ libbulletcollision_la_SOURCES = \
BulletCollision/CollisionDispatch/btConvexPlaneCollisionAlgorithm.cpp \ BulletCollision/CollisionDispatch/btConvexPlaneCollisionAlgorithm.cpp \
BulletCollision/CollisionDispatch/btConvexConcaveCollisionAlgorithm.cpp \ BulletCollision/CollisionDispatch/btConvexConcaveCollisionAlgorithm.cpp \
BulletCollision/CollisionDispatch/btBoxBoxCollisionAlgorithm.cpp \ BulletCollision/CollisionDispatch/btBoxBoxCollisionAlgorithm.cpp \
BulletCollision/CollisionDispatch/btBox2dBox2dCollisionAlgorithm.cpp \
BulletCollision/CollisionDispatch/SphereTriangleDetector.cpp \ BulletCollision/CollisionDispatch/SphereTriangleDetector.cpp \
BulletCollision/CollisionDispatch/btManifoldResult.cpp \ BulletCollision/CollisionDispatch/btManifoldResult.cpp \
BulletCollision/CollisionDispatch/btCollisionWorld.cpp \ BulletCollision/CollisionDispatch/btCollisionWorld.cpp \
BulletCollision/CollisionDispatch/btSphereTriangleCollisionAlgorithm.cpp \ BulletCollision/CollisionDispatch/btSphereTriangleCollisionAlgorithm.cpp \
BulletCollision/CollisionDispatch/btConvexConvexAlgorithm.cpp \ BulletCollision/CollisionDispatch/btConvexConvexAlgorithm.cpp \
BulletCollision/CollisionDispatch/btConvex2dConvex2dAlgorithm.cpp \
BulletCollision/CollisionDispatch/btUnionFind.cpp \ BulletCollision/CollisionDispatch/btUnionFind.cpp \
BulletCollision/CollisionDispatch/btCompoundCollisionAlgorithm.cpp \ BulletCollision/CollisionDispatch/btCompoundCollisionAlgorithm.cpp \
BulletCollision/CollisionShapes/btTetrahedronShape.cpp \ BulletCollision/CollisionShapes/btTetrahedronShape.cpp \
@@ -167,6 +169,7 @@ libbulletcollision_la_SOURCES = \
BulletCollision/CollisionShapes/btEmptyShape.cpp \ BulletCollision/CollisionShapes/btEmptyShape.cpp \
BulletCollision/CollisionShapes/btCollisionShape.cpp \ BulletCollision/CollisionShapes/btCollisionShape.cpp \
BulletCollision/CollisionShapes/btConvexShape.cpp \ BulletCollision/CollisionShapes/btConvexShape.cpp \
BulletCollision/CollisionShapes/btConvex2dShape.cpp \
BulletCollision/CollisionShapes/btConvexInternalShape.cpp \ BulletCollision/CollisionShapes/btConvexInternalShape.cpp \
BulletCollision/CollisionShapes/btConvexHullShape.cpp \ BulletCollision/CollisionShapes/btConvexHullShape.cpp \
BulletCollision/CollisionShapes/btTriangleCallback.cpp \ BulletCollision/CollisionShapes/btTriangleCallback.cpp \
@@ -175,6 +178,7 @@ libbulletcollision_la_SOURCES = \
BulletCollision/CollisionShapes/btConcaveShape.cpp \ BulletCollision/CollisionShapes/btConcaveShape.cpp \
BulletCollision/CollisionShapes/btConvexPointCloudShape.cpp \ BulletCollision/CollisionShapes/btConvexPointCloudShape.cpp \
BulletCollision/CollisionShapes/btBoxShape.cpp \ BulletCollision/CollisionShapes/btBoxShape.cpp \
BulletCollision/CollisionShapes/btBox2dShape.cpp \
BulletCollision/CollisionShapes/btOptimizedBvh.cpp \ BulletCollision/CollisionShapes/btOptimizedBvh.cpp \
BulletCollision/CollisionShapes/btHeightfieldTerrainShape.cpp \ BulletCollision/CollisionShapes/btHeightfieldTerrainShape.cpp \
BulletCollision/CollisionShapes/btMultimaterialTriangleMeshShape.cpp \ BulletCollision/CollisionShapes/btMultimaterialTriangleMeshShape.cpp \
@@ -311,6 +315,7 @@ libbulletdynamics_la_SOURCES = \
BulletDynamics/Character/btKinematicCharacterController.cpp \ BulletDynamics/Character/btKinematicCharacterController.cpp \
BulletDynamics/Character/btKinematicCharacterController.h \ BulletDynamics/Character/btKinematicCharacterController.h \
BulletDynamics/Character/btCharacterControllerInterface.h \ BulletDynamics/Character/btCharacterControllerInterface.h \
BulletDynamics/Dynamics/btActionInterface.h \
BulletDynamics/Dynamics/btContinuousDynamicsWorld.h \ BulletDynamics/Dynamics/btContinuousDynamicsWorld.h \
BulletDynamics/Dynamics/btSimpleDynamicsWorld.h \ BulletDynamics/Dynamics/btSimpleDynamicsWorld.h \
BulletDynamics/Dynamics/btRigidBody.h \ BulletDynamics/Dynamics/btRigidBody.h \
@@ -420,11 +425,13 @@ nobase_bullet_include_HEADERS += \
BulletCollision/CollisionShapes/btTriangleIndexVertexArray.h \ BulletCollision/CollisionShapes/btTriangleIndexVertexArray.h \
BulletCollision/CollisionShapes/btTriangleBuffer.h \ BulletCollision/CollisionShapes/btTriangleBuffer.h \
BulletCollision/CollisionShapes/btConvexShape.h \ BulletCollision/CollisionShapes/btConvexShape.h \
BulletCollision/CollisionShapes/btConvex2dShape.h \
BulletCollision/CollisionShapes/btStaticPlaneShape.h \ BulletCollision/CollisionShapes/btStaticPlaneShape.h \
BulletCollision/CollisionShapes/btConeShape.h \ BulletCollision/CollisionShapes/btConeShape.h \
BulletCollision/CollisionShapes/btCollisionShape.h \ BulletCollision/CollisionShapes/btCollisionShape.h \
BulletCollision/CollisionShapes/btTriangleShape.h \ BulletCollision/CollisionShapes/btTriangleShape.h \
BulletCollision/CollisionShapes/btBoxShape.h \ BulletCollision/CollisionShapes/btBoxShape.h \
BulletCollision/CollisionShapes/btBox2dShape.h \
BulletCollision/CollisionShapes/btMinkowskiSumShape.h \ BulletCollision/CollisionShapes/btMinkowskiSumShape.h \
BulletCollision/CollisionShapes/btTriangleMeshShape.h \ BulletCollision/CollisionShapes/btTriangleMeshShape.h \
BulletCollision/CollisionShapes/btMaterial.h \ BulletCollision/CollisionShapes/btMaterial.h \
@@ -467,9 +474,11 @@ nobase_bullet_include_HEADERS += \
BulletCollision/CollisionDispatch/btCollisionCreateFunc.h \ BulletCollision/CollisionDispatch/btCollisionCreateFunc.h \
BulletCollision/CollisionDispatch/btSphereTriangleCollisionAlgorithm.h \ BulletCollision/CollisionDispatch/btSphereTriangleCollisionAlgorithm.h \
BulletCollision/CollisionDispatch/btConvexConvexAlgorithm.h \ BulletCollision/CollisionDispatch/btConvexConvexAlgorithm.h \
BulletCollision/CollisionDispatch/btConvex2dConvex2dAlgorithm.h \
BulletCollision/CollisionDispatch/btCollisionObject.h \ BulletCollision/CollisionDispatch/btCollisionObject.h \
BulletCollision/CollisionDispatch/btConvexPlaneCollisionAlgorithm.h \ BulletCollision/CollisionDispatch/btConvexPlaneCollisionAlgorithm.h \
BulletCollision/CollisionDispatch/btBoxBoxCollisionAlgorithm.h \ BulletCollision/CollisionDispatch/btBoxBoxCollisionAlgorithm.h \
BulletCollision/CollisionDispatch/btBox2dBox2dCollisionAlgorithm.h \
BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.h \ BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.h \
BulletCollision/CollisionDispatch/btCompoundCollisionAlgorithm.h \ BulletCollision/CollisionDispatch/btCompoundCollisionAlgorithm.h \
BulletCollision/CollisionDispatch/btSphereBoxCollisionAlgorithm.h \ BulletCollision/CollisionDispatch/btSphereBoxCollisionAlgorithm.h \