Refactoring menus and adding application manager setup

ChristopherSchubert · ChristopherSchubert · commit 1fa3fd149189 · 2021-10-31T13:02:21.000-04:00
diff --git a/package.json b/package.json
@@ -30,7 +30,8 @@
     "com.unity.mathematics": "1.2.4",
     "com.unity.collections": "1.0.0-pre.6",
     "com.unity.render-pipelines.core": "12.1.0",
-    "com.unity.timeline": "1.6.2"
+    "com.unity.timeline": "1.6.2",
+    "com.unity.inputsystem": "1.1.1"
   },
   "scripts": {
     "preversion": "bash ~/com.appalachia/appa/appa package unity3d preversion",
diff --git a/src/Appalachia.Audio.asmdef b/src/Appalachia.Audio.asmdef
@@ -51,6 +51,7 @@
     "GUID:a03736e1d95a0ed4c8a44e1ee02df53f",
     "GUID:9e24947de15b9834991c9d8411ea37cf",
     "GUID:e0cd26848372d4e5c891c569017e11f1",
+    "GUID:75469ad4d38634e559750d17036d5f7c",
     "GUID:d8b63aba1907145bea998dd612889d6b",
     "GUID:df380645f10b7bc4b97d4f5eb6303d95",
     "GUID:84651a3751eca9349aac36a66bba901b",
diff --git a/src/Components/OcclusionSettings.cs b/src/Components/OcclusionSettings.cs
@@ -12,7 +12,7 @@
 
 namespace Appalachia.Audio.Components
 {
-    public class OcclusionSettings : SelfSavingSingletonScriptableObject<OcclusionSettings>
+    public class OcclusionSettings : SingletonAppalachiaObject<OcclusionSettings>
     {
         public float speedOfSound = 340f;
         public LayerMask layerMask = 1;
diff --git a/src/Components/Patch.cs b/src/Components/Patch.cs
@@ -9,7 +9,7 @@
 
 namespace Appalachia.Audio.Components
 {
-    public sealed class Patch : SelfSavingScriptableObject<Patch>
+    public sealed class Patch : AppalachiaObject<Patch>
     {
         [Space(10)] [Colorize] public AudioProgram program;
 
diff --git a/src/Contextual/Appalachia.Audio.Contextual.asmdef b/src/Contextual/Appalachia.Audio.Contextual.asmdef
@@ -52,6 +52,7 @@
     "GUID:a03736e1d95a0ed4c8a44e1ee02df53f",
     "GUID:9e24947de15b9834991c9d8411ea37cf",
     "GUID:e0cd26848372d4e5c891c569017e11f1",
+    "GUID:75469ad4d38634e559750d17036d5f7c",
     "GUID:d8b63aba1907145bea998dd612889d6b",
     "GUID:df380645f10b7bc4b97d4f5eb6303d95",
     "GUID:84651a3751eca9349aac36a66bba901b",
diff --git a/src/Contextual/Context/Collections/AudioContextCollection.cs b/src/Contextual/Context/Collections/AudioContextCollection.cs
@@ -12,7 +12,7 @@ namespace Appalachia.Audio.Contextual.Context.Collections
 {
     [Serializable]
     public abstract class
-        AudioContextCollection<TContext, TParams, T> : SelfSavingSingletonScriptableObject<T>
+        AudioContextCollection<TContext, TParams, T> : SingletonAppalachiaObject<T>
         where TParams : AudioContextParameters
         where TContext : AudioContext<TParams>
         where T : AudioContextCollection<TContext, TParams, T>
diff --git a/src/Contextual/Context/_old/Collections - Copy/AudioContextCollection.cs b/src/Contextual/Context/_old/Collections - Copy/AudioContextCollection.cs
@@ -12,7 +12,7 @@
 namespace Appalachia.Core.AssetMetadata.AudioMetadata.Context.Base.Collections
 {
     [Serializable]
-public abstract class AudioContextCollection<TContext, T> : SelfSavingAndIdentifyingScriptableObject<T>
+public abstract class AudioContextCollection<TContext, T> : AppalachiaAndIdentifyingScriptableObject<T>
         where TContext : AudioContext
         where T : AudioContextCollection<TContext, T>
     {
diff --git a/src/Contextual/ContextualAudioPatch.cs b/src/Contextual/ContextualAudioPatch.cs
@@ -11,7 +11,7 @@
 namespace Appalachia.Audio.Contextual
 {
     [Serializable]
-    public sealed class ContextualAudioPatch : SelfSavingAndIdentifyingScriptableObject<ContextualAudioPatch>
+    public sealed class ContextualAudioPatch : IdentifiableAppalachiaObject<ContextualAudioPatch>
     {
         [ToggleLeft]
         [SmartLabel]
diff --git a/src/Contextual/Execution/AudioExecutionManagerBehaviour.cs b/src/Contextual/Execution/AudioExecutionManagerBehaviour.cs
@@ -7,7 +7,7 @@
 namespace Appalachia.Audio.Contextual.Execution
 {
     [DisallowMultipleComponent]
-    public abstract class AudioExecutionManagerBehaviour<T> : AppalachiaMonoBehaviour
+    public abstract class AudioExecutionManagerBehaviour<T> : AppalachiaBehaviour
         where T : AudioExecutionManagerBehaviour<T>
     {
         protected void HandleExecution<TProcessor, TCollection, TContext, TParams>(
diff --git a/src/Contextual/Execution/AudioExecutionManagerSingletonBehaviour.cs b/src/Contextual/Execution/AudioExecutionManagerSingletonBehaviour.cs
@@ -7,7 +7,7 @@
 namespace Appalachia.Audio.Contextual.Execution
 {
     [DisallowMultipleComponent]
-    public abstract class AudioExecutionManagerSingletonBehaviour<T> : SingletonMonoBehaviour<T>
+    public abstract class AudioExecutionManagerSingletonBehaviour<T> : SingletonAppalachiaBehaviour<T>
         where T : AudioExecutionManagerSingletonBehaviour<T>
     {
         protected void HandleExecution<TProcessor, TCollection, TContext, TParams>(
diff --git a/src/Contextual/Execution/AudioExecutionProcessor.cs b/src/Contextual/Execution/AudioExecutionProcessor.cs
@@ -12,7 +12,7 @@ public abstract class AudioExecutionProcessor<TCollection, TContext, TParams, TO
         where TCollection : AudioContextCollection<TContext, TParams, TCollection>
         where TContext : AudioContext<TParams>
         where TParams : AudioContextParameters, new()
-        where TOwner : AppalachiaMonoBehaviour
+        where TOwner : AppalachiaBehaviour
     {
         [SerializeField] public TCollection audio;
 
diff --git a/src/Contextual/PKG.cs b/src/Contextual/PKG.cs
@@ -8,9 +8,10 @@ namespace Appalachia.Audio.Contextual
 {
     internal static partial class PKG
     {
+        public const int Priority = -362000;
+        public const string Name = "Audio/Contextual";
+        public const string Prefix = Root + Name + "/";
         public const string Root = "Appalachia/";
-        public const string Prefix = Root + "Audio/Contextual/";
-        public const int Priority = 1000*5;
         
         public static partial class Prefs
         {
@@ -24,8 +25,8 @@ public static partial class Gizmos
 
         public static partial class Menu
         {
-            public static partial class Assets
-            {
+             public static partial class Assets
+             {
                 public const int Priority = PKG.Priority;
                 public const string Base =  "Assets/" + Prefix;
             }
@@ -34,6 +35,12 @@ public static partial class GameObject
             {
                 public const int Priority = PKG.Priority;
                 public const string Base = "GameObject/" + Prefix;
+                    
+                public static partial class Create
+                {
+                    public const int Priority = GameObject.Priority + 0;
+                    public const string Base =  "GameObject/Create/" + Prefix;
+                }
             }
 
             public static partial class Appalachia
@@ -43,61 +50,61 @@ public static partial class Appalachia
                 public static partial class Behaviours
                 {
                     public const int Priority = Appalachia.Priority;
-                    public const string Base =  Prefix + nameof(Behaviours) + "/"; 
+                    public const string Base =  Root + nameof(Behaviours) + "/" + Name + "/"; 
                 }
                 
                 public static partial class Components
                 { 
                     public const int Priority = Behaviours.Priority + 100;
-                    public const string Base = Prefix + nameof(Components) + "/";
+                    public const string Base = Root + nameof(Components) + "/" + Name + "/";
                 }
 
                 public static partial class Add
                 { 
                     public const int Priority = Components.Priority + 100;
-                    public const string Base = Prefix + nameof(Add) +  "/";
+                    public const string Base = Root + nameof(Add) +  "/" + Name + "/";
                 }
                 
                 public static partial class Create
                 { 
                     public const int Priority = Add.Priority + 100;
-                    public const string Base = Prefix + nameof(Create) +  "/";
+                    public const string Base = Root + nameof(Create) +  "/" + Name + "/";
                 }
                 
                 public static partial class Update
                 { 
                     public const int Priority = Create.Priority + 100;
-                    public const string Base = Prefix + nameof(Update) +  "/";
+                    public const string Base = Root + nameof(Update) +  "/" + Name + "/";
                 }
                 
                 public static partial class Manage
                 { 
                     public const int Priority = Update.Priority + 100;
-                    public const string Base = Prefix + nameof(Manage) +  "/";
+                    public const string Base = Root + nameof(Manage) +  "/" + Name + "/";
                 }
                 
                 public static partial class Data
                 { 
                     public const int Priority = Manage.Priority + 100;
-                    public const string Base = Prefix + nameof(Data) +  "/";
+                    public const string Base = Root + nameof(Data) +  "/" + Name + "/";
                 }
                 
                 public static partial class RootTools
                 { 
-                    public const int Priority = Data.Priority + 100;
+                    public const int Priority = 0;
                     public const string Base = Root + "Tools/";
                 }
                 
                 public static partial class State
                 { 
-                    public const int Priority = RootTools.Priority + 100;
-                    public const string Base = Prefix + nameof(State) +  "/";
+                    public const int Priority = Data.Priority + 100;
+                    public const string Base = Root + nameof(State) +  "/" + Name + "/";
                 }
                 
                 public static partial class Tools
                 { 
                     public const int Priority = State.Priority + 100;
-                    public const string Base = Prefix + nameof(Tools) +  "/";
+                    public const string Base = Root + nameof(Tools) +  "/" + Name + "/";
                                         
                     public static partial class Enable
                     { 
@@ -115,61 +122,61 @@ public static partial class Disable
                 public static partial class Jobs
                 { 
                     public const int Priority = Tools.Priority + 100;
-                    public const string Base = Prefix + nameof(Jobs) +  "/";
+                    public const string Base = Root + nameof(Jobs) +  "/" + Name + "/";
                 }
                 
                 public static partial class Timing
                 { 
                     public const int Priority = Jobs.Priority + 100;
-                    public const string Base = Prefix + nameof(Timing) +  "/";
+                    public const string Base = Root + nameof(Timing) +  "/" + Name + "/";
                 }
                                 
                 public static partial class Utility
                 { 
                     public const int Priority = Timing.Priority + 100;
-                    public const string Base = Prefix + nameof(Utility) +  "/";
+                    public const string Base = Root + nameof(Utility) +  "/" + Name + "/";
                 }
                 
                 public static partial class Windows
                 { 
                     public const int Priority = Utility.Priority + 100;
-                    public const string Base = Prefix + nameof(Windows) +  "/";
+                    public const string Base = Root + nameof(Windows) +  "/" + Name + "/";
                 }
                 
                 public static partial class Logging
                 { 
                     public const int Priority = Windows.Priority + 100;
-                    public const string Base = Prefix + nameof(Logging) +  "/";
+                    public const string Base = Root + nameof(Logging) +  "/" + Name + "/";
                 }          
                 
                 public static partial class Settings
                 { 
                     public const int Priority = Logging.Priority + 100;
-                    public const string Base = Prefix + nameof(Settings) + "/";
+                    public const string Base = Root + nameof(Settings) + "/" + Name + "/";
                 }               
                 
                 public static partial class Packages
                 { 
                     public const int Priority = Settings.Priority + 100;
-                    public const string Base = Prefix + nameof(Packages) + "/";
+                    public const string Base = Root + nameof(Packages) + "/" + Name + "/";
                 }                          
                 
                 public static partial class External
                 { 
                     public const int Priority = Packages.Priority + 100;
-                    public const string Base = Prefix + nameof(External) + "/";
+                    public const string Base = Root + nameof(External) + "/" + Name + "/";
                 }           
                 
                 public static partial class Debug
                 { 
                     public const int Priority = External.Priority + 100;
-                    public const string Base = Prefix + nameof(Debug) +  "/";
+                    public const string Base = Root + nameof(Debug) +  "/" + Name + "/";
                 }                                               
                 
                 public static partial class Gizmos
                 { 
                     public const int Priority = Debug.Priority + 100;
-                    public const string Base = Prefix + nameof(Gizmos) +  "/";
+                    public const string Base = Root + nameof(Gizmos) +  "/" + Name + "/";
                 }                 
             }
 
diff --git a/src/Editor/Appalachia.Audio.Editor.asmdef b/src/Editor/Appalachia.Audio.Editor.asmdef
@@ -54,6 +54,7 @@
     "GUID:a03736e1d95a0ed4c8a44e1ee02df53f",
     "GUID:9e24947de15b9834991c9d8411ea37cf",
     "GUID:e0cd26848372d4e5c891c569017e11f1",
+    "GUID:75469ad4d38634e559750d17036d5f7c",
     "GUID:d8b63aba1907145bea998dd612889d6b",
     "GUID:df380645f10b7bc4b97d4f5eb6303d95",
     "GUID:84651a3751eca9349aac36a66bba901b",
diff --git a/src/Editor/AudioImportSettings.cs b/src/Editor/AudioImportSettings.cs
@@ -3,7 +3,7 @@
 
 namespace Appalachia.Audio
 {
-    public class AudioImportSettings : SelfSavingSingletonScriptableObject<AudioImportSettings>
+    public class AudioImportSettings : SingletonAppalachiaObject<AudioImportSettings>
     {
         [Colorize] public AudioImportSettingsOverride[] overrides;
     }
diff --git a/src/Editor/PKG.cs b/src/Editor/PKG.cs
diff --git a/src/PKG.cs b/src/PKG.cs

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@`
`12`	`12`
`13`	`13`	`namespace Appalachia.Audio.Components`
`14`	`14`	`{`
`15`		`- public class OcclusionSettings : SelfSavingSingletonScriptableObject<OcclusionSettings>`
	`15`	`+ public class OcclusionSettings : SingletonAppalachiaObject<OcclusionSettings>`
`16`	`16`	`{`
`17`	`17`	`public float speedOfSound = 340f;`
`18`	`18`	`public LayerMask layerMask = 1;`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`
`10`	`10`	`namespace Appalachia.Audio.Components`
`11`	`11`	`{`
`12`		`- public sealed class Patch : SelfSavingScriptableObject<Patch>`
	`12`	`+ public sealed class Patch : AppalachiaObject<Patch>`
`13`	`13`	`{`
`14`	`14`	`[Space(10)] [Colorize] public AudioProgram program;`
`15`	`15`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ namespace Appalachia.Audio.Contextual.Context.Collections`
`12`	`12`	`{`
`13`	`13`	`[Serializable]`
`14`	`14`	`public abstract class`
`15`		`- AudioContextCollection<TContext, TParams, T> : SelfSavingSingletonScriptableObject<T>`
	`15`	`+ AudioContextCollection<TContext, TParams, T> : SingletonAppalachiaObject<T>`
`16`	`16`	`where TParams : AudioContextParameters`
`17`	`17`	`where TContext : AudioContext<TParams>`
`18`	`18`	`where T : AudioContextCollection<TContext, TParams, T>`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`namespace Appalachia.Audio.Contextual`
`12`	`12`	`{`
`13`	`13`	`[Serializable]`
`14`		`- public sealed class ContextualAudioPatch : SelfSavingAndIdentifyingScriptableObject<ContextualAudioPatch>`
	`14`	`+ public sealed class ContextualAudioPatch : IdentifiableAppalachiaObject<ContextualAudioPatch>`
`15`	`15`	`{`
`16`	`16`	`[ToggleLeft]`
`17`	`17`	`[SmartLabel]`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`namespace Appalachia.Audio.Contextual.Execution`
`8`	`8`	`{`
`9`	`9`	`[DisallowMultipleComponent]`
`10`		`- public abstract class AudioExecutionManagerBehaviour<T> : AppalachiaMonoBehaviour`
	`10`	`+ public abstract class AudioExecutionManagerBehaviour<T> : AppalachiaBehaviour`
`11`	`11`	`where T : AudioExecutionManagerBehaviour<T>`
`12`	`12`	`{`
`13`	`13`	`protected void HandleExecution<TProcessor, TCollection, TContext, TParams>(`