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

Fix issues with btSortedOverlappingPairCache, both for btAxisSweep3 and btDbvtBroadphase.

Browse Source
This commit is contained in:
erwin.coumans
2009-02-09 22:57:52 +00:00
parent cf751f5493
commit 98436a85c3
5 changed files with 80 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Demos/BspDemo/main.cpp
View File

@@ -54,6 +54,6 @@ int main(int argc,char** argv)
return glutmain(argc, argv,640,480,"Bullet Quake BSP Physics Viewer http://bullet.sourceforge.net",bspDemo);
return glutmain(argc, argv,640,480,"Bullet Quake BSP Physics Viewer http://bulletphysics.org",bspDemo);
}

2
Demos/ColladaDemo/ColladaDemo.cpp
View File

@@ -98,7 +98,7 @@ int main(int argc,char** argv)
colladaDemo->setCameraDistance(26.f);
return glutmain(argc, argv,640,480,"Bullet COLLADA Physics Viewer http://bullet.sourceforge.net",colladaDemo);
return glutmain(argc, argv,640,480,"Bullet COLLADA Physics Viewer http://bulletphysics.org",colladaDemo);
}
void ColladaDemo::initPhysics(const char* filename)

5
Demos/OpenGL/DemoApplication.cpp
View File

@@ -278,7 +278,7 @@ void DemoApplication::keyboardCallback(unsigned char key, int x, int y)
m_lastKey = 0;
#ifndef BT_NO_PROFILE
if (key >= 0x31 && key < 0x37)
if (key >= 0x31 && key <= 0x39)
{
int child = key-0x31;
m_profileIterator->Enter_Child(child);
@@ -1248,6 +1248,7 @@ void DemoApplication::renderme()
updateCamera();
}
#include "BulletCollision/BroadphaseCollision/btAxisSweep3.h"
void DemoApplication::clientResetScene()
{
@@ -1290,6 +1291,8 @@ void DemoApplication::clientResetScene()
}
}
btAxisSweep3* sap = (btAxisSweep3*)m_dynamicsWorld->getBroadphase();
sap->resetPool();
/*
//quickly search some issue at a certain simulation frame, pressing space to reset
int fixed=18;