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

rename to b3 convention, to avoid naming conflicts when using in combination with Bullet 2.x

Browse Source
This commit is contained in:
erwincoumans
2013-04-29 15:19:36 -07:00
parent 7366e262fd
commit 55b69201a9
88 changed files with 1682 additions and 1584 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
demo/donttouch/GpuDemo.cpp
View File

@@ -74,7 +74,7 @@ void GpuDemo::clientMoveAndDisplay()
count++;
if (count==25)
{
//CProfileManager::dumpAll();
//b3ProfileManager::dumpAll();
}
}

2
demo/donttouch/OpenGL3CoreRenderer.cpp
View File

@@ -311,7 +311,7 @@ GraphicsShape* createGraphicsShapeFromWavefrontObj(objLoader* obj)
vtx.xyzw[1] = obj->vertexList[v]->e[1];
vtx.xyzw[2] = obj->vertexList[v]->e[2];
b3Vector3 n(vtx.xyzw[0],vtx.xyzw[1],vtx.xyzw[2]);
if (n.length2()>SIMD_EPSILON)
if (n.length2()>B3_EPSILON)
{
n.normalize();
vtx.normal[0] = n[0];

4
demo/donttouch/b3GpuDynamicsWorld.cpp
View File

@@ -46,7 +46,7 @@ void b3GpuDynamicsWorld::exitOpenCL()
int b3GpuDynamicsWorld::stepSimulation( b3Scalar timeStep,int maxSubSteps, b3Scalar fixedTimeStep)
{
#ifndef B3_NO_PROFILE
// CProfileManager::Reset();
// b3ProfileManager::Reset();
#endif //B3_NO_PROFILE
B3_PROFILE("stepSimulation");
@@ -86,7 +86,7 @@ int b3GpuDynamicsWorld::stepSimulation( b3Scalar timeStep,int maxSubSteps, b3Sc
#ifndef B3_NO_PROFILE
//CProfileManager::Increment_Frame_Counter();
//b3ProfileManager::Increment_Frame_Counter();
#endif //B3_NO_PROFILE