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

Minor fixes to keep trunk compiling, while doing the refactoring.

Browse Source
This commit is contained in:
erwin.coumans
2008-12-01 07:24:39 +00:00
parent bbfdcd44b6
commit dd21959709
7 changed files with 23 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Demos/Benchmarks/BenchmarkDemo.cpp
View File

@@ -91,7 +91,7 @@ public:
// rotate around by alpha degrees y // rotate around by alpha degrees y
btQuaternion q(btVector3(0.0, 1.0, 0.0), alpha); btQuaternion q(btVector3(0.0, 1.0, 0.0), alpha);
direction[i] = btVector3(1.0, 0.0, 0.0); direction[i] = btVector3(1.0, 0.0, 0.0);
direction[i] = q * direction[i]; direction[i] = quatRotate(q , direction[i]);
direction[i] = direction[i] * ray_length; direction[i] = direction[i] * ray_length;

8
Demos/BspDemo/BspConverter.cpp
View File

@@ -81,8 +81,8 @@ void BspConverter::convertBsp(BspLoader& bspLoader,float scaling)
planeEq.setValue( planeEq.setValue(
plane.normal[0], plane.normal[0],
plane.normal[1], plane.normal[1],
plane.normal[2], plane.normal[2]);
scaling*-plane.dist); planeEq[3] = scaling*-plane.dist;
planeEquations.push_back(planeEq); planeEquations.push_back(planeEq);
isValidBrush=true; isValidBrush=true;
@@ -160,8 +160,8 @@ void BspConverter::convertBsp(BspLoader& bspLoader,float scaling)
planeEq.setValue( planeEq.setValue(
plane.normal[0], plane.normal[0],
plane.normal[1], plane.normal[1],
plane.normal[2], plane.normal[2]);
scaling*-plane.dist); planeEq[3] = scaling*-plane.dist;
planeEquations.push_back(planeEq); planeEquations.push_back(planeEq);
isValidBrush=true; isValidBrush=true;
} }

2
Demos/CcdPhysicsDemo/CcdPhysicsDemo.cpp
View File

@@ -119,7 +119,7 @@ void CcdPhysicsDemo::createStack( btCollisionShape* boxShape, float halfCubeSize
int rowSize = size - i; int rowSize = size - i;
for(int j=0; j< rowSize; j++) for(int j=0; j< rowSize; j++)
{ {
btVector4 pos; btVector3 pos;
pos.setValue( pos.setValue(
-rowSize * halfCubeSize + halfCubeSize + j * 2.0f * halfCubeSize, -rowSize * halfCubeSize + halfCubeSize + j * 2.0f * halfCubeSize,
halfCubeSize + i * halfCubeSize * 2.0f, halfCubeSize + i * halfCubeSize * 2.0f,

4
Demos/ConcaveConvexcastDemo/ConcaveConvexcastDemo.cpp
View File

@@ -123,9 +123,9 @@ public:
{ {
btScalar alpha = dalpha * i; btScalar alpha = dalpha * i;
// rotate around by alpha degrees y // rotate around by alpha degrees y
btQuaternion q(btVector3(0.0, 1.0, 0.0), alpha); btTransform tr(btQuaternion(btVector3(0.0, 1.0, 0.0), alpha));
direction[i] = btVector3(1.0, 0.0, 0.0); direction[i] = btVector3(1.0, 0.0, 0.0);
direction[i] = q * direction[i]; direction[i] = tr * direction[i];
direction[i] = direction[i]; direction[i] = direction[i];
source[i] = btVector3(min_x, max_y, z); source[i] = btVector3(min_x, max_y, z);
dest[i] = source[i] + direction[i] * ray_length; dest[i] = source[i] + direction[i] * ray_length;

4
Demos/ConcaveRaycastDemo/ConcaveRaycastDemo.cpp
View File

@@ -126,9 +126,9 @@ public:
{ {
btScalar alpha = dalpha * i; btScalar alpha = dalpha * i;
// rotate around by alpha degrees y // rotate around by alpha degrees y
btQuaternion q(btVector3(0.0, 1.0, 0.0), alpha); btTransform tr (btQuaternion (btVector3(0.0, 1.0, 0.0), alpha));
direction[i] = btVector3(1.0, 0.0, 0.0); direction[i] = btVector3(1.0, 0.0, 0.0);
direction[i] = q * direction[i]; direction[i] = tr* direction[i];
direction[i] = direction[i] * ray_length; direction[i] = direction[i] * ray_length;
source[i] = btVector3(min_x, max_y, z); source[i] = btVector3(min_x, max_y, z);
dest[i] = source[i] + direction[i]; dest[i] = source[i] + direction[i];

2
Demos/SoftDemo/SoftDemo.cpp
View File

@@ -76,7 +76,7 @@ void SoftDemo::createStack( btCollisionShape* boxShape, float halfCubeSize, int
int rowSize = size - i; int rowSize = size - i;
for(int j=0; j< rowSize; j++) for(int j=0; j< rowSize; j++)
{ {
btVector4 pos; btVector3 pos;
pos.setValue( pos.setValue(
-rowSize * halfCubeSize + halfCubeSize + j * 2.0f * halfCubeSize, -rowSize * halfCubeSize + halfCubeSize + j * 2.0f * halfCubeSize,
halfCubeSize + i * halfCubeSize * 2.0f, halfCubeSize + i * halfCubeSize * 2.0f,

13
src/BulletDynamics/Vehicle/btRaycastVehicle.h
View File

@@ -180,7 +180,18 @@ public:
//not yet //not yet
} }
virtual void solveConstraint(btScalar timeStep) virtual void getInfo1 (btConstraintInfo1* info)
{
info->m_numConstraintRows = 0;
info->nub = 0;
}
virtual void getInfo2 (btConstraintInfo2* info)
{
btAssert(0);
}
virtual void solveConstraintObsolete(btSolverBody& bodyA,btSolverBody& bodyB,btScalar timeStep)
{ {
(void)timeStep; (void)timeStep;
//not yet //not yet