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:
@@ -34,7 +34,7 @@ subject to the following restrictions:
|
||||
|
||||
|
||||
|
||||
#include "BMF_Api.h"
|
||||
#include "GLDebugFont.h"
|
||||
#include <stdio.h> //printf debugging
|
||||
|
||||
|
||||
@@ -55,6 +55,13 @@ btVector3 convexDecompositionObjectOffset(10,0,0);
|
||||
unsigned int tcount = 0;
|
||||
|
||||
|
||||
void ConvexDecompositionDemo::initPhysics()
|
||||
{
|
||||
initPhysics("file.obj");
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
void ConvexDecompositionDemo::initPhysics(const char* filename)
|
||||
{
|
||||
|
||||
@@ -15,7 +15,7 @@ subject to the following restrictions:
|
||||
#ifndef CONVEX_DECOMPOSITION_DEMO_H
|
||||
#define CONVEX_DECOMPOSITION_DEMO_H
|
||||
|
||||
#include "DemoApplication.h"
|
||||
#include "GlutDemoApplication.h"
|
||||
#include "LinearMath/btAlignedObjectArray.h"
|
||||
|
||||
class btBroadphaseInterface;
|
||||
@@ -28,7 +28,7 @@ class btDefaultCollisionConfiguration;
|
||||
class btTriangleMesh;
|
||||
|
||||
///ConvexDecompositionDemo shows automatic convex decomposition of a concave mesh
|
||||
class ConvexDecompositionDemo : public DemoApplication
|
||||
class ConvexDecompositionDemo : public GlutDemoApplication
|
||||
{
|
||||
|
||||
public:
|
||||
@@ -48,6 +48,7 @@ public:
|
||||
btDefaultCollisionConfiguration* m_collisionConfiguration;
|
||||
|
||||
|
||||
virtual void initPhysics();
|
||||
|
||||
void initPhysics(const char* filename);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user