Merge pull request #82 from OpenCommissioning/development

Preliy · web-flow · commit 0bb2e67e4340 · 2025-07-09T17:59:14.000+02:00
Development
diff --git a/Editor/Scripts/Inspector/Axis.cs b/Editor/Scripts/Inspector/Axis.cs
@@ -1,5 +1,4 @@
-﻿using OC.VisualElements;
-using UnityEditor;
+﻿using UnityEditor;
 using UnityEditor.UIElements;
 using UnityEngine.UIElements;
 
@@ -17,10 +16,10 @@ public override VisualElement CreateInspectorGUI()
 
             var groupControl = new PropertyGroup("Control");
             groupControl.Add(new ObjectField("Actor"){bindingPath = "_actor", objectType = typeof(Components.Actor)}.AlignedField());
-            groupControl.Add(new FloatField("Target") { isReadOnly = false }.BindProperty(component.Target).AlignedField());
+            groupControl.Add(new FloatField("Target"){bindingPath = "_target._value"}.AlignedField());
 
             var groupStatus = new PropertyGroup("Status");
-            groupStatus.Add(new FloatField("Value") { isReadOnly = true }.BindProperty(component.Value).AlignedField());
+            groupStatus.Add(new FloatField("Value"){isReadOnly = true, bindingPath = "_value._value"}.AlignedField());
             
             var groupSettings = new PropertyGroup("Settings");
             groupSettings.Add(new FloatField("Factor"){bindingPath = "_factor"}.AlignedField());
diff --git a/Editor/Scripts/Inspector/Button.cs b/Editor/Scripts/Inspector/Button.cs
@@ -1,4 +1,3 @@
-using OC.VisualElements;
 using OC.Interactions.UIElements;
 using UnityEditor;
 using UnityEditor.UIElements;
@@ -18,8 +17,8 @@ public override VisualElement CreateInspectorGUI()
             var container = new VisualElement();
 
             var groupStatus = new PropertyGroup("Status");
-            groupStatus.Add(new LampField("Pressed", Color.green).BindProperty(component.Pressed).AlignedField());
-            groupStatus.Add(new LampField("Feedback", Color.green).BindProperty(component.Feedback).AlignedField());
+            groupStatus.Add(new LampField("Pressed", Color.green){bindingPath = "_pressed._value"}.AlignedField());
+            groupStatus.Add(new LampField("Feedback", Color.green){bindingPath = "_feedback._value"}.AlignedField());
             
             var groupSettings = new PropertyGroup("Settings");
             groupSettings.Add(new Toggle("Local Feedback"){bindingPath = "_localFeedback"}.AlignedField());
diff --git a/Editor/Scripts/Inspector/Cylinder.cs b/Editor/Scripts/Inspector/Cylinder.cs
@@ -18,13 +18,13 @@ public override VisualElement CreateInspectorGUI()
             var groupControl = new PropertyGroup("Control");
             groupControl.AddOverride(serializedObject);
             var hStack = new StackHorizontal();
-            hStack.Add(new PushButton("Minus").BindProperty(component.Minus));
-            hStack.Add(new PushButton("Plus").BindProperty(component.Plus));
+            hStack.Add(new PushButton("Minus"){bindingPath = "_minus._value"});
+            hStack.Add(new PushButton("Plus"){bindingPath = "_plus._value"});
             groupControl.Add(hStack);
 
             var groupStatus = new PropertyGroup("Status");
             groupStatus.Add(new ProgressBar("Progress"){bindingPath = "_progress._value", ShowLimits = true});
-            groupStatus.Add(new FloatField("Value"){isReadOnly = true}.BindProperty(component.Value).AlignedField());
+            groupStatus.Add(new FloatField("Value"){isReadOnly = true, bindingPath = "_value._value"}.AlignedField());
             
             var groupSettings = new PropertyGroup("Settings");
             groupSettings.Add(new Vector2Field("Limits"){bindingPath = "_limits._value"}.AlignedField());
diff --git a/Editor/Scripts/Inspector/DrivePosition.cs b/Editor/Scripts/Inspector/DrivePosition.cs
@@ -1,4 +1,3 @@
-using OC.VisualElements;
 using UnityEditor;
 using UnityEditor.UIElements;
 using UnityEngine;
@@ -18,11 +17,11 @@ public override VisualElement CreateInspectorGUI()
 
             var groupControl = new PropertyGroup("Control");
             groupControl.AddOverride(serializedObject);
-            groupControl.Add(new FloatField("Target").BindProperty(component.Target).AlignedField());
+            groupControl.Add(new FloatField("Target"){bindingPath = "_target._value"}.AlignedField());
             
             var groupStatus = new PropertyGroup("Status");
-            groupStatus.Add(new LampField("Is Active", Color.green).BindProperty(component.IsActive).AlignedField());
-            groupStatus.Add(new FloatField("Value"){isReadOnly = true}.BindProperty(component.Value).AlignedField());
+            groupStatus.Add(new LampField("Is Active", Color.green){bindingPath = "_stateObserver._isActive._value"}.AlignedField());
+            groupStatus.Add(new FloatField("Value"){isReadOnly = true, bindingPath = "_value._value"}.AlignedField());
             
             var groupSettings = new PropertyGroup("Settings");
             groupSettings.Add(new FloatField("Speed"){bindingPath = "_speed._value"}.AlignedField());
diff --git a/Editor/Scripts/Inspector/DriveSimple.cs b/Editor/Scripts/Inspector/DriveSimple.cs
@@ -24,8 +24,8 @@ public override VisualElement CreateInspectorGUI()
             groupControl.Add(hStack);
 
             var groupStatus = new PropertyGroup("Status");
-            groupStatus.Add(new LampField("Is Active", Color.green).BindProperty(component.IsActive).AlignedField());
-            groupStatus.Add(new FloatField("Value"){isReadOnly = true}.BindProperty(component.Value).AlignedField());
+            groupStatus.Add(new LampField("Is Active", Color.green){bindingPath = "_stateObserver._isActive._value"}.AlignedField());
+            groupStatus.Add(new FloatField("Value"){isReadOnly = true, bindingPath = "_value._value"}.AlignedField());
             
             var groupSettings = new PropertyGroup("Settings");
             groupSettings.Add(new FloatField("Speed"){bindingPath = "_speed._value"}.AlignedField());
diff --git a/Editor/Scripts/Inspector/DriveSpeed.cs b/Editor/Scripts/Inspector/DriveSpeed.cs
@@ -1,4 +1,3 @@
-using OC.VisualElements;
 using UnityEditor;
 using UnityEditor.UIElements;
 using UnityEngine;
@@ -18,11 +17,11 @@ public override VisualElement CreateInspectorGUI()
 
             var groupControl = new PropertyGroup("Control");
             groupControl.AddOverride(serializedObject);
-            groupControl.Add(new FloatField("Target").BindProperty(component.Target).AlignedField());
+            groupControl.Add(new FloatField("Target"){bindingPath = "_target._value"}.AlignedField());
 
             var groupStatus = new PropertyGroup("Status");
-            groupStatus.Add(new LampField("Is Active", Color.green).BindProperty(component.IsActive).AlignedField());
-            groupStatus.Add(new FloatField("Value"){isReadOnly = true}.BindProperty(component.Value).AlignedField());
+            groupStatus.Add(new LampField("Is Active", Color.green){bindingPath = "_stateObserver._isActive._value"}.AlignedField());
+            groupStatus.Add(new FloatField("Value"){isReadOnly = true, bindingPath = "_value._value"}.AlignedField());
             
             var groupSettings = new PropertyGroup("Settings");
             groupSettings.Add(new FloatField("Acceleration"){bindingPath = "_acceleration._value"}.AlignedField());
diff --git a/Editor/Scripts/Inspector/Lock.cs b/Editor/Scripts/Inspector/Lock.cs
@@ -18,7 +18,7 @@ public override VisualElement CreateInspectorGUI()
             
             var groupControl = new PropertyGroup("Control");
             groupControl.AddOverride(serializedObject);
-            groupControl.Add(new ToggleButton("Lock").BindProperty(component.LockSignal)); 
+            groupControl.Add(new ToggleButton("Lock"){bindingPath = "_lockSignal._value"}); 
 
             var groupStatus = new PropertyGroup("Status");
             groupStatus.Add(new LampField("Lock", Color.green).BindProperty(component.LockSignal).AlignedField());
diff --git a/Editor/Scripts/Inspector/SensorBinary.cs b/Editor/Scripts/Inspector/SensorBinary.cs
@@ -19,7 +19,7 @@ public override VisualElement CreateInspectorGUI()
 
             var groupControl = new PropertyGroup("Control");
             groupControl.AddOverride(serializedObject);
-            groupControl.Add(new ToggleButton("Collision").BindProperty(component.State).AlignedField());
+            groupControl.Add(new ToggleButton("Collision"){bindingPath = "_state._value"}.AlignedField());
             
             var groupStatus = new PropertyGroup("Status");
             groupStatus.Add(new LampField("Collision", Color.yellow).BindProperty(component.Collision).AlignedField());
diff --git a/Editor/Scripts/Inspector/SignalBinary.cs b/Editor/Scripts/Inspector/SignalBinary.cs
@@ -18,7 +18,7 @@ public override VisualElement CreateInspectorGUI()
 
             var groupControl = new PropertyGroup("Control");
             groupControl.AddOverride(serializedObject);
-            groupControl.Add(new ToggleButton("Signal").BindProperty(component.Signal).AlignedField());
+            groupControl.Add(new ToggleButton("Signal"){bindingPath = "_signal._value"}.AlignedField());
             
             var groupStatus = new PropertyGroup("Status");
             groupStatus.Add(new LampField("Value", Color.green).BindProperty(component.Value).AlignedField());
diff --git a/Editor/Scripts/Inspector/TagReader.cs b/Editor/Scripts/Inspector/TagReader.cs
@@ -18,7 +18,7 @@ public override VisualElement CreateInspectorGUI()
 
             var groupControl = new PropertyGroup("Control");
             groupControl.AddOverride(serializedObject);
-            groupControl.Add(new UnsignedLongField("Value").BindProperty(component.Value).AlignedField());
+            groupControl.Add(new UnsignedLongField("Value"){bindingPath = "_value._value"}.AlignedField());
             
             var groupStatus = new PropertyGroup("Status");
             groupStatus.Add(new LampField("Collision", Color.yellow).BindProperty(component.Collision).AlignedField());
diff --git a/Editor/Scripts/Inspector/TransportCurved.cs b/Editor/Scripts/Inspector/TransportCurved.cs
@@ -1,4 +1,3 @@
-using OC.VisualElements;
 using UnityEditor;
 using UnityEditor.UIElements;
 using UnityEngine.UIElements;
@@ -16,10 +15,10 @@ public override VisualElement CreateInspectorGUI()
             var container = new VisualElement();
 
             var groupControl = new PropertyGroup("Control");
-            groupControl.Add(new FloatField("Target").BindProperty(component.Target).AlignedField());
+            groupControl.Add(new FloatField("Target"){bindingPath = "_target._value"}.AlignedField());
 
             var groupStatus = new PropertyGroup("Status");
-            groupStatus.Add(new FloatField("Value"){ isReadOnly = true }.BindProperty(component.Value).AlignedField());
+            groupStatus.Add(new FloatField("Value"){isReadOnly = true, bindingPath = "_value._value"}.AlignedField());
             
             var groupSettings = new PropertyGroup("Settings");
             groupSettings.Add(new PropertyField{bindingPath = "_gizmos"});
diff --git a/Editor/Scripts/Inspector/TransportLinear.cs b/Editor/Scripts/Inspector/TransportLinear.cs
@@ -1,4 +1,3 @@
-using OC.VisualElements;
 using UnityEditor;
 using UnityEditor.UIElements;
 using UnityEngine.UIElements;
@@ -16,10 +15,10 @@ public override VisualElement CreateInspectorGUI()
             var container = new VisualElement();
 
             var groupControl = new PropertyGroup("Control");
-            groupControl.Add(new FloatField("Target").BindProperty(component.Target).AlignedField());
+            groupControl.Add(new FloatField("Target"){bindingPath = "_target._value"}.AlignedField());
 
             var groupStatus = new PropertyGroup("Status");
-            groupStatus.Add(new FloatField("Value"){ isReadOnly = true }.BindProperty(component.Value).AlignedField());
+            groupStatus.Add(new FloatField("Value"){isReadOnly = true, bindingPath = "_value._value"}.AlignedField());
             
             var groupSettings = new PropertyGroup("Settings");
             groupSettings.Add(new PropertyField{bindingPath = "_gizmos"});
diff --git a/Runtime/Scripts/Components/SensorBinary.cs b/Runtime/Scripts/Components/SensorBinary.cs
@@ -52,17 +52,13 @@ public bool Invert
             base.OnEnable();
             _state.Subscribe(OnStateChanged);
             _value.Subscribe(OnValueChanged);
-            //_state.OnValueChanged += OnStateChanged;
-            //_value.OnValueChanged += OnValueChanged;
         }
 
         private new void OnDisable()
         {
             base.OnDisable();
             _state.Unsubscribe(OnStateChanged);
             _value.Unsubscribe(OnValueChanged);
-            //_state.OnValueChanged -= OnStateChanged;
-            //_value.OnValueChanged -= OnValueChanged;
         }
         
         private void Start()
diff --git a/Runtime/Scripts/VisualElements/BaseFieldExtension.cs b/Runtime/Scripts/VisualElements/BaseFieldExtension.cs
@@ -5,9 +5,6 @@ namespace OC.VisualElements
 {
     public static class BaseFieldExtension
     {
-        private const string USS = "StyleSheet/oc-inspector";
-        private const string INSPECTOR_LABEL_CLASS = "inspector-label";
-        
         public static BaseField<T> BindProperty<T>(this BaseField<T> field, IProperty<T> property)
         {
             if (field.userData != null) field.UnbindProperty();
