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

more work towards shared CPU/OpenCL codebase

Browse Source
This commit is contained in:
erwincoumans
2013-08-30 21:38:04 -07:00
parent a6d9cf382f
commit 5a1d0d8170
6 changed files with 380 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Bullet3Collision/NarrowPhaseCollision/b3CpuNarrowPhase.cpp
View File

@@ -25,6 +25,12 @@ struct b3CpuNarrowPhaseInternalData
int m_numAcceleratedShapes;
};
const b3AlignedObjectArray<b3Contact4Data>& b3CpuNarrowPhase::getContacts() const
{
return m_data->m_contacts;
}
b3Collidable& b3CpuNarrowPhase::getCollidableCpu(int collidableIndex)
{
return m_data->m_collidablesCPU[collidableIndex];

5
src/Bullet3Collision/NarrowPhaseCollision/b3CpuNarrowPhase.h
View File

@@ -7,6 +7,7 @@
#include "Bullet3Collision/BroadPhaseCollision/shared/b3Aabb.h"
#include "Bullet3Common/shared/b3Int4.h"
#include "Bullet3Collision/NarrowPhaseCollision/shared/b3RigidBodyData.h"
#include "Bullet3Collision/NarrowPhaseCollision/shared/b3Contact4Data.h"
class b3CpuNarrowPhase
{
@@ -72,11 +73,13 @@ public:
int getNumCollidablesGpu() const;
const struct b3Contact4* getContactsCPU() const;
/*const struct b3Contact4* getContactsCPU() const;
int getNumContactsGpu() const;
*/
const b3AlignedObjectArray<b3Contact4Data>& getContacts() const;
int getNumRigidBodies() const;