From 33531ae0a4fc01591bcbe35eb2cec392deb7ca2f Mon Sep 17 00:00:00 2001 From: MihailRis Date: Thu, 22 Aug 2024 23:28:40 +0300 Subject: [PATCH] fix --- src/data/dynamic.hpp | 3 --- src/data/dynamic_util.hpp | 13 +++++++++++-- src/world/generator/Structure.cpp | 4 ++-- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/src/data/dynamic.hpp b/src/data/dynamic.hpp index 7aca99a5..65320fbb 100644 --- a/src/data/dynamic.hpp +++ b/src/data/dynamic.hpp @@ -65,9 +65,6 @@ namespace dynamic { return put(List_sptr(value.release())); } List& put(const Value& value); - List& put(uint64_t value) { - return put(static_cast(value)); - } Value* getValueWriteable(size_t index); diff --git a/src/data/dynamic_util.hpp b/src/data/dynamic_util.hpp index 836eb21f..ff389086 100644 --- a/src/data/dynamic_util.hpp +++ b/src/data/dynamic_util.hpp @@ -5,8 +5,8 @@ #include "dynamic.hpp" namespace dynamic { - template - inline dynamic::List_sptr to_value(glm::vec vec) { + template + inline dynamic::List_sptr to_value(glm::vec vec) { auto list = dynamic::create_list(); for (size_t i = 0; i < n; i++) { list->put(vec[i]); @@ -14,6 +14,15 @@ namespace dynamic { return list; } + template + inline dynamic::List_sptr to_value(glm::vec vec) { + auto list = dynamic::create_list(); + for (size_t i = 0; i < n; i++) { + list->put(static_cast(vec[i])); + } + return list; + } + template inline dynamic::List_sptr to_value(glm::mat mat) { auto list = dynamic::create_list(); diff --git a/src/world/generator/Structure.cpp b/src/world/generator/Structure.cpp index 0ce55c67..1d4837b7 100644 --- a/src/world/generator/Structure.cpp +++ b/src/world/generator/Structure.cpp @@ -31,8 +31,8 @@ std::unique_ptr Structure::serialize() const { auto& voxelsArr = root->putList("voxels"); for (size_t i = 0; i < voxels.size(); i++) { - voxelsArr.put(voxels[i].id); - voxelsArr.put(blockstate2int(voxels[i].state)); + voxelsArr.put(static_cast(voxels[i].id)); + voxelsArr.put(static_cast(blockstate2int(voxels[i].state))); } return root; }