Marker progress

src/dawntools/vnscenetool/VNSceneGen.cpp

@@ -71,6 +71,12 @@ void VNSceneGen::test(
       break;
     }
 
+    case VN_SCENE_EVENT_TYPE_MARKER:
+      initType = "VNDummyEvent";
+      toInclude = "games/vn/events/VNDummyEvent.hpp";
+      line(&afterLines, "auto marker_" + event->marker.name + " = " + eventName + ";", "");
+      break;
+
     default:
       std::cout << "Unknown event type: " << event->type << std::endl;
       assertUnreachable();

src/dawntools/vnscenetool/events/CMakeLists.txt

@@ -6,6 +6,7 @@
 # Sources
 target_sources(vnscenetool
   PRIVATE
+    VNMarkerParser.cpp
     VNSceneEventsParser.cpp
     VNPositionEventParser.cpp
     VNTextEventParser.cpp

src/dawntools/vnscenetool/events/VNGoToMarkerEventParser.cpp

@@ -0,0 +1,26 @@
+// Copyright (c) 2023 Dominic Masters
+// 
+// This software is released under the MIT License.
+// https://opensource.org/licenses/MIT
+
+#include "VNGoToMarkerEventParser.hpp"
+
+using namespace Dawn;
+
+std::vector<std::string> VNGoToMarkerEventParser::getRequiredAttributes() {
+  return { "name" };
+}
+
+std::map<std::string, std::string> VNGoToMarkerEventParser::getOptionalAttributes() {
+  return {};
+}
+
+int32_t VNGoToMarkerEventParser::onParse(
+  Xml *node,
+  std::map<std::string, std::string> values,
+  struct VNGoToMarkerEvent *out,
+  std::string *error
+) {
+  out->name = values["name"];
+  return 0;
+}

src/dawntools/vnscenetool/events/VNGoToMarkerEventParser.hpp

@@ -0,0 +1,25 @@
+// Copyright (c) 2023 Dominic Masters
+// 
+// This software is released under the MIT License.
+// https://opensource.org/licenses/MIT
+
+#pragma once
+#include "util/XmlParser.hpp"
+
+namespace Dawn {
+  struct VNGoToMarkerEvent {
+    std::string name;
+  };
+
+  class VNGoToMarkerEventParser : public XmlParser<struct VNGoToMarkerEvent> {
+    protected:
+      std::vector<std::string> getRequiredAttributes() override;
+      std::map<std::string, std::string> getOptionalAttributes() override;
+      int32_t onParse(
+        Xml *node,
+        std::map<std::string, std::string> values,
+        struct VNGoToMarkerEvent *out,
+        std::string *error
+      ) override;
+  };
+}

src/dawntools/vnscenetool/events/VNMarkerParser.cpp

@@ -0,0 +1,32 @@
+// Copyright (c) 2023 Dominic Masters
+// 
+// This software is released under the MIT License.
+// https://opensource.org/licenses/MIT
+
+#include "VNMarkerParser.hpp"
+
+using namespace Dawn;
+
+std::vector<std::string> VNMarkerParser::getRequiredAttributes() {
+  return { "name" };
+}
+
+std::map<std::string, std::string> VNMarkerParser::getOptionalAttributes() {
+  return {};
+}
+
+int32_t VNMarkerParser::onParse(
+  Xml *node,
+  std::map<std::string, std::string> values,
+  struct VNMarker *out,
+  std::string *error
+) {
+  // Ensure name only contains letters, and numbers, no spaces or symbols
+  if(!std::regex_match(values["name"], std::regex("^[a-zA-Z0-9]+$"))) {
+    *error = "Marker name " + values["name"] + " must only contain letters and numbers.";
+    return -1;
+  }
+
+  out->name = values["name"];
+  return 0;
+}

src/dawntools/vnscenetool/events/VNMarkerParser.hpp

@@ -5,6 +5,7 @@
 
 #pragma once
 #include "util/XmlParser.hpp"
+#include <regex>
 
 namespace Dawn {
   struct VNMarker {

src/dawntools/vnscenetool/events/VNSceneEventsParser.cpp

@@ -55,6 +55,11 @@ int32_t VNSceneEventsParser::onParse(
       ret = (VNParallelEventParser()).parse(child, &event.parallel, error);
       if(ret != 0) return ret;
 
+    } else if(child->node == "marker") {
+      event.type = VN_SCENE_EVENT_TYPE_MARKER;
+      ret = (VNMarkerParser()).parse(child, &event.marker, error);
+      if(ret != 0) return ret;
+
     } else {
       *error = "Unknown child node '" + child->node + "'";
       return -1;

src/dawntools/vnscenetool/events/VNSceneEventsParser.hpp

@@ -9,6 +9,7 @@
 #include "VNSetEventParser.hpp"
 #include "VNWaitEventParser.hpp"
 #include "VNParallelEventParser.hpp"
+#include "VNMarkerParser.hpp"
 
 namespace Dawn {
   struct VNSceneEvent;
@@ -22,7 +23,8 @@ namespace Dawn {
     VN_SCENE_EVENT_TYPE_POSITION,
     VN_SCENE_EVENT_TYPE_SET,
     VN_SCENE_EVENT_TYPE_WAIT,
-    VN_SCENE_EVENT_TYPE_PARALLEL
+    VN_SCENE_EVENT_TYPE_PARALLEL,
+    VN_SCENE_EVENT_TYPE_MARKER
   };
 
   struct VNParallelEvent {
@@ -37,6 +39,7 @@ namespace Dawn {
     struct VNSetEvent set;
     struct VNWaitEvent wait;
     struct VNParallelEvent parallel;
+    struct VNMarker marker;
   };
 
   class VNSceneEventsParser : public XmlParser<struct VNSceneEventList> {