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:
@@ -28,7 +28,7 @@ subject to the following restrictions:
|
||||
#include "BspConverter.h"
|
||||
#endif //QUAKE_BSP_IMPORTING
|
||||
|
||||
#include "BMF_Api.h"
|
||||
|
||||
#include <stdio.h> //printf debugging
|
||||
|
||||
|
||||
@@ -131,7 +131,16 @@ BspDemo::~BspDemo()
|
||||
delete m_collisionConfiguration;
|
||||
}
|
||||
|
||||
void BspDemo::initPhysics(char* bspfilename)
|
||||
void BspDemo::initPhysics()
|
||||
{
|
||||
const char* bspfilename = "BspDemo.bsp";
|
||||
|
||||
initPhysics(bspfilename);
|
||||
}
|
||||
|
||||
|
||||
|
||||
void BspDemo::initPhysics(const char* bspfilename)
|
||||
{
|
||||
setTexturing(true);
|
||||
setShadows(false);
|
||||
|
||||
@@ -15,7 +15,7 @@ subject to the following restrictions:
|
||||
#ifndef BSP_DEMO_H
|
||||
#define BSP_DEMO_H
|
||||
|
||||
#include "DemoApplication.h"
|
||||
#include "GlutDemoApplication.h"
|
||||
#include "LinearMath/btAlignedObjectArray.h"
|
||||
|
||||
class btBroadphaseInterface;
|
||||
@@ -28,7 +28,7 @@ class btDefaultCollisionConfiguration;
|
||||
|
||||
|
||||
///BspDemo shows the convex collision detection, by converting a Quake BSP file into convex objects and allowing interaction with boxes.
|
||||
class BspDemo : public DemoApplication
|
||||
class BspDemo : public GlutDemoApplication
|
||||
{
|
||||
public:
|
||||
|
||||
@@ -48,7 +48,9 @@ class BspDemo : public DemoApplication
|
||||
|
||||
virtual ~BspDemo();
|
||||
|
||||
void initPhysics(char* bspfilename);
|
||||
virtual void initPhysics();
|
||||
|
||||
void initPhysics(const char* bspfilename);
|
||||
|
||||
virtual void clientMoveAndDisplay();
|
||||
|
||||
|
||||
Reference in New Issue
Block a user