Jiga228/UwU-Engine
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Replaced hard pointers to shared_ptr in SaveMap"

Browse Source 
This reverts commit 4e58512567.
This commit is contained in:
Jiga228
2025-10-15 18:59:42 +07:00
parent 4e58512567
commit 938b76ac07
3 changed files with 70 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Core/Game/SaveMap/SaveMap.cpp
+16 -16
View File
@@ -7,18 +7,18 @@
extern std::vector<ObjectFactory> factories;
extern std::vector<ObjectFactory> base_object_factories;
std::shared_ptr<ISave> SaveMap::MakeObjectByName(const std::string& name)
ISave* SaveMap::MakeObjectByName(const std::string& name)
{
for (ObjectFactory& factory : base_object_factories)
{
if (name == factory.name) {
return std::shared_ptr<ISave>(factory.factory());
return factory.factory();
}
}
for (ObjectFactory& factory : factories)
{
if (name == factory.name) {
return std::shared_ptr<ISave>(factory.factory());
return factory.factory();
}
}
throw std::runtime_error("Object not found");
@@ -95,7 +95,7 @@ SaveMap::SaveMap(const std::string& json_data)
end = object_json.find('\"', begin);
std::string object_name = object_json.substr(begin, end - begin);
std::shared_ptr<ISave> object_ptr = MakeObjectByName(object_name);
ISave* object_ptr = MakeObjectByName(object_name);
object_ptr->load(std::make_shared<SaveMap>(object_json));
save_objects[name.c_str() + 1] = object_ptr;
@@ -169,10 +169,10 @@ SaveMap::SaveMap(const std::string& json_data)
}
} else if (name[1] == 'o')
{
save_vector_objects[key] = std::vector<std::shared_ptr<ISave>>();
save_vector_objects[key] = std::vector<ISave*>();
if (arr_data.length() == 2)
continue;
std::vector<std::shared_ptr<ISave>>& vector_object = save_vector_objects[key];
std::vector<ISave*>& vector_object = save_vector_objects[key];
size_t j = 1;
while (j < arr_data.length())
@@ -196,7 +196,7 @@ SaveMap::SaveMap(const std::string& json_data)
size_t end_name = object_json.find('\"', begin_name);
std::string object_name = object_json.substr(begin_name, end_name - begin_name);
std::shared_ptr<ISave> object_ptr = MakeObjectByName(object_name);
ISave* object_ptr = MakeObjectByName(object_name);
object_ptr->load(std::make_shared<SaveMap>(object_json));
vector_object.push_back(object_ptr);
@@ -270,10 +270,10 @@ SaveMap::SaveMap(const std::string& json_data)
}
} else if (name[1] == 'o')
{
save_list_objects[key] = std::list<std::shared_ptr<ISave>>();
save_list_objects[key] = std::list<ISave*>();
if (arr_data.length() == 2)
continue;
std::list<std::shared_ptr<ISave>>& list_object = save_list_objects[key];
std::list<ISave*>& list_object = save_list_objects[key];
size_t j = 1;
while (j < arr_data.length())
@@ -297,7 +297,7 @@ SaveMap::SaveMap(const std::string& json_data)
size_t end_name = object_json.find('\"', begin_name);
std::string object_name = object_json.substr(begin_name, end_name - begin_name);
std::shared_ptr<ISave> object_ptr = MakeObjectByName(object_name);
ISave* object_ptr = MakeObjectByName(object_name);
object_ptr->load(std::make_shared<SaveMap>(object_json));
list_object.push_back(object_ptr);
@@ -387,7 +387,7 @@ std::shared_ptr<SaveMap> SaveMap::SaveString(const char* name, const std::string
return std::shared_ptr<SaveMap>(this);
}
std::shared_ptr<SaveMap> SaveMap::SaveObject(const char* name, std::shared_ptr<ISave> object) noexcept
std::shared_ptr<SaveMap> SaveMap::SaveObject(const char* name, ISave* object) noexcept
{
save_objects[name] = object;
return std::shared_ptr<SaveMap>(this);
@@ -411,7 +411,7 @@ std::shared_ptr<SaveMap> SaveMap::SaveVectorStrings(const char* name, std::vecto
return std::shared_ptr<SaveMap>(this);
}
std::shared_ptr<SaveMap> SaveMap::SaveVectorObject(const char* name, std::vector<std::shared_ptr<ISave>>&& value) noexcept
std::shared_ptr<SaveMap> SaveMap::SaveVectorObject(const char* name, std::vector<ISave*>&& value) noexcept
{
save_vector_objects[name] = std::move(value);
return std::shared_ptr<SaveMap>(this);
@@ -435,7 +435,7 @@ std::shared_ptr<SaveMap> SaveMap::SaveListStrings(const char* name, std::list<st
return std::shared_ptr<SaveMap>(this);
}
std::shared_ptr<SaveMap> SaveMap::SaveListObject(const char* name, std::list<std::shared_ptr<ISave>>&& value) noexcept
std::shared_ptr<SaveMap> SaveMap::SaveListObject(const char* name, std::list<ISave*>&& value) noexcept
{
save_list_objects[name] = std::move(value);
return std::shared_ptr<SaveMap>(this);
@@ -456,7 +456,7 @@ std::string SaveMap::GetString(const char* name)
return save_string[name];
}
std::shared_ptr<ISave>& SaveMap::GetObject(const char* name)
ISave* SaveMap::GetObject(const char* name)
{
return save_objects[name];
}
@@ -476,7 +476,7 @@ std::vector<std::string> SaveMap::GetVectorString(const char* name)
return save_vector_strings[name];
}
std::vector<std::shared_ptr<ISave>>& SaveMap::GetVectorObject(const char* name)
std::vector<ISave*>& SaveMap::GetVectorObject(const char* name)
{
return save_vector_objects[name];
}
@@ -496,7 +496,7 @@ std::list<std::string>& SaveMap::GetListString(const char* name)
return save_list_strings[name];
}
std::list<std::shared_ptr<ISave>>& SaveMap::GetListObject(const char* name)
std::list<ISave*>& SaveMap::GetListObject(const char* name)
{
return save_list_objects[name];
}
Core/Game/SaveMap/SaveMap.hpp
+10 -10
View File
@@ -17,21 +17,21 @@ class SaveMap final
std::unordered_map<std::string, long long> save_long;
std::unordered_map<std::string, double> save_double;
std::unordered_map<std::string, std::string> save_string;
std::unordered_map<std::string, std::shared_ptr<ISave>> save_objects;
std::unordered_map<std::string, ISave*> save_objects;
// Массивы
std::unordered_map<std::string, std::vector<long long>> save_vector_integer;
std::unordered_map<std::string, std::vector<double>> save_vector_double;
std::unordered_map<std::string, std::vector<std::shared_ptr<ISave>>> save_vector_objects;
std::unordered_map<std::string, std::vector<ISave*>> save_vector_objects;
std::unordered_map<std::string, std::vector<std::string>> save_vector_strings;
// Связаные списки
std::unordered_map<std::string, std::list<long long>> save_list_integer;
std::unordered_map<std::string, std::list<double>> save_list_double;
std::unordered_map<std::string, std::list<std::shared_ptr<ISave>>> save_list_objects;
std::unordered_map<std::string, std::list<ISave*>> save_list_objects;
std::unordered_map<std::string, std::list<std::string>> save_list_strings;
static std::shared_ptr<ISave> MakeObjectByName(const std::string& name);
static ISave* MakeObjectByName(const std::string& name);
public:
// Создаёт пустой объект для заполнения
@@ -47,29 +47,29 @@ public:
std::shared_ptr<SaveMap> SaveInteger(const char* name, int value) noexcept;
std::shared_ptr<SaveMap> SaveDouble(const char* name, double value) noexcept;
std::shared_ptr<SaveMap> SaveString(const char* name, const std::string& value) noexcept;
std::shared_ptr<SaveMap> SaveObject(const char* name, std::shared_ptr<ISave> object) noexcept;
std::shared_ptr<SaveMap> SaveObject(const char* name, ISave* object) noexcept;
std::shared_ptr<SaveMap> SaveVectorInteger(const char* name, std::vector<long long>&& value) noexcept;
std::shared_ptr<SaveMap> SaveVectorDouble(const char* name, std::vector<double>&& value) noexcept;
std::shared_ptr<SaveMap> SaveVectorStrings(const char* name, std::vector<std::string>&& value) noexcept;
std::shared_ptr<SaveMap> SaveVectorObject(const char* name, std::vector<std::shared_ptr<ISave>>&& value) noexcept;
std::shared_ptr<SaveMap> SaveVectorObject(const char* name, std::vector<ISave*>&& value) noexcept;
std::shared_ptr<SaveMap> SaveListInteger(const char* name, std::list<long long>&& value) noexcept;
std::shared_ptr<SaveMap> SaveListDouble(const char* name, std::list<double>&& value) noexcept;
std::shared_ptr<SaveMap> SaveListStrings(const char* name, std::list<std::string>&& value) noexcept;
std::shared_ptr<SaveMap> SaveListObject(const char* name, std::list<std::shared_ptr<ISave>>&& value) noexcept;
std::shared_ptr<SaveMap> SaveListObject(const char* name, std::list<ISave*>&& value) noexcept;
// Методы получения значенй
long long GetInteger(const char* name);
double GetDouble(const char* name);
std::string GetString(const char* name);
std::shared_ptr<ISave>& GetObject(const char* name);
ISave* GetObject(const char* name);
std::vector<long long>& GetVectorInteger(const char* name);
std::vector<double>& GetVectorDouble(const char* name);
std::vector<std::string> GetVectorString(const char* name);
std::vector<std::shared_ptr<ISave>>& GetVectorObject(const char* name);
std::vector<ISave*>& GetVectorObject(const char* name);
std::list<long long>& GetListInteger(const char* name);
std::list<double>& GetListDouble(const char* name);
std::list<std::string>& GetListString(const char* name);
std::list<std::shared_ptr<ISave>>& GetListObject(const char* name);
std::list<ISave*>& GetListObject(const char* name);
std::shared_ptr<SaveMap> getParent() const { return parent_; }
const std::string& getClassName() const { return class_name; }
Tests/SaveMapTest.cpp
+42 -5
View File
@@ -17,7 +17,7 @@ public:
}
void load(std::shared_ptr<SaveMap> save) override
{
num = static_cast<int>(save->GetInteger("num"));
num = save->GetInteger("num");
str = save->GetString("str");
dbl = save->GetDouble("dbl");
}
@@ -99,6 +99,24 @@ TEST(SaveMapTest, check_load_with_custom_type)
std::string json =
"{\n"
"\t\"Class name\": \"test class\",\n"
"\t\"iTestInt\": 123,\n"
"\t\"dTestDouble\": 123.56,\n"
"\t\"sTestString\": \"string str\",\n"
"\t\"viTestVectorInt\": [\n"
"\t\t1,\n"
"\t\t2,\n"
"\t\t3\n"
"\t],\n"
"\t\"vdTestVectorDouble\": [\n"
"\t\t1.2,\n"
"\t\t3.4,\n"
"\t\t5.6\n"
"\t],\n"
"\t\t\"vsTestVectorString\": [\n"
"\t\t\"str 1\",\n"
"\t\t\"2 str\",\n"
"\t\t\"str 3 str\"\n"
"\t],\n"
"\t\"oCustomObject\": {\n"
"\t\t\"Class name\": \"CustomObject\",\n"
"\t\t\"inum\": 123,\n"
@@ -120,17 +138,34 @@ TEST(SaveMapTest, check_load_with_custom_type)
"}"
"]"
"}";
std::vector<int> test_vector_int = { 1, 2, 3 };
std::vector<double> test_vector_double = { 1.2, 3.4, 5.6 };
std::vector<std::string> test_vector_string = { "str 1", "2 str", "str 3 str" };
SaveMap save_map(json);
EXPECT_EQ(save_map.GetInteger("TestInt"), 123);
EXPECT_EQ(save_map.GetDouble("TestDouble"), 123.56);
EXPECT_EQ(save_map.GetString("TestString"), "string str");
std::shared_ptr<CustomObject> obj = reinterpret_cast<std::shared_ptr<CustomObject>&>(save_map.GetObject("CustomObject"));
EXPECT_EQ(save_map.GetVectorInteger("TestVectorInt").size(), 3);
EXPECT_EQ(save_map.GetVectorDouble("TestVectorDouble").size(), 3);
EXPECT_EQ(save_map.GetVectorString("TestVectorString").size(), 3);
for (auto i = 0; i < 3; i++)
{
EXPECT_EQ(test_vector_int[i], save_map.GetVectorInteger("TestVectorInt")[i]);
EXPECT_EQ(test_vector_double[i], save_map.GetVectorDouble("TestVectorDouble")[i]);
EXPECT_EQ(test_vector_string[i], save_map.GetVectorString("TestVectorString")[i]);
}
CustomObject* obj = reinterpret_cast<CustomObject*>(save_map.GetObject("CustomObject"));
CustomObject test_obj;
test_obj.num = 123;
test_obj.str = "str123";
test_obj.dbl = 123.45;
EXPECT_EQ(*obj.get(), test_obj);
EXPECT_EQ(*obj, test_obj);
std::vector<std::shared_ptr<CustomObject>> vec_obj = reinterpret_cast<std::vector<std::shared_ptr<CustomObject>>&>(save_map.GetVectorObject("CustomObjects"));
std::vector<CustomObject*> vec_obj = reinterpret_cast<std::vector<CustomObject*>&>(save_map.GetVectorObject("CustomObjects"));
std::vector<CustomObject*> vec_obj_test = {
new CustomObject,
new CustomObject,
@@ -143,6 +178,8 @@ TEST(SaveMapTest, check_load_with_custom_type)
vec_obj_test[1]->dbl = 543.21;
for (auto i = 0; i < 2; i++)
{
EXPECT_EQ(*vec_obj[i].get(), *vec_obj_test[i]);
EXPECT_EQ(*vec_obj[i], *vec_obj_test[i]);
delete vec_obj[i];
delete vec_obj_test[i];
}
}