From aa634c8ff238731bb94bf97f3b6dfbb6fbebccb1 Mon Sep 17 00:00:00 2001 From: ZappoMan Date: Thu, 2 Oct 2014 17:55:32 -0700 Subject: [PATCH] added new methods to Vec3 and Quat --- libraries/script-engine/src/Quat.cpp | 4 ++++ libraries/script-engine/src/Quat.h | 1 + libraries/script-engine/src/Vec3.cpp | 4 ++++ libraries/script-engine/src/Vec3.h | 1 + 4 files changed, 10 insertions(+) diff --git a/libraries/script-engine/src/Quat.cpp b/libraries/script-engine/src/Quat.cpp index 5985858026..e961eb0acf 100644 --- a/libraries/script-engine/src/Quat.cpp +++ b/libraries/script-engine/src/Quat.cpp @@ -84,3 +84,7 @@ void Quat::print(const QString& lable, const glm::quat& q) { qDebug() << qPrintable(lable) << q.x << "," << q.y << "," << q.z << "," << q.w; } +bool Quat::equal(const glm::vec3& q1, const glm::vec3& q2) { + return q1 == q2; +} + diff --git a/libraries/script-engine/src/Quat.h b/libraries/script-engine/src/Quat.h index faae636f02..55bfa3c061 100644 --- a/libraries/script-engine/src/Quat.h +++ b/libraries/script-engine/src/Quat.h @@ -40,6 +40,7 @@ public slots: glm::quat squad(const glm::quat& q1, const glm::quat& q2, const glm::quat& s1, const glm::quat& s2, float h); float dot(const glm::quat& q1, const glm::quat& q2); void print(const QString& lable, const glm::quat& q); + bool equal(const glm::vec3& q1, const glm::vec3& q2); }; #endif // hifi_Quat_h diff --git a/libraries/script-engine/src/Vec3.cpp b/libraries/script-engine/src/Vec3.cpp index 7589ade3b6..689ce2c747 100644 --- a/libraries/script-engine/src/Vec3.cpp +++ b/libraries/script-engine/src/Vec3.cpp @@ -55,3 +55,7 @@ glm::vec3 Vec3::normalize(const glm::vec3& v) { void Vec3::print(const QString& lable, const glm::vec3& v) { qDebug() << qPrintable(lable) << v.x << "," << v.y << "," << v.z; } + +bool Vec3::equal(const glm::vec3& v1, const glm::vec3& v2) { + return v1 == v2; +} diff --git a/libraries/script-engine/src/Vec3.h b/libraries/script-engine/src/Vec3.h index 598f9be432..2af1350e4a 100644 --- a/libraries/script-engine/src/Vec3.h +++ b/libraries/script-engine/src/Vec3.h @@ -36,6 +36,7 @@ public slots: 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); + bool equal(const glm::vec3& v1, const glm::vec3& v2); };