From 1b63e00b6b08133f5ee37ed90043eee0f67942fd Mon Sep 17 00:00:00 2001
From: Andy Belle-Isle <drumsetmonkey@gmail.com>
Date: Mon, 7 Oct 2019 17:39:52 -0400
Subject: Added script conversion code, can now convert table to vec2, vec3 and
 vec4

---
 src/components/Component.hpp |  2 ++
 src/components/Position.hpp  | 13 ++++---------
 2 files changed, 6 insertions(+), 9 deletions(-)

(limited to 'src/components')

diff --git a/src/components/Component.hpp b/src/components/Component.hpp
index 2928366..538d42b 100644
--- a/src/components/Component.hpp
+++ b/src/components/Component.hpp
@@ -24,6 +24,8 @@
 #include <entityx/entityx.h>
 #include <sol/sol.hpp>
 
+#include <script/vectors.hpp>
+
 template<typename T>
 class Component : public entityx::Component<T>
 {
diff --git a/src/components/Position.hpp b/src/components/Position.hpp
index 56e8707..07009f9 100644
--- a/src/components/Position.hpp
+++ b/src/components/Position.hpp
@@ -31,15 +31,10 @@ public:
 
     Position FromLua(sol::object ref)
     {
-        if (ref.get_type() == sol::type::table) {
-            sol::table tab = ref;
-            if (tab["x"] != nullptr)
-                this->x = tab["x"];
-            if (tab["y"] != nullptr)
-                this->y = tab["y"];
-        } else {
-            throw std::string("Position table not formatted properly");
-        }
+        glm::vec2 vec = Script::to<glm::vec2>(ref);
+        this->x = vec.x;
+        this->y = vec.y;
+
         return *this;
     }
 
-- 
cgit v1.2.3