cleanup

jheiling · jheiling · commit 5a343471f2a5 · 2023-12-02T00:12:59.000+01:00
diff --git a/Examples/Example1/Scripts/ExamplePlayerCharacterInput.cs b/Examples/Example1/Scripts/ExamplePlayerCharacterInput.cs
@@ -7,13 +7,13 @@ namespace Signals.Examples
     [AddComponentMenu(nameof(Signals) + "/" + nameof(Examples) + "/" + nameof(ExamplePlayerCharacterInput))]
     public class ExamplePlayerCharacterInput : TopDownPlayerCharacterInput
     {
-#pragma warning disable 649
         [SerializeField] StringSignal _lookingAtSignal;
-#pragma warning restore 649
 
         protected override void OnMouseOverUI() => _lookingAtSignal.Value = "";
 
+#pragma warning disable UNT0006 // Incorrect message signature
         protected override void OnMouseOver(ref RaycastHit target)
+#pragma warning restore UNT0006 // Incorrect message signature
         {
             var name = target.transform.GetComponent<Name>();
             _lookingAtSignal.Value = name ? name : "";
diff --git a/Examples/Example2.meta b/Examples/Example2.meta
diff --git a/Examples/Example2/Scene.unity.meta b/Examples/Example2/Scene.unity.meta
diff --git a/Examples/Example3.meta b/Examples/Example3.meta
diff --git a/Examples/Example3/Scene.unity.meta b/Examples/Example3/Scene.unity.meta
diff --git a/Extras/Characters/Scripts/PlayerCharacterInput.cs b/Extras/Characters/Scripts/PlayerCharacterInput.cs
@@ -6,9 +6,7 @@ namespace Signals.Extras.Characters
     [AddComponentMenu(nameof(Signals) + "/" + nameof(Extras) + "/" + nameof(Characters) + "/" + nameof(PlayerCharacterInput))]
     public class PlayerCharacterInput : MonoBehaviour
     {
-#pragma warning disable 649
         [SerializeField] PlayerCharacterInputSettingsValueReference _settings;
-#pragma warning restore 649
         [SerializeField] CharacterMoveSignal _moveSignal;
         [SerializeField] BoolSignal _runSignal;
         [SerializeField] BoolSignal _jumpSignal;
diff --git a/Extras/Characters/Scripts/RigidbodyCharacter.cs b/Extras/Characters/Scripts/RigidbodyCharacter.cs
@@ -8,9 +8,7 @@ namespace Signals.Extras.Characters
     [RequireComponent(typeof(CapsuleCollider))]
     public class RigidbodyCharacter : MonoBehaviour
     {
-#pragma warning disable
         [SerializeField] RigidbodyCharacterSettingsValueReference _settings;
-#pragma warning restore
         [SerializeField] Transform _cameraPivot;
         [SerializeField] CharacterMoveSignal _moveSignal;
         [SerializeField] BoolSignal _runSignal;
diff --git a/Extras/Characters/Scripts/TopDownPlayerCharacterInput.cs b/Extras/Characters/Scripts/TopDownPlayerCharacterInput.cs
@@ -32,7 +32,10 @@ void Update()
         }
 
         protected virtual void OnMouseOverUI() { }
+
+#pragma warning disable UNT0006 // Incorrect message signature
         protected virtual void OnMouseOver(ref RaycastHit target) { }
+#pragma warning restore UNT0006 // Incorrect message signature
 
         protected virtual void OnMouseButtonDown(ref RaycastHit target)
         {
diff --git a/Extras/Engine/Scripts/Editor/ApplicationWrapperEditor.cs b/Extras/Engine/Scripts/Editor/ApplicationWrapperEditor.cs
@@ -11,7 +11,7 @@ protected override void OnPlayingInspectorGUI(ApplicationWrapper wrapper)
         {
             wrapper.TargetFrameRate = EditorGUILayout.IntField("Target Frame Rate", wrapper.TargetFrameRate);
             wrapper.RunInBackground = EditorGUILayout.Toggle("Run In Background", wrapper.RunInBackground);
-            wrapper.BackgroundLoadingPriority = (ThreadPriority)EditorGUILayout.EnumPopup("Background Loading Priority", wrapper.BackgroundLoadingPriority as Enum);
+            wrapper.BackgroundLoadingPriority = (ThreadPriority)EditorGUILayout.EnumPopup("Background Loading Priority", wrapper.BackgroundLoadingPriority);
         }
     }
 }
diff --git a/Extras/Engine/Scripts/Editor/PhysicsWrapperEditor.cs b/Extras/Engine/Scripts/Editor/PhysicsWrapperEditor.cs
@@ -1,4 +1,5 @@
-﻿using UnityEditor;
+﻿using UnityEngine;
+using UnityEditor;
 
 namespace Signals.Extras.Engine
 {
@@ -15,7 +16,7 @@ protected override void OnPlayingInspectorGUI(PhysicsWrapper wrapper)
             wrapper.DefaultSolverVelocityIterations = EditorGUILayout.IntField("Default Solver Velocity Iterations", wrapper.DefaultSolverVelocityIterations);
             wrapper.QueriesHitBackfaces = EditorGUILayout.Toggle("Queries Hit Backfaces", wrapper.QueriesHitBackfaces);
             wrapper.QueriesHitTriggers = EditorGUILayout.Toggle("Queries Hit Triggers", wrapper.QueriesHitTriggers);
-            wrapper.AutoSimulation = EditorGUILayout.Toggle("Auto Simulation", wrapper.AutoSimulation);
+            wrapper.SimulationMode = (SimulationMode)EditorGUILayout.EnumPopup("Simulation Mode", wrapper.SimulationMode);
             wrapper.AutoSyncTransforms = EditorGUILayout.Toggle("Auto Sync Transforms", wrapper.AutoSyncTransforms);
             wrapper.InterCollisionDistance = EditorGUILayout.FloatField("Inter Collision Distance", wrapper.InterCollisionDistance);
             wrapper.InterCollisionStiffness = EditorGUILayout.FloatField("Inter Collision Stiffness", wrapper.InterCollisionStiffness);
diff --git a/Extras/Engine/Scripts/EngineSettingsSignal.cs b/Extras/Engine/Scripts/EngineSettingsSignal.cs
@@ -1,5 +1,4 @@
-﻿using UnityEngine;
-using UnityEngine.Events;
+﻿using UnityEngine.Events;
 
 namespace Signals.Extras.Engine
 {
diff --git a/Extras/Engine/Scripts/PhysicsSettings.cs b/Extras/Engine/Scripts/PhysicsSettings.cs
@@ -14,7 +14,7 @@ public class PhysicsSettings : IEngineSettings
         [SerializeField] int _defaultSolverVelocityIterations = 1;
         [SerializeField] bool _queriesHitBackfaces;
         [SerializeField] bool _queriesHitTriggers = true;
-        [SerializeField] bool _autoSimulation = true;
+        [SerializeField] SimulationMode _simulationMode = SimulationMode.FixedUpdate;
         [SerializeField] bool _autoSyncTransforms = true;
         [SerializeField] float _interCollisionDistance;
         [SerializeField] float _interCollisionStiffness;
@@ -67,10 +67,10 @@ public bool QueriesHitTriggers
             set => _queriesHitTriggers = value;
         }
 
-        public bool AutoSimulation
+        public SimulationMode SimulationMode
         {
-            get => _autoSimulation;
-            set => _autoSimulation = value;
+            get => _simulationMode;
+            set => _simulationMode = value;
         }
 
         public bool AutoSyncTransforms
@@ -101,7 +101,7 @@ public void SetToCurrent()
             _defaultSolverVelocityIterations = Physics.defaultSolverVelocityIterations;
             _queriesHitBackfaces = Physics.queriesHitBackfaces;
             _queriesHitTriggers = Physics.queriesHitTriggers;
-            _autoSimulation = Physics.autoSimulation;
+            _simulationMode = Physics.simulationMode;
             _autoSyncTransforms = Physics.autoSyncTransforms;
             _interCollisionDistance = Physics.interCollisionDistance;
             _interCollisionStiffness = Physics.interCollisionStiffness;
@@ -117,7 +117,7 @@ public void Apply()
             Physics.defaultSolverVelocityIterations = _defaultSolverVelocityIterations;
             Physics.queriesHitBackfaces = _queriesHitBackfaces;
             Physics.queriesHitTriggers = _queriesHitTriggers;
-            Physics.autoSimulation = _autoSimulation;
+            Physics.simulationMode = _simulationMode;
             Physics.autoSyncTransforms = _autoSyncTransforms;
             Physics.interCollisionDistance = _interCollisionDistance;
             Physics.interCollisionStiffness = _interCollisionStiffness;
diff --git a/Extras/Engine/Scripts/PhysicsWrapper.cs b/Extras/Engine/Scripts/PhysicsWrapper.cs
@@ -59,10 +59,10 @@ public bool QueriesHitTriggers
             set => Physics.queriesHitTriggers = value;
         }
 
-        public bool AutoSimulation
+        public SimulationMode SimulationMode
         {
-            get => Physics.autoSimulation;
-            set => Physics.autoSimulation = value;
+            get => Physics.simulationMode;
+            set => Physics.simulationMode = value;
         }
 
         public bool AutoSyncTransforms
diff --git a/Scripts/Editor/SignalEditor.cs b/Scripts/Editor/SignalEditor.cs
@@ -9,9 +9,9 @@ namespace Signals
     /// <typeparam name="ET">The type of the <see cref="Signal.OnChanged"/> event.</typeparam>
     public abstract class SignalEditor<T, ET> : Editor where ET : UnityEvent<T>, new()
     {
-        static readonly GUIContent _descriptionLabel = new GUIContent("Description");
-        static readonly GUIContent _onUpdatedLabel = new GUIContent("On Updated");
-        static readonly GUIContent _serializeChangesLabel = new GUIContent("Serialize Changes");
+        static readonly GUIContent _descriptionLabel = new("Description");
+        static readonly GUIContent _onUpdatedLabel = new("On Updated");
+        static readonly GUIContent _serializeChangesLabel = new("Serialize Changes");
 
         SerializedProperty _description;
         SerializedProperty _onUpdated;
diff --git a/Scripts/Editor/ValueReferenceDrawer.cs b/Scripts/Editor/ValueReferenceDrawer.cs
@@ -8,7 +8,7 @@ public abstract class ValueReferenceDrawer : PropertyDrawer
     {
         static readonly string[] _popupOptions = { "Use Signal Value", "Use Local Value" };
 
-        static readonly GUIStyle _popupStyle = new GUIStyle(GUI.skin.GetStyle("PaneOptions"))
+        static readonly GUIStyle _popupStyle = new(GUI.skin.GetStyle("PaneOptions"))
         {
             imagePosition = ImagePosition.ImageOnly
         };
diff --git a/Scripts/Signal.cs b/Scripts/Signal.cs
@@ -7,12 +7,10 @@ namespace Signals
     [CreateAssetMenu(menuName = nameof(Signals) + "/" + nameof(Signal))]
     public class Signal : ScriptableObject, ISignal
     {
-#pragma warning disable 649, IDE0044 // Add readonly modifier
 #if UNITY_EDITOR
         [SerializeField, Multiline] string _description;
 #endif
         [SerializeField] UnityEvent _onUpdated;
-#pragma warning restore 649, IDE0044 // Add readonly modifier
 
         public void AddListener(UnityAction listener) => _onUpdated.AddListener(listener);
         public void RemoveListener(UnityAction listener) => _onUpdated.RemoveListener(listener);
@@ -29,15 +27,13 @@ public class Signal : ScriptableObject, ISignal
     /// <typeparam name="ET">The type of the underlying UnityEvent.</typeparam>
     public abstract class Signal<T, ET> : ScriptableObject, ISignal<T, ET> where ET : UnityEvent<T>, new()
     {
-#pragma warning disable 649, IDE0044 // Add readonly modifier
 #if UNITY_EDITOR
         [SerializeField, Multiline] string _description;
         [SerializeField] bool _serializeChanges;
 #endif
         [SerializeField] T _initialValue;
         [SerializeField] ET _onUpdated;
         [SerializeField] bool _useValidation = true;
-#pragma warning restore 649, IDE0044 // Add readonly modifier
         T _value;
 
         /// <summary>The initial value of the Signal.</summary>
diff --git a/Scripts/SignalListener.cs b/Scripts/SignalListener.cs
@@ -7,14 +7,12 @@ namespace Signals
     [AddComponentMenu("Signals/SignalListener")]
     public class SignalListener : MonoBehaviour
     {
-#pragma warning disable 649, IDE0044 // Add readonly modifier
 #if UNITY_EDITOR
         [SerializeField, Multiline] string _description;
 #endif
         [SerializeField] Signal _signal;
         [SerializeField] UnityEvent _onUpdated;
         [SerializeField] bool _invokeImmediately;
-#pragma warning restore 649, IDE0044 // Add readonly modifier
 
         /// <summary>The <see cref="Signal"/>.</summary>
         public Signal Signal
@@ -66,14 +64,12 @@ public abstract class SignalListener<T, ET, ST> : MonoBehaviour
         where ET : UnityEvent<T>, new() 
         where ST : ISignal<T, ET>
     {
-#pragma warning disable 649, IDE0044 // Add readonly modifier
 #if UNITY_EDITOR
         [SerializeField] [Multiline] string _description;
 #endif
         [SerializeField] ST _signal;
         [SerializeField] ET _onUpdated;
         [SerializeField] bool _invokeImmediately;
-#pragma warning restore 649, IDE0044 // Add readonly modifier
 
         /// <summary>The <see cref="Signal"/>.</summary>
         public ST Signal
diff --git a/Scripts/ValueReferenceComponent.cs b/Scripts/ValueReferenceComponent.cs
@@ -8,9 +8,7 @@ public abstract class ValueReferenceComponent<T, ET, ST, VT> : MonoBehaviour
         where ST : ISignal<T, ET>
         where VT : ValueReference<T, ET, ST>
     {
-#pragma warning disable 649, IDE0044 // Add readonly modifier
         [SerializeField] VT _reference;
-#pragma warning restore 649, IDE0044 // Add readonly modifier
 
         public VT Reference => _reference;
 

Original file line number	Diff line number	Diff line change
`@@ -7,13 +7,13 @@ namespace Signals.Examples`
`7`	`7`	`[AddComponentMenu(nameof(Signals) + "/" + nameof(Examples) + "/" + nameof(ExamplePlayerCharacterInput))]`
`8`	`8`	`public class ExamplePlayerCharacterInput : TopDownPlayerCharacterInput`
`9`	`9`	`{`
`10`		`-#pragma warning disable 649`
`11`	`10`	`[SerializeField] StringSignal _lookingAtSignal;`
`12`		`-#pragma warning restore 649`
`13`	`11`
`14`	`12`	`protected override void OnMouseOverUI() => _lookingAtSignal.Value = "";`
`15`	`13`
	`14`	`+#pragma warning disable UNT0006 // Incorrect message signature`
`16`	`15`	`protected override void OnMouseOver(ref RaycastHit target)`
	`16`	`+#pragma warning restore UNT0006 // Incorrect message signature`
`17`	`17`	`{`
`18`	`18`	`var name = target.transform.GetComponent<Name>();`
`19`	`19`	`_lookingAtSignal.Value = name ? name : "";`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,10 @@ void Update()`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`protected virtual void OnMouseOverUI() { }`
	`35`	`+`
	`36`	`+#pragma warning disable UNT0006 // Incorrect message signature`
`35`	`37`	`protected virtual void OnMouseOver(ref RaycastHit target) { }`
	`38`	`+#pragma warning restore UNT0006 // Incorrect message signature`
`36`	`39`
`37`	`40`	`protected virtual void OnMouseButtonDown(ref RaycastHit target)`
`38`	`41`	`{`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ protected override void OnPlayingInspectorGUI(ApplicationWrapper wrapper)`
`11`	`11`	`{`
`12`	`12`	`wrapper.TargetFrameRate = EditorGUILayout.IntField("Target Frame Rate", wrapper.TargetFrameRate);`
`13`	`13`	`wrapper.RunInBackground = EditorGUILayout.Toggle("Run In Background", wrapper.RunInBackground);`
`14`		`- wrapper.BackgroundLoadingPriority = (ThreadPriority)EditorGUILayout.EnumPopup("Background Loading Priority", wrapper.BackgroundLoadingPriority as Enum);`
	`14`	`+ wrapper.BackgroundLoadingPriority = (ThreadPriority)EditorGUILayout.EnumPopup("Background Loading Priority", wrapper.BackgroundLoadingPriority);`
`15`	`15`	`}`
`16`	`16`	`}`
`17`	`17`	`}`