From 96aa18f12f2c61f23f66727d5fb3ea9065b7af2a Mon Sep 17 00:00:00 2001 From: "erwin.coumans" Date: Sat, 8 Nov 2008 05:28:24 +0000 Subject: [PATCH] don't align btVector3 for now (need to reconsider it) --- src/LinearMath/btConvexHull.h | 4 ---- src/LinearMath/btQuadWord.h | 12 ++++-------- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/src/LinearMath/btConvexHull.h b/src/LinearMath/btConvexHull.h index ffa33a90d..b82e5f0e8 100644 --- a/src/LinearMath/btConvexHull.h +++ b/src/LinearMath/btConvexHull.h @@ -137,13 +137,9 @@ class ConvexH }; ConvexH() { - int i; - i=0; } ~ConvexH() { - int i; - i=0; } btAlignedObjectArray vertices; btAlignedObjectArray edges; diff --git a/src/LinearMath/btQuadWord.h b/src/LinearMath/btQuadWord.h index 293990492..4c90feb08 100644 --- a/src/LinearMath/btQuadWord.h +++ b/src/LinearMath/btQuadWord.h @@ -27,14 +27,11 @@ subject to the following restrictions: /**@brief The btQuadWordStorage 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. */ -#if defined (USE_LIBSPE2) class btQuadWordStorage -#else -ATTRIBUTE_ALIGNED16(class) btQuadWordStorage -#endif { -#if defined (__SPU__) && defined (__CELLOS_LV2__) protected: + +#if defined (__SPU__) && defined (__CELLOS_LV2__) union { vec_float4 mVec128; btScalar m_floats[4]; @@ -44,13 +41,12 @@ public: { return mVec128; } -}; #else //__CELLOS_LV2__ __SPU__ -protected: btScalar m_floats[4]; -}; #endif //__CELLOS_LV2__ __SPU__ +}; + /** @brief The btQuadWord is base-class for vectors, points */ class btQuadWord : public btQuadWordStorage {