From 0a7cccc3f7fead14c3b48abf1bc459a3327d7dd1 Mon Sep 17 00:00:00 2001
From: David Rowe <david@ctrlaltstudio.com>
Date: Fri, 20 Apr 2018 12:47:53 +1200
Subject: [PATCH] Move Vec2 and Vec4 JSDoc

---
 libraries/script-engine/src/Vec3.h         | 18 ------------------
 libraries/shared/src/RegisteredMetaTypes.h | 16 ++++++++++++++++
 2 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/libraries/script-engine/src/Vec3.h b/libraries/script-engine/src/Vec3.h
index 7ed0fd9e8b..c419749c26 100644
--- a/libraries/script-engine/src/Vec3.h
+++ b/libraries/script-engine/src/Vec3.h
@@ -21,14 +21,6 @@
 
 #include "GLMHelpers.h"
 
-/**jsdoc
- * A 2-dimensional vector.
- *
- * @typedef {object} Vec2
- * @property {number} x - X-coordinate of the vector.
- * @property {number} y - Y-coordinate of the vector.
- */
-
 /**jsdoc
  * A 3-dimensional vector.
  *
@@ -38,16 +30,6 @@
  * @property {number} z - Z-coordinate of the vector.
  */
 
-/**jsdoc
- * A 4-dimensional vector.
- *
- * @typedef {object} Vec4
- * @property {number} x - X-coordinate of the vector.
- * @property {number} y - Y-coordinate of the vector.
- * @property {number} z - Z-coordinate of the vector.
- * @property {number} w - W-coordinate of the vector.
- */
-
 /**jsdoc
  * A color vector.
  *
diff --git a/libraries/shared/src/RegisteredMetaTypes.h b/libraries/shared/src/RegisteredMetaTypes.h
index 78e368748b..689d1a3f42 100644
--- a/libraries/shared/src/RegisteredMetaTypes.h
+++ b/libraries/shared/src/RegisteredMetaTypes.h
@@ -44,6 +44,15 @@ void registerMetaTypes(QScriptEngine* engine);
 QScriptValue mat4toScriptValue(QScriptEngine* engine, const glm::mat4& mat4);
 void mat4FromScriptValue(const QScriptValue& object, glm::mat4& mat4);
 
+/**jsdoc
+ * A 4-dimensional vector.
+ *
+ * @typedef {object} Vec4
+ * @property {number} x - X-coordinate of the vector.
+ * @property {number} y - Y-coordinate of the vector.
+ * @property {number} z - Z-coordinate of the vector.
+ * @property {number} w - W-coordinate of the vector.
+ */
 // Vec4
 QScriptValue vec4toScriptValue(QScriptEngine* engine, const glm::vec4& vec4);
 void vec4FromScriptValue(const QScriptValue& object, glm::vec4& vec4);
@@ -59,6 +68,13 @@ QVariant vec3toVariant(const glm::vec3& vec3);
 glm::vec3 vec3FromVariant(const QVariant &object, bool& valid);
 glm::vec3 vec3FromVariant(const QVariant &object);
 
+/**jsdoc
+ * A 2-dimensional vector.
+ *
+ * @typedef {object} Vec2
+ * @property {number} x - X-coordinate of the vector.
+ * @property {number} y - Y-coordinate of the vector.
+ */
 // Vec2
 QScriptValue vec2toScriptValue(QScriptEngine* engine, const glm::vec2 &vec2);
 void vec2FromScriptValue(const QScriptValue &object, glm::vec2 &vec2);