diff --git a/data/testFile.bullet b/data/testFile.bullet index e2fa89612..bc82d4950 100644 Binary files a/data/testFile.bullet and b/data/testFile.bullet differ diff --git a/demo/gpudemo/GpuDemo.h b/demo/gpudemo/GpuDemo.h index d177762ba..2bfc81fd7 100644 --- a/demo/gpudemo/GpuDemo.h +++ b/demo/gpudemo/GpuDemo.h @@ -38,9 +38,9 @@ public: :useOpenCL(true), preferredOpenCLPlatformIndex(-1), preferredOpenCLDeviceIndex(-1), - arraySizeX(30), + arraySizeX(20), arraySizeY(20), - arraySizeZ(30), + arraySizeZ(20), m_useConcaveMesh(false), gapX(14.3), gapY(14.0), diff --git a/demo/gpudemo/rigidbody/Bullet2FileDemo.cpp b/demo/gpudemo/rigidbody/Bullet2FileDemo.cpp index 15dd4c24c..d9fc9a868 100644 --- a/demo/gpudemo/rigidbody/Bullet2FileDemo.cpp +++ b/demo/gpudemo/rigidbody/Bullet2FileDemo.cpp @@ -2,7 +2,7 @@ #include "Bullet2FileDemo.h" #include "BulletDataExtractor.h" #include "GpuRigidBodyDemoInternalData.h" - +#include "OpenGLWindow/GLInstancingRenderer.h" 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->convertAllObjects(bulletFile); + + b3Vector3 pos(-20,10,0); + ci.m_instancingRenderer->setCameraTargetPosition(pos); + ci.m_instancingRenderer->setCameraDistance(10); } diff --git a/opencl/gpu_rigidbody/host/b3GpuRigidBodyPipeline.cpp b/opencl/gpu_rigidbody/host/b3GpuRigidBodyPipeline.cpp index cf77e4e71..27ac3bf1c 100644 --- a/opencl/gpu_rigidbody/host/b3GpuRigidBodyPipeline.cpp +++ b/opencl/gpu_rigidbody/host/b3GpuRigidBodyPipeline.cpp @@ -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) { m_data = new b3GpuRigidBodyPipelineInternalData;