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

tweaked the particle demo a little bit

Browse Source
This commit is contained in:
erwincoumans
2013-11-08 23:21:01 -08:00
parent 768ea211a6
commit a6bc61ad1a
8 changed files with 77 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Bullet3OpenCL/BroadphaseCollision/b3GpuSapBroadphase.cpp
View File

@@ -1000,6 +1000,7 @@ void b3GpuSapBroadphase::calculateOverlappingPairs(int maxPairs)
//if (m_currentBuffer>=0)
// return calculateOverlappingPairsHostIncremental3Sap();
B3_PROFILE("GPU 1-axis SAP calculateOverlappingPairs");
int axis = 0;
@@ -1149,6 +1150,7 @@ void b3GpuSapBroadphase::calculateOverlappingPairs(int maxPairs)
clFinish(m_queue);
}
if (m_gpuSmallSortData.size())
{
B3_PROFILE("gpu radix sort\n");
m_sorter->execute(m_gpuSmallSortData);

1
src/Bullet3OpenCL/NarrowphaseCollision/b3ConvexHullContact.cpp
View File

@@ -3056,6 +3056,7 @@ void GpuSatCollision::computeConvexConvexContactsGPUSAT( b3OpenCLArray<b3Int4>*
launcher.launch1D( num);
clFinish(m_queue);
numConcavePairs = m_numConcavePairsOut.at(0);
//printf("numConcavePairs=%d (max = %d\n",numConcavePairs,maxTriConvexPairCapacity);
if (numConcavePairs > maxTriConvexPairCapacity)
{