feat: set up interactions in Loading Docs (#25)

Author: aarthificial

Assets/Editor/Typewriter/CsvConverter.cs

@@ -1,17 +1,13 @@
 using Aarthificial.Typewriter;
 using Aarthificial.Typewriter.Blackboards;
-using Aarthificial.Typewriter.Editor.Common;
-using Aarthificial.Typewriter.Editor.Localization;
 using Aarthificial.Typewriter.Entries;
 using Aarthificial.Typewriter.References;
 using Interactions;
 using System;
 using System.Collections.Generic;
 using System.Text;
 using Typewriter;
-using UnityEditor.Localization;
 using UnityEngine;
-using UnityEngine.Localization;
 using Object = UnityEngine.Object;
 
 namespace Editor.Typewriter {
@@ -51,7 +47,6 @@ public ParsingException(string message, ParsingContext context) : base(
     private static readonly List<BlackboardCriterion> _criteria = new();
     private static readonly List<BlackboardModification> _modifications = new();
     private static readonly HashSet<int> _convertedIds = new();
-    private static StringTableCollection _collection;
 
     public static void Convert(
       DatabaseTable table,
@@ -64,17 +59,17 @@ Object context
       _lookup.Clear();
 
       foreach (var entry in table.Facts) {
-        _lookup.Add(entry.GetKey(), (EntryReference)entry);
+        _lookup.Add(entry.Key, (EntryReference)entry);
       }
       foreach (var entry in table.Rules) {
-        _lookup.Add(entry.GetKey(), (EntryReference)entry);
+        _lookup.Add(entry.Key, (EntryReference)entry);
       }
       foreach (var entry in table.Events) {
-        _lookup.Add(entry.GetKey(), (EntryReference)entry);
+        _lookup.Add(entry.Key, (EntryReference)entry);
       }
 
-      _collection =
-        LocalizationEditorSettings.GetStringTableCollection("Dialogue");
+      // _collection =
+        // LocalizationEditorSettings.GetStringTableCollection("Dialogue");
 
       _lookup.Add("LT", InteractionContext.LT);
       _lookup.Add("RT", InteractionContext.RT);
@@ -89,6 +84,10 @@ Object context
       BaseEntry previous = null;
       for (var i = 1; i < rows.Count; i++) {
         var cells = rows[i].Cells;
+        if (cells.Key() == "") {
+          continue;
+        }
+
         Type type;
         switch (cells.Type()) {
           case "event":
@@ -107,7 +106,7 @@ Object context
             type = typeof(FactEntry);
             break;
           default:
-            Debug.LogError($"Unknown type {cells.Type()}", context);
+            Debug.LogError($"Row {i + 1}: Unknown type {cells.Type()}", context);
             continue;
         }
 
@@ -139,10 +138,15 @@ Object context
 
       for (var i = 1; i < rows.Count; i++) {
         var cells = rows[i].Cells;
+        if (cells.Key() == "") {
+          previous = null;
+          continue;
+        }
+
         try {
           switch (cells.Type()) {
             case "fact":
-              previous = CreateFactEntry(cells, previous);
+              CreateFactEntry(cells, previous);
               break;
             case "event":
               previous = CreateEventEntry(cells, previous);
@@ -242,6 +246,7 @@ BaseEntry previous
         throw new Exception($"Missing speaker {cells.Speaker()}.");
       }
 
+      /* TODO: Switch to localized strings later
       var textEntry = _collection.StringTables[0].GetEntry(entry.Key);
       long textId;
       if (textEntry == null) {
@@ -262,6 +267,8 @@ BaseEntry previous
         _collection.SharedData.TableCollectionName,
         textId
       );
+      */
+      entry.Content = cells.Text();
 
       if (cells.Actions() != "") {
         _events.Clear();
@@ -569,16 +576,15 @@ private static string GetErrorFrame(ParsingContext context) {
     }
 
     private static string Key(this List<string> list) => list[0];
-    private static string Type(this List<string> list) => list[1];
-    private static string Speaker(this List<string> list) => list[2];
-    private static bool Once(this List<string> list) => list[3] == "TRUE";
-
-    private static bool Cancel(this List<string> list) => list[4] == "TRUE";
-    private static string Text(this List<string> list) => list[5];
-    private static string Triggers(this List<string> list) => list[6];
-    private static string Criteria(this List<string> list) => list[7];
-    private static string Modifications(this List<string> list) => list[8];
-    private static string Padding(this List<string> list) => list[9];
-    private static string Actions(this List<string> list) => list[11];
+    private static string Type(this List<string> list) => list[2];
+    private static string Speaker(this List<string> list) => list[3];
+    private static bool Once(this List<string> list) => list[4] == "TRUE";
+    private static bool Cancel(this List<string> list) => list[5] == "TRUE";
+    private static string Text(this List<string> list) => list[6];
+    private static string Triggers(this List<string> list) => list[7];
+    private static string Criteria(this List<string> list) => list[8];
+    private static string Modifications(this List<string> list) => list[9];
+    private static string Padding(this List<string> list) => list[10];
+    private static string Actions(this List<string> list) => list[12];
   }
 }

Assets/Editor/Typewriter/CsvParser.cs

@@ -16,6 +16,7 @@ public static IReadOnlyList<Row> Parse(string text) {
       var cells = new List<string>();
 
       var isInsideField = false;
+      var previousEmpty = false;
       _builder.Clear();
       _rows.Clear();
 
@@ -36,9 +37,7 @@ public static IReadOnlyList<Row> Parse(string text) {
             break;
           case '\n' when !isInsideField:
             AddCell(cells);
-            if (cells.Count > 0 && cells[0] != "") {
-              _rows.Add(new Row { Cells = cells });
-            }
+            _rows.Add(new Row { Cells = cells });
             cells = new List<string>();
             break;
           default:

Assets/Editor/Typewriter/DialogueEntryDescriptor.cs

@@ -4,7 +4,7 @@
 namespace Editor.Typewriter
 {
     [CustomEntryDescriptor(typeof(DialogueEntry))]
-    public class DialogueEntryDescriptor : LocalizedRuleEntryDescriptor
+    public class DialogueEntryDescriptor : RuleEntryDescriptor
     {
         public override string Name => "Dialogue";
     }

Assets/Environment/LookAtCamera.cs

@@ -0,0 +1,17 @@
+using UnityEngine;
+using Utils;
+using View.Overlay;
+
+namespace Environment {
+  [DefaultExecutionOrder(1000)]
+  public class LookAtCamera : MonoBehaviour {
+    [Inject] [SerializeField] private OverlayChannel _overlay;
+
+    private void LateUpdate() {
+      if (_overlay.IsReady) {
+        transform.rotation =
+          _overlay.CameraManager.MainCamera.transform.rotation;
+      }
+    }
+  }
+}