From 1cf6945bf222dcbefd31f415521e602ea817eda1 Mon Sep 17 00:00:00 2001 From: Seth Alves Date: Tue, 28 Mar 2017 11:12:00 -0700 Subject: [PATCH] pass radials argument to AABox::touchesAAEllipsoid as const reference --- libraries/shared/src/AABox.cpp | 2 +- libraries/shared/src/AABox.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/shared/src/AABox.cpp b/libraries/shared/src/AABox.cpp index b52deaa4ff..3f3146cc04 100644 --- a/libraries/shared/src/AABox.cpp +++ b/libraries/shared/src/AABox.cpp @@ -436,7 +436,7 @@ glm::vec3 AABox::getClosestPointOnFace(const glm::vec4& origin, const glm::vec4& return getClosestPointOnFace(glm::vec3(origin), face); } -bool AABox::touchesAAEllipsoid(const glm::vec3& center, glm::vec3 radials) const { +bool AABox::touchesAAEllipsoid(const glm::vec3& center, const glm::vec3& radials) const { // handle case where ellipsoid's alix-aligned box doesn't touch this AABox if (_corner.x - radials.x > center.x || _corner.y - radials.y > center.y || diff --git a/libraries/shared/src/AABox.h b/libraries/shared/src/AABox.h index 022f1a6ff1..a53cc26163 100644 --- a/libraries/shared/src/AABox.h +++ b/libraries/shared/src/AABox.h @@ -70,7 +70,7 @@ public: bool findRayIntersection(const glm::vec3& origin, const glm::vec3& direction, float& distance, BoxFace& face, glm::vec3& surfaceNormal) const; bool touchesSphere(const glm::vec3& center, float radius) const; // fast but may generate false positives - bool touchesAAEllipsoid(const glm::vec3& center, glm::vec3 radials) const; + bool touchesAAEllipsoid(const glm::vec3& center, const glm::vec3& radials) const; bool findSpherePenetration(const glm::vec3& center, float radius, glm::vec3& penetration) const; bool findCapsulePenetration(const glm::vec3& start, const glm::vec3& end, float radius, glm::vec3& penetration) const;