Merge pull request #95 from OpenCommissioning/development

Development

Author: Preliy

Editor/Scripts/Inspector/Cylinder.cs

@@ -37,6 +37,8 @@ public override VisualElement CreateInspectorGUI()
             groupEvents.Add(new PropertyField{bindingPath = "OnActiveChanged"});
             groupEvents.Add(new PropertyField{bindingPath = "OnLimitMinEvent"});
             groupEvents.Add(new PropertyField{bindingPath = "OnLimitMaxEvent"});
+            groupEvents.Add(new PropertyField{bindingPath = "OnValueChanged"});
+            groupEvents.Add(new PropertyField{bindingPath = "OnProgressChanged"});
 
             container.Add(groupControl);
             container.Add(groupStatus);

Runtime/Scripts/Components/Cylinder.cs

@@ -51,6 +51,8 @@ public class Cylinder : Actor, IDevice, ICustomInspector, IInteractable
         public UnityEvent<bool> OnActiveChanged;
         public UnityEvent<bool> OnLimitMinEvent;
         public UnityEvent<bool> OnLimitMaxEvent;
+        public UnityEvent<float> OnValueChanged;
+        public UnityEvent<float> OnProgressChanged;
 
         public bool JogMinus
         {
@@ -67,23 +69,40 @@ public bool JogPlus
         [SerializeField]
         protected Link _link = new() { Type = "FB_Cylinder" };
 
-        private void Start()
+        protected void Start()
         {
             _link.Initialize(this);
-            _progress.OnValueChanged += OnProgressChanged;
-            _isActive.OnValueChanged += value => OnActiveChanged?.Invoke(value);
-            _onLimitMin.OnValueChanged += value => OnLimitMinEvent?.Invoke(value);
-            _onLimitMax.OnValueChanged += value => OnLimitMaxEvent?.Invoke(value);
-            OnProgressChanged(_progress.Value);
+            
+            RefreshState(_progress.Value);
         }
 
-        private void OnValidate()
+        protected void OnEnable()
+        {
+            _progress.OnValueChanged += RefreshState;
+            _isActive.Subscribe(OnActiveChanged.Invoke);
+            _onLimitMin.Subscribe(OnLimitMinEvent.Invoke);
+            _onLimitMax.Subscribe(OnLimitMaxEvent.Invoke);
+            _value.Subscribe(OnValueChanged.Invoke);
+            _progress.Subscribe(OnProgressChanged.Invoke);
+        }
+
+        protected void OnDisable()
+        {
+            _progress.OnValueChanged -= RefreshState;
+            _isActive.Unsubscribe(OnActiveChanged.Invoke);
+            _onLimitMin.Unsubscribe(OnLimitMinEvent.Invoke);
+            _onLimitMax.Unsubscribe(OnLimitMaxEvent.Invoke);
+            _value.Unsubscribe(OnValueChanged.Invoke);
+            _progress.Unsubscribe(OnProgressChanged.Invoke);
+        }
+
+        protected void OnValidate()
         {
             _minus.OnValidate();
             _plus.OnValidate();
         }
 
-        private void FixedUpdate()
+        protected void FixedUpdate()
         {
             GetLinkData();
             Operation(Time.fixedDeltaTime);
@@ -136,7 +155,7 @@ private void IntegrateProgress(float deltaTime, float duration)
             _progress.Value = Mathf.Clamp01(progress);
         }
 
-        private void OnProgressChanged(float value)
+        private void RefreshState(float value)
         {
             _target.Value = Mathf.Lerp(_limits.Value.x, _limits.Value.y, _profile.Evaluate(_progress));
             _isActive.Value = Math.FastApproximately(_target, _value, 1e-3f);

Runtime/Scripts/Components/Drive.cs

@@ -28,14 +28,23 @@ public abstract class Drive : Actor, IDevice, IMetadataAsset, ICustomInspector,
         [HideInInspector]
         [SerializeField]
         protected DriveStateObserver _stateObserver = new ();
+
+        protected void OnEnable()
+        {
+            _stateObserver.IsActive.Subscribe(OnActiveChanged.Invoke);
+        }
+        
+        protected void OnDisable()
+        {
+            _stateObserver.IsActive.Unsubscribe(OnActiveChanged.Invoke);
+        }
 
-        private void Start()
+        protected void Start()
         {
             _link.Initialize(this);
-            _stateObserver.IsActive.OnValueChanged += value => OnActiveChanged?.Invoke(value);
         }
 
-        private void FixedUpdate()
+        protected void FixedUpdate()
         {
             if (!_override && _link.Connected) GetLinkData();
             Operation(Time.fixedDeltaTime);

Samples/Demo/0.1 Devices.unity

@@ -790,6 +790,12 @@ MonoBehaviour:
   OnLimitMaxEvent:
     m_PersistentCalls:
       m_Calls: []
+  OnValueChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  OnProgressChanged:
+    m_PersistentCalls:
+      m_Calls: []
   _link:
     Control: 0
     Status: 0
@@ -3942,6 +3948,12 @@ MonoBehaviour:
   OnLimitMaxEvent:
     m_PersistentCalls:
       m_Calls: []
+  OnValueChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  OnProgressChanged:
+    m_PersistentCalls:
+      m_Calls: []
   _link:
     Control: 0
     Status: 0
@@ -4928,6 +4940,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   _productDataDirectories:
   - Name: RFID
+    Path: 
 --- !u!1 &1571801102
 GameObject:
   m_ObjectHideFlags: 0
@@ -5386,6 +5399,12 @@ MonoBehaviour:
   OnLimitMaxEvent:
     m_PersistentCalls:
       m_Calls: []
+  OnValueChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  OnProgressChanged:
+    m_PersistentCalls:
+      m_Calls: []
   _link:
     Control: 0
     Status: 0