From 2d5bfc81cdef5b16cd1cd47a5fbcc281fe95d5a7 Mon Sep 17 00:00:00 2001 From: Andrew Meadows Date: Fri, 25 Apr 2014 14:14:34 -0700 Subject: [PATCH] add Vec3.distance(Vec3, Vec3) for JS --- 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 bab529df1f..badc980913 100644 --- a/libraries/script-engine/src/Vec3.cpp +++ b/libraries/script-engine/src/Vec3.cpp @@ -36,6 +36,10 @@ float Vec3::length(const glm::vec3& v) { return glm::length(v); } +float Vec3::distance(const glm::vec3& v1, const glm::vec3& v2) { + return glm::distance(v1, v2); +} + glm::vec3 Vec3::normalize(const glm::vec3& v) { return glm::normalize(v); } diff --git a/libraries/script-engine/src/Vec3.h b/libraries/script-engine/src/Vec3.h index b30e274d89..e401cd71bd 100644 --- a/libraries/script-engine/src/Vec3.h +++ b/libraries/script-engine/src/Vec3.h @@ -31,6 +31,7 @@ public slots: glm::vec3 sum(const glm::vec3& v1, const glm::vec3& v2); glm::vec3 subtract(const glm::vec3& v1, const glm::vec3& v2); float length(const glm::vec3& v); + float distance(const glm::vec3& v1, const glm::vec3& v2); glm::vec3 normalize(const glm::vec3& v); void print(const QString& lable, const glm::vec3& v); };