From 982605ee21941358080b9e20c9b9b2c2006f2d6a Mon Sep 17 00:00:00 2001
From: Clyne Sullivan <clyne@bitgloo.com>
Date: Tue, 10 Sep 2019 20:13:52 -0400
Subject: added Text component and skeleton system

---
 src/components/Text.hpp | 69 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 69 insertions(+)
 create mode 100644 src/components/Text.hpp

(limited to 'src/components/Text.hpp')

diff --git a/src/components/Text.hpp b/src/components/Text.hpp
new file mode 100644
index 0000000..002d19a
--- /dev/null
+++ b/src/components/Text.hpp
@@ -0,0 +1,69 @@
+/**
+ * @file Text.hpp
+ * Allows text to be shown with an entity.
+ *
+ * Copyright (C) 2019 Clyne Sullivan
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef COMPONENT_TEXT_HPP_
+#define COMPONENT_TEXT_HPP_
+
+#include "Component.hpp"
+
+struct Text : Component<Text>
+{
+public:
+    // TODO include font info?
+
+    std::string text;
+    double offsetX, offsetY;
+
+    Text(const std::string& _text) :
+        text(_text), offsetX(0), offsetY(0) {}
+    Text(const std::string& _text, double _x, double _y) :
+        text(_text), x(_x), y(_y) {}
+
+    Text FromLua(sol::object ref)
+    {
+        if (ref.get_type() == sol::type::table) {
+            sol::table tab = ref;
+            if (tab["text"] != nullptr)
+                this->text = tab["text"];
+            if (tab["x"] != nullptr)
+                this->x = tab["x"];
+            if (tab["y"] != nullptr)
+                this->y = tab["y"];
+        } else {
+            throw std::string("Text table not formatted properly");
+        }
+        return *this;
+    }
+
+    void serialize(cereal::JSONOutputArchive& ar) final {
+        ar(CEREAL_NVP(text), CEREAL_NVP(x), CEREAL_NVP(y));
+    }
+
+    void serialize(cereal::JSONInputArchive& ar) final {
+        ar(CEREAL_NVP(text), CEREAL_NVP(x), CEREAL_NVP(y));
+    }
+
+    std::string serializeName(void) const final {
+        return "Text";
+    }
+};
+
+#endif // COMPONENT_TEXT_HPP_
+
-- 
cgit v1.2.3


From 331e858d2dd0155b54b4bf9edfbbb84d3d5a8145 Mon Sep 17 00:00:00 2001
From: Clyne Sullivan <clyne@bitgloo.com>
Date: Thu, 12 Sep 2019 14:24:39 -0400
Subject: add font name to Text component

---
 src/components/Text.hpp | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

(limited to 'src/components/Text.hpp')

diff --git a/src/components/Text.hpp b/src/components/Text.hpp
index 002d19a..9566499 100644
--- a/src/components/Text.hpp
+++ b/src/components/Text.hpp
@@ -26,20 +26,22 @@
 struct Text : Component<Text>
 {
 public:
-    // TODO include font info?
-
+    std::string font;
     std::string text;
     double offsetX, offsetY;
 
-    Text(const std::string& _text) :
-        text(_text), offsetX(0), offsetY(0) {}
-    Text(const std::string& _text, double _x, double _y) :
-        text(_text), x(_x), y(_y) {}
+    Text(const std::string& _font, const std::string& _text) :
+        font(_font), text(_text), offsetX(0), offsetY(0) {}
+    Text(const std::string& _font, const std::string& _text,
+         double _x, double _y) :
+        font(_font), text(_text), x(_x), y(_y) {}
 
     Text FromLua(sol::object ref)
     {
         if (ref.get_type() == sol::type::table) {
             sol::table tab = ref;
+            if (tab["font"] != nullptr)
+                this->font = tab["font"];
             if (tab["text"] != nullptr)
                 this->text = tab["text"];
             if (tab["x"] != nullptr)
@@ -53,11 +55,11 @@ public:
     }
 
     void serialize(cereal::JSONOutputArchive& ar) final {
-        ar(CEREAL_NVP(text), CEREAL_NVP(x), CEREAL_NVP(y));
+        ar(CEREAL_NVP(font), CEREAL_NVP(text), CEREAL_NVP(x), CEREAL_NVP(y));
     }
 
     void serialize(cereal::JSONInputArchive& ar) final {
-        ar(CEREAL_NVP(text), CEREAL_NVP(x), CEREAL_NVP(y));
+        ar(CEREAL_NVP(font), CEREAL_NVP(text), CEREAL_NVP(x), CEREAL_NVP(y));
     }
 
     std::string serializeName(void) const final {
-- 
cgit v1.2.3