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

Static objects support added for appGpu2dDemo

Browse Source
This commit is contained in:
rponom
2009-05-13 00:43:42 +00:00
parent 22fe8935c3
commit 4616b62686
4 changed files with 43 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Demos/Gpu2dDemo/btGpuDemoDynamicsWorld.cpp
View File

@@ -204,6 +204,10 @@ void btGpuDemoDynamicsWorld::grabData()
m_hVel[i+1] = *((float4*)&v);
v = rb->getAngularVelocity();
m_hAngVel[i+1] = v[2];
if(m_copyMassDataToGPU)
{
m_hInvMass[i+1] = rb->getInvMass();
}
}
if(m_useBulletNarrowphase)
{
@@ -328,6 +332,11 @@ void btGpuDemoDynamicsWorld::copyDataToGPU()
btCuda_copyArrayToDevice(m_dShapeIds, m_hShapeIds, (m_numObj + 1) * sizeof(int2));
m_copyShapeDataToGPU = false;
}
if(m_copyMassDataToGPU)
{
btCuda_copyArrayToDevice(m_dInvMass, m_hInvMass, (m_numObj + 1) * sizeof(float));
m_copyMassDataToGPU = false;
}
#endif //BT_USE_CUDA
} // btGpuDemoDynamicsWorld::copyDataToGPU()
@@ -465,7 +474,7 @@ void btGpuDemoDynamicsWorld::solveConstraintsCPU2(btContactSolverInfo& solverInf
for(int i=0;i<nIter;i++){
btGpu_collisionWithWallBox(m_hPos, m_hVel, m_hRot, m_hAngVel,m_hShapeBuffer, m_hShapeIds,
partProps, boxProps, m_numObj + 1, timeStep);
m_hInvMass, partProps, boxProps, m_numObj + 1, timeStep);
int* pBatchIds = m_hBatchIds;
for(int iBatch=0;iBatch < m_maxBatches;iBatch++)
{
@@ -479,6 +488,7 @@ void btGpuDemoDynamicsWorld::solveConstraintsCPU2(btContactSolverInfo& solverInf
m_hRot, m_hAngVel,
m_hLambdaDtBox,
m_hContact,
m_hInvMass,
partProps, iBatch, timeStep);
pBatchIds += numContConstraints;
}