Bart/bullet3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix broken build

Browse Source 
Add btCompoundShape export support for BulletColladaConverter. 
Thanks to JamesH for the report/request:
http://www.bulletphysics.com/Bullet/phpBB3/viewtopic.php?f=12&t=2840
This commit is contained in:
erwin.coumans
2008-11-12 22:25:23 +00:00
parent 5feea39803
commit 9516e505a7
3 changed files with 40 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/BulletCollision/BroadphaseCollision/btDbvt.h
View File

@@ -579,7 +579,7 @@ DBVT_INLINE int Select( const btDbvtAabbMm& o,
const btDbvtAabbMm& b)
{
#if DBVT_SELECT_IMPL == DBVT_IMPL_SSE
static DBVT_ALIGN const unsigned __int32 mask[]={0x7fffffff,0x7fffffff,0x7fffffff,0x7fffffff};
static ATTRIBUTE_ALIGNED16(const unsigned __int32) mask[]={0x7fffffff,0x7fffffff,0x7fffffff,0x7fffffff};
///@todo: the intrinsic version is 11% slower
#if DBVT_USE_INTRINSIC_SSE
@@ -612,7 +612,7 @@ DBVT_INLINE int Select( const btDbvtAabbMm& o,
return tmp.ints[0]&1;
#else
DBVT_ALIGN __int32 r[1];
ATTRIBUTE_ALIGNED16(__int32 r[1]);
__asm
{
mov eax,o