refactor enums: CursorShape, InterpolationType, ParticleSpawnShape

src/graphics/core/commons.cpp

@@ -1,39 +0,0 @@
-#include "commons.hpp"
-
-#include <map>
-
-std::optional<CursorShape> CursorShape_from(std::string_view name) {
-    static std::map<std::string_view, CursorShape> shapes = {
-        {"arrow", CursorShape::ARROW},
-        {"text", CursorShape::TEXT},
-        {"crosshair", CursorShape::CROSSHAIR},
-        {"pointer", CursorShape::POINTER},
-        {"ew-resize", CursorShape::EW_RESIZE},
-        {"ns-resize", CursorShape::NS_RESIZE},
-        {"nwse-resize", CursorShape::NWSE_RESIZE},
-        {"nesw-resize", CursorShape::NESW_RESIZE},
-        {"all-resize", CursorShape::ALL_RESIZE},
-        {"not-allowed", CursorShape::NOT_ALLOWED}
-    };
-    const auto& found = shapes.find(name);
-    if (found == shapes.end()) {
-        return std::nullopt;
-    }
-    return found->second;
-}
-
-std::string to_string(CursorShape shape) {
-    static std::string names[] = {
-        "arrow",
-        "text",
-        "crosshair",
-        "pointer",
-        "ew-resize",
-        "ns-resize",
-        "nwse-resize",
-        "nesw-resize",
-        "all-resize",
-        "not-allowed"
-    };
-    return names[static_cast<int>(shape)];
-}

src/graphics/core/commons.hpp

@@ -3,6 +3,8 @@
 #include <string>
 #include <optional>
 
+#include "util/EnumMetadata.hpp"
+
 enum class DrawPrimitive {
     point = 0,
     line,
@@ -48,8 +50,18 @@ enum class CursorShape {
     LAST=NOT_ALLOWED
 };
 
-std::optional<CursorShape> CursorShape_from(std::string_view name);
-std::string to_string(CursorShape shape);
+VC_ENUM_METADATA(CursorShape)
+    {"arrow", CursorShape::ARROW},
+    {"text", CursorShape::TEXT},
+    {"crosshair", CursorShape::CROSSHAIR},
+    {"pointer", CursorShape::POINTER},
+    {"ew-resize", CursorShape::EW_RESIZE},
+    {"ns-resize", CursorShape::NS_RESIZE},
+    {"nwse-resize", CursorShape::NWSE_RESIZE},
+    {"nesw-resize", CursorShape::NESW_RESIZE},
+    {"all-resize", CursorShape::ALL_RESIZE},
+    {"not-allowed", CursorShape::NOT_ALLOWED},
+VC_ENUM_END
 
 class Flushable {
 public:

src/graphics/ui/gui_xml.cpp

@@ -1,3 +1,4 @@
+#define VC_ENABLE_REFLECTION
 #include "gui_xml.hpp"
 
 #include <stdexcept>
@@ -168,8 +169,9 @@ static void read_uinode(
         node.setTooltipDelay(element.attr("tooltip-delay").asFloat());
     }
     if (element.has("cursor")) {
-        if (auto cursor = CursorShape_from(element.attr("cursor").getText())) {
-            node.setCursor(*cursor);
+        CursorShape cursor;
+        if (CursorShapeMeta.getItem(element.attr("cursor").getText(), cursor)) {
+            node.setCursor(cursor);
         }
     }