Make all magic methods in StateMonoBehaviour overridable

neilsarkar · Oct 13, 2020 · 0022e0d · 0022e0d
1 parent 929dae9
commit 0022e0d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/Runtime/RenderShortcut.cs b/Runtime/RenderShortcut.cs
@@ -11,7 +11,7 @@ public static class RenderShortcut {
 
 		[Shortcut("VioletRenderShortcut", KeyCode.Semicolon, ShortcutModifiers.Action)]
 		public static void Press() {
-			Violet.LogVerbose("Rendering from shortcut press");
+			Violet.Log("Rendering from shortcut press");
 			OnPress?.Invoke();
 		}
 	}

diff --git a/Runtime/StateMonoBehaviour.cs b/Runtime/StateMonoBehaviour.cs
@@ -45,19 +45,17 @@ public abstract class ChildView<T> : ChildView<TState, T> {
 			protected override Dispatcher<TState> Dispatcher => Singleton?.Dispatcher;
 		}
 
-		void Awake() {
+		protected virtual void Awake() {
 			Singleton = this;
 			CopyState();
 		}
 
 #if UNITY_EDITOR
-		void OnValidate() {
+		protected virtual void OnValidate() {
 			Render();
 		}
 
-		void Update() {
-			if (Application.isPlaying) { return; }
-
+		protected virtual void Update() {
 			RenderShortcut.OnPress -= Render;
 			RenderShortcut.OnPress += Render;
 			Singleton = this;
@@ -66,10 +64,11 @@ void Update() {
 		protected override void OnDestroy() {
 			base.OnDestroy();
 			RenderShortcut.OnPress -= Render;
+			Singleton = null;
 		}
 
 		[Button("Render (shortcut: cmd+;)"), GUIColor(Violet.r, Violet.g, Violet.b)]
-		void Render() {
+		protected void Render() {
 			if (State == null) {
 				Violet.LogWarning($"state is null for {name}");
 				return;