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

Removed obsolete btPoint3: use btVector3 instead

Browse Source
This commit is contained in:
erwin.coumans
2008-10-27 19:56:48 +00:00
parent 52a151f5e4
commit 6f28170422
77 changed files with 215 additions and 261 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Demos/BspDemo/BspLoader.h
View File

@@ -278,7 +278,7 @@ class BspLoader
enum
{
BSP_LITTLE_ENDIAN = 0,
BSP_BIG_ENDIAN = 1,
BSP_BIG_ENDIAN = 1
};
//returns machines big endian / little endian

4
Demos/CcdPhysicsDemo/CcdPhysicsDemo.cpp
View File

@@ -104,8 +104,8 @@ int shapeIndex[maxNumObjects];
#define CUBE_HALF_EXTENTS 0.5
#define EXTRA_HEIGHT -10.f
//GL_LineSegmentShape shapeE(btPoint3(-50,0,0),
// btPoint3(50,0,0));
//GL_LineSegmentShape shapeE(btVector3(-50,0,0),
// btVector3(50,0,0));
void CcdPhysicsDemo::createStack( btCollisionShape* boxShape, float halfCubeSize, int size, float zPos )

2
Demos/CollisionDemo/CollisionDemo.cpp
View File

@@ -241,7 +241,7 @@ void CollisionDemo::displayCallback(void) {
}
simplex.setSimplexSolver(&sGjkSimplexSolver);
btPoint3 ybuf[4],pbuf[4],qbuf[4];
btVector3 ybuf[4],pbuf[4],qbuf[4];
int numpoints = sGjkSimplexSolver.getSimplex(pbuf,qbuf,ybuf);
simplex.reset();

3
Demos/CollisionInterfaceDemo/CollisionInterfaceDemo.cpp
View File

@@ -68,9 +68,6 @@ void CollisionInterfaceDemo::initPhysics()
objects[0].getWorldTransform().setBasis(basisA);
objects[1].getWorldTransform().setBasis(basisB);
//btPoint3 points0[3]={btPoint3(1,0,0),btPoint3(0,1,0),btPoint3(0,0,1)};
//btPoint3 points1[5]={btPoint3(1,0,0),btPoint3(0,1,0),btPoint3(0,0,1),btPoint3(0,0,-1),btPoint3(-1,-1,0)};
btBoxShape* boxA = new btBoxShape(btVector3(1,1,1));
btBoxShape* boxB = new btBoxShape(btVector3(0.5,0.5,0.5));
//ConvexHullShape hullA(points0,3);

6
Demos/ContinuousConvexCollision/ContinuousConvexCollisionDemo.cpp
View File

@@ -99,13 +99,11 @@ void btContinuousConvexCollisionDemo::initPhysics()
btVector3 boxHalfExtentsA(10,1,1);
btVector3 boxHalfExtentsB(1.1f,1.1f,1.1f);
btBoxShape* boxA = new btBoxShape(boxHalfExtentsA);
// btBU_Simplex1to4* boxA = new btBU_Simplex1to4(btPoint3(-2,0,-2),btPoint3(2,0,-2),btPoint3(0,0,2),btPoint3(0,2,0));
// btBU_Simplex1to4* boxA = new btBU_Simplex1to4(btPoint3(-12,0,0),btPoint3(12,0,0));
// btBU_Simplex1to4* boxA = new btBU_Simplex1to4(btVector3(-2,0,-2),btVector3(2,0,-2),btVector3(0,0,2),btVector3(0,2,0));
// btBU_Simplex1to4* boxA = new btBU_Simplex1to4(btVector3(-12,0,0),btVector3(12,0,0));
btBoxShape* boxB = new btBoxShape(boxHalfExtentsB);
// btBU_Simplex1to4 boxB(btPoint3(0,10,0),btPoint3(0,-10,0));
shapePtr[0] = boxA;
shapePtr[1] = boxB;

2
Demos/ConvexDecompositionDemo/ConvexDecompositionDemo.cpp
View File

@@ -321,7 +321,7 @@ void ConvexDecompositionDemo::initPhysics(const char* filename)
btConvexHullShape* convexShape = new btConvexHullShape();
for (i=0;i<hull->numVertices();i++)
{
convexShape->addPoint(btPoint3(hull->getVertexPointer()[i]));
convexShape->addPoint(hull->getVertexPointer()[i]);
}
delete tmpConvexShape;

4
Demos/DynamicControlDemo/MotorDemo.cpp
View File

@@ -264,8 +264,8 @@ void MotorDemo::initPhysics()
m_dispatcher = new btCollisionDispatcher(m_collisionConfiguration);
btPoint3 worldAabbMin(-10000,-10000,-10000);
btPoint3 worldAabbMax(10000,10000,10000);
btVector3 worldAabbMin(-10000,-10000,-10000);
btVector3 worldAabbMax(10000,10000,10000);
m_broadphase = new btAxisSweep3 (worldAabbMin, worldAabbMax);
m_solver = new btSequentialImpulseConstraintSolver;

4
Demos/GenericJointDemo/GenericJointDemo.cpp
View File

@@ -68,8 +68,8 @@ void GenericJointDemo::initPhysics()
btCollisionDispatcher* dispatcher = new btCollisionDispatcher(collision_config);
btPoint3 worldAabbMin(-10000,-10000,-10000);
btPoint3 worldAabbMax(10000,10000,10000);
btVector3 worldAabbMin(-10000,-10000,-10000);
btVector3 worldAabbMax(10000,10000,10000);
btBroadphaseInterface* overlappingPairCache = new btAxisSweep3 (worldAabbMin, worldAabbMax);
#ifdef USE_ODE_QUICKSTEP

4
Demos/MultiThreadedDemo/MultiThreadedDemo.cpp
View File

@@ -87,8 +87,8 @@ static int shapeIndex[maxNumObjects];
#define CUBE_HALF_EXTENTS 0.5
#define EXTRA_HEIGHT -10.f
//GL_LineSegmentShape shapeE(btPoint3(-50,0,0),
// btPoint3(50,0,0));
//GL_LineSegmentShape shapeE(btVector3(-50,0,0),
// btVector3(50,0,0));
void MultiThreadedDemo::createStack( btCollisionShape* boxShape, float halfCubeSize, int size, float zPos )

1
Demos/OpenGL/GLDebugDrawer.cpp
View File

@@ -1,6 +1,5 @@
#include "GLDebugDrawer.h"
#include "LinearMath/btPoint3.h"
#ifdef WIN32 //needed for glut.h
#include <windows.h>

4
Demos/OpenGL/GL_ShapeDrawer.cpp
View File

@@ -657,7 +657,7 @@ void GL_ShapeDrawer::drawOpenGL(btScalar* m, const btCollisionShape* shape, cons
int i;
for (i=0;i<polyshape->getNumVertices();i++)
{
btPoint3 vtx;
btVector3 vtx;
polyshape->getVertex(i,vtx);
glRasterPos3f(vtx.x(), vtx.y(), vtx.z());
char buf[12];
@@ -668,7 +668,7 @@ void GL_ShapeDrawer::drawOpenGL(btScalar* m, const btCollisionShape* shape, cons
for (i=0;i<polyshape->getNumPlanes();i++)
{
btVector3 normal;
btPoint3 vtx;
btVector3 vtx;
polyshape->getPlane(normal,vtx,i);
btScalar d = vtx.dot(normal);

2
Demos/OpenGL/GL_Simplex1to4.cpp
View File

@@ -56,7 +56,7 @@ void GL_Simplex1to4::calcClosest(btScalar* m)
for (int i=0;i<m_numVertices;i++)
{
v = tr(m_vertices[i]);
m_simplexSolver->addVertex(v,v,btPoint3(0.f,0.f,0.f));
m_simplexSolver->addVertex(v,v,btVector3(0.f,0.f,0.f));
res = m_simplexSolver->closest(v);
}

4
Demos/RagdollDemo/RagdollDemo.cpp
View File

@@ -318,8 +318,8 @@ void RagdollDemo::initPhysics()
m_dispatcher = new btCollisionDispatcher(m_collisionConfiguration);
btPoint3 worldAabbMin(-10000,-10000,-10000);
btPoint3 worldAabbMax(10000,10000,10000);
btVector3 worldAabbMin(-10000,-10000,-10000);
btVector3 worldAabbMax(10000,10000,10000);
m_broadphase = new btAxisSweep3 (worldAabbMin, worldAabbMax);
m_solver = new btSequentialImpulseConstraintSolver;

8
Demos/SimplexDemo/SimplexDemo.cpp
View File

@@ -109,10 +109,10 @@ void SimplexDemo::initPhysics()
simplex.setSimplexSolver(&simplexSolver);
simplex.addVertex(btPoint3(-2,0,-2));
simplex.addVertex(btPoint3(2,0,-2));
simplex.addVertex(btPoint3(0,0,2));
simplex.addVertex(btPoint3(0,2,0));
simplex.addVertex(btVector3(-2,0,-2));
simplex.addVertex(btVector3(2,0,-2));
simplex.addVertex(btVector3(0,0,2));
simplex.addVertex(btVector3(0,2,0));
shapePtr[0] = &simplex;