feat: Implement Save/Load - Serialization/Deserialization

Author: Shell4026

Test/ContainerTest.hpp

@@ -131,7 +131,7 @@ TEST(ContainerTest, SHashMapVectorTest)
 TEST(ContainerTest, SHashSetVectorTest)
 {
 	using namespace sh;
-	core::SHashSetVector<int> set{};
+	core::SHashSetVector<int, std::hash<int>, std::equal_to<int>, 8> set{};
 	set.Insert(0);
 	set.Insert(1);
 	set.Insert(2);

Test/OctreeTest.hpp

@@ -25,9 +25,9 @@ TEST(OctreeTest, InsertTest)
 		{
 			return pos;
 		}
-		bool Intersect(const render::AABB& aabb) const override
+		bool Intersect(const render::AABB& other) const override
 		{
-			return aabb.Intersects(aabb);
+			return aabb.Intersects(other);
 		}
 	};
 

Test/ReflectionTest.hpp

@@ -29,6 +29,8 @@ class Derived : public Base
     Derived* sobjectPtr;
     PROPERTY(sobjectArr)
     std::array<Derived*, 2> sobjectArr;
+    PROPERTY(map)
+    sh::core::SMap<std::string, int> map;
 };
 
 TEST(ReflectionTest, TypeInfoTest) 
@@ -56,7 +58,7 @@ TEST(ReflectionTest, PropertyTest)
     ASSERT_NE(numbersProperty, nullptr);
 
     EXPECT_EQ(*numberProperty->Get<int>(&derived), 42);
-    EXPECT_EQ(numbersProperty->GetTypeName(), sh::core::reflection::GetTypeName<std::vector<int>>());
+    EXPECT_EQ(numbersProperty->type.name, sh::core::reflection::GetTypeName<std::vector<int>>());
 
     auto begin = numbersProperty->Begin(&derived);
     auto end = numbersProperty->End(&derived);
@@ -94,6 +96,24 @@ TEST(ReflectionTest, PropertyTest)
         auto arrIterator = prop->Begin(&derived);
         EXPECT_FALSE(arrIterator.IsConst());
     }
+    // map 요소 변경 테스트
+    {
+        derived.map.insert({ "test0", 0 });
+        derived.map.insert({ "test1", 1 });
+        auto prop = derived.GetType().GetProperty("map");
+        EXPECT_TRUE(prop->isContainer);
+        for (auto it = prop->Begin(&derived); it != prop->End(&derived); ++it)
+        {
+            EXPECT_TRUE(it.IsPair());
+            EXPECT_TRUE(it.GetPairType()->first.isConst);
+            EXPECT_TRUE(it.GetPairType()->first == sh::core::reflection::GetType<std::string>());
+            EXPECT_TRUE(it.GetPairType()->second == sh::core::reflection::GetType<int>());
+            auto pair = it.Get<std::pair<const std::string, int>>();
+            pair->second++;
+        }
+        EXPECT_EQ(derived.map["test0"], 1);
+        EXPECT_EQ(derived.map["test1"], 2);
+    }
 }
 
 TEST(ReflectionTest, SafePropertyTest)

UserCode/Save.cpp

@@ -0,0 +1,28 @@
+#include "Save.h"
+#include "Game/Input.h"
+#include "Game/GameObject.h"
+
+#include <fstream>
+
+using namespace sh::game;
+
+Save::Save(sh::game::GameObject& owner) :
+	Component(owner)
+{
+}
+
+void Save::Update()
+{
+	if (Input::GetKeyDown(Input::KeyCode::LCtrl) && Input::GetKeyDown(Input::KeyCode::S))
+	{
+		std::ofstream file{ "test.json" };
+		file << gameObject.Serialize();
+	}
+	if (Input::GetKeyDown(Input::KeyCode::LCtrl) && Input::GetKeyDown(Input::KeyCode::O))
+	{
+		std::ifstream file{ "test.json" };
+		sh::core::Json json{};
+		file >> json;
+		gameObject.Deserialize(json);
+	}
+}

UserCode/Save.h

@@ -0,0 +1,11 @@
+#pragma once
+#include "Export.h"
+#include "Game/Component/Component.h"
+
+class Save : public sh::game::Component
+{
+	COMPONENT(Save)
+public:
+	SH_USER_API Save(sh::game::GameObject& owner);
+	SH_USER_API void Update() override;
+};

UserCode/main.cpp

@@ -1,10 +1,5 @@
 #include "Export.h"
-
-#include "ComponentTest.h"
-#include "RotateObject.h"
-
 #include "Core/Logger.h"
-
 #include "Game/ComponentModule.h"
 
 extern "C"
@@ -15,6 +10,6 @@ extern "C"
 	}
 	SH_USER_API auto GetModule() -> sh::game::ComponentModule*
 	{
-		return ComponentModule::GetInstance();
+		return sh::game::ComponentModule::GetInstance();
 	}
 }

include/Core/FileLoader.h

@@ -11,9 +11,7 @@ namespace sh::core
 	class FileLoader
 	{
 	public:
-		SH_CORE_API virtual ~FileLoader();
-
-		SH_CORE_API auto LoadBinary(std::string_view dir)->std::optional<std::vector<unsigned char>>;
-		SH_CORE_API auto LoadText(std::string_view dir) -> std::optional<std::string>;
+		SH_CORE_API static auto LoadBinary(std::string_view dir) -> std::optional<std::vector<unsigned char>>;
+		SH_CORE_API static auto LoadText(std::string_view dir) -> std::optional<std::string>;
 	};
 }

include/Core/FileSystem.h

@@ -0,0 +1,23 @@
+#pragma once
+#include "Export.h"
+
+#include <string>
+#include <filesystem>
+namespace sh::core
+{
+	class FileSystem
+	{
+	public:
+		SH_CORE_API static auto GetDesktopDirectory() -> std::string;
+		SH_CORE_API static auto GetHomeDirectory() -> std::string;
+		/// @brief 해당 경로에 폴더를 만드는 함수. 이미 존재한다면 뒤에 숫자를 붙인다.
+		/// @param path 경로
+		/// @param name 폴더 이름
+		SH_CORE_API static void CreateFolder(const std::filesystem::path& path, std::string_view folderName);
+		/// @brief 해당 경로에 같은 이름의 파일이 존재 할 시 이름에 숫자를 붙여 반환하는 함수
+		/// @param path 경로
+		/// @param fileName 파일 이름
+		/// @return 새 파일 이름
+		SH_CORE_API static auto CreateUniqueFileName(const std::filesystem::path& path, const std::filesystem::path& fileName) -> std::string;
+	};
+}//namespace

include/Core/GarbageCollection.h

@@ -20,7 +20,7 @@ namespace sh::core
 	{
 		friend Singleton<GarbageCollection>;
 	private:
-		SHashSet<SObject*, 128> objs;
+		SHashMap<std::string, SObject*>& objs;
 		SHashSet<SObject*, 128> rootSets;
 
 		uint32_t elapseTime = 0;
@@ -43,10 +43,6 @@ namespace sh::core
 	public:
 		SH_CORE_API ~GarbageCollection();
 
-		/// @brief GC 목록에 추가하는 함수.
-		/// @param obj SObject 포인터
-		/// @return 
-		SH_CORE_API void AddObject(SObject* obj);
 		/// @brief 루트셋으로 지정하는 함수. 루트셋 객체는 참조하고 있는 객체가 없어도 메모리에서 유지된다.
 		/// @param obj 루트셋으로 지정할 SObject 포인터
 		SH_CORE_API void SetRootSet(SObject* obj);
@@ -56,11 +52,6 @@ namespace sh::core
 		/// @return 
 		SH_CORE_API void RemoveRootSet(SObject* obj);
 
-		/// @brief GC 목록에서 제거하는 함수.
-		/// @param obj SObject 포인터
-		/// @return 성공하면 true, 아니면 false
-		SH_CORE_API auto RemoveObject(SObject* obj) -> bool;
-
 		/// @brief GC를 갱신하여 쓰레기 수집 시작
 		SH_CORE_API void Update();
 

include/Core/ISerializable.h

@@ -0,0 +1,28 @@
+#pragma once
+
+#include "nlohmann/json.hpp"
+
+namespace sh::core
+{
+	using Json = nlohmann::json;
+
+	class ISerializable
+	{
+	public:
+		virtual ~ISerializable() = default;
+		virtual auto Serialize() const -> Json = 0;
+		virtual void Deserialize(const Json& json) = 0;
+	};
+
+	template<typename T>
+	inline void SerializeProperty(core::Json& json, const std::string& key, const T& value)
+	{
+		json[key] = value;
+	}
+	template<typename T>
+	inline void DeserializeProperty(const core::Json& json, const std::string& key, T& value)
+	{
+		if (json.contains(key))
+			value = json.at(key).get<T>();
+	}
+}