From e50f6389ca9db47f6919d62ee7f241229e6d9a43 Mon Sep 17 00:00:00 2001 From: ZappoMan Date: Fri, 7 Feb 2014 00:00:30 -0800 Subject: [PATCH] add more JS Quat features --- libraries/script-engine/src/Quat.cpp | 4 ++++ libraries/script-engine/src/Quat.h | 1 + 2 files changed, 5 insertions(+) diff --git a/libraries/script-engine/src/Quat.cpp b/libraries/script-engine/src/Quat.cpp index 12900c29c7..41dafcf40a 100644 --- a/libraries/script-engine/src/Quat.cpp +++ b/libraries/script-engine/src/Quat.cpp @@ -18,3 +18,7 @@ glm::quat Quat::multiply(const glm::quat& q1, const glm::quat& q2) { glm::quat Quat::fromVec3(const glm::vec3& vec3) { return glm::quat(vec3); } + +glm::quat Quat::fromPitchYawRoll(float pitch, float yaw, float roll) { + return glm::quat(glm::radians(glm::vec3(pitch, yaw, roll))); +} diff --git a/libraries/script-engine/src/Quat.h b/libraries/script-engine/src/Quat.h index 6bcd121808..7695fe9daf 100644 --- a/libraries/script-engine/src/Quat.h +++ b/libraries/script-engine/src/Quat.h @@ -22,6 +22,7 @@ class Quat : public QObject { public slots: glm::quat multiply(const glm::quat& q1, const glm::quat& q2); glm::quat fromVec3(const glm::vec3& vec3); + glm::quat fromPitchYawRoll(float pitch, float yaw, float roll); };