Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-05 04:00:48 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

const references in glmhelpers

Browse source
This commit is contained in:
SamGondelman 2015-07-20 17:30:23 -07:00
parent db52729b1a
commit a4cbb7f412
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
libraries/shared/src/GLMHelpers.cpp
View file

@ -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);
}

8
libraries/shared/src/GLMHelpers.h
View file

@ -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