Merge pull request #1 from tcsullivan/save-load

Save load looks good

8 files changed, 98 insertions, 8 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..6849d7c 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,18 @@ public:
         }
         return *this;
     }
+
+    void serialize(cereal::JSONOutputArchive& ar) final {
+        ar(CEREAL_NVP(r), CEREAL_NVP(g), CEREAL_NVP(b), CEREAL_NVP(strength));
+    }
+
+    void serialize(cereal::JSONInputArchive& ar) final {
+        ar(CEREAL_NVP(r), CEREAL_NVP(g), CEREAL_NVP(b), CEREAL_NVP(strength));
+    }
+
+    std::string serializeName(void) const final {
+        return "Light";
+    }
 };
 
 #endif//COMPONENT_LIGHT_HPP_
diff --git a/src/components/Name.hpp b/src/components/Name.hpp
index 94b7531..a6a6d8a 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,18 @@ public:
 
         return *this;
     }
+
+    void serialize(cereal::JSONOutputArchive& ar) final {
+        ar(CEREAL_NVP(name));
+    }
+
+    void serialize(cereal::JSONInputArchive& ar) final {
+        ar(CEREAL_NVP(name));
+    }
+
+    std::string serializeName(void) const final {
+        return "Name";
+    }
 };
 
 #endif // COMPONENT_NAME_HPP_
diff --git a/src/components/Player.hpp b/src/components/Player.hpp
index 5c1e870..33db1eb 100644
--- a/src/components/Player.hpp
+++ b/src/components/Player.hpp
@@ -23,13 +23,22 @@
 
 #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 {}
+
+    std::string serializeName(void) const final {
+        return "Player";
+    }
 };
 
 #endif // COMPONENT_PLAYER_HPP_
diff --git a/src/components/Position.hpp b/src/components/Position.hpp
index c801998..56e8707 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,18 @@ public:
         }
         return *this;
     }
+
+    void serialize(cereal::JSONOutputArchive& ar) final {
+        ar(CEREAL_NVP(x), CEREAL_NVP(y));
+    }
+
+    void serialize(cereal::JSONInputArchive& ar) final {
+        ar(CEREAL_NVP(x), CEREAL_NVP(y));
+    }
+
+    std::string serializeName(void) const final {
+        return "Position";
+    }
 };
 
 #endif // COMPONENT_POSITION_HPP_
diff --git a/src/components/Render.hpp b/src/components/Render.hpp
index 073cbdf..81ca591 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;
@@ -53,6 +53,18 @@ public:
         }
         return *this;
     }
+
+    void serialize(cereal::JSONOutputArchive& ar) final {
+        ar(CEREAL_NVP(visible), CEREAL_NVP(flipX));
+    }
+
+    void serialize(cereal::JSONInputArchive& ar) final {
+        ar(CEREAL_NVP(visible), CEREAL_NVP(flipX));
+    }
+
+    std::string serializeName(void) const final {
+        return "Render";
+    }
 };
 
 #endif // COMPONENT_RENDER_HPP_
diff --git a/src/components/Script.hpp b/src/components/Script.hpp
index b3c89f3..f792750 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,13 @@ 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 {}
+
+    std::string serializeName(void) const final {
+        return "Scripted";
+    }
 };
 
 #endif // COMPONENT_SCRIPT_HPP_
diff --git a/src/components/Velocity.hpp b/src/components/Velocity.hpp
index 29c0e5c..776c1dd 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,18 @@ public:
         }
         return *this;
     }
+
+    void serialize(cereal::JSONOutputArchive& ar) final {
+        ar(CEREAL_NVP(x), CEREAL_NVP(y));
+    }
+
+    void serialize(cereal::JSONInputArchive& ar) final {
+        ar(CEREAL_NVP(x), CEREAL_NVP(y));
+    }
+
+    std::string serializeName(void) const final {
+        return "Velocity";
+    }
 };
 
 #endif // COMPONENT_VELOCITY_HPP_