From 6614ea639414caab546091841bf920fe6459cc9e Mon Sep 17 00:00:00 2001
From: Clyne Sullivan <clyne@bitgloo.com>
Date: Mon, 2 Sep 2019 18:23:09 -0400
Subject: json entity saving: cout

---
 src/components/Component.hpp | 16 +++++++++++++++-
 src/components/Light.hpp     | 10 +++++++++-
 src/components/Name.hpp      | 10 +++++++++-
 src/components/Player.hpp    |  7 ++++++-
 src/components/Position.hpp  | 10 +++++++++-
 src/components/Render.hpp    | 14 +++++++++++---
 src/components/Script.hpp    |  5 ++++-
 src/components/Velocity.hpp  | 10 +++++++++-
 8 files changed, 72 insertions(+), 10 deletions(-)

(limited to 'src/components')

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_
-- 
cgit v1.2.3


From aa7b0a92d065b4435467d482ec65dd97b03459ee Mon Sep 17 00:00:00 2001
From: Clyne Sullivan <clyne@bitgloo.com>
Date: Mon, 2 Sep 2019 18:53:21 -0400
Subject: made json names readable

---
 lib/entityx/entityx/Entity.h | 8 ++++++--
 src/components/Light.hpp     | 8 ++++++--
 src/components/Name.hpp      | 8 ++++++--
 src/components/Player.hpp    | 4 ++++
 src/components/Position.hpp  | 8 ++++++--
 src/components/Render.hpp    | 8 ++++++--
 src/components/Script.hpp    | 4 ++++
 src/components/Velocity.hpp  | 8 ++++++--
 src/engine.cpp               | 1 +
 9 files changed, 45 insertions(+), 12 deletions(-)

(limited to 'src/components')

diff --git a/lib/entityx/entityx/Entity.h b/lib/entityx/entityx/Entity.h
index 193d581..27a8820 100644
--- a/lib/entityx/entityx/Entity.h
+++ b/lib/entityx/entityx/Entity.h
@@ -243,6 +243,7 @@ struct BaseComponent {
   void operator delete[]([[maybe_unused]] void *p) { fail(); }
 
   virtual void internal_serialize(bool save, void *ar) = 0;
+  virtual std::string serializeName(void) const = 0;
 
  protected:
   static void fail() {
@@ -757,8 +758,11 @@ class EntityManager : entityx::help::NonCopyable {
     for (size_t i = 0; i < component_helpers_.size(); i++) {
       BaseComponentHelper *helper = component_helpers_[i];
       if (helper && mask.test(i)) {
-        helper->get_component(entity)->internal_serialize(save,
-          static_cast<void*>(&ar));
+        auto* c = helper->get_component(entity);
+        ar.setNextName(c->serializeName().c_str());
+        ar.startNode();
+        c->internal_serialize(save, static_cast<void*>(&ar));
+        ar.finishNode();
       }
     }
   }
diff --git a/src/components/Light.hpp b/src/components/Light.hpp
index 2cb0e1b..6849d7c 100644
--- a/src/components/Light.hpp
+++ b/src/components/Light.hpp
@@ -51,11 +51,15 @@ public:
     }
 
     void serialize(cereal::JSONOutputArchive& ar) final {
-        ar(r, g, b, strength);
+        ar(CEREAL_NVP(r), CEREAL_NVP(g), CEREAL_NVP(b), CEREAL_NVP(strength));
     }
 
     void serialize(cereal::JSONInputArchive& ar) final {
-        ar(r, g, b, strength);
+        ar(CEREAL_NVP(r), CEREAL_NVP(g), CEREAL_NVP(b), CEREAL_NVP(strength));
+    }
+
+    std::string serializeName(void) const final {
+        return "Light";
     }
 };
 
diff --git a/src/components/Name.hpp b/src/components/Name.hpp
index b42ef46..a6a6d8a 100644
--- a/src/components/Name.hpp
+++ b/src/components/Name.hpp
@@ -40,11 +40,15 @@ public:
     }
 
     void serialize(cereal::JSONOutputArchive& ar) final {
-        ar(name);
+        ar(CEREAL_NVP(name));
     }
 
     void serialize(cereal::JSONInputArchive& ar) final {
-        ar(name);
+        ar(CEREAL_NVP(name));
+    }
+
+    std::string serializeName(void) const final {
+        return "Name";
     }
 };
 
diff --git a/src/components/Player.hpp b/src/components/Player.hpp
index 95b2a96..33db1eb 100644
--- a/src/components/Player.hpp
+++ b/src/components/Player.hpp
@@ -35,6 +35,10 @@ public:
 
     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 6157265..56e8707 100644
--- a/src/components/Position.hpp
+++ b/src/components/Position.hpp
@@ -44,11 +44,15 @@ public:
     }
 
     void serialize(cereal::JSONOutputArchive& ar) final {
-        ar(x, y);
+        ar(CEREAL_NVP(x), CEREAL_NVP(y));
     }
 
     void serialize(cereal::JSONInputArchive& ar) final {
-        ar(x, y);
+        ar(CEREAL_NVP(x), CEREAL_NVP(y));
+    }
+
+    std::string serializeName(void) const final {
+        return "Position";
     }
 };
 
diff --git a/src/components/Render.hpp b/src/components/Render.hpp
index 49a9588..81ca591 100644
--- a/src/components/Render.hpp
+++ b/src/components/Render.hpp
@@ -55,11 +55,15 @@ public:
     }
 
     void serialize(cereal::JSONOutputArchive& ar) final {
-        ar(visible, flipX);
+        ar(CEREAL_NVP(visible), CEREAL_NVP(flipX));
     }
 
     void serialize(cereal::JSONInputArchive& ar) final {
-        ar(visible, flipX);
+        ar(CEREAL_NVP(visible), CEREAL_NVP(flipX));
+    }
+
+    std::string serializeName(void) const final {
+        return "Render";
     }
 };
 
diff --git a/src/components/Script.hpp b/src/components/Script.hpp
index 178c933..f792750 100644
--- a/src/components/Script.hpp
+++ b/src/components/Script.hpp
@@ -63,6 +63,10 @@ public:
 
     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 7a75706..776c1dd 100644
--- a/src/components/Velocity.hpp
+++ b/src/components/Velocity.hpp
@@ -45,11 +45,15 @@ public:
     }
 
     void serialize(cereal::JSONOutputArchive& ar) final {
-        ar(x, y);
+        ar(CEREAL_NVP(x), CEREAL_NVP(y));
     }
 
     void serialize(cereal::JSONInputArchive& ar) final {
-        ar(x, y);
+        ar(CEREAL_NVP(x), CEREAL_NVP(y));
+    }
+
+    std::string serializeName(void) const final {
+        return "Velocity";
     }
 };
 
diff --git a/src/engine.cpp b/src/engine.cpp
index db31b9d..539515c 100644
--- a/src/engine.cpp
+++ b/src/engine.cpp
@@ -126,6 +126,7 @@ void Engine::run(void)
         entities.entity_serialize(e, true, archive);
         archive.finishNode();
     }
+    std::cout << std::endl;
 }
 
 bool Engine::shouldRun(void)
-- 
cgit v1.2.3