diff options
author | Erwin Coumans <blender@erwincoumans.com> | 2007-06-23 09:28:07 +0400 |
---|---|---|
committer | Erwin Coumans <blender@erwincoumans.com> | 2007-06-23 09:28:07 +0400 |
commit | ca26aeb7b23e37e65f49d907ea53fcaeee77ad4e (patch) | |
tree | b6530195a8ef5d874b9fc2bbb9574f1484781be5 /extern/bullet2/src/LinearMath/btQuadWord.h | |
parent | 14ad8c9941ac1e6f5252a843c6ad17653cbbd689 (diff) |
upgrade to latest Bullet 2.53. cross the fingers it doesn't break one of the exotic or less exotic platforms
Diffstat (limited to 'extern/bullet2/src/LinearMath/btQuadWord.h')
-rw-r--r-- | extern/bullet2/src/LinearMath/btQuadWord.h | 30 |
1 files changed, 18 insertions, 12 deletions
diff --git a/extern/bullet2/src/LinearMath/btQuadWord.h b/extern/bullet2/src/LinearMath/btQuadWord.h index 4331b668210..961ac484d20 100644 --- a/extern/bullet2/src/LinearMath/btQuadWord.h +++ b/extern/bullet2/src/LinearMath/btQuadWord.h @@ -16,12 +16,13 @@ subject to the following restrictions: #ifndef SIMD_QUADWORD_H #define SIMD_QUADWORD_H -#include "LinearMath/btScalar.h" +#include "btScalar.h" -ATTRIBUTE_ALIGNED16 (class btQuadWord) +///btQuadWord is base-class for vectors, points +class btQuadWord { protected: btScalar m_x; @@ -31,8 +32,8 @@ ATTRIBUTE_ALIGNED16 (class btQuadWord) public: - SIMD_FORCE_INLINE btScalar& operator[](int i) { return (&m_x)[i]; } - SIMD_FORCE_INLINE const btScalar& operator[](int i) const { return (&m_x)[i]; } +// SIMD_FORCE_INLINE btScalar& operator[](int i) { return (&m_x)[i]; } +// SIMD_FORCE_INLINE const btScalar& operator[](int i) const { return (&m_x)[i]; } SIMD_FORCE_INLINE const btScalar& getX() const { return m_x; } @@ -40,11 +41,13 @@ ATTRIBUTE_ALIGNED16 (class btQuadWord) SIMD_FORCE_INLINE const btScalar& getZ() const { return m_z; } - SIMD_FORCE_INLINE void setX(float x) { m_x = x;}; + SIMD_FORCE_INLINE void setX(btScalar x) { m_x = x;}; - SIMD_FORCE_INLINE void setY(float y) { m_y = y;}; + SIMD_FORCE_INLINE void setY(btScalar y) { m_y = y;}; - SIMD_FORCE_INLINE void setZ(float z) { m_z = z;}; + SIMD_FORCE_INLINE void setZ(btScalar z) { m_z = z;}; + + SIMD_FORCE_INLINE void setW(btScalar w) { m_unusedW = w;}; SIMD_FORCE_INLINE const btScalar& x() const { return m_x; } @@ -52,15 +55,18 @@ ATTRIBUTE_ALIGNED16 (class btQuadWord) SIMD_FORCE_INLINE const btScalar& z() const { return m_z; } + SIMD_FORCE_INLINE const btScalar& w() const { return m_unusedW; } + - operator btScalar *() { return &m_x; } - operator const btScalar *() const { return &m_x; } + SIMD_FORCE_INLINE operator btScalar *() { return &m_x; } + SIMD_FORCE_INLINE operator const btScalar *() const { return &m_x; } SIMD_FORCE_INLINE void setValue(const btScalar& x, const btScalar& y, const btScalar& z) { m_x=x; m_y=y; m_z=z; + m_unusedW = 0.f; } /* void getValue(btScalar *m) const @@ -78,15 +84,15 @@ ATTRIBUTE_ALIGNED16 (class btQuadWord) m_unusedW=w; } - SIMD_FORCE_INLINE btQuadWord() : - m_x(0.f),m_y(0.f),m_z(0.f),m_unusedW(0.f) + SIMD_FORCE_INLINE btQuadWord() + // :m_x(btScalar(0.)),m_y(btScalar(0.)),m_z(btScalar(0.)),m_unusedW(btScalar(0.)) { } SIMD_FORCE_INLINE btQuadWord(const btScalar& x, const btScalar& y, const btScalar& z) :m_x(x),m_y(y),m_z(z) //todo, remove this in release/simd ? - ,m_unusedW(0.f) + ,m_unusedW(btScalar(0.)) { } |