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

added Leo wavefront file

Browse Source
This commit is contained in:
erwin coumans
2013-03-22 16:24:09 -07:00
parent 47344ec500
commit 8a6d71ad42
5 changed files with 88288 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

88272
data/leoTest1.obj Normal file
View File

File diff suppressed because it is too large Load Diff

10
demo/gpudemo/GpuDemo.h
View File

@@ -37,13 +37,13 @@ public:
:useOpenCL(true), :useOpenCL(true),
preferredOpenCLPlatformIndex(-1), preferredOpenCLPlatformIndex(-1),
preferredOpenCLDeviceIndex(-1), preferredOpenCLDeviceIndex(-1),
arraySizeX(20), arraySizeX(30),
arraySizeY(20 ), arraySizeY(20 ),
arraySizeZ(20), arraySizeZ(30),
m_useConcaveMesh(false), m_useConcaveMesh(false),
gapX(4.3), gapX(14.3),
gapY(4.0), gapY(14.0),
gapZ(4.3), gapZ(14.3),
m_instancingRenderer(0), m_instancingRenderer(0),
m_window(0) m_window(0)
{ {

3
demo/gpudemo/main_opengl3core.cpp
View File

@@ -64,9 +64,10 @@ btAlignedObjectArray<const char*> demoNames;
int selectedDemo = 0; int selectedDemo = 0;
GpuDemo::CreateFunc* allDemos[]= GpuDemo::CreateFunc* allDemos[]=
{ {
ConcaveScene::MyCreateFunc,
GpuConvexScene::MyCreateFunc, GpuConvexScene::MyCreateFunc,
GpuCompoundScene::MyCreateFunc, GpuCompoundScene::MyCreateFunc,
ConcaveScene::MyCreateFunc,
GpuConvexScene::MyCreateFunc, GpuConvexScene::MyCreateFunc,
GpuRigidBodyDemo::MyCreateFunc, GpuRigidBodyDemo::MyCreateFunc,

12
demo/gpudemo/rigidbody/ConcaveScene.cpp
View File

@@ -156,8 +156,9 @@ void ConcaveScene::setupScene(const ConstructionInfo& ci)
objLoader* objData = new objLoader(); objLoader* objData = new objLoader();
//char* fileName = "data/plane100.obj"; //char* fileName = "data/plane100.obj";
//char* fileName = "data/teddy.obj";//"plane.obj"; //char* fileName = "data/teddy.obj";//"plane.obj";
char* fileName = "data/sponza_closed.obj";//"plane.obj"; // char* fileName = "data/sponza_closed.obj";//"plane.obj";
char* fileName = "data/leoTest1.obj";
btVector3 shift(150,-100,-120);
FILE* f = 0; FILE* f = 0;
char relativeFileName[1024]; char relativeFileName[1024];
@@ -193,6 +194,9 @@ void ConcaveScene::setupScene(const ConstructionInfo& ci)
btAlignedObjectArray<btVector3> verts; btAlignedObjectArray<btVector3> verts;
for (int i=0;i<shape->m_numvertices;i++) for (int i=0;i<shape->m_numvertices;i++)
{ {
for (int j=0;j<3;j++)
shape->m_vertices->at(i).xyzw[j] += shift[j];
btVector3 vtx(shape->m_vertices->at(i).xyzw[0], btVector3 vtx(shape->m_vertices->at(i).xyzw[0],
shape->m_vertices->at(i).xyzw[1], shape->m_vertices->at(i).xyzw[1],
shape->m_vertices->at(i).xyzw[2]); shape->m_vertices->at(i).xyzw[2]);
@@ -253,7 +257,7 @@ void ConcaveScene::setupScene(const ConstructionInfo& ci)
float mass = 1; float mass = 1;
//btVector3 position(-2*ci.gapX+i*ci.gapX,25+j*ci.gapY,-2*ci.gapZ+k*ci.gapZ); //btVector3 position(-2*ci.gapX+i*ci.gapX,25+j*ci.gapY,-2*ci.gapZ+k*ci.gapZ);
btVector3 position(-(ci.arraySizeX/2)*ci.gapX+i*ci.gapX,5+j*ci.gapY,-(ci.arraySizeZ/2)*ci.gapZ+k*ci.gapZ); btVector3 position(-(ci.arraySizeX/2)*ci.gapX+i*ci.gapX,50+j*ci.gapY,-(ci.arraySizeZ/2)*ci.gapZ+k*ci.gapZ);
btQuaternion orn(1,0,0,0); btQuaternion orn(1,0,0,0);
btVector4 color(0,1,0,1); btVector4 color(0,1,0,1);
@@ -269,6 +273,6 @@ void ConcaveScene::setupScene(const ConstructionInfo& ci)
float camPos[4]={0,0,0,0};//65.5,4.5,65.5,0}; float camPos[4]={0,0,0,0};//65.5,4.5,65.5,0};
//float camPos[4]={1,12.5,1.5,0}; //float camPos[4]={1,12.5,1.5,0};
m_instancingRenderer->setCameraTargetPosition(camPos); m_instancingRenderer->setCameraTargetPosition(camPos);
m_instancingRenderer->setCameraDistance(120); m_instancingRenderer->setCameraDistance(370);
} }

2
opencl/gpu_rigidbody/host/btConfig.h
View File

@@ -18,7 +18,7 @@ struct btConfig
int m_maxTriConvexPairCapacity; int m_maxTriConvexPairCapacity;
btConfig() btConfig()
:m_maxConvexBodies(32*1024), :m_maxConvexBodies(64*1024),
m_maxConvexShapes(8192), m_maxConvexShapes(8192),
m_maxVerticesPerFace(64), m_maxVerticesPerFace(64),
m_maxFacesPerShape(64), m_maxFacesPerShape(64),