From 09d3c511205364a69c89f4dd5df16614e20dafab Mon Sep 17 00:00:00 2001 From: Andrew Meadows Date: Fri, 19 Sep 2014 16:54:03 -0700 Subject: [PATCH] add multiply(float, Vec3) because multiply commutes --- libraries/script-engine/src/Vec3.cpp | 4 ++++ libraries/script-engine/src/Vec3.h | 1 + 2 files changed, 5 insertions(+) diff --git a/libraries/script-engine/src/Vec3.cpp b/libraries/script-engine/src/Vec3.cpp index 0cbb43f89a..7589ade3b6 100644 --- a/libraries/script-engine/src/Vec3.cpp +++ b/libraries/script-engine/src/Vec3.cpp @@ -25,6 +25,10 @@ glm::vec3 Vec3::multiply(const glm::vec3& v1, float f) { return v1 * f; } +glm::vec3 Vec3::multiply(float f, const glm::vec3& v1) { + return v1 * f; +} + glm::vec3 Vec3::multiplyQbyV(const glm::quat& q, const glm::vec3& v) { return q * v; } diff --git a/libraries/script-engine/src/Vec3.h b/libraries/script-engine/src/Vec3.h index 5a3eeca7be..598f9be432 100644 --- a/libraries/script-engine/src/Vec3.h +++ b/libraries/script-engine/src/Vec3.h @@ -28,6 +28,7 @@ public slots: glm::vec3 cross(const glm::vec3& v1, const glm::vec3& v2); float dot(const glm::vec3& v1, const glm::vec3& v2); glm::vec3 multiply(const glm::vec3& v1, float f); + glm::vec3 multiply(float, const glm::vec3& v1); glm::vec3 multiplyQbyV(const glm::quat& q, const glm::vec3& v); glm::vec3 sum(const glm::vec3& v1, const glm::vec3& v2); glm::vec3 subtract(const glm::vec3& v1, const glm::vec3& v2);