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

rename to b3 convention, to avoid naming conflicts when using in combination with Bullet 2.x

Browse Source
This commit is contained in:
erwincoumans
2013-04-29 15:19:36 -07:00
parent 7366e262fd
commit 55b69201a9
88 changed files with 1682 additions and 1584 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
opencl/parallel_primitives/host/b3Int4.h
View File

@@ -3,7 +3,7 @@
#include "Bullet3Common/b3Scalar.h"
ATTRIBUTE_ALIGNED16(struct) b3UnsignedInt4
B3_ATTRIBUTE_ALIGNED16(struct) b3UnsignedInt4
{
B3_DECLARE_ALIGNED_ALLOCATOR();
@@ -20,7 +20,7 @@ ATTRIBUTE_ALIGNED16(struct) b3UnsignedInt4
};
};
ATTRIBUTE_ALIGNED16(struct) b3Int4
B3_ATTRIBUTE_ALIGNED16(struct) b3Int4
{
B3_DECLARE_ALIGNED_ALLOCATOR();
@@ -37,14 +37,14 @@ ATTRIBUTE_ALIGNED16(struct) b3Int4
};
};
SIMD_FORCE_INLINE b3Int4 b3MakeInt4(int x, int y, int z, int w = 0)
B3_FORCE_INLINE b3Int4 b3MakeInt4(int x, int y, int z, int w = 0)
{
b3Int4 v;
v.s[0] = x; v.s[1] = y; v.s[2] = z; v.s[3] = w;
return v;
}
SIMD_FORCE_INLINE b3UnsignedInt4 b3MakeUnsignedInt4(unsigned int x, unsigned int y, unsigned int z, unsigned int w = 0)
B3_FORCE_INLINE b3UnsignedInt4 b3MakeUnsignedInt4(unsigned int x, unsigned int y, unsigned int z, unsigned int w = 0)
{
b3UnsignedInt4 v;
v.s[0] = x; v.s[1] = y; v.s[2] = z; v.s[3] = w;

16
opencl/parallel_primitives/host/b3OpenCLArray.h
View File

@@ -30,7 +30,7 @@ class b3OpenCLArray
b3OpenCLArray<T>& operator=(const b3OpenCLArray<T>& src);
SIMD_FORCE_INLINE int allocSize(int size)
B3_FORCE_INLINE int allocSize(int size)
{
return (size ? size*2 : 1);
}
@@ -81,7 +81,7 @@ public:
m_capacity=0;
}
SIMD_FORCE_INLINE void push_back(const T& _Val,bool waitForCompletion=true)
B3_FORCE_INLINE void push_back(const T& _Val,bool waitForCompletion=true)
{
int sz = size();
if( sz == capacity() )
@@ -92,7 +92,7 @@ public:
m_size++;
}
SIMD_FORCE_INLINE T forcedAt(int n) const
B3_FORCE_INLINE T forcedAt(int n) const
{
b3Assert(n>=0);
b3Assert(n<capacity());
@@ -101,7 +101,7 @@ public:
return elem;
}
SIMD_FORCE_INLINE T at(int n) const
B3_FORCE_INLINE T at(int n) const
{
b3Assert(n>=0);
b3Assert(n<size());
@@ -110,7 +110,7 @@ public:
return elem;
}
SIMD_FORCE_INLINE void resize(int newsize, bool copyOldContents=true)
B3_FORCE_INLINE void resize(int newsize, bool copyOldContents=true)
{
int curSize = size();
@@ -131,17 +131,17 @@ public:
m_size = newsize;
}
SIMD_FORCE_INLINE int size() const
B3_FORCE_INLINE int size() const
{
return m_size;
}
SIMD_FORCE_INLINE int capacity() const
B3_FORCE_INLINE int capacity() const
{
return m_capacity;
}
SIMD_FORCE_INLINE void reserve(int _Count, bool copyOldContents=true)
B3_FORCE_INLINE void reserve(int _Count, bool copyOldContents=true)
{ // determine new minimum length of allocated storage
if (capacity() < _Count)
{ // not enough room, reallocate