INotifyPropertyChanged for Bindings, Added Lock class

Author: coryleach

Runtime/Locks.meta

@@ -0,0 +1,90 @@
+using System;
+using Gameframe.ScriptableObjects.Events;
+using UnityEngine;
+
+namespace Gameframe.ScriptableObjects.Locks
+{
+    [CreateAssetMenu(menuName=MenuNames.LockMenu+"Lock")]
+    public class GameLock : ScriptableObject
+    {
+        [NonSerialized]
+        private int lockCount = 0;
+
+        public bool Locked => lockCount != 0;
+        public event Action<bool> OnValueChanged;
+
+        [SerializeField]
+        private GameEvent unlockedEvent;
+        public GameEvent OnUnlocked
+        {
+            get
+            {
+                if (unlockedEvent == null)
+                {
+                    unlockedEvent = CreateInstance<GameEvent>();
+                }
+                return unlockedEvent;
+            }
+        }
+        
+        [SerializeField]
+        private GameEvent lockedEvent;
+        public GameEvent OnLocked
+        {
+            get
+            {
+                if (lockedEvent == null)
+                {
+                    lockedEvent = CreateInstance<GameEvent>();
+                }
+                return lockedEvent;
+            }
+        }
+        
+        private void OnEnable()
+        {
+            lockCount = 0;
+        }
+
+        public void Lock()
+        {
+            lockCount++;
+            if (lockCount == 1)
+            {
+                RaiseValueChanged();
+            }
+        }
+
+        public void Unlock()
+        {
+            lockCount--;
+            if (lockCount == 0)
+            {
+                RaiseValueChanged();
+            }
+        }
+
+        private void RaiseValueChanged()
+        {
+            var value = Locked;
+            if (value)
+            {
+                if (lockedEvent != null)
+                {
+                    lockedEvent.Raise();
+                }
+            }
+            else
+            {
+                if (unlockedEvent != null)
+                {
+                    unlockedEvent.Raise();
+                }
+            }
+            OnValueChanged?.Invoke(value);
+        }
+        
+    }
+}
+
+

Runtime/Locks/GameLock.cs

@@ -1,9 +1,12 @@
-namespace Gameframe.ScriptableObjects
+using UnityEditor;
+
+namespace Gameframe.ScriptableObjects
 {
     public static class MenuNames
     {
         public const string MenuBase = "Gameframe/";
         public const string EventMenu = MenuBase + "Events/";
+        public const string LockMenu = MenuBase;
         public const string RuntimeSetMenu = MenuBase + "RuntimeSets/";
         public const string Variables = MenuBase + "Variables/";
     }

Runtime/Locks/GameLock.cs.meta

@@ -1,9 +1,13 @@
-using Gameframe.ScriptableObjects.Events;
+using System;
+using System.ComponentModel;
+using System.Runtime.CompilerServices;
+using Gameframe.ScriptableObjects.Events;
+using JetBrains.Annotations;
 using UnityEngine;
 
 namespace Gameframe.ScriptableObjects.Variables
 {
-    public class BaseVariable : ScriptableObject
+    public class BaseVariable : ScriptableObject, INotifyPropertyChanged
     {
         [SerializeField]
         protected GameEvent onValueChanged;
@@ -19,6 +23,44 @@ public GameEvent OnValueChanged
                 return onValueChanged;
             }
         }
+
+        /// <summary>
+        /// INotifyPropertyChanged interface implemented to support Gameframe.Bindings
+        /// </summary>
+#region INotifyPropertyChanged
+
+        public event PropertyChangedEventHandler PropertyChanged;
+
+        [NotifyPropertyChangedInvocator]
+        protected void OnPropertyChanged([CallerMemberName] string propertyName = null)
+        {
+            try
+            {
+                PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
+            }
+            catch (Exception e)
+            {
+                Debug.LogException(e,this);   
+            }
+            if (onValueChanged != null)
+            {
+                onValueChanged.Raise();
+            }
+        }
+
+#endregion
+        
+        protected bool SetProperty<T>(ref T field, T value, [CallerMemberName] string propertyName = null)
+        {
+            if (!Equals(field,value))
+            {
+                field = value;
+                OnPropertyChanged(propertyName);
+                return true;
+            }
+            return false;
+        }
+
     }
 }
 

Runtime/MenuNames.cs

@@ -11,17 +11,7 @@ public class ColorVariable : BaseVariable, IVariable<Color>
     public Color Value
     {
       get => value;
-      set
-      {
-        if (this.value != value)
-        {
-          this.value = value;
-          if (onValueChanged != null)
-          {
-            onValueChanged.Raise();
-          }
-        }
-      }
+      set => SetProperty(ref this.value, value);
     }
   }
 }

Runtime/Variables/BaseVariable.cs

@@ -10,17 +10,7 @@ public class FloatVariable : BaseVariable, IVariable<float>
     public float Value
     {
       get => value;
-      set
-      {
-        if (!Mathf.Approximately(this.value,value) )
-        {
-          this.value = value;
-          if (onValueChanged != null)
-          {
-            onValueChanged.Raise();
-          }
-        }
-      }
+      set => SetProperty(ref this.value, value);
     }
   }
 }

Runtime/Variables/ColorVariable.cs

@@ -21,10 +21,7 @@ public GameObject Value
         if (gameObject != value)
         {
           gameObject = value;
-          if (onValueChanged != null)
-          {
-            onValueChanged.Raise();
-          }
+          OnPropertyChanged();
         }
       }
     }

Runtime/Variables/FloatVariable.cs

@@ -10,17 +10,7 @@ public class IntVariable : BaseVariable, IVariable<int>
     public int Value
     {
       get => value;
-      set
-      {
-        if ( this.value != value )
-        {
-          this.value = value;
-          if ( onValueChanged != null )
-          {
-            onValueChanged.Raise();
-          }
-        }
-      }
+      set => SetProperty(ref this.value, value);
     }
   }
 }

Runtime/Variables/GameObjectVariable.cs

@@ -10,17 +10,7 @@ public class StringVariable : BaseVariable, IVariable<string>
     public string Value
     {
       get => value;
-      set
-      {
-        if (this.value != value)
-        {
-          this.value = value;
-          if (onValueChanged != null)
-          {
-            onValueChanged.Raise();
-          }
-        }
-      }
+      set => SetProperty(ref this.value, value);
     }
   }
 }