From ccecb4db6265e90ad77abaf99e306ddb85d7f871 Mon Sep 17 00:00:00 2001 From: nicolaichuk Date: Thu, 30 Mar 2017 01:47:43 +0300 Subject: [PATCH] revert add compare operation --- .../Gimpact/btContactProcessingStructs.h | 31 +---------------- .../Gimpact/btGImpactQuantizedBvhStructs.h | 33 ------------------- 2 files changed, 1 insertion(+), 63 deletions(-) diff --git a/src/BulletCollision/Gimpact/btContactProcessingStructs.h b/src/BulletCollision/Gimpact/btContactProcessingStructs.h index cfd4bb19b..efbc4a567 100644 --- a/src/BulletCollision/Gimpact/btContactProcessingStructs.h +++ b/src/BulletCollision/Gimpact/btContactProcessingStructs.h @@ -28,6 +28,7 @@ subject to the following restrictions: #include "LinearMath/btAlignedObjectArray.h" #include "btTriangleShapeEx.h" + /** Configuration var for applying interpolation of contact normals */ @@ -50,36 +51,6 @@ public: 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): m_point(contact.m_point), diff --git a/src/BulletCollision/Gimpact/btGImpactQuantizedBvhStructs.h b/src/BulletCollision/Gimpact/btGImpactQuantizedBvhStructs.h index acd7b1649..7dd5a1b9d 100644 --- a/src/BulletCollision/Gimpact/btGImpactQuantizedBvhStructs.h +++ b/src/BulletCollision/Gimpact/btGImpactQuantizedBvhStructs.h @@ -37,39 +37,6 @@ ATTRIBUTE_ALIGNED16 (struct) BT_QUANTIZED_BVH_NODE //4 bytes 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() { m_escapeIndexOrDataIndex = 0;