[ISerializable] Moved to GameKit.

Unarelith · Jun 19, 2020 · afc4918 · afc4918
1 parent 1f7d83b
commit afc4918
Show file tree

Hide file tree

Showing 25 changed files with 49 additions and 137 deletions.
diff --git a/external/gamekit b/external/gamekit
diff --git a/source/common/core/Registry.hpp b/source/common/core/Registry.hpp
@@ -43,7 +43,7 @@
 #include "Tree.hpp"
 #include "Sky.hpp"
 
-class Registry : public ISerializable {
+class Registry : public gk::ISerializable {
 	public:
 		template<typename T>
 		auto registerBlock(const TilesDef &tiles, const std::string &stringID, const std::string &label) -> typename std::enable_if<std::is_base_of<Block, T>::value, T&>::type {

diff --git a/source/common/core/TilesDef.hpp b/source/common/core/TilesDef.hpp
@@ -33,11 +33,10 @@
 #include <SFML/Network/Packet.hpp>
 
 #include <gk/core/IntTypes.hpp>
+#include <gk/core/ISerializable.hpp>
 
 #include <sol/sol.hpp>
 
-#include "ISerializable.hpp"
-
 enum BlockFace : u8 {
 	West   = 0,
 	East   = 1,
@@ -47,7 +46,7 @@ enum BlockFace : u8 {
 	Top    = 5,
 };
 
-class TilesDef : public ISerializable {
+class TilesDef : public gk::ISerializable {
 	public:
 		TilesDef() = default;
 		TilesDef(const std::string &texture) { m_textureFilenames.emplace_back(texture); }

diff --git a/source/common/inventory/Inventory.hpp b/source/common/inventory/Inventory.hpp
@@ -29,12 +29,12 @@
 
 #include <vector>
 
+#include <gk/core/ISerializable.hpp>
 #include <gk/core/Vector3.hpp>
 
 #include "ItemStack.hpp"
-#include "ISerializable.hpp"
 
-class Inventory : public ISerializable {
+class Inventory : public gk::ISerializable {
 	public:
 		Inventory() = default;
 		Inventory(u16 width, u16 height, const std::string &name = "")

diff --git a/source/common/inventory/Item.hpp b/source/common/inventory/Item.hpp
@@ -30,12 +30,12 @@
 #include <string>
 
 #include <gk/core/IntTypes.hpp>
+#include <gk/core/ISerializable.hpp>
 
 #include "ItemType.hpp"
-#include "ISerializable.hpp"
 #include "TilesDef.hpp"
 
-class Item : public ISerializable {
+class Item : public gk::ISerializable {
 	public:
 		Item() = default;
 		Item(u32 id, const TilesDef &tiles, const std::string &stringID, const std::string &label);

diff --git a/source/common/inventory/Recipe.hpp b/source/common/inventory/Recipe.hpp
@@ -27,12 +27,11 @@
 #ifndef RECIPE_HPP_
 #define RECIPE_HPP_
 
-#include "Inventory.hpp"
-#include "ISerializable.hpp"
+#include <gk/core/ISerializable.hpp>
 
-namespace sf { class Packet; }
+#include "Inventory.hpp"
 
-class Recipe : public ISerializable {
+class Recipe : public gk::ISerializable {
 	public:
 		Recipe(const std::string &type, const ItemStack &result = {}) : m_type(type), m_result(result) {}
 		virtual ~Recipe() = default;

diff --git a/source/common/network/ISerializable.cpp b/source/common/network/ISerializable.cpp
diff --git a/source/common/network/ISerializable.hpp b/source/common/network/ISerializable.hpp
diff --git a/source/common/scene/Scene.cpp b/source/common/scene/Scene.cpp
@@ -25,6 +25,7 @@
  * =====================================================================================
  */
 #include <gk/core/Debug.hpp>
+#include <gk/core/ISerializable.hpp>
 
 #include <entt/entt.hpp>
 
@@ -75,7 +76,7 @@ T &set(entt::registry &registry, entt::entity entity, const T &instance) {
 template<typename T>
 Network::Packet serialize(entt::entity entity, T &component) {
 	Network::Packet packet;
-	if constexpr(std::is_base_of_v<ISerializable, std::decay_t<T>>) {
+	if constexpr(std::is_base_of_v<gk::ISerializable, std::decay_t<T>>) {
 		if (component.isUpdated) {
 			packet << component.packetType << entity << component;
 			component.isUpdated = false;

diff --git a/source/common/scene/Scene.hpp b/source/common/scene/Scene.hpp
@@ -30,7 +30,6 @@
 #include <deque>
 
 #include "AbstractController.hpp"
-#include "ISerializable.hpp"
 
 class Scene {
 	public:

diff --git a/source/common/scene/component/AnimationComponent.hpp b/source/common/scene/component/AnimationComponent.hpp
@@ -30,8 +30,8 @@
 #include <vector>
 
 #include <gk/core/IntTypes.hpp>
+#include <gk/core/ISerializable.hpp>
 
-#include "ISerializable.hpp"
 #include "Network.hpp"
 #include "NetworkUtils.hpp"
 
@@ -40,7 +40,7 @@ enum class AnimationType {
 	Translation,
 };
 
-struct AnimationData : public ISerializable {
+struct AnimationData : public gk::ISerializable {
 	AnimationType type;
 
 	union {
@@ -88,7 +88,7 @@ struct AnimationData : public ISerializable {
 	}
 };
 
-struct AnimationComponent : public ISerializable {
+struct AnimationComponent : public gk::ISerializable {
 	void addRotation(float axisX, float axisY, float axisZ, float angle) {
 		list.emplace_back();
 		AnimationData &data = list.back();

diff --git a/source/common/scene/component/DrawableDef.hpp b/source/common/scene/component/DrawableDef.hpp
@@ -28,8 +28,8 @@
 #define DRAWABLEDEF_HPP_
 
 #include <gk/core/IntTypes.hpp>
+#include <gk/core/ISerializable.hpp>
 
-#include "ISerializable.hpp"
 #include "InventoryCubeDef.hpp"
 #include "Network.hpp"
 
@@ -40,7 +40,7 @@ namespace DrawableType {
 	};
 }
 
-class DrawableDef : public ISerializable {
+class DrawableDef : public gk::ISerializable {
 	public:
 		InventoryCubeDef &addInventoryCube();
 

diff --git a/source/common/scene/component/InventoryCubeDef.hpp b/source/common/scene/component/InventoryCubeDef.hpp
@@ -29,12 +29,12 @@
 
 #include <string>
 
+#include <gk/core/ISerializable.hpp>
 #include <gk/core/Vector3.hpp>
 
-#include "ISerializable.hpp"
 #include "NetworkUtils.hpp"
 
-struct InventoryCubeDef : public ISerializable {
+struct InventoryCubeDef : public gk::ISerializable {
 	float size = 1.f;
 	gk::Vector3f origin{0, 0, 0};
 	std::string blockID{"_:air"};

diff --git a/source/common/scene/component/PositionComponent.hpp b/source/common/scene/component/PositionComponent.hpp
@@ -28,11 +28,11 @@
 #define POSITIONCOMPONENT_HPP_
 
 #include <gk/core/IntTypes.hpp>
+#include <gk/core/ISerializable.hpp>
 
-#include "ISerializable.hpp"
 #include "Network.hpp"
 
-struct PositionComponent : public ISerializable {
+struct PositionComponent : public gk::ISerializable {
 	PositionComponent() = default;
 	PositionComponent(double x_, double y_, double z_, u16 dimension_)
 		: x(x_), y(y_), z(z_), dimension(dimension_) {}

diff --git a/source/common/scene/component/RotationComponent.hpp b/source/common/scene/component/RotationComponent.hpp
@@ -29,10 +29,11 @@
 
 #include <glm/gtc/quaternion.hpp>
 
-#include "ISerializable.hpp"
+#include <gk/core/ISerializable.hpp>
+
 #include "Network.hpp"
 
-struct RotationComponent : public ISerializable {
+struct RotationComponent : public gk::ISerializable {
 	glm::quat quat{1, 0, 0, 0};
 
 	bool isUpdated = true;

diff --git a/source/common/world/Biome.hpp b/source/common/world/Biome.hpp
@@ -31,11 +31,11 @@
 #include <vector>
 
 #include <gk/core/IntTypes.hpp>
+#include <gk/core/ISerializable.hpp>
 
-#include "ISerializable.hpp"
 #include "PlacementEntry.hpp"
 
-class Biome : public ISerializable {
+class Biome : public gk::ISerializable {
 	public:
 		Biome() = default;
 		Biome(u16 id, const std::string &stringID, const std::string &label);

diff --git a/source/common/world/Block.hpp b/source/common/world/Block.hpp
@@ -33,10 +33,10 @@
 
 #include <gk/core/Box.hpp>
 #include <gk/core/IntTypes.hpp>
+#include <gk/core/ISerializable.hpp>
 #include <gk/graphics/Color.hpp>
 
 #include "ItemStack.hpp"
-#include "ISerializable.hpp"
 #include "TilesDef.hpp"
 
 class Chunk;
@@ -53,7 +53,7 @@ enum class BlockDrawType : u8 {
 	BoundingBox = 6, // FIXME: Temporary
 };
 
-class Block : public ISerializable {
+class Block : public gk::ISerializable {
 	public:
 		Block() = default;
 		Block(u32 id, const TilesDef &tiles, const std::string &stringID, const std::string &label);

diff --git a/source/common/world/BlockMetadata.hpp b/source/common/world/BlockMetadata.hpp
@@ -33,10 +33,9 @@
 
 #include <sol/sol.hpp>
 
-#include <gk/core/IntTypes.hpp>
 #include <gk/core/Exception.hpp>
-
-#include "ISerializable.hpp"
+#include <gk/core/IntTypes.hpp>
+#include <gk/core/ISerializable.hpp>
 
 class BlockMetadataValue {
 	public:
@@ -65,7 +64,7 @@ class BlockMetadataValue {
 		Type m_type = Type::Undefined;
 };
 
-class BlockMetadata : public ISerializable {
+class BlockMetadata : public gk::ISerializable {
 	public:
 		void setString(const std::string &name, const std::string &value);
 		void setInt(const std::string &name, int value);

diff --git a/source/common/world/Dimension.hpp b/source/common/world/Dimension.hpp
@@ -31,12 +31,11 @@
 #include <vector>
 
 #include <gk/core/IntTypes.hpp>
+#include <gk/core/ISerializable.hpp>
 
 #include <sol/sol.hpp>
 
-#include "ISerializable.hpp"
-
-class Dimension : public ISerializable {
+class Dimension : public gk::ISerializable {
 	public:
 		Dimension() = default;
 		Dimension(u16 id, const std::string &stringID, const std::string &name)

diff --git a/source/common/world/Key.hpp b/source/common/world/Key.hpp
@@ -34,12 +34,11 @@
 
 #include <sol/sol.hpp>
 
-#include "ISerializable.hpp"
-#include "NetworkUtils.hpp"
+#include <gk/core/ISerializable.hpp>
 
-#include <gk/core/Debug.hpp>
+#include "NetworkUtils.hpp"
 
-class Key : public ISerializable {
+class Key : public gk::ISerializable {
 	public:
 		Key() = default;
 		Key(u16 id, const std::string &stringID, const std::string &name)

diff --git a/source/common/world/PlacementEntry.hpp b/source/common/world/PlacementEntry.hpp
@@ -30,12 +30,11 @@
 #include <SFML/Network/Packet.hpp>
 
 #include <gk/core/IntTypes.hpp>
-
-#include "ISerializable.hpp"
+#include <gk/core/ISerializable.hpp>
 
 namespace PlacementEntry {
 
-struct Flora : public ISerializable {
+struct Flora : public gk::ISerializable {
 	u16 blockID;
 	u16 spawnsOnBlockID;
 	double probability;
@@ -49,7 +48,7 @@ struct Flora : public ISerializable {
 	}
 };
 
-struct Ore : public ISerializable {
+struct Ore : public gk::ISerializable {
 	u16 blockID;
 	double probability;
 	double size;
@@ -63,7 +62,7 @@ struct Ore : public ISerializable {
 	}
 };
 
-struct Tree : public ISerializable {
+struct Tree : public gk::ISerializable {
 	u16 treeID;
 	double probability;
+47 −0		include/gk/core/ISerializable.hpp
+1 −0		source/CMakeLists.txt
+38 −0		source/core/ISerializable.cpp