Base variables now inherit from bindable scriptable object

Author: coryleach

Runtime/BindingSupport/BindableScriptableObject.cs

@@ -17,18 +17,18 @@ protected virtual void OnPropertyChanged([CallerMemberName] string propertyName
         /// <summary>
         /// Use this inside property setters to raise property changed events which are needed by bindingssss
         /// </summary>
-        /// <param name="storage">storage location where value will be set</param>
+        /// <param name="field">field to which the value will be set</param>
         /// <param name="value">value you want to assign to storage</param>
         /// <param name="propertyName">name of the property being set</param>
         /// <typeparam name="T">Type of the property being set</typeparam>
         /// <returns>True if property was set. False if it was already equal to the given value.</returns>
-        protected bool SetProperty<T>(ref T storage, T value, [CallerMemberName] string propertyName = null )
+        protected bool SetProperty<T>(ref T field, T value, [CallerMemberName] string propertyName = null )
         {
-            if (EqualityComparer<T>.Default.Equals(storage,value))
+            if (EqualityComparer<T>.Default.Equals(field,value))
             {
                 return false;
             }
-            storage = value;
+            field = value;
             OnPropertyChanged(propertyName);
             return true;
         }

Runtime/Variables/BaseVariable.cs

@@ -1,12 +1,13 @@
 using System;
 using System.ComponentModel;
 using System.Runtime.CompilerServices;
+using Gameframe.ScriptableObjects.BindingSupport;
 using Gameframe.ScriptableObjects.Events;
 using UnityEngine;
 
 namespace Gameframe.ScriptableObjects.Variables
 {
-    public class BaseVariable : ScriptableObject, INotifyPropertyChanged
+    public class BaseVariable : BindableScriptableObject
     {
         [SerializeField]
         protected GameEvent onValueChanged;
@@ -27,37 +28,15 @@ public GameEvent OnValueChanged
         /// INotifyPropertyChanged interface implemented to support Gameframe.Bindings
         /// </summary>
 #region INotifyPropertyChanged
-
-        public event PropertyChangedEventHandler PropertyChanged;
-
-        protected void OnPropertyChanged([CallerMemberName] string propertyName = null)
+        protected override void OnPropertyChanged([CallerMemberName] string propertyName = null)
         {
-            try
-            {
-                PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
-            }
-            catch (Exception e)
-            {
-                Debug.LogException(e,this);   
-            }
+            base.OnPropertyChanged(propertyName);
             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;
-        }
 
     }
 }