fix demo/gpudemo build

This commit is contained in:
erwin coumans
2013-03-13 13:22:56 -07:00
parent 6d56a69344
commit d8a3732306
18 changed files with 130 additions and 1177 deletions

View File

@@ -1,13 +1,49 @@
#ifndef PARTICLE_DEMO_H
#define PARTICLE_DEMO_H
#include "GpuDemo.h"
//#include "GpuDemo.h"
struct GLInstancingRenderer;
class ParticleDemo;
class ParticleDemo : public GpuDemo
class ParticleDemo //: public GpuDemo
{
protected:
public:
typedef class ParticleDemo* (CreateFunc)();
struct ConstructionInfo
{
bool useOpenCL;
int preferredOpenCLPlatformIndex;
int preferredOpenCLDeviceIndex;
int arraySizeX;
int arraySizeY;
int arraySizeZ;
bool m_useConcaveMesh;
float gapX;
float gapY;
float gapZ;
GLInstancingRenderer* m_instancingRenderer;
ConstructionInfo()
:useOpenCL(false),//true),
preferredOpenCLPlatformIndex(-1),
preferredOpenCLDeviceIndex(-1),
arraySizeX(10),
arraySizeY(10 ),
arraySizeZ(10),
m_useConcaveMesh(false),
gapX(4.3),
gapY(4.0),
gapZ(4.3),
m_instancingRenderer(0)
{
}
};
protected:
struct ParticleInternalData* m_data;
GLInstancingRenderer* m_instancingRenderer;
@@ -31,16 +67,13 @@ public:
{
return "ParticleDemo";
}
static GpuDemo* CreateFunc()
static ParticleDemo* MyCreateFunc()
{
GpuDemo* demo = new ParticleDemo;
ParticleDemo* demo = new ParticleDemo;
return demo;
}
virtual const btDynamicsWorld* getDynamicsWorld() const
{
return 0;
}
virtual void renderScene();