Bart/bullet3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

add Takahiro's batching pgs solver

Browse Source
This commit is contained in:
erwin coumans
2013-03-17 01:19:27 -07:00
parent 74a422dfa9
commit d3c80fe160
23 changed files with 7020 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
demo/gpudemo/GpuDemo.h
View File

@@ -31,16 +31,16 @@ public:
class btgWindowInterface* m_window;
ConstructionInfo()
:useOpenCL(false),//true),
:useOpenCL(true),
preferredOpenCLPlatformIndex(-1),
preferredOpenCLDeviceIndex(-1),
arraySizeX(22),
arraySizeY(22 ),
arraySizeZ(22),
m_useConcaveMesh(false),
gapX(4.3),
gapY(4.0),
gapZ(4.3),
arraySizeX(33),
arraySizeY(30 ),
arraySizeZ(33),
m_useConcaveMesh(false),
gapX(4.3),
gapY(2.0),
gapZ(4.3),
m_instancingRenderer(0),
m_window(0)
{

5
demo/gpudemo/main_opengl3core.cpp
View File

@@ -61,10 +61,13 @@ btAlignedObjectArray<const char*> demoNames;
int selectedDemo = 0;
GpuDemo::CreateFunc* allDemos[]=
{
GpuRigidBodyDemo::MyCreateFunc,
//BroadphaseBenchmark::CreateFunc,
//GpuBoxDemo::CreateFunc,
PairBench::MyCreateFunc,
GpuRigidBodyDemo::MyCreateFunc,
ParticleDemo::MyCreateFunc,

9
demo/gpudemo/rigidbody/GpuRigidBodyDemo.cpp
View File

@@ -136,9 +136,9 @@ void GpuRigidBodyDemo::initPhysics(const ConstructionInfo& ci)
{
for (int k=0;k<ci.arraySizeZ;k++)
{
float mass = i==0? 0.f : 1.f;
float mass = j==0? 0.f : 1.f;
btVector3 position(k*3,i*3,j*3);
btVector3 position(i*ci.gapX,j*ci.gapY,k*ci.gapZ);
btQuaternion orn(1,0,0,0);
btVector4 color(0,1,0,1);
@@ -169,9 +169,10 @@ void GpuRigidBodyDemo::initPhysics(const ConstructionInfo& ci)
m_instancingRenderer = ci.m_instancingRenderer;
float camPos[4]={15.5,12.5,15.5,0};
float camPos[4]={65.5,4.5,65.5,0};
//float camPos[4]={1,12.5,1.5,0};
m_instancingRenderer->setCameraTargetPosition(camPos);
m_instancingRenderer->setCameraDistance(60);
m_instancingRenderer->setCameraDistance(90);
m_instancingRenderer->writeTransforms();