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

fix btQuaternion(1,0,0,0) ->fix btQuaternion(0,0,0,1)

Browse Source
This commit is contained in:
erwin coumans
2013-04-03 18:28:06 -07:00
parent 4a93c2e704
commit 733572e625
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
demo/gpudemo/broadphase/PairBench.cpp
View File

@@ -188,7 +188,7 @@ void PairBench::initPhysics(const ConstructionInfo& ci)
for (int k=0;k<ci.arraySizeZ;k++) for (int k=0;k<ci.arraySizeZ;k++)
{ {
btVector3 position(k*3,i*3,j*3); btVector3 position(k*3,i*3,j*3);
btQuaternion orn(1,0,0,0); btQuaternion orn(0,0,0,1);
btVector4 color(0,1,0,1); btVector4 color(0,1,0,1);
btVector4 scaling(1,1,1,1); btVector4 scaling(1,1,1,1);

2
demo/gpudemo/rigidbody/ConcaveScene.cpp
View File

@@ -273,7 +273,7 @@ void ConcaveScene::setupScene(const ConstructionInfo& ci)
//btVector3 position(-2*ci.gapX+i*ci.gapX,25+j*ci.gapY,-2*ci.gapZ+k*ci.gapZ); //btVector3 position(-2*ci.gapX+i*ci.gapX,25+j*ci.gapY,-2*ci.gapZ+k*ci.gapZ);
btVector3 position(-(ci.arraySizeX/2)*CONCAVE_GAPX+i*CONCAVE_GAPX,50+j*CONCAVE_GAPY,-(ci.arraySizeZ/2)*CONCAVE_GAPZ+k*CONCAVE_GAPZ); btVector3 position(-(ci.arraySizeX/2)*CONCAVE_GAPX+i*CONCAVE_GAPX,50+j*CONCAVE_GAPY,-(ci.arraySizeZ/2)*CONCAVE_GAPZ+k*CONCAVE_GAPZ);
btQuaternion orn(1,0,0,0); btQuaternion orn(0,0,0,1);
btVector4 color = colors[curColor]; btVector4 color = colors[curColor];
curColor++; curColor++;

4
demo/gpudemo/rigidbody/GpuConvexScene.cpp
View File

@@ -35,7 +35,7 @@ void GpuConvexScene::setupScene(const ConstructionInfo& ci)
btVector4 scaling(400,1,400,1); btVector4 scaling(400,1,400,1);
int colIndex = m_data->m_np->registerConvexHullShape(&cube_vertices[0],strideInBytes,numVertices, scaling); int colIndex = m_data->m_np->registerConvexHullShape(&cube_vertices[0],strideInBytes,numVertices, scaling);
btVector3 position(0,0,0); btVector3 position(0,0,0);
btQuaternion orn(1,0,0,0); btQuaternion orn(0,0,0,1);
btVector4 color(0,0,1,1); btVector4 color(0,0,1,1);
@@ -69,7 +69,7 @@ void GpuConvexScene::setupScene(const ConstructionInfo& ci)
btVector3 position((j&1)+i*2.2,2+j*2.,(j&1)+k*2.2); btVector3 position((j&1)+i*2.2,2+j*2.,(j&1)+k*2.2);
btQuaternion orn(1,0,0,0); btQuaternion orn(0,0,0,1);
btVector4 color = colors[curColor]; btVector4 color = colors[curColor];
curColor++; curColor++;