32 lines
1.4 KiB
Diff
32 lines
1.4 KiB
Diff
|
Index: extern/bullet2/src/BulletSoftBody/btSoftBodyConcaveCollisionAlgorithm.h
|
||
|
|
===================================================================
|
||
|
|
--- extern/bullet2/src/BulletSoftBody/btSoftBodyConcaveCollisionAlgorithm.h (Revision 45907)
|
||
|
|
+++ extern/bullet2/src/BulletSoftBody/btSoftBodyConcaveCollisionAlgorithm.h (Revision 45908)
|
||
|
|
@@ -45,7 +45,9 @@
|
||
|
|
int getTriangleIndex() const
|
||
|
|
{
|
||
|
|
// Get only the lower bits where the triangle index is stored
|
||
|
|
- return (m_PartIdTriangleIndex&~((~0)<<(31-MAX_NUM_PARTS_IN_BITS)));
|
||
|
|
+ unsigned int x = 0;
|
||
|
|
+ unsigned int y = (~(x&0))<<(31-MAX_NUM_PARTS_IN_BITS);
|
||
|
|
+ return (m_PartIdTriangleIndex&~(y));
|
||
|
|
}
|
||
|
|
int getPartId() const
|
||
|
|
{
|
||
|
|
Index: extern/bullet2/src/BulletCollision/BroadphaseCollision/btQuantizedBvh.h
|
||
|
|
===================================================================
|
||
|
|
--- extern/bullet2/src/BulletCollision/BroadphaseCollision/btQuantizedBvh.h (Revision 45907)
|
||
|
|
+++ extern/bullet2/src/BulletCollision/BroadphaseCollision/btQuantizedBvh.h (Revision 45908)
|
||
|
|
@@ -78,8 +78,10 @@
|
||
|
|
int getTriangleIndex() const
|
||
|
|
{
|
||
|
|
btAssert(isLeafNode());
|
||
|
|
+ unsigned int x=0;
|
||
|
|
+ unsigned int y = (~(x&0))<<(31-MAX_NUM_PARTS_IN_BITS);
|
||
|
|
// Get only the lower bits where the triangle index is stored
|
||
|
|
- return (m_escapeIndexOrTriangleIndex&~((~0)<<(31-MAX_NUM_PARTS_IN_BITS)));
|
||
|
|
+ return (m_escapeIndexOrTriangleIndex&~(y));
|
||
|
|
}
|
||
|
|
int getPartId() const
|
||
|
|
{
|