From f30464ebcb7aa7054550edecdbe72dd98e755b4e Mon Sep 17 00:00:00 2001 From: nicolaichuk Date: Wed, 29 Mar 2017 18:20:36 +0300 Subject: [PATCH] Revert "add compare operators in btAABB" This reverts commit 18f17be47d4853b273204ee17e06f78d5a669566. --- src/BulletCollision/Gimpact/btBoxCollision.h | 19 +------ .../Gimpact/btGImpactBvhStructs.h | 56 ------------------- 2 files changed, 1 insertion(+), 74 deletions(-) diff --git a/src/BulletCollision/Gimpact/btBoxCollision.h b/src/BulletCollision/Gimpact/btBoxCollision.h index 2fa1fb0df..0a0357e5a 100644 --- a/src/BulletCollision/Gimpact/btBoxCollision.h +++ b/src/BulletCollision/Gimpact/btBoxCollision.h @@ -234,24 +234,7 @@ public: btAABB() {} - - bool operator<(const btAABB& obj) const { - return - m_min < obj.m_min && - m_max < obj.m_max; - } - - bool operator>(const btAABB& obj) const { - return - m_min > obj.m_min && - m_max > obj.m_max; - } - - bool operator==(const btAABB& obj) const { - return - m_min == obj.m_min && - m_max == obj.m_max; - } + btAABB(const btVector3 & V1, const btVector3 & V2, diff --git a/src/BulletCollision/Gimpact/btGImpactBvhStructs.h b/src/BulletCollision/Gimpact/btGImpactBvhStructs.h index 1e082fe2d..9342a572d 100644 --- a/src/BulletCollision/Gimpact/btGImpactBvhStructs.h +++ b/src/BulletCollision/Gimpact/btGImpactBvhStructs.h @@ -35,25 +35,6 @@ struct GIM_PAIR { int m_index1; int m_index2; - - bool operator<(const GIM_PAIR& obj) const { - return - m_index1 < obj.m_index1 && - m_index2 < obj.m_index2; - } - - bool operator>(const GIM_PAIR& obj) const { - return - m_index1 > obj.m_index1 && - m_index2 > obj.m_index2; - } - - bool operator==(const GIM_PAIR& obj) const { - return - m_index1 == obj.m_index1 && - m_index2 == obj.m_index2; - } - GIM_PAIR() {} @@ -75,24 +56,6 @@ struct GIM_BVH_DATA { btAABB m_bound; int m_data; - - bool operator<(const GIM_BVH_DATA& obj) const { - return - m_bound < obj.m_bound && - m_data < obj.m_data; - } - - bool operator>(const GIM_BVH_DATA& obj) const { - return - m_bound > obj.m_bound && - m_data > obj.m_data; - } - - bool operator==(const GIM_BVH_DATA& obj) const { - return - m_bound == obj.m_bound && - m_data == obj.m_data; - } }; //! Node Structure for trees @@ -103,25 +66,6 @@ public: protected: int m_escapeIndexOrDataIndex; public: - - bool operator<(const GIM_BVH_TREE_NODE& obj) const { - return - m_bound < obj.m_bound && - m_escapeIndexOrDataIndex < obj.m_escapeIndexOrDataIndex; - } - - bool operator>(const GIM_BVH_TREE_NODE& obj) const { - return - m_bound > obj.m_bound && - m_escapeIndexOrDataIndex > obj.m_escapeIndexOrDataIndex; - } - - bool operator==(const GIM_BVH_TREE_NODE& obj) const { - return - m_bound == obj.m_bound && - m_escapeIndexOrDataIndex == obj.m_escapeIndexOrDataIndex; - } - GIM_BVH_TREE_NODE() { m_escapeIndexOrDataIndex = 0;