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

tweaks in camera position in demo

Browse Source
This commit is contained in:
erwin coumans
2013-04-23 16:30:35 -07:00
parent f943204aa2
commit 6bcb5b9d5f
4 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
data/testFile.bullet
View File

Binary file not shown.

4
demo/gpudemo/GpuDemo.h
View File

@@ -38,9 +38,9 @@ public:
:useOpenCL(true), :useOpenCL(true),
preferredOpenCLPlatformIndex(-1), preferredOpenCLPlatformIndex(-1),
preferredOpenCLDeviceIndex(-1), preferredOpenCLDeviceIndex(-1),
arraySizeX(30), arraySizeX(20),
arraySizeY(20), arraySizeY(20),
arraySizeZ(30), arraySizeZ(20),
m_useConcaveMesh(false), m_useConcaveMesh(false),
gapX(14.3), gapX(14.3),
gapY(14.0), gapY(14.0),

6
demo/gpudemo/rigidbody/Bullet2FileDemo.cpp
View File

@@ -2,7 +2,7 @@
#include "Bullet2FileDemo.h" #include "Bullet2FileDemo.h"
#include "BulletDataExtractor.h" #include "BulletDataExtractor.h"
#include "GpuRigidBodyDemoInternalData.h" #include "GpuRigidBodyDemoInternalData.h"
#include "OpenGLWindow/GLInstancingRenderer.h"
Bullet2FileDemo::Bullet2FileDemo() Bullet2FileDemo::Bullet2FileDemo()
{ {
@@ -37,4 +37,8 @@ void Bullet2FileDemo::setupScene(const ConstructionInfo& ci)
} }
// m_loader = new btBulletDataExtractor(*ci.m_instancingRenderer,*m_data->m_np,*m_data->m_rigidBodyPipeline); // m_loader = new btBulletDataExtractor(*ci.m_instancingRenderer,*m_data->m_np,*m_data->m_rigidBodyPipeline);
// m_loader->convertAllObjects(bulletFile); // m_loader->convertAllObjects(bulletFile);
b3Vector3 pos(-20,10,0);
ci.m_instancingRenderer->setCameraTargetPosition(pos);
ci.m_instancingRenderer->setCameraDistance(10);
} }

1
opencl/gpu_rigidbody/host/b3GpuRigidBodyPipeline.cpp
View File

@@ -33,6 +33,7 @@ bool dumpContactStats = false;
b3GpuRigidBodyPipeline::b3GpuRigidBodyPipeline(cl_context ctx,cl_device_id device, cl_command_queue q,class b3GpuNarrowPhase* narrowphase, class b3GpuSapBroadphase* broadphaseSap , class b3DynamicBvhBroadphase* broadphaseDbvt) b3GpuRigidBodyPipeline::b3GpuRigidBodyPipeline(cl_context ctx,cl_device_id device, cl_command_queue q,class b3GpuNarrowPhase* narrowphase, class b3GpuSapBroadphase* broadphaseSap , class b3DynamicBvhBroadphase* broadphaseDbvt)
{ {
m_data = new b3GpuRigidBodyPipelineInternalData; m_data = new b3GpuRigidBodyPipelineInternalData;