Changeset 7983 for code/branches/kicklib/src/external/bullet/LinearMath/btAlignedObjectArray.h

Timestamp:

Feb 27, 2011, 7:43:24 AM (14 years ago)

Author:

rgrieder

Message:

Updated Bullet Physics Engine from v2.74 to v2.77

File:

• code/branches/kicklib/src/external/bullet/LinearMath/btAlignedObjectArray.h (modified) (4 diffs)

code/branches/kicklib/src/external/bullet/LinearMath/btAlignedObjectArray.h

@@ -139 +139 @@
                 }
                 
+                SIMD_FORCE_INLINE const T& at(int n) const
+                {
+                        return m_data[n];
+                }
+
+                SIMD_FORCE_INLINE T& at(int n)
+                {
+                        return m_data[n];
+                }
+
                 SIMD_FORCE_INLINE const T& operator[](int n) const
                 {
@@ -172 +182 @@
                         int curSize = size();
 
-                        if (newsize < size())
-                        {
-                                for(int i = curSize; i < newsize; i++)
+                        if (newsize < curSize)
+                        {
+                                for(int i = newsize; i < curSize; i++)
                                 {
                                         m_data[i].~T();
@@ -196 +206 @@
                 }
         
+                SIMD_FORCE_INLINE       T&  expandNonInitializing( )
+                {       
+                        int sz = size();
+                        if( sz == capacity() )
+                        {
+                                reserve( allocSize(size()) );
+                        }
+                        m_size++;
+
+                        return m_data[sz];              
+                }
+
 
                 SIMD_FORCE_INLINE       T&  expand( const T& fillValue=T())
@@ -438 +460 @@
         }
 
+        void copyFromArray(const btAlignedObjectArray& otherArray)
+        {
+                int otherSize = otherArray.size();
+                resize (otherSize);
+                otherArray.copy(0, otherSize, m_data);
+        }
+
 };