From a4cbb7f41258fdb90508f791b23e5ebe858c1832 Mon Sep 17 00:00:00 2001 From: SamGondelman Date: Mon, 20 Jul 2015 17:30:23 -0700 Subject: [PATCH] const references in glmhelpers --- libraries/shared/src/GLMHelpers.cpp | 8 ++++---- libraries/shared/src/GLMHelpers.h | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/libraries/shared/src/GLMHelpers.cpp b/libraries/shared/src/GLMHelpers.cpp index a9b7f98507..822b6843c8 100644 --- a/libraries/shared/src/GLMHelpers.cpp +++ b/libraries/shared/src/GLMHelpers.cpp @@ -348,14 +348,14 @@ QRectF glmToRect(const glm::vec2 & pos, const glm::vec2 & size) { } // create matrix from orientation and position -glm::mat4 createMatFromQuatAndPos(glm::quat q, glm::vec3 p) { +glm::mat4 createMatFromQuatAndPos(const glm::quat& q, const glm::vec3& p) { glm::mat4 m = glm::mat4_cast(q); m[3] = glm::vec4(p, 1); return m; } // cancel out roll and pitch -glm::quat cancelOutRollAndPitch(glm::quat q) { +glm::quat cancelOutRollAndPitch(const glm::quat& q) { glm::vec3 xAxis = q * glm::vec3(1, 0, 0); glm::vec3 yAxis = q * glm::vec3(0, 1, 0); glm::vec3 zAxis = q * glm::vec3(0, 0, 1); @@ -370,7 +370,7 @@ glm::quat cancelOutRollAndPitch(glm::quat q) { } // cancel out roll and pitch -glm::mat4 cancelOutRollAndPitch(glm::mat4 m) { +glm::mat4 cancelOutRollAndPitch(const glm::mat4& m) { glm::vec3 xAxis = glm::vec3(m[0]); glm::vec3 yAxis = glm::vec3(m[1]); glm::vec3 zAxis = glm::vec3(m[2]); @@ -384,7 +384,7 @@ glm::mat4 cancelOutRollAndPitch(glm::mat4 m) { return temp; } -glm::vec3 transformPoint(const glm::mat4& m, glm::vec3 p) { +glm::vec3 transformPoint(const glm::mat4& m, const glm::vec3& p) { glm::vec4 temp = m * glm::vec4(p, 1); return glm::vec3(temp.x / temp.w, temp.y / temp.w, temp.z / temp.w); } diff --git a/libraries/shared/src/GLMHelpers.h b/libraries/shared/src/GLMHelpers.h index b2090af3e8..a364a3624a 100644 --- a/libraries/shared/src/GLMHelpers.h +++ b/libraries/shared/src/GLMHelpers.h @@ -150,9 +150,9 @@ T toNormalizedDeviceScale(const T& value, const T& size) { #define PITCH(euler) euler.x #define ROLL(euler) euler.z -glm::mat4 createMatFromQuatAndPos(glm::quat q, glm::vec3 p); -glm::quat cancelOutRollAndPitch(glm::quat q); -glm::mat4 cancelOutRollAndPitch(glm::mat4 m); -glm::vec3 transformPoint(const glm::mat4& m, glm::vec3 p); +glm::mat4 createMatFromQuatAndPos(const glm::quat& q, const glm::vec3& p); +glm::quat cancelOutRollAndPitch(const glm::quat& q); +glm::mat4 cancelOutRollAndPitch(const glm::mat4& m); +glm::vec3 transformPoint(const glm::mat4& m, const glm::vec3& p); #endif // hifi_GLMHelpers_h