updated demos -> ALT + mouse uses Maya-style controls, replaced BMF_Fonts by GLDebugFont

fix debug drawing of btMultiSphereShape
added box2d demo
added experimental gpu 2d demo
This commit is contained in:
erwin.coumans
2009-05-09 19:27:14 +00:00
parent 7a210546cf
commit 33029ad996
129 changed files with 8576 additions and 2184 deletions

View File

@@ -24,8 +24,7 @@ subject to the following restrictions:
#include "GL_ShapeDrawer.h"
#include "GlutStuff.h"
#include "BMF_Api.h"
#include "GLDebugFont.h"
@@ -564,12 +563,14 @@ btScalar& maxHeight
////////////////////////////////////////////////////////////////////////////////
/// class that demonstrates the btHeightfieldTerrainShape object
class TerrainDemo : public DemoApplication {
class TerrainDemo : public GlutDemoApplication {
public:
// constructor, destructor ---------------------------------------------
TerrainDemo(void);
~TerrainDemo(void);
virtual void initPhysics() {}
// public class methods ------------------------------------------------
void initialize(void);
@@ -769,17 +770,9 @@ void TerrainDemo::keyboardCallback(unsigned char key, int x, int y) {
static void
doPrint
(
int x,
int& y,
int dy,
const char * text
)
static void doPrint(int x,int& y,int dy,const char * text)
{
glRasterPos3f(x, y, 0);
BMF_DrawString(BMF_GetFont(BMF_kHelvetica10), text);
GLDebugDrawString(x,y, text);
y += dy;
}
@@ -916,7 +909,7 @@ void TerrainDemo::clearWorld(void)
////////////////////////////////////////////////////////////////////////////////
/// creates an object that demonstrates terrain
DemoApplication * btCreateTerrainDemo(void)
GlutDemoApplication * btCreateTerrainDemo(void)
{
TerrainDemo * demo = new TerrainDemo;
btAssert(demo && "out of memory");