Fix compilation for MSVC 6.0 for Bullet and COLLADA DOM.
Fix issues with btDbvt: use ATTRIBUTE_ALIGNED16 Removed several places where variable was declared within for statement: for (int i=0; should be int i; for (i=0
This commit is contained in:
@@ -37,11 +37,11 @@ static DBVT_INLINE int indexof(const btDbvtNode* node)
|
||||
static DBVT_INLINE btDbvtVolume merge( const btDbvtVolume& a,
|
||||
const btDbvtVolume& b)
|
||||
{
|
||||
#if DBVT_MERGE_IMPL==DBVT_IMPL_SSE
|
||||
DBVT_ALIGN char locals[sizeof(btDbvtAabbMm)];
|
||||
#if (DBVT_MERGE_IMPL==DBVT_IMPL_SSE)
|
||||
ATTRIBUTE_ALIGNED16(char locals[sizeof(btDbvtAabbMm)]);
|
||||
btDbvtVolume& res=*(btDbvtVolume*)locals;
|
||||
#else
|
||||
btDbvtVolume res;
|
||||
btDbvtVolume res;
|
||||
#endif
|
||||
Merge(a,b,res);
|
||||
return(res);
|
||||
@@ -249,7 +249,7 @@ static void split( const tNodeArray& leaves,
|
||||
static btDbvtVolume bounds( const tNodeArray& leaves)
|
||||
{
|
||||
#if DBVT_MERGE_IMPL==DBVT_IMPL_SSE
|
||||
DBVT_ALIGN char locals[sizeof(btDbvtVolume)];
|
||||
ATTRIBUTE_ALIGNED16(char locals[sizeof(btDbvtVolume)]);
|
||||
btDbvtVolume& volume=*(btDbvtVolume*)locals;
|
||||
volume=leaves[0]->volume;
|
||||
#else
|
||||
|
||||
Reference in New Issue
Block a user