ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix more uses of 'int' and 'short int' type in bullet where they clearly meant to use 16-bits or 32-bits types (hey the comments even say '4 bytes' but they use a int type that is 8 bytes on many computers -.-)

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10603 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
auria
2012-01-08 16:59:53 +00:00
parent cadd8a3faf
commit fb0ee953f5
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/bullet/src/BulletCollision/BroadphaseCollision/btQuantizedBvh.h
View File

@@ -60,10 +60,10 @@ ATTRIBUTE_ALIGNED16 (struct) btQuantizedBvhNode
BT_DECLARE_ALIGNED_ALLOCATOR();
//12 bytes
unsigned short int m_quantizedAabbMin[3];
unsigned short int m_quantizedAabbMax[3];
uint16_t m_quantizedAabbMin[3];
uint16_t m_quantizedAabbMax[3];
//4 bytes
int m_escapeIndexOrTriangleIndex;
int32_t m_escapeIndexOrTriangleIndex;
bool isLeafNode() const
{
@@ -101,15 +101,15 @@ ATTRIBUTE_ALIGNED16 (struct) btOptimizedBvhNode
btVector3 m_aabbMaxOrg;
//4
int m_escapeIndex;
int32_t m_escapeIndex;
//8
//for child nodes
int m_subPart;
int m_triangleIndex;
int32_t m_subPart;
int32_t m_triangleIndex;
//pad the size to 64 bytes
char m_padding[20];
int8_t m_padding[20];
};
@@ -120,13 +120,13 @@ public:
BT_DECLARE_ALIGNED_ALLOCATOR();
//12 bytes
unsigned short int m_quantizedAabbMin[3];
unsigned short int m_quantizedAabbMax[3];
uint16_t m_quantizedAabbMin[3];
uint16_t m_quantizedAabbMax[3];
//4 bytes, points to the root of the subtree
int m_rootNodeIndex;
int32_t m_rootNodeIndex;
//4 bytes
int m_subtreeSize;
int m_padding[3];
int32_t m_subtreeSize;
int32_t m_padding[3];
btBvhSubtreeInfo()
{