AuroraMiddleware/bullet3
1
0
Fork 0
mirror of https://github.com/bulletphysics/bullet3 synced 2025-01-05 15:21:06 +00:00
Code Issues Releases Wiki Activity

Merge branch 'Branch_2.86.1'

Browse Source
This commit is contained in:
nicolaichuk 2017-03-30 01:48:39 +03:00
commit 1122afc2f4
2 changed files with 1 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/BulletCollision/Gimpact/btContactProcessingStructs.h
View File

@ -28,6 +28,7 @@ subject to the following restrictions:
#include "LinearMath/btAlignedObjectArray.h" #include "LinearMath/btAlignedObjectArray.h"
#include "btTriangleShapeEx.h" #include "btTriangleShapeEx.h"
/** /**
Configuration var for applying interpolation of contact normals Configuration var for applying interpolation of contact normals
*/ */
@ -50,36 +51,6 @@ public:
GIM_CONTACT() GIM_CONTACT()
{ {
} }
bool operator<(const GIM_CONTACT& obj) const {
return
m_point < obj.m_point &&
m_normal < obj.m_normal &&
m_depth < obj.m_depth &&
m_distance < obj.m_distance &&
m_feature1 < obj.m_feature1 &&
m_feature2 < obj.m_feature2;
}
bool operator>(const GIM_CONTACT& obj) const {
return
m_point > obj.m_point &&
m_normal > obj.m_normal &&
m_depth > obj.m_depth &&
m_distance > obj.m_distance &&
m_feature1 > obj.m_feature1 &&
m_feature2 > obj.m_feature2;
}
bool operator==(const GIM_CONTACT& obj) const {
return
m_point == obj.m_point &&
m_normal == obj.m_normal &&
m_depth == obj.m_depth &&
m_distance == obj.m_distance &&
m_feature1 == obj.m_feature1 &&
m_feature2 == obj.m_feature2;
}
GIM_CONTACT(const GIM_CONTACT & contact): GIM_CONTACT(const GIM_CONTACT & contact):
m_point(contact.m_point), m_point(contact.m_point),

33
src/BulletCollision/Gimpact/btGImpactQuantizedBvhStructs.h
View File

@ -37,39 +37,6 @@ ATTRIBUTE_ALIGNED16 (struct) BT_QUANTIZED_BVH_NODE
//4 bytes //4 bytes
int m_escapeIndexOrDataIndex; int m_escapeIndexOrDataIndex;
bool operator<(const BT_QUANTIZED_BVH_NODE& obj) const {
return
m_quantizedAabbMin[0] < obj.m_quantizedAabbMin[0] &&
m_quantizedAabbMin[1] < obj.m_quantizedAabbMin[1] &&
m_quantizedAabbMin[2] < obj.m_quantizedAabbMin[2] &&
m_quantizedAabbMax[0] < obj.m_quantizedAabbMax[0] &&
m_quantizedAabbMax[1] < obj.m_quantizedAabbMax[1] &&
m_quantizedAabbMax[2] < obj.m_quantizedAabbMax[2] &&
m_escapeIndexOrDataIndex < obj.m_escapeIndexOrDataIndex;
}
bool operator>(const BT_QUANTIZED_BVH_NODE& obj) const {
return
m_quantizedAabbMin[0] > obj.m_quantizedAabbMin[0] &&
m_quantizedAabbMin[1] > obj.m_quantizedAabbMin[1] &&
m_quantizedAabbMin[2] > obj.m_quantizedAabbMin[2] &&
m_quantizedAabbMax[0] > obj.m_quantizedAabbMax[0] &&
m_quantizedAabbMax[1] > obj.m_quantizedAabbMax[1] &&
m_quantizedAabbMax[2] > obj.m_quantizedAabbMax[2] &&
m_escapeIndexOrDataIndex > obj.m_escapeIndexOrDataIndex;
}
bool operator==(const BT_QUANTIZED_BVH_NODE& obj) const {
return
m_quantizedAabbMin[0] == obj.m_quantizedAabbMin[0] &&
m_quantizedAabbMin[1] == obj.m_quantizedAabbMin[1] &&
m_quantizedAabbMin[2] == obj.m_quantizedAabbMin[2] &&
m_quantizedAabbMax[0] == obj.m_quantizedAabbMax[0] &&
m_quantizedAabbMax[1] == obj.m_quantizedAabbMax[1] &&
m_quantizedAabbMax[2] == obj.m_quantizedAabbMax[2] &&
m_escapeIndexOrDataIndex == obj.m_escapeIndexOrDataIndex;
}
BT_QUANTIZED_BVH_NODE() BT_QUANTIZED_BVH_NODE()
{ {
m_escapeIndexOrDataIndex = 0; m_escapeIndexOrDataIndex = 0;