Changeset 2908 for code/branches/questsystem5/src/bullet/LinearMath/btQuaternion.h

Timestamp:

Apr 8, 2009, 12:58:47 AM (16 years ago)

Author:

dafrick

Message:

Reverted to revision 2906 (because I'm too stupid to merge correctly, 2nd try will follow shortly. )

Location:

code/branches/questsystem5

Files:

• . (modified) (1 prop)
• src/bullet/LinearMath/btQuaternion.h (modified) (6 diffs)

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

@@ -20 +20 @@
 
 #include "btVector3.h"
-#include "btQuadWord.h"
 
 /**@brief The btQuaternion implements quaternion to perform linear algebra rotations in combination with btMatrix3x3, btVector3 and btTransform. */
@@ -59 +58 @@
         {
                 btScalar d = axis.length();
-                btAssert(d != btScalar(0.0));
+                assert(d != btScalar(0.0));
                 btScalar s = btSin(angle * btScalar(0.5)) / d;
                 setValue(axis.x() * s, axis.y() * s, axis.z() * s, 
@@ -178 +177 @@
         btQuaternion operator/(const btScalar& s) const
         {
-                btAssert(s != btScalar(0.0));
+                assert(s != btScalar(0.0));
                 return *this * (btScalar(1.0) / s);
         }
@@ -186 +185 @@
         btQuaternion& operator/=(const btScalar& s) 
         {
-                btAssert(s != btScalar(0.0));
+                assert(s != btScalar(0.0));
                 return *this *= btScalar(1.0) / s;
         }
@@ -200 +199 @@
         {
                 btScalar s = btSqrt(length2() * q.length2());
-                btAssert(s != btScalar(0.0));
+                assert(s != btScalar(0.0));
                 return btAcos(dot(q) / s);
         }
@@ -276 +275 @@
         }
 
-        static const btQuaternion&      getIdentity()
-        {
-                static const btQuaternion identityQuat(btScalar(0.),btScalar(0.),btScalar(0.),btScalar(1.));
-                return identityQuat;
-        }
-
         SIMD_FORCE_INLINE const btScalar& getW() const { return m_floats[3]; }