From 8886e93d5fa764f983c3495e6431d012f56fce6e Mon Sep 17 00:00:00 2001
From: Eric Levin <ericrius1@gmail.com>
Date: Thu, 28 May 2015 11:26:41 -0700
Subject: [PATCH] changed qVector to qVectorVec3

---
 libraries/entities/src/EntityItemProperties.cpp     |  2 +-
 libraries/entities/src/EntityItemPropertiesMacros.h |  8 ++++----
 libraries/shared/src/RegisteredMetaTypes.cpp        | 10 +++++++---
 libraries/shared/src/RegisteredMetaTypes.h          |  4 ++--
 4 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/libraries/entities/src/EntityItemProperties.cpp b/libraries/entities/src/EntityItemProperties.cpp
index 4e4d4fd696..dada7ff1ea 100644
--- a/libraries/entities/src/EntityItemProperties.cpp
+++ b/libraries/entities/src/EntityItemProperties.cpp
@@ -531,7 +531,7 @@ void EntityItemProperties::copyFromScriptValue(const QScriptValue& object) {
     COPY_PROPERTY_FROM_QSCRITPTVALUE_ENUM(backgroundMode, BackgroundMode);
     COPY_PROPERTY_FROM_QSCRIPTVALUE(sourceUrl, QString, setSourceUrl);
     COPY_PROPERTY_FROM_QSCRIPTVALUE(lineWidth, float, setLineWidth);
-    COPY_PROPERTY_FROM_QSCRIPTVALUE(linePoints, qVector, setLinePoints);
+    COPY_PROPERTY_FROM_QSCRIPTVALUE(linePoints, qVectorVec3, setLinePoints);
     
 
     
diff --git a/libraries/entities/src/EntityItemPropertiesMacros.h b/libraries/entities/src/EntityItemPropertiesMacros.h
index dd55ae8b3e..3c087b9891 100644
--- a/libraries/entities/src/EntityItemPropertiesMacros.h
+++ b/libraries/entities/src/EntityItemPropertiesMacros.h
@@ -94,7 +94,7 @@ inline QScriptValue convertScriptValue(QScriptEngine* e, const QString& v) { ret
 inline QScriptValue convertScriptValue(QScriptEngine* e, const xColor& v) { return xColorToScriptValue(e, v); }
 inline QScriptValue convertScriptValue(QScriptEngine* e, const glm::quat& v) { return quatToScriptValue(e, v); }
 inline QScriptValue convertScriptValue(QScriptEngine* e, const QScriptValue& v) { return v; }
-inline QScriptValue convertScriptValue(QScriptEngine* e,  const QVector<glm::vec3>& v) {return qVectorToScriptValue(e, v); }
+inline QScriptValue convertScriptValue(QScriptEngine* e,  const QVector<glm::vec3>& v) {return qVectorVec3ToScriptValue(e, v); }
 
 #define COPY_GROUP_PROPERTY_TO_QSCRIPTVALUE(G,g,P,p) \
     if (!skipDefaults || defaultEntityProperties.get##G().get##P() != get##P()) { \
@@ -124,7 +124,7 @@ inline QScriptValue convertScriptValue(QScriptEngine* e,  const QVector<glm::vec
     
 typedef glm::vec3 glmVec3;
 typedef glm::quat glmQuat;
-typedef QVector<glm::vec3> qVector;
+typedef QVector<glm::vec3> qVectorVec3;
 inline float float_convertFromScriptValue(const QScriptValue& v, bool& isValid) { return v.toVariant().toFloat(&isValid); }
 inline uint16_t uint16_t_convertFromScriptValue(const QScriptValue& v, bool& isValid) { return v.toVariant().toInt(&isValid); }
 inline int int_convertFromScriptValue(const QScriptValue& v, bool& isValid) { return v.toVariant().toInt(&isValid); }
@@ -151,9 +151,9 @@ inline glmVec3 glmVec3_convertFromScriptValue(const QScriptValue& v, bool& isVal
     return glm::vec3(0);
 }
 
-inline qVector qVector_convertFromScriptValue(const QScriptValue& v, bool& isValid){
+inline qVectorVec3 qVectorVec3_convertFromScriptValue(const QScriptValue& v, bool& isValid){
     isValid = true;
-    return qVectorFromScriptValue(v);
+    return qVectorVec3FromScriptValue(v);
 }
 
 inline glmQuat glmQuat_convertFromScriptValue(const QScriptValue& v, bool& isValid) { 
diff --git a/libraries/shared/src/RegisteredMetaTypes.cpp b/libraries/shared/src/RegisteredMetaTypes.cpp
index 242dc0970a..7b7a15416a 100644
--- a/libraries/shared/src/RegisteredMetaTypes.cpp
+++ b/libraries/shared/src/RegisteredMetaTypes.cpp
@@ -72,14 +72,18 @@ void vec3FromScriptValue(const QScriptValue &object, glm::vec3 &vec3) {
     vec3.z = object.property("z").toVariant().toFloat();
 }
 
-QScriptValue qVectorToScriptValue(QScriptEngine* engine, const QVector<glm::vec3> &vector){
+QScriptValue qVectorVec3ToScriptValue(QScriptEngine* engine, const QVector<glm::vec3> &vector){
     QScriptValue array = engine->newArray();
+    for(int i = 0; i < vector.size(); i++){
+        array.setProperty(i, vec3toScriptValue(vector.at(i)));
+    }
     return array;
 }
 
-QVector<glm::vec3> qVectorFromScriptValue(const QScriptValue &array){
+QVector<glm::vec3> qVectorVec3FromScriptValue(const QScriptValue &array){
+    QVector<glm:vec3> newVector;
     qDebug()<<"Point 2 x"<<array.property(1).property("y").toString();
-    return QVector<glm::vec3>(7);
+    return QVector<glm::vec3>(8);
 }
 
 QScriptValue vec2toScriptValue(QScriptEngine* engine, const glm::vec2 &vec2) {
diff --git a/libraries/shared/src/RegisteredMetaTypes.h b/libraries/shared/src/RegisteredMetaTypes.h
index 41bfb2004a..bab4dc7d08 100644
--- a/libraries/shared/src/RegisteredMetaTypes.h
+++ b/libraries/shared/src/RegisteredMetaTypes.h
@@ -56,8 +56,8 @@ void qColorFromScriptValue(const QScriptValue& object, QColor& color);
 QScriptValue qURLToScriptValue(QScriptEngine* engine, const QUrl& url);
 void qURLFromScriptValue(const QScriptValue& object, QUrl& url);
 
-QScriptValue qVectorToScriptValue(QScriptEngine*, const QVector<glm::vec3>& vector);
-QVector<glm::vec3> qVectorFromScriptValue( const QScriptValue &array);
+QScriptValue qVectorVec3ToScriptValue(QScriptEngine*, const QVector<glm::vec3>& vector);
+QVector<glm::vec3> qVectorVec3FromScriptValue( const QScriptValue &array);
 
 class PickRay {
 public: