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

sync repo

Browse Source
This commit is contained in:
Erwin Coumans
2015-11-11 12:44:26 -08:00
parent 91204e8ed2
commit f6a8079353
16 changed files with 239 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/LinearMath/btAlignedObjectArray.h
View File

@@ -39,6 +39,12 @@ subject to the following restrictions:
#include <new> //for placement new
#endif //BT_USE_PLACEMENT_NEW
// The register keyword is deprecated in C++11 so don't use it.
#if __cplusplus > 199711L
#define BT_REGISTER
#else
#define BT_REGISTER register
#endif
///The btAlignedObjectArray template class uses a subset of the stl::vector interface for its methods
///It is developed to replace stl::vector to avoid portability issues, including STL alignment issues to add SIMD/SSE data
@@ -211,7 +217,7 @@ protected:
SIMD_FORCE_INLINE void resize(int newsize, const T& fillData=T())
{
const register int curSize = size();
const BT_REGISTER int curSize = size();
if (newsize < curSize)
{
@@ -238,7 +244,7 @@ protected:
}
SIMD_FORCE_INLINE T& expandNonInitializing( )
{
const register int sz = size();
const BT_REGISTER int sz = size();
if( sz == capacity() )
{
reserve( allocSize(size()) );
@@ -251,7 +257,7 @@ protected:
SIMD_FORCE_INLINE T& expand( const T& fillValue=T())
{
const register int sz = size();
const BT_REGISTER int sz = size();
if( sz == capacity() )
{
reserve( allocSize(size()) );
@@ -267,7 +273,7 @@ protected:
SIMD_FORCE_INLINE void push_back(const T& _Val)
{
const register int sz = size();
const BT_REGISTER int sz = size();
if( sz == capacity() )
{
reserve( allocSize(size()) );

4
src/LinearMath/btTransform.h
View File

@@ -127,7 +127,7 @@ public:
/**@brief Set from an array
* @param m A pointer to a 15 element array (12 rotation(row major padded on the right by 1), and 3 translation */
* @param m A pointer to a 16 element array (12 rotation(row major padded on the right by 1), and 3 translation */
void setFromOpenGLMatrix(const btScalar *m)
{
m_basis.setFromOpenGLSubMatrix(m);
@@ -135,7 +135,7 @@ public:
}
/**@brief Fill an array representation
* @param m A pointer to a 15 element array (12 rotation(row major padded on the right by 1), and 3 translation */
* @param m A pointer to a 16 element array (12 rotation(row major padded on the right by 1), and 3 translation */
void getOpenGLMatrix(btScalar *m) const
{
m_basis.getOpenGLSubMatrix(m);