add EnumMetadata

src/voxels/Block.cpp

@@ -18,62 +18,6 @@ dv::value BlockMaterial::serialize() const {
     });
 }
 
-std::string to_string(BlockModel model) {
-    switch (model) {
-        case BlockModel::none:
-            return "none";
-        case BlockModel::block:
-            return "block";
-        case BlockModel::xsprite:
-            return "X";
-        case BlockModel::aabb:
-            return "aabb";
-        case BlockModel::custom:
-            return "custom";
-        default:
-            return "unknown";
-    }
-}
-
-std::optional<BlockModel> BlockModel_from(std::string_view str) {
-    if (str == "none") {
-        return BlockModel::none;
-    } else if (str == "block") {
-        return BlockModel::block;
-    } else if (str == "X") {
-        return BlockModel::xsprite;
-    } else if (str == "aabb") {
-        return BlockModel::aabb;
-    } else if (str == "custom") {
-        return BlockModel::custom;
-    }
-    return std::nullopt;
-}
-
-std::string to_string(CullingMode mode) {
-    switch (mode) {
-        case CullingMode::DEFAULT:
-            return "default";
-        case CullingMode::OPTIONAL:
-            return "optional";
-        case CullingMode::DISABLED:
-            return "disabled";
-        default:
-            return "unknown";
-    }
-}
-
-std::optional<CullingMode> CullingMode_from(std::string_view str) {
-    if (str == "default") {
-        return CullingMode::DEFAULT;
-    } else if (str == "optional") {
-        return CullingMode::OPTIONAL;
-    } else if (str == "disabled") {
-        return CullingMode::DISABLED;
-    }
-    return std::nullopt;
-}
-
 CoordSystem::CoordSystem(glm::ivec3 axisX, glm::ivec3 axisY, glm::ivec3 axisZ)
     : axes({axisX, axisY, axisZ}) {
     fix = glm::ivec3(0);

src/voxels/Block.hpp

@@ -1,7 +1,6 @@
 #pragma once
 
 #include <glm/glm.hpp>
-#include <optional>
 #include <string>
 #include <vector>
 #include <array>
@@ -10,6 +9,7 @@
 #include "maths/UVRegion.hpp"
 #include "maths/aabb.hpp"
 #include "typedefs.hpp"
+#include "util/EnumMetadata.hpp"
 
 struct ParticlesPreset;
 
@@ -93,8 +93,13 @@ enum class BlockModel {
     custom
 };
 
-std::string to_string(BlockModel model);
-std::optional<BlockModel> BlockModel_from(std::string_view str);
+VC_ENUM_METADATA(BlockModel)
+    {"none", BlockModel::none},
+    {"block", BlockModel::block},
+    {"X", BlockModel::xsprite},
+    {"aabb", BlockModel::aabb},
+    {"custom", BlockModel::custom},
+VC_ENUM_END
 
 enum class CullingMode {
     DEFAULT,
@@ -102,8 +107,11 @@ enum class CullingMode {
     DISABLED,
 };
 
-std::string to_string(CullingMode mode);
-std::optional<CullingMode> CullingMode_from(std::string_view str);
+VC_ENUM_METADATA(CullingMode)
+    {"default", CullingMode::DEFAULT},
+    {"optional", CullingMode::OPTIONAL},
+    {"disabled", CullingMode::DISABLED},
+VC_ENUM_END
 
 using BoxModel = AABB;