Updated INSTALL description. This info should go also in Bullet User Manual and Online.
Thanks to ejtttje http://code.google.com/p/bullet/issues/detail?id=248 Use GJK for GImpact triangle test See http://bulletphysics.com/Bullet/phpBB3/viewtopic.php?f=9&t=3687 More improvements in GJK degeneracy handling (using second EPA/GJK run) Issue/discussion here http://code.google.com/p/bullet/issues/detail?id=250 CMake improvements Thanks to ejtttje http://code.google.com/p/bullet/issues/detail?id=247 Added basic camera/wall detection for character demo
This commit is contained in:
@@ -63,7 +63,7 @@ btTransform toTrans[maxNumObjects];
|
||||
int screenWidth = 640;
|
||||
int screenHeight = 480;
|
||||
|
||||
|
||||
#ifndef _WINDOWS
|
||||
int main(int argc,char** argv)
|
||||
{
|
||||
btContinuousConvexCollisionDemo* ccdDemo = new btContinuousConvexCollisionDemo();
|
||||
@@ -74,6 +74,17 @@ int main(int argc,char** argv)
|
||||
|
||||
return glutmain(argc, argv,screenWidth,screenHeight,"Continuous Convex Collision Demo",ccdDemo);
|
||||
}
|
||||
#else
|
||||
DemoApplication* createDemo()
|
||||
{
|
||||
btContinuousConvexCollisionDemo* ccdDemo = new btContinuousConvexCollisionDemo();
|
||||
|
||||
ccdDemo->setCameraDistance(40.f);
|
||||
return ccdDemo;
|
||||
|
||||
}
|
||||
#endif //_WINDOWS
|
||||
|
||||
|
||||
void btContinuousConvexCollisionDemo::initPhysics()
|
||||
{
|
||||
@@ -280,8 +291,7 @@ void btContinuousConvexCollisionDemo::displayCallback(void) {
|
||||
}
|
||||
}
|
||||
|
||||
glFlush();
|
||||
glutSwapBuffers();
|
||||
swapBuffers();
|
||||
}
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user