Reactivate Generator function in Unity 2018.4. (#106)

Co-authored-by: Adam Ramberg <adam@mambojambostudios.com>
unity-atoms · Feb 23, 2020 · 5f66ed0 · 5f66ed0
1 parent e2fb8ce
commit 5f66ed0
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 5 deletions.
diff --git a/Packages/Core/Editor/Generator/Generator.cs b/Packages/Core/Editor/Generator/Generator.cs
@@ -1,4 +1,4 @@
-#if UNITY_2019_1_OR_NEWER
+#if UNITY_2018_4_OR_NEWER
 using System;
 using System.Collections.Generic;
 using System.IO;
@@ -56,8 +56,9 @@ public void Generate(string type, string baseWritePath, bool isEquatable, List<A
 
             // Recursively search for template files. TODO: Is there a better way to find and load templates?
             var templateSearchPath = Runtime.IsUnityAtomsRepo ?
-                Directory.GetParent(baseWritePath).FullName : // "Packages"
+                Directory.GetParent(Application.dataPath).Parent.FullName : // "Packages"
                 Directory.GetParent(Application.dataPath).FullName;
+
             var templatePaths = Directory.GetFiles(templateSearchPath, "UA_Template*.txt", SearchOption.AllDirectories);
             var templateConditions = new List<string>();
             if (isEquatable) { templateConditions.Add("EQUATABLE"); }

diff --git a/Packages/Core/Editor/Generator/GeneratorEditor.cs b/Packages/Core/Editor/Generator/GeneratorEditor.cs
@@ -1,10 +1,16 @@
-#if UNITY_2019_1_OR_NEWER
+#if UNITY_2018_4_OR_NEWER
 using System;
 using System.Linq;
 using System.Collections.Generic;
 using UnityEditor;
 using UnityEngine;
+#if UNITY_2019_1_OR_NEWER
 using UnityEngine.UIElements;
+#elif UNITY_2018_4_OR_NEWER
+using UnityEditor.Experimental.UIElements;
+using UnityEngine.Experimental.UIElements;
+using UnityEngine.Experimental.UIElements.StyleEnums;
+#endif
 
 namespace UnityAtoms.Editor
 {
@@ -146,8 +152,11 @@ private void OnEnable()
                 AtomTypes.VARIABLE
             };
             generator = generator == null ? new Generator() : generator;
-
+#if UNITY_2019_1_OR_NEWER
             var root = this.rootVisualElement;
+#elif UNITY_2018_4_OR_NEWER
+            var root = this.GetRootVisualContainer();
+#endif
             var pathRow = new VisualElement() { style = { flexDirection = FlexDirection.Row } };
             pathRow.Add(new Label() { text = "Relative Write Path", style = { width = 180, marginRight = 8 } });
             var textfield = new TextField() { value = _writePath, style = { flexGrow = 1 } };

diff --git a/Packages/Core/Editor/Generator/RegenerateAllAtoms.cs b/Packages/Core/Editor/Generator/RegenerateAllAtoms.cs
@@ -1,4 +1,4 @@
-#if UNITY_2019_1_OR_NEWER
+#if UNITY_2018_4_OR_NEWER
 using System;
 using System.Linq;
 using System.Collections.Generic;