From 5f53889d4357d8dba6e726ed38358eca96dbeb47 Mon Sep 17 00:00:00 2001
From: Andy Belle-Isle <drumsetmonkey@gmail.com>
Date: Mon, 7 Oct 2019 18:35:47 -0400
Subject: Added ability to change rendering offsets and sizes

---
 src/components/Component.hpp |  2 ++
 src/components/Position.hpp  |  9 +++++++--
 src/components/Render.hpp    | 19 +++++++++++++++++++
 src/components/Velocity.hpp  | 21 ++++++++++-----------
 4 files changed, 38 insertions(+), 13 deletions(-)

(limited to 'src/components')

diff --git a/src/components/Component.hpp b/src/components/Component.hpp
index 538d42b..5b0e3af 100644
--- a/src/components/Component.hpp
+++ b/src/components/Component.hpp
@@ -24,6 +24,8 @@
 #include <entityx/entityx.h>
 #include <sol/sol.hpp>
 
+#include <glm/glm.hpp>
+
 #include <script/vectors.hpp>
 
 template<typename T>
diff --git a/src/components/Position.hpp b/src/components/Position.hpp
index 07009f9..fc5cb9a 100644
--- a/src/components/Position.hpp
+++ b/src/components/Position.hpp
@@ -24,9 +24,9 @@
 struct Position : Component<Position>
 {
 public:
-    double x, y;
+    float x, y;
 
-    Position(double _x = 0, double _y = 0) :
+    Position(float _x = 0, float _y = 0) :
         x(_x), y(_y) {}
 
     Position FromLua(sol::object ref)
@@ -38,6 +38,11 @@ public:
         return *this;
     }
 
+    glm::vec2 vec()
+    {
+        return glm::vec2(x, y);
+    }
+
     void serialize(cereal::JSONOutputArchive& ar) final {
         ar(CEREAL_NVP(x), CEREAL_NVP(y));
     }
diff --git a/src/components/Render.hpp b/src/components/Render.hpp
index 81ca591..a9af51a 100644
--- a/src/components/Render.hpp
+++ b/src/components/Render.hpp
@@ -28,6 +28,12 @@ public:
     Texture normal;
     bool visible;
     bool flipX = false;
+    glm::vec2 corners[4] = {
+        glm::vec2(-0.5, -0.5), // lower left
+        glm::vec2( 0.5, -0.5), // lower right
+        glm::vec2(-0.5,  0.5), // upper left
+        glm::vec2( 0.5,  0.5)  // upper right
+    };
 
     Render(std::string _file) :
         texture(_file), visible(true) {}
@@ -46,6 +52,19 @@ public:
                 this->normal = Texture(tab.get<std::string>("normal"));
             if (tab["flipx"].get_type() == sol::type::boolean)
                 this->flipX = tab["flipx"];
+
+            if (tab["offset"].get_type() == sol::type::table) {
+                sol::table offset = tab["offset"];
+                if (offset["ll"] == sol::type::table)
+                    corners[0] = Script::to<glm::vec2>(offset["ll"]);
+                if (offset["lr"] == sol::type::table)
+                    corners[1] = Script::to<glm::vec2>(offset["lr"]);
+                if (offset["ul"] == sol::type::table)
+                    corners[2] = Script::to<glm::vec2>(offset["ul"]);
+                if (offset["ur"] == sol::type::table)
+                    corners[3] = Script::to<glm::vec2>(offset["ur"]);
+            }
+
         } else {
             throw std::string(
                 "Render component table formatted incorrectly"
diff --git a/src/components/Velocity.hpp b/src/components/Velocity.hpp
index 776c1dd..888cbb5 100644
--- a/src/components/Velocity.hpp
+++ b/src/components/Velocity.hpp
@@ -25,25 +25,24 @@
 struct Velocity : Component<Velocity>
 {
 public:
-    double x, y;
+    float x, y;
 
-    Velocity(double _x = 0, double _y = 0) :
+    Velocity(float _x = 0, float _y = 0) :
         x(_x), y(_y) {}
 
     Velocity 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("Velocity table not formatted properly");
-        }
+        glm::vec2 vel = Script::to<glm::vec2>(ref);
+        this->x = vel.x;
+        this->y = vel.y;
         return *this;
     }
 
+    glm::vec2 vec()
+    {
+        return glm::vec2(x, y);
+    }
+
     void serialize(cereal::JSONOutputArchive& ar) final {
         ar(CEREAL_NVP(x), CEREAL_NVP(y));
     }
-- 
cgit v1.2.3