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

fix Mac version of cloth rendering

Browse Source
This commit is contained in:
Erwin Coumans
2013-06-03 17:35:31 -07:00
parent a886a978b7
commit a9d4184e2d
5 changed files with 125 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Bullet3OpenCL/Initialize/b3OpenCLUtils.cpp
View File

@@ -662,8 +662,8 @@ cl_program b3OpenCLUtils_compileCLProgramFromString(cl_context clContext, cl_dev
if (srcFileHandle==INVALID_HANDLE_VALUE)
{
const char* prefix[]={"../","../../","../../../","../../../../"};
for (int i=0;(srcFileHandle==INVALID_HANDLE_VALUE) && i<3;i++)
const char* prefix[]={"./","../","../../","../../../","../../../../"};
for (int i=0;(srcFileHandle==INVALID_HANDLE_VALUE) && i<5;i++)
{
char relativeFileName[1024];
sprintf(relativeFileName,"%s%s",prefix[i],clFileNameForCaching);

13
src/Bullet3OpenCL/RigidBody/b3GpuNarrowPhase.cpp
View File

@@ -904,10 +904,15 @@ void b3GpuNarrowPhase::writeAllBodiesToGpu()
m_data->m_bodyBufferGPU->resize(m_data->m_numAcceleratedRigidBodies);
m_data->m_inertiaBufferGPU->resize(m_data->m_numAcceleratedRigidBodies);
m_data->m_bodyBufferGPU->copyFromHostPointer(&m_data->m_bodyBufferCPU->at(0),m_data->m_numAcceleratedRigidBodies);
m_data->m_inertiaBufferGPU->copyFromHostPointer(&m_data->m_inertiaBufferCPU->at(0),m_data->m_numAcceleratedRigidBodies);
m_data->m_collidablesGPU->copyFromHost(m_data->m_collidablesCPU);
if (m_data->m_numAcceleratedRigidBodies)
{
m_data->m_bodyBufferGPU->copyFromHostPointer(&m_data->m_bodyBufferCPU->at(0),m_data->m_numAcceleratedRigidBodies);
m_data->m_inertiaBufferGPU->copyFromHostPointer(&m_data->m_inertiaBufferCPU->at(0),m_data->m_numAcceleratedRigidBodies);
}
if (m_data->m_collidablesCPU.size())
{
m_data->m_collidablesGPU->copyFromHost(m_data->m_collidablesCPU);
}
}