renamed classes in Extras.Engine

jheiling · jheiling · commit 7cd6c60c7de2 · 2019-02-27T10:36:21.000+01:00
diff --git a/Extras/Engine/Scripts/ApplicationSettings.cs b/Extras/Engine/Scripts/ApplicationSettings.cs
@@ -4,7 +4,7 @@
 namespace Signals.Extras.Engine
 {
     [Serializable]
-    public class ApplicationSettings : ISettings
+    public class ApplicationSettings : IEngineSettings
     {
         [SerializeField] int _targetFrameRate = -1;
         [SerializeField] bool _runInBackground;
diff --git a/Extras/Engine/Scripts/ApplicationSettingsSignal.cs b/Extras/Engine/Scripts/ApplicationSettingsSignal.cs
@@ -3,5 +3,5 @@
 namespace Signals.Extras.Engine
 {
     [CreateAssetMenu(menuName = nameof(Signals) + "/" + nameof(Extras) + "/" + nameof(Engine) + "/" + nameof(ApplicationSettingsSignal))]
-    public class ApplicationSettingsSignal : SettingsSignal<ApplicationSettings, ApplicationSettingsEvent> { }
+    public class ApplicationSettingsSignal : EngineSettingsSignal<ApplicationSettings, ApplicationSettingsEvent> { }
 }
diff --git a/Extras/Engine/Scripts/ApplicationSetup.cs b/Extras/Engine/Scripts/ApplicationSetup.cs
@@ -3,5 +3,5 @@
 namespace Signals.Extras.Engine
 {
     [AddComponentMenu(nameof(Signals) + "/" + nameof(Extras) + "/" + nameof(Engine) + "/" + nameof(ApplicationSetup))]
-    public class ApplicationSetup : Setup<ApplicationSettings, ApplicationSettingsEvent, ApplicationSettingsSignal, ApplicationSettingsValueReference> { }
+    public class ApplicationSetup : EngineSetup<ApplicationSettings, ApplicationSettingsEvent, ApplicationSettingsSignal, ApplicationSettingsValueReference> { }
 }
diff --git a/Extras/Engine/Scripts/Editor/ApplicationSettingsSignalEditor.cs b/Extras/Engine/Scripts/Editor/ApplicationSettingsSignalEditor.cs
@@ -3,5 +3,5 @@
 namespace Signals.Extras.Engine
 {
     [CustomEditor(typeof(ApplicationSettingsSignal))]
-    public class ApplicationSettingsSignalEditor : SettingsSignalEditor<ApplicationSettings, ApplicationSettingsEvent> { }
+    public class ApplicationSettingsSignalEditor : EngineSettingsSignalEditor<ApplicationSettings, ApplicationSettingsEvent> { }
 }
diff --git a/Extras/Engine/Scripts/Editor/ApplicationSetupEditor.cs b/Extras/Engine/Scripts/Editor/ApplicationSetupEditor.cs
@@ -3,5 +3,5 @@
 namespace Signals.Extras.Engine
 {
     [CustomEditor(typeof(ApplicationSetup))]
-    public class ApplicationSetupEditor : SetupEditor<ApplicationSetup> { }
+    public class ApplicationSetupEditor : EngineSetupEditor<ApplicationSetup> { }
 }
diff --git a/Extras/Engine/Scripts/Editor/ApplicationWrapperEditor.cs b/Extras/Engine/Scripts/Editor/ApplicationWrapperEditor.cs
@@ -5,7 +5,7 @@
 namespace Signals.Extras.Engine
 {
     [CustomEditor(typeof(ApplicationWrapper))]
-    public class ApplicationWrapperEditor : WrapperEditor<ApplicationWrapper>
+    public class ApplicationWrapperEditor : EngineWrapperEditor<ApplicationWrapper>
     {
         protected override void OnPlayingInspectorGUI(ApplicationWrapper wrapper)
         {
diff --git a/Extras/Engine/Scripts/Editor/EngineSettingsSignalEditor.cs b/Extras/Engine/Scripts/Editor/EngineSettingsSignalEditor.cs
@@ -3,8 +3,8 @@
 
 namespace Signals.Extras.Engine
 {
-    public abstract class SettingsSignalEditor<T, ET> : SignalEditor<T, ET> 
-        where T : class, ISettings 
+    public abstract class EngineSettingsSignalEditor<T, ET> : SignalEditor<T, ET> 
+        where T : class, IEngineSettings 
         where ET : UnityEvent<T>, new()
     {
         public override void OnInspectorGUI()
diff --git a/Extras/Engine/Scripts/Editor/EngineSettingsSignalEditor.cs.meta b/Extras/Engine/Scripts/Editor/EngineSettingsSignalEditor.cs.meta
diff --git a/Extras/Engine/Scripts/Editor/EngineSetupEditor.cs b/Extras/Engine/Scripts/Editor/EngineSetupEditor.cs
@@ -3,7 +3,7 @@
 
 namespace Signals.Extras.Engine
 {
-    public abstract class SetupEditor<T> : Editor where T : class, ISettings
+    public abstract class EngineSetupEditor<T> : Editor where T : class, IEngineSettings
     {
         public override void OnInspectorGUI()
         {
diff --git a/Extras/Engine/Scripts/Editor/EngineSetupEditor.cs.meta b/Extras/Engine/Scripts/Editor/EngineSetupEditor.cs.meta
diff --git a/Extras/Engine/Scripts/Editor/EngineWrapperEditor.cs b/Extras/Engine/Scripts/Editor/EngineWrapperEditor.cs
@@ -3,7 +3,7 @@
 
 namespace Signals.Extras.Engine
 {
-    public abstract class WrapperEditor<T> : Editor where T : Object
+    public abstract class EngineWrapperEditor<T> : Editor where T : Object
     {
         public override void OnInspectorGUI() { if (Application.isPlaying) OnPlayingInspectorGUI(target as T); }
         protected abstract void OnPlayingInspectorGUI(T wrapper);
diff --git a/Extras/Engine/Scripts/Editor/EngineWrapperEditor.cs.meta b/Extras/Engine/Scripts/Editor/EngineWrapperEditor.cs.meta
diff --git a/Extras/Engine/Scripts/Editor/PhysicsSettingsSignalEditor.cs b/Extras/Engine/Scripts/Editor/PhysicsSettingsSignalEditor.cs
@@ -3,5 +3,5 @@
 namespace Signals.Extras.Engine
 {
     [CustomEditor(typeof(PhysicsSettingsSignal))]
-    public class PhysicsSettingsSignalEditor : SettingsSignalEditor<PhysicsSettings, PhysicsSettingsEvent> { }
+    public class PhysicsSettingsSignalEditor : EngineSettingsSignalEditor<PhysicsSettings, PhysicsSettingsEvent> { }
 }
diff --git a/Extras/Engine/Scripts/Editor/PhysicsSetupEditor.cs b/Extras/Engine/Scripts/Editor/PhysicsSetupEditor.cs
@@ -3,5 +3,5 @@
 namespace Signals.Extras.Engine
 {
     [CustomEditor(typeof(PhysicsSetup))]
-    public class PhysicsSetupEditor : SetupEditor<PhysicsSetup> { }
+    public class PhysicsSetupEditor : EngineSetupEditor<PhysicsSetup> { }
 }
diff --git a/Extras/Engine/Scripts/Editor/PhysicsWrapperEditor.cs b/Extras/Engine/Scripts/Editor/PhysicsWrapperEditor.cs
@@ -3,7 +3,7 @@
 namespace Signals.Extras.Engine
 {
     [CustomEditor(typeof(PhysicsWrapper))]
-    public class PhysicsWrapperEditor : WrapperEditor<PhysicsWrapper>
+    public class PhysicsWrapperEditor : EngineWrapperEditor<PhysicsWrapper>
     {
         protected override void OnPlayingInspectorGUI(PhysicsWrapper wrapper)
         {
diff --git a/Extras/Engine/Scripts/Editor/TimeSettingsSignalEditor.cs b/Extras/Engine/Scripts/Editor/TimeSettingsSignalEditor.cs
@@ -3,5 +3,5 @@
 namespace Signals.Extras.Engine
 {
     [CustomEditor(typeof(TimeSettingsSignal))]
-    public class TimeSettingsSignalEditor : SettingsSignalEditor<TimeSettings, TimeSettingsEvent> { }
+    public class TimeSettingsSignalEditor : EngineSettingsSignalEditor<TimeSettings, TimeSettingsEvent> { }
 }
diff --git a/Extras/Engine/Scripts/Editor/TimeSetupEditor.cs b/Extras/Engine/Scripts/Editor/TimeSetupEditor.cs
@@ -3,5 +3,5 @@
 namespace Signals.Extras.Engine
 {
     [CustomEditor(typeof(TimeSetup))]
-    public class TimeSetupEditor : SetupEditor<TimeSetup> { }
+    public class TimeSetupEditor : EngineSetupEditor<TimeSetup> { }
 }
diff --git a/Extras/Engine/Scripts/Editor/TimeWrapperEditor.cs b/Extras/Engine/Scripts/Editor/TimeWrapperEditor.cs
@@ -4,7 +4,7 @@
 namespace Signals.Extras.Engine
 {
     [CustomEditor(typeof(TimeWrapper))]
-    public class TimeWrapperEditor : WrapperEditor<TimeWrapper>
+    public class TimeWrapperEditor : EngineWrapperEditor<TimeWrapper>
     {
         protected override void OnPlayingInspectorGUI(TimeWrapper wrapper)
         {
diff --git a/Extras/Engine/Scripts/EngineSettingsSignal.cs b/Extras/Engine/Scripts/EngineSettingsSignal.cs
@@ -3,8 +3,8 @@
 
 namespace Signals.Extras.Engine
 {
-    public abstract class SettingsSignal<T, ET> : Signal<T, ET>, ISettings 
-        where T : ISettings, new() 
+    public abstract class EngineSettingsSignal<T, ET> : Signal<T, ET>, IEngineSettings 
+        where T : IEngineSettings, new() 
         where ET : UnityEvent<T>, new()
     {
         public void SetToCurrent()
@@ -13,6 +13,6 @@ public void SetToCurrent()
             Value.SetToCurrent();
         }
 
-        public void Apply() { if (Value != null) Value.Apply(); }
+        public void Apply() => Value?.Apply();
     }
 }
diff --git a/Extras/Engine/Scripts/EngineSettingsSignal.cs.meta b/Extras/Engine/Scripts/EngineSettingsSignal.cs.meta
diff --git a/Extras/Engine/Scripts/EngineSetup.cs b/Extras/Engine/Scripts/EngineSetup.cs
@@ -3,16 +3,16 @@
 
 namespace Signals.Extras.Engine
 {
-    public abstract class Setup<T, ET, ST, VT> : MonoBehaviour, ISettings 
-        where T : ISettings, new()
+    public abstract class EngineSetup<T, ET, ST, VT> : MonoBehaviour, IEngineSettings 
+        where T : IEngineSettings, new()
         where ET : UnityEvent<T>, new() 
         where ST : ISignal<T, ET> 
         where VT : ValueReference<T, ET, ST>
     {
 #pragma warning disable 649
         [SerializeField] VT _settings;
-#pragma warning restore 649
         [SerializeField] bool _applyOnStart = true;
+#pragma warning restore 649
 
         public VT Settings => _settings;
 
@@ -22,14 +22,14 @@ public bool ApplyOnStart
             set => _applyOnStart = value;
         }
 
-        void Start() { if (_applyOnStart) Apply(); }
-
         public void SetToCurrent()
         {
             if (_settings.Value == null) _settings.Value = new T();
             _settings.Value.SetToCurrent();
         }
 
-        public void Apply() { if (_settings.Value != null) _settings.Value.Apply(); }
+        public void Apply() => _settings.Value?.Apply();
+
+        void Start() { if (_applyOnStart) Apply(); }
     }
 }
diff --git a/Extras/Engine/Scripts/EngineSetup.cs.meta b/Extras/Engine/Scripts/EngineSetup.cs.meta
diff --git a/Extras/Engine/Scripts/IEngineSettings.cs b/Extras/Engine/Scripts/IEngineSettings.cs
@@ -1,6 +1,6 @@
 ﻿namespace Signals.Extras.Engine
 {
-    public interface ISettings
+    public interface IEngineSettings
     {
         void SetToCurrent();
         void Apply();
diff --git a/Extras/Engine/Scripts/IEngineSettings.cs.meta b/Extras/Engine/Scripts/IEngineSettings.cs.meta
diff --git a/Extras/Engine/Scripts/PhysicsSettings.cs b/Extras/Engine/Scripts/PhysicsSettings.cs
@@ -4,7 +4,7 @@
 namespace Signals.Extras.Engine
 {
     [Serializable]
-    public class PhysicsSettings : ISettings
+    public class PhysicsSettings : IEngineSettings
     {
         [SerializeField] Vector3 _gravity = new Vector3(0f, -9.81f, 0f);
         [SerializeField] float _bounceThreshold = 2f;
diff --git a/Extras/Engine/Scripts/PhysicsSettingsSignal.cs b/Extras/Engine/Scripts/PhysicsSettingsSignal.cs
@@ -3,5 +3,5 @@
 namespace Signals.Extras.Engine
 {
     [CreateAssetMenu(menuName = nameof(Signals) + "/" + nameof(Extras) + "/" + nameof(Engine) + "/" + nameof(PhysicsSettingsSignal))]
-    public class PhysicsSettingsSignal : SettingsSignal<PhysicsSettings, PhysicsSettingsEvent> { }
+    public class PhysicsSettingsSignal : EngineSettingsSignal<PhysicsSettings, PhysicsSettingsEvent> { }
 }
diff --git a/Extras/Engine/Scripts/PhysicsSetup.cs b/Extras/Engine/Scripts/PhysicsSetup.cs
@@ -3,5 +3,5 @@
 namespace Signals.Extras.Engine
 {
     [AddComponentMenu(nameof(Signals) + "/" + nameof(Extras) + "/" + nameof(Engine) + "/" + nameof(PhysicsSetup))]
-    public class PhysicsSetup : Setup<PhysicsSettings, PhysicsSettingsEvent, PhysicsSettingsSignal, PhysicsSettingsValueReference> { }
+    public class PhysicsSetup : EngineSetup<PhysicsSettings, PhysicsSettingsEvent, PhysicsSettingsSignal, PhysicsSettingsValueReference> { }
 }
diff --git a/Extras/Engine/Scripts/SettingsSignal.cs.meta b/Extras/Engine/Scripts/SettingsSignal.cs.meta
diff --git a/Extras/Engine/Scripts/Setup.cs.meta b/Extras/Engine/Scripts/Setup.cs.meta
diff --git a/Extras/Engine/Scripts/TimeSettings.cs b/Extras/Engine/Scripts/TimeSettings.cs
@@ -4,7 +4,7 @@
 namespace Signals.Extras.Engine
 {
     [Serializable]
-    public class TimeSettings : ISettings
+    public class TimeSettings : IEngineSettings
     {
         [SerializeField] float _fixedDeltaTime = .02f;
         [SerializeField] float _maximumDeltaTime = .3333333f;
diff --git a/Extras/Engine/Scripts/TimeSetup.cs b/Extras/Engine/Scripts/TimeSetup.cs
@@ -3,5 +3,5 @@
 namespace Signals.Extras.Engine
 {
     [AddComponentMenu(nameof(Signals) + "/" + nameof(Extras) + "/" + nameof(Engine) + "/" + nameof(TimeSetup))]
-    public class TimeSetup : Setup<TimeSettings, TimeSettingsEvent, TimeSettingsSignal, TimeSettingsValueReference> { }
+    public class TimeSetup : EngineSetup<TimeSettings, TimeSettingsEvent, TimeSettingsSignal, TimeSettingsValueReference> { }
 }

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`namespace Signals.Extras.Engine`
`5`	`5`	`{`
`6`	`6`	`[Serializable]`
`7`		`- public class ApplicationSettings : ISettings`
	`7`	`+ public class ApplicationSettings : IEngineSettings`
`8`	`8`	`{`
`9`	`9`	`[SerializeField] int _targetFrameRate = -1;`
`10`	`10`	`[SerializeField] bool _runInBackground;`
Original file line number	Diff line number	Diff line change
`@@ -3,5 +3,5 @@`
`3`	`3`	`namespace Signals.Extras.Engine`
`4`	`4`	`{`
`5`	`5`	`[CreateAssetMenu(menuName = nameof(Signals) + "/" + nameof(Extras) + "/" + nameof(Engine) + "/" + nameof(ApplicationSettingsSignal))]`
`6`		`- public class ApplicationSettingsSignal : SettingsSignal<ApplicationSettings, ApplicationSettingsEvent> { }`
	`6`	`+ public class ApplicationSettingsSignal : EngineSettingsSignal<ApplicationSettings, ApplicationSettingsEvent> { }`
`7`	`7`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,5 +3,5 @@`
`3`	`3`	`namespace Signals.Extras.Engine`
`4`	`4`	`{`
`5`	`5`	`[AddComponentMenu(nameof(Signals) + "/" + nameof(Extras) + "/" + nameof(Engine) + "/" + nameof(ApplicationSetup))]`
`6`		`- public class ApplicationSetup : Setup<ApplicationSettings, ApplicationSettingsEvent, ApplicationSettingsSignal, ApplicationSettingsValueReference> { }`
	`6`	`+ public class ApplicationSetup : EngineSetup<ApplicationSettings, ApplicationSettingsEvent, ApplicationSettingsSignal, ApplicationSettingsValueReference> { }`
`7`	`7`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,5 +3,5 @@`
`3`	`3`	`namespace Signals.Extras.Engine`
`4`	`4`	`{`
`5`	`5`	`[CustomEditor(typeof(ApplicationSettingsSignal))]`
`6`		`- public class ApplicationSettingsSignalEditor : SettingsSignalEditor<ApplicationSettings, ApplicationSettingsEvent> { }`
	`6`	`+ public class ApplicationSettingsSignalEditor : EngineSettingsSignalEditor<ApplicationSettings, ApplicationSettingsEvent> { }`
`7`	`7`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,5 +3,5 @@`
`3`	`3`	`namespace Signals.Extras.Engine`
`4`	`4`	`{`
`5`	`5`	`[CustomEditor(typeof(ApplicationSetup))]`
`6`		`- public class ApplicationSetupEditor : SetupEditor<ApplicationSetup> { }`
	`6`	`+ public class ApplicationSetupEditor : EngineSetupEditor<ApplicationSetup> { }`
`7`	`7`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`namespace Signals.Extras.Engine`
`6`	`6`	`{`
`7`	`7`	`[CustomEditor(typeof(ApplicationWrapper))]`
`8`		`- public class ApplicationWrapperEditor : WrapperEditor<ApplicationWrapper>`
	`8`	`+ public class ApplicationWrapperEditor : EngineWrapperEditor<ApplicationWrapper>`
`9`	`9`	`{`
`10`	`10`	`protected override void OnPlayingInspectorGUI(ApplicationWrapper wrapper)`
`11`	`11`	`{`
Original file line number	Diff line number	Diff line change
`@@ -3,8 +3,8 @@`
`3`	`3`
`4`	`4`	`namespace Signals.Extras.Engine`
`5`	`5`	`{`
`6`		`- public abstract class SettingsSignalEditor<T, ET> : SignalEditor<T, ET>`
`7`		`- where T : class, ISettings`
	`6`	`+ public abstract class EngineSettingsSignalEditor<T, ET> : SignalEditor<T, ET>`
	`7`	`+ where T : class, IEngineSettings`
`8`	`8`	`where ET : UnityEvent<T>, new()`
`9`	`9`	`{`
`10`	`10`	`public override void OnInspectorGUI()`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`
`4`	`4`	`namespace Signals.Extras.Engine`
`5`	`5`	`{`
`6`		`- public abstract class SetupEditor<T> : Editor where T : class, ISettings`
	`6`	`+ public abstract class EngineSetupEditor<T> : Editor where T : class, IEngineSettings`
`7`	`7`	`{`
`8`	`8`	`public override void OnInspectorGUI()`
`9`	`9`	`{`