From b4362ea85ae04e4520d347c3438b0d073c570208 Mon Sep 17 00:00:00 2001
From: Thijs Wenker <me@thoys.nl>
Date: Wed, 22 Apr 2020 22:59:01 +0200
Subject: [PATCH] move template functions to header

---
 .../src/graphics/BufferViewHelpers.cpp        | 44 ----------------
 .../graphics/src/graphics/BufferViewHelpers.h | 50 ++++++++++++++++++-
 2 files changed, 48 insertions(+), 46 deletions(-)

diff --git a/libraries/graphics/src/graphics/BufferViewHelpers.cpp b/libraries/graphics/src/graphics/BufferViewHelpers.cpp
index 076cb92dcf..58ddbc9f58 100644
--- a/libraries/graphics/src/graphics/BufferViewHelpers.cpp
+++ b/libraries/graphics/src/graphics/BufferViewHelpers.cpp
@@ -120,50 +120,6 @@ template<> glm::uint32 forEach<glm::vec3>(const gpu::BufferView& view, std::func
     return forEachGlmVec<glm::vec3>(view, func);
 }
 
-template <typename T>
-QVariant glmVecToVariant(const T& v, bool asArray /*= false*/) {
-    static const auto len = T().length();
-    if (asArray) {
-        QVariantList list;
-        for (int i = 0; i < len ; i++) {
-            list << v[i];
-        }
-        return list;
-    } else {
-        QVariantMap obj;
-        for (int i = 0; i < len ; i++) {
-            obj[XYZW[i]] = v[i];
-        }
-        return obj;
-    }
-}
-
-template <typename T>
-const T glmVecFromVariant(const QVariant& v) {
-    auto isMap = v.type() == (QVariant::Type)QMetaType::QVariantMap;
-    static const auto len = T().length();
-    const auto& components = isMap ? XYZW : ZERO123;
-    T result;
-    QVariantMap map;
-    QVariantList list;
-    if (isMap) map = v.toMap(); else list = v.toList();
-    for (int i = 0; i < len ; i++) {
-        float value;
-        if (isMap) {
-            value = map.value(components[i]).toFloat();
-        } else {
-            value = list.value(i).toFloat();
-        }
-#ifdef DEBUG_BUFFERVIEW_HELPERS
-        if (value != value) { // NAN
-            qWarning().nospace()<< "vec" << len << "." << components[i] << " NAN received from script.... " << v.toString();
-        }
-#endif
-        result[i] = value;
-    }
-    return result;
-}
-
 // QVector<T> => BufferView
 template <typename T>
 gpu::BufferView newFromVector(const QVector<T>& elements, const gpu::Element& elementType) {
diff --git a/libraries/graphics/src/graphics/BufferViewHelpers.h b/libraries/graphics/src/graphics/BufferViewHelpers.h
index 3635ef64e5..4c467b5175 100644
--- a/libraries/graphics/src/graphics/BufferViewHelpers.h
+++ b/libraries/graphics/src/graphics/BufferViewHelpers.h
@@ -27,8 +27,54 @@ namespace buffer_helpers {
     extern const std::array<const char*, 4> XYZW;
     extern const std::array<const char*, 4> ZERO123;
 
-    template <typename T> QVariant glmVecToVariant(const T& v, bool asArray = false);
-    template <typename T> const T glmVecFromVariant(const QVariant& v);
+    template <typename T>
+    QVariant glmVecToVariant(const T& v, bool asArray = false) {
+        static const auto len = T().length();
+        if (asArray) {
+            QVariantList list;
+            for (int i = 0; i < len; i++) {
+                list << v[i];
+            }
+            return list;
+        } else {
+            QVariantMap obj;
+            for (int i = 0; i < len; i++) {
+                obj[XYZW[i]] = v[i];
+            }
+            return obj;
+        }
+    }
+
+    template <typename T>
+    const T glmVecFromVariant(const QVariant& v) {
+        auto isMap = v.type() == (QVariant::Type)QMetaType::QVariantMap;
+        static const auto len = T().length();
+        const auto& components = isMap ? XYZW : ZERO123;
+        T result;
+        QVariantMap map;
+        QVariantList list;
+        if (isMap) {
+            map = v.toMap();
+        } else {
+            list = v.toList();
+        }
+        for (int i = 0; i < len; i++) {
+            float value;
+            if (isMap) {
+                value = map.value(components[i]).toFloat();
+            } else {
+                value = list.value(i).toFloat();
+            }
+#ifdef DEBUG_BUFFERVIEW_HELPERS
+            if (value != value) { // NAN
+                qWarning().nospace() << "vec" << len << "." << components[i] << " NAN received from script.... " << v.toString();
+            }
+#endif
+            result[i] = value;
+        }
+        return result;
+    }
+
 
     glm::uint32 forEachVariant(const gpu::BufferView& view, std::function<bool(glm::uint32 index, const QVariant& value)> func, const char* hint = "");
     template <typename T> glm::uint32 forEach(const gpu::BufferView& view, std::function<bool(glm::uint32 index, const T& value)> func);