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

Assorted cleanup of compilation warnings. Also fixed some actual errors:

Browse Source 
#include "renderTexture.h"...when the file is actually called 'RenderTexture.h'.
This commit is contained in:
sjbaker
2006-10-01 00:08:09 +00:00
parent 62bdd2bde2
commit 2aaab1ab1a
15 changed files with 30 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Demos/ConcaveDemo/ConcavePhysicsDemo.cpp
View File

@@ -146,14 +146,10 @@ void ConcaveDemo::initPhysics()
totalVerts,(float*) &gVertices[0].x(),vertStride);
btCollisionShape* trimeshShape = new btBvhTriangleMeshShape(indexVertexArrays);
// btConstraintSolver* solver = new btSequentialImpulseConstraintSolver;
btCollisionDispatcher* dispatcher = new btCollisionDispatcher();
btOverlappingPairCache* broadphase = new btSimpleBroadphase();
//btConstraintSolver* solver = new btSequentialImpulseConstraintSolver;
//btCollisionDispatcher* dispatcher = new btCollisionDispatcher();
//btOverlappingPairCache* broadphase = new btSimpleBroadphase();
m_dynamicsWorld = new btDiscreteDynamicsWorld();

10
Demos/ConstraintDemo/ConstraintDemo.cpp
View File

@@ -52,11 +52,8 @@ void ConstraintDemo::initPhysics()
{
//ConstraintSolver* solver = new btSequentialImpulseConstraintSolver;
//ConstraintSolver* solver = new OdeConstraintSolver;
btCollisionDispatcher* dispatcher = new btCollisionDispatcher();
btOverlappingPairCache* broadphase = new btSimpleBroadphase();
//btCollisionDispatcher* dispatcher = new btCollisionDispatcher();
//btOverlappingPairCache* broadphase = new btSimpleBroadphase();
m_dynamicsWorld = new btDiscreteDynamicsWorld();
@@ -80,8 +77,6 @@ void ConstraintDemo::initPhysics()
clientResetScene();
{
int constraintId;
btVector3 pivotInA(CUBE_HALF_EXTENTS,-CUBE_HALF_EXTENTS,-CUBE_HALF_EXTENTS);
btVector3 axisInA(0,0,1);
@@ -110,7 +105,6 @@ void ConstraintDemo::clientMoveAndDisplay()
glFlush();
glutSwapBuffers();
}

7
Demos/OpenGL/DemoApplication.cpp
View File

@@ -479,9 +479,6 @@ void DemoApplication::mouseFunc(int button, int state, int x, int y)
//apply an impulse
if (m_dynamicsWorld)
{
float hit[3];
float normal[3];
btCollisionWorld::ClosestRayResultCallback rayCallback(m_cameraPosition,rayTo);
m_dynamicsWorld->rayTest(m_cameraPosition,rayTo,rayCallback);
if (rayCallback.HasHit())
@@ -517,8 +514,6 @@ void DemoApplication::mouseFunc(int button, int state, int x, int y)
//add a point to point constraint for picking
if (m_dynamicsWorld)
{
float hit[3];
float normal[3];
btCollisionWorld::ClosestRayResultCallback rayCallback(m_cameraPosition,rayTo);
m_dynamicsWorld->rayTest(m_cameraPosition,rayTo,rayCallback);
if (rayCallback.HasHit())
@@ -768,7 +763,7 @@ void DemoApplication::renderme()
BMF_DrawString(BMF_GetFont(BMF_kHelvetica10),buf);
yStart += yIncr;
bool useBulletLCP = !(getDebugMode() & btIDebugDraw::DBG_DisableBulletLCP);
//bool useBulletLCP = !(getDebugMode() & btIDebugDraw::DBG_DisableBulletLCP);
bool useCCD = (getDebugMode() & btIDebugDraw::DBG_EnableCCD);

2
Demos/OpenGL/RenderTexture.cpp
View File

@@ -13,7 +13,7 @@ subject to the following restrictions:
3. This notice may not be removed or altered from any source distribution.
*/
#include "renderTexture.h"
#include "RenderTexture.h"
#include <memory.h>
#include "BMF_FontData.h"

1
Demos/OpenGL/RenderTexture.h
View File

@@ -51,3 +51,4 @@ public:
};
#endif //RENDER_TEXTURE_H

2
Demos/Raytracer/Raytracer.cpp
View File

@@ -46,7 +46,7 @@ Very basic raytracer, rendering into a texture.
#include "renderTexture.h"
#include "RenderTexture.h"
btVoronoiSimplexSolver simplexSolver;