Changeset 2907 for code/branches/questsystem5/src/bullet/LinearMath/btQuadWord.h

Timestamp:

Apr 8, 2009, 12:36:08 AM (16 years ago)

Author:

dafrick

Message:

Merging of the current QuestSystem branch.

Location:

code/branches/questsystem5

Files:

• . (modified) (1 prop)
• src/bullet/LinearMath/btQuadWord.h (modified) (3 diffs)

code/branches/questsystem5/src/bullet/LinearMath/btQuadWord.h

@@ -25 +25 @@
 #endif
 
-/**@brief The btQuadWordStorage class is base class for btVector3 and btQuaternion. 
+/**@brief The btQuadWord class is base class for btVector3 and btQuaternion. 
  * Some issues under PS3 Linux with IBM 2.1 SDK, gcc compiler prevent from using aligned quadword.
  */
 #ifndef USE_LIBSPE2
-ATTRIBUTE_ALIGNED16(class) btQuadWordStorage
+ATTRIBUTE_ALIGNED16(class) btQuadWord
 #else
-class btQuadWordStorage
+class btQuadWord
 #endif
 {
@@ -46 +46 @@
                 return mVec128;
         }
+protected:
 #else //__CELLOS_LV2__ __SPU__
         btScalar        m_floats[4];
 #endif //__CELLOS_LV2__ __SPU__
 
-};
-
-/** @brief The btQuadWord is base-class for vectors, points */
-class   btQuadWord : public btQuadWordStorage
-{
         public:
   
@@ -135 +131 @@
                 {
                 }
-  /**@brief Copy constructor */
-                SIMD_FORCE_INLINE btQuadWord(const btQuadWordStorage& q)
-                {
-                        *((btQuadWordStorage*)this) = q;
-                }
+ 
   /**@brief Three argument constructor (zeros w)
    * @param x Value of x