From 7cde6811ca2bcd11fed53aae41e651963e93e8c7 Mon Sep 17 00:00:00 2001 From: Andrew Meadows Date: Thu, 4 Sep 2014 15:21:19 -0700 Subject: [PATCH] remove unecessary AACube::operator<() --- libraries/shared/src/AACube.cpp | 7 ------- libraries/shared/src/AACube.h | 2 -- 2 files changed, 9 deletions(-) diff --git a/libraries/shared/src/AACube.cpp b/libraries/shared/src/AACube.cpp index 1bfffb202c..bf8e972455 100644 --- a/libraries/shared/src/AACube.cpp +++ b/libraries/shared/src/AACube.cpp @@ -314,13 +314,6 @@ bool AACube::findCapsulePenetration(const glm::vec3& start, const glm::vec3& end return true; } -bool AACube::operator<(const AACube& otherCube) const { - return (_corner.x < otherCube._corner.x - || (_corner.x == otherCube._corner.x && (_corner.y < otherCube._corner.y - || (_corner.y == otherCube._corner.y && (_corner.z < otherCube._corner.z - || _scale < otherCube._scale))))); -} - glm::vec3 AACube::getClosestPointOnFace(const glm::vec3& point, BoxFace face) const { switch (face) { case MIN_X_FACE: diff --git a/libraries/shared/src/AACube.h b/libraries/shared/src/AACube.h index 873f271981..705c025d74 100644 --- a/libraries/shared/src/AACube.h +++ b/libraries/shared/src/AACube.h @@ -60,8 +60,6 @@ public: AABox clamp(const glm::vec3& min, const glm::vec3& max) const; AABox clamp(float min, float max) const; - bool operator<(const AACube& otherCube) const; // for qSorted lists of AACubes - private: glm::vec3 getClosestPointOnFace(const glm::vec3& point, BoxFace face) const; glm::vec3 getClosestPointOnFace(const glm::vec4& origin, const glm::vec4& direction, BoxFace face) const;