json entity saving: cout

8 files changed, 72 insertions, 10 deletions

diff --git a/src/components/Component.hpp b/src/components/Component.hpp
index 5a062bd..2928366 100644
--- a/src/components/Component.hpp
+++ b/src/components/Component.hpp
@@ -18,13 +18,27 @@
 #ifndef COMPONENT_HPP_
 #define COMPONENT_HPP_
 
+#include <cereal/cereal.hpp>
+#include <cereal/archives/json.hpp>
+
+#include <entityx/entityx.h>
 #include <sol/sol.hpp>
 
 template<typename T>
-class Component 
+class Component : public entityx::Component<T>
 {
 public:
     virtual T FromLua(sol::object) = 0;
+
+    virtual void serialize(cereal::JSONOutputArchive& ar) = 0;
+    virtual void serialize(cereal::JSONInputArchive& ar) = 0;
+
+    void internal_serialize(bool save, void *ar) final {
+        if (save)
+            serialize(*reinterpret_cast<cereal::JSONOutputArchive*>(ar));
+        else
+            serialize(*reinterpret_cast<cereal::JSONInputArchive*>(ar));
+    }
 };
 
 #endif // COMPONENT_HPP_
diff --git a/src/components/Light.hpp b/src/components/Light.hpp
index ee215a6..2cb0e1b 100644
--- a/src/components/Light.hpp
+++ b/src/components/Light.hpp
@@ -22,7 +22,7 @@
 
 #include "Component.hpp"
 
-struct Light : Component<Light>, entityx::Component<Light>
+struct Light : Component<Light>
 {
 public:
     float r, g, b;
@@ -49,6 +49,14 @@ public:
         }
         return *this;
     }
+
+    void serialize(cereal::JSONOutputArchive& ar) final {
+        ar(r, g, b, strength);
+    }
+
+    void serialize(cereal::JSONInputArchive& ar) final {
+        ar(r, g, b, strength);
+    }
 };
 
 #endif//COMPONENT_LIGHT_HPP_
diff --git a/src/components/Name.hpp b/src/components/Name.hpp
index 94b7531..b42ef46 100644
--- a/src/components/Name.hpp
+++ b/src/components/Name.hpp
@@ -21,7 +21,7 @@
 #include "Component.hpp"
 #include <string>
 
-struct Name : Component<Name>, entityx::Component<Name>
+struct Name : Component<Name>
 {
 public:
     std::string name;
@@ -38,6 +38,14 @@ public:
 
         return *this;
     }
+
+    void serialize(cereal::JSONOutputArchive& ar) final {
+        ar(name);
+    }
+
+    void serialize(cereal::JSONInputArchive& ar) final {
+        ar(name);
+    }
 };
 
 #endif // COMPONENT_NAME_HPP_
diff --git a/src/components/Player.hpp b/src/components/Player.hpp
index 5c1e870..95b2a96 100644
--- a/src/components/Player.hpp
+++ b/src/components/Player.hpp
@@ -23,13 +23,18 @@
 
 #include "Component.hpp"
 
-struct Player : Component<Player>, entityx::Component<Player>
+struct Player : Component<Player>
 {
 public:
+    char _unused;
+
     Player FromLua([[maybe_unused]] sol::object ref)
     {
         return *this;
     }
+
+    void serialize([[maybe_unused]] cereal::JSONOutputArchive& ar) final {}
+    void serialize([[maybe_unused]] cereal::JSONInputArchive& ar) final {}
 };
 
 #endif // COMPONENT_PLAYER_HPP_
diff --git a/src/components/Position.hpp b/src/components/Position.hpp
index c801998..6157265 100644
--- a/src/components/Position.hpp
+++ b/src/components/Position.hpp
@@ -21,7 +21,7 @@
 
 #include "Component.hpp"
 
-struct Position : Component<Position>, entityx::Component<Position>
+struct Position : Component<Position>
 {
 public:
     double x, y;
@@ -42,6 +42,14 @@ public:
         }
         return *this;
     }
+
+    void serialize(cereal::JSONOutputArchive& ar) final {
+        ar(x, y);
+    }
+
+    void serialize(cereal::JSONInputArchive& ar) final {
+        ar(x, y);
+    }
 };
 
 #endif // COMPONENT_POSITION_HPP_
diff --git a/src/components/Render.hpp b/src/components/Render.hpp
index 3f1750f..49a9588 100644
--- a/src/components/Render.hpp
+++ b/src/components/Render.hpp
@@ -21,7 +21,7 @@
 #include "Component.hpp"
 #include "texture.hpp"
 
-struct Render : Component<Render>, entityx::Component<Render>
+struct Render : Component<Render>
 {
 public:
     Texture texture;
@@ -41,9 +41,9 @@ public:
             if (tab["visible"].get_type() == sol::type::boolean)
                 this->visible = tab["visible"];
             if (tab["texture"].get_type() == sol::type::string)
-                this->texture = Texture(static_cast<std::string>(tab["texture"]));
+                this->texture = Texture(tab.get<std::string>("texture"));
             if (tab["normal"].get_type() == sol::type::string)
-                this->normal = Texture(static_cast<std::string>(tab["normal"]));
+                this->normal = Texture(tab.get<std::string>("normal"));
             if (tab["flipx"].get_type() == sol::type::boolean)
                 this->flipX = tab["flipx"];
         } else {
@@ -53,6 +53,14 @@ public:
         }
         return *this;
     }
+
+    void serialize(cereal::JSONOutputArchive& ar) final {
+        ar(visible, flipX);
+    }
+
+    void serialize(cereal::JSONInputArchive& ar) final {
+        ar(visible, flipX);
+    }
 };
 
 #endif // COMPONENT_RENDER_HPP_
diff --git a/src/components/Script.hpp b/src/components/Script.hpp
index b3c89f3..178c933 100644
--- a/src/components/Script.hpp
+++ b/src/components/Script.hpp
@@ -21,7 +21,7 @@
 
 #include "Component.hpp"
 
-struct Scripted : Component<Scripted>, entityx::Component<Scripted>
+struct Scripted : Component<Scripted>
 {
 public:
     sol::table caller;
@@ -60,6 +60,9 @@ public:
         if (caller["RenderIdle"] == sol::type::function)
             caller["RenderIdle"](caller);
     }
+
+    void serialize([[maybe_unused]] cereal::JSONOutputArchive& ar) final {}
+    void serialize([[maybe_unused]] cereal::JSONInputArchive& ar) final {}
 };
 
 #endif // COMPONENT_SCRIPT_HPP_
diff --git a/src/components/Velocity.hpp b/src/components/Velocity.hpp
index 29c0e5c..7a75706 100644
--- a/src/components/Velocity.hpp
+++ b/src/components/Velocity.hpp
@@ -22,7 +22,7 @@
 
 #include "Component.hpp"
 
-struct Velocity : Component<Velocity>, entityx::Component<Velocity>
+struct Velocity : Component<Velocity>
 {
 public:
     double x, y;
@@ -43,6 +43,14 @@ public:
         }
         return *this;
     }
+
+    void serialize(cereal::JSONOutputArchive& ar) final {
+        ar(x, y);
+    }
+
+    void serialize(cereal::JSONInputArchive& ar) final {
+        ar(x, y);
+    }
 };
 
 #endif // COMPONENT_VELOCITY_HPP_