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

resolve some naming conflicts between Bullet 3.x and Bullet 2.x

Browse Source 
add BasicGpuDemo that bridges Bullet 2.x and Bullet 3.x (still preliminary/crashing/instable)
This commit is contained in:
erwincoumans
2013-04-30 18:17:44 -07:00
parent bf7a779562
commit e999903c15
27 changed files with 1581 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/Bullet3OpenCL/NarrowphaseCollision/b3QuantizedBvh.cpp
View File

@@ -346,7 +346,7 @@ void b3QuantizedBvh::reportAabbOverlappingNodex(b3NodeOverlapCallback* nodeCallb
}
int maxIterations = 0;
static int b3s_maxIterations = 0;
void b3QuantizedBvh::walkStacklessTree(b3NodeOverlapCallback* nodeCallback,const b3Vector3& aabbMin,const b3Vector3& aabbMax) const
@@ -387,8 +387,8 @@ void b3QuantizedBvh::walkStacklessTree(b3NodeOverlapCallback* nodeCallback,const
curIndex += escapeIndex;
}
}
if (maxIterations < walkIterations)
maxIterations = walkIterations;
if (b3s_maxIterations < walkIterations)
b3s_maxIterations = walkIterations;
}
@@ -530,8 +530,8 @@ void b3QuantizedBvh::walkStacklessTreeAgainstRay(b3NodeOverlapCallback* nodeCall
curIndex += escapeIndex;
}
}
if (maxIterations < walkIterations)
maxIterations = walkIterations;
if (b3s_maxIterations < walkIterations)
b3s_maxIterations = walkIterations;
}
@@ -658,8 +658,8 @@ void b3QuantizedBvh::walkStacklessQuantizedTreeAgainstRay(b3NodeOverlapCallback*
curIndex += escapeIndex;
}
}
if (maxIterations < walkIterations)
maxIterations = walkIterations;
if (b3s_maxIterations < walkIterations)
b3s_maxIterations = walkIterations;
}
@@ -723,8 +723,8 @@ void b3QuantizedBvh::walkStacklessQuantizedTree(b3NodeOverlapCallback* nodeCallb
curIndex += escapeIndex;
}
}
if (maxIterations < walkIterations)
maxIterations = walkIterations;
if (b3s_maxIterations < walkIterations)
b3s_maxIterations = walkIterations;
}