diff --git a/Demos3/bullet2/RagdollDemo/RagdollDemo.cpp b/Demos3/bullet2/RagdollDemo/RagdollDemo.cpp index a4340546e..2ca5976e6 100644 --- a/Demos3/bullet2/RagdollDemo/RagdollDemo.cpp +++ b/Demos3/bullet2/RagdollDemo/RagdollDemo.cpp @@ -366,7 +366,8 @@ void RagDollDemo::initPhysics() btVector3 offset(0,3,0); RagDoll* doll = new RagDoll(this->m_dynamicsWorld,offset,m_glApp); - + offset.setValue(0,6,0); + doll = new RagDoll(this->m_dynamicsWorld,offset,m_glApp); m_glApp->m_instancingRenderer->writeTransforms(); diff --git a/btgui/OpenGLWindow/GLInstancingRenderer.cpp b/btgui/OpenGLWindow/GLInstancingRenderer.cpp index 8fb865c06..8009ce9bd 100644 --- a/btgui/OpenGLWindow/GLInstancingRenderer.cpp +++ b/btgui/OpenGLWindow/GLInstancingRenderer.cpp @@ -1296,7 +1296,7 @@ void GLInstancingRenderer::renderScene() { float color[4]={1,1,1,1}; renderSceneInternal(B3_CREATE_SHADOWMAP_RENDERMODE); - glClear(GL_COLOR_BUFFER_BIT|GL_DEPTH_BUFFER_BIT); + // glClear(GL_COLOR_BUFFER_BIT|GL_DEPTH_BUFFER_BIT); renderSceneInternal(B3_USE_SHADOWMAP_RENDERMODE); } else diff --git a/src/Bullet3OpenCL/NarrowphaseCollision/b3ConvexHullContact.cpp b/src/Bullet3OpenCL/NarrowphaseCollision/b3ConvexHullContact.cpp index 73f990402..5186da2d1 100644 --- a/src/Bullet3OpenCL/NarrowphaseCollision/b3ConvexHullContact.cpp +++ b/src/Bullet3OpenCL/NarrowphaseCollision/b3ConvexHullContact.cpp @@ -135,7 +135,6 @@ m_unitSphereDirections(m_context,m_queue) // sprintf(flags,"-g -s \"%s\"","C:/develop/bullet3_experiments2/opencl/gpu_narrowphase/kernels/sat.cl"); //#endif m_mprPenetrationKernel = 0; - if (useMprGpu) { cl_program mprProg = b3OpenCLUtils::compileCLProgramFromString(m_context,m_device,mprSrc,&errNum,flags,BT_NARROWPHASE_MPR_PATH); b3Assert(errNum==CL_SUCCESS);