From a231b14df487f21e1e9a987dfede68c798c04f46 Mon Sep 17 00:00:00 2001
From: Dominic Masters <dominic@domsplace.com>
Date: Mon, 24 Apr 2023 22:35:45 -0700
Subject: [PATCH] Fixed parallel event bug

---
 assets/games/liminal/test.xml                 | 34 +++++++++++++++++--
 src/dawn/games/vn/events/VNParallelEvent.hpp  |  3 +-
 src/dawntools/vnscenetool/VNSceneGen.cpp      |  2 +-
 .../vnscenetool/events/VNMarkerParser.hpp     | 25 ++++++++++++++
 4 files changed, 60 insertions(+), 4 deletions(-)
 create mode 100644 src/dawntools/vnscenetool/events/VNMarkerParser.hpp

diff --git a/assets/games/liminal/test.xml b/assets/games/liminal/test.xml
index 60cee144..b9cb7c1f 100644
--- a/assets/games/liminal/test.xml
+++ b/assets/games/liminal/test.xml
@@ -4,10 +4,40 @@
   <events>
     <!-- Set the default values -->
     <position item="cube" x="0" y="0" z="0" />
+
+    <set property="cube->material->color" value="COLOR_BLACK" type="struct Color" />
+    <set property="cube->material->color.a" value="0" type="uint8_t" />
     
+
+    <!-- Fade out the black overlay -->
+    <set property="cube->material->color.a" to="0" duration="1" curve="easeOut" type="uint8_t" />
+    
+    <!-- Example Text, also showing how in future we can support multiple languages -->
+    <text character="eth">
+      <string lang="en">Hi, I'm Ethereality.</string>
+    </text>
+    
+    <!-- Fade in craig -->
+    <set property="cube->material->color.a" to="255" duration="1" curve="easeOut" type="uint8_t" />
+    <text character="craig">
+      <string lang="en">Hi, I'm Craig.</string>
+    </text>
+
+    <!--
+      Because each event stops things happening until it's complete, let's
+      assume we want to do two things at once, say move and fade out a character
+      at the same time. This will make craig exit screen left.
+    -->
     <parallel>
-      <wait time="1" />
-      <wait time="3" />
+      <set property="cube->material->color.a" to="0" duration="1" curve="easeOut" type="uint8_t" />
+      <position item="cube" x="-2" duration="1" curve="easeOut" />
     </parallel>
+
+    <!-- Now Craig is gone, so sad, let's now fade the screen out and present some choices -->
+    <set property="cube->material->color.a" to="255" duration="1" curve="easeOut" type="uint8_t" />
+
+    <!-- Here I am creating a marker -->
+    <marker name="craigCool" />
+
   </events>
 </vnscene>
\ No newline at end of file
diff --git a/src/dawn/games/vn/events/VNParallelEvent.hpp b/src/dawn/games/vn/events/VNParallelEvent.hpp
index f751fddd..e511ed69 100644
--- a/src/dawn/games/vn/events/VNParallelEvent.hpp
+++ b/src/dawn/games/vn/events/VNParallelEvent.hpp
@@ -25,13 +25,14 @@ namespace Dawn {
         auto itEvents = this->events.begin();
         while(itEvents != this->events.end()) {
           auto event = *itEvents;
-          event->start(this, this);
           eventCount++;
 
           useEvent([&]{
             eventCompleteCount++;
             if(eventCompleteCount >= eventCount) this->next();
           }, event->eventFinished);
+
+          event->start(this, this);
           itEvents++;
         }
       }
diff --git a/src/dawntools/vnscenetool/VNSceneGen.cpp b/src/dawntools/vnscenetool/VNSceneGen.cpp
index cfa55f0e..83a7c999 100644
--- a/src/dawntools/vnscenetool/VNSceneGen.cpp
+++ b/src/dawntools/vnscenetool/VNSceneGen.cpp
@@ -23,7 +23,7 @@ void VNSceneGen::test(
     case VN_SCENE_EVENT_TYPE_TEXT:
       initType = "VNTextEvent";
       toInclude = "games/vn/events/VNTextEvent.hpp";
-      line(body, eventName + "->" + "text = \"" + event->text.texts.begin()->text + "\";", "");
+      line(&afterLines, eventName + "->" + "text = \"" + event->text.texts.begin()->text + "\";", "");
       break;
 
     case VN_SCENE_EVENT_TYPE_POSITION:
diff --git a/src/dawntools/vnscenetool/events/VNMarkerParser.hpp b/src/dawntools/vnscenetool/events/VNMarkerParser.hpp
new file mode 100644
index 00000000..f9b05c68
--- /dev/null
+++ b/src/dawntools/vnscenetool/events/VNMarkerParser.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 VNMarker {
+    std::string name;
+  };
+
+  class VNMarkerParser : public XmlParser<struct VNMarker> {
+    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 VNMarker *out,
+        std::string *error
+      ) override;
+  };
+}
\ No newline at end of file