Profile editor - Changed data binding behaviour in profile editor

src/Artemis.Core/Models/Profile/DataBindings/DataBinding.cs

@@ -6,10 +6,12 @@ namespace Artemis.Core
     /// <inheritdoc />
     public class DataBinding<TLayerProperty, TProperty> : IDataBinding
     {
-        private TProperty _currentValue = default!;
         private bool _disposed;
         private TimeSpan _easingProgress;
+        private bool _reapplyValue;
+        private TProperty _currentValue = default!;
         private TProperty _previousValue = default!;
+        private TProperty _lastAppliedValue = default!;
 
         internal DataBinding(DataBindingRegistration<TLayerProperty, TProperty> dataBindingRegistration)
         {
@@ -114,6 +116,9 @@ namespace Artemis.Core
             _easingProgress = _easingProgress.Add(delta);
             if (_easingProgress > EasingTime)
                 _easingProgress = EasingTime;
+
+            // Tell Apply() to apply a new value next call
+            _reapplyValue = false;
         }
 
         private void ResetEasing(TProperty value)
@@ -158,6 +163,11 @@ namespace Artemis.Core
         /// <param name="timeline">The timeline to apply during update</param>
         public void Update(Timeline timeline)
         {
+            // Don't update data bindings if there is no delta, otherwise this creates an inconsistency between
+            // data bindings with easing and data bindings without easing (the ones with easing will seemingly not update)
+            if (timeline.Delta == TimeSpan.Zero) 
+                return;
+            
             UpdateWithDelta(timeline.Delta);
         }
 
@@ -170,9 +180,19 @@ namespace Artemis.Core
             if (Converter == null)
                 return;
 
+            // If Update() has not been called, reapply the previous value
+            if (_reapplyValue)
+            {
+                Converter.ApplyValue(_lastAppliedValue);
+                return;
+            }
+
             TProperty converterValue = Converter.GetValue();
             TProperty value = GetValue(converterValue);
             Converter.ApplyValue(value);
+
+            _lastAppliedValue = value;
+            _reapplyValue = true;
         }
 
         #region IDisposable

src/Artemis.Core/Models/Profile/LayerProperties/LayerProperty.cs

@@ -289,9 +289,9 @@ namespace Artemis.Core
             if (keyframeEntity.Position > ProfileElement.Timeline.Length)
                 return null;
             T value = CoreJson.DeserializeObject<T>(keyframeEntity.Value);
-            if (value == null) 
+            if (value == null)
                 return null;
-          
+
             LayerPropertyKeyframe<T> keyframe = new LayerPropertyKeyframe<T>(
                 CoreJson.DeserializeObject<T>(keyframeEntity.Value)!, keyframeEntity.Position, (Easings.Functions) keyframeEntity.EasingFunction, this
             );
@@ -470,10 +470,6 @@ namespace Artemis.Core
 
         private void UpdateDataBindings(Timeline timeline)
         {
-            // To avoid data bindings applying at non-regular updating (during editing) only update when not overriden
-            if (timeline.IsOverridden)
-                return;
-
             foreach (IDataBinding dataBinding in _dataBindings)
             {
                 dataBinding.Update(timeline);
@@ -543,7 +539,7 @@ namespace Artemis.Core
             _keyframes.Clear();
             try
             {
-                foreach (KeyframeEntity keyframeEntity in Entity.KeyframeEntities.Where(k => k.Position <= ProfileElement.Timeline.Length)) 
+                foreach (KeyframeEntity keyframeEntity in Entity.KeyframeEntities.Where(k => k.Position <= ProfileElement.Timeline.Length))
                     AddKeyframeEntity(keyframeEntity);
             }
             catch (JsonException)

src/Artemis.UI/Screens/ProfileEditor/LayerProperties/DataBindings/DataBindingView.xaml

@@ -84,27 +84,20 @@
                 <materialDesign:Card Grid.Row="3" Grid.ColumnSpan="2" Margin="0 5 0 0">
                     <Grid>
                         <Grid.ColumnDefinitions>
-                            <ColumnDefinition />
-                            <ColumnDefinition />
+                            <ColumnDefinition Width="Auto"/>
+                            <ColumnDefinition Width="*"/>
                         </Grid.ColumnDefinitions>
                         <Grid.RowDefinitions>
                             <RowDefinition Height="Auto" />
                             <RowDefinition Height="Auto" />
                             <RowDefinition Height="Auto" />
                         </Grid.RowDefinitions>
-                        <TextBlock Grid.Row="0" Margin="10 10 4 0">
-                            Test result
+                        <TextBlock Grid.Row="0" Margin="10 10 0 0">
+                            Data binding result
+                        </TextBlock>
+                        <TextBlock Grid.Row="0" Grid.Column="1" Margin="0 10 10 0" TextAlignment="Right" ToolTip="Click Play to ensure all other data bindings update as well." Cursor="Help">
+                            Other data bindings not updating?
                         </TextBlock>
-                        <CheckBox Grid.Row="0"
-                                  Grid.Column="1"
-                                  HorizontalAlignment="Right"
-                                  VerticalAlignment="Center"
-                                  Margin="0 6 10 0"
-                                  Style="{StaticResource MaterialDesignCheckBox}"
-                                  ToolTip="Apply the test value to the layer"
-                                  IsChecked="{Binding ApplyTestResultToLayer}">
-                            Preview on layer
-                        </CheckBox>
                         <Separator Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="2" Style="{StaticResource MaterialDesignLightSeparator}" Margin="0" />
                         <Grid Grid.Row="2" Grid.Column="0" Grid.ColumnSpan="2" Margin="10 4 10 10">
                             <Grid.ColumnDefinitions>

src/Artemis.UI/Screens/ProfileEditor/LayerProperties/DataBindings/DataBindingViewModel.cs

@@ -15,7 +15,6 @@ namespace Artemis.UI.Screens.ProfileEditor.LayerProperties.DataBindings
         private readonly IDataBindingsVmFactory _dataBindingsVmFactory;
         private readonly IProfileEditorService _profileEditorService;
         private readonly Timer _updateTimer;
-        private bool _applyTestResultToLayer;
         private int _easingTime;
         private bool _isDataBindingEnabled;
         private bool _isEasingTimeEnabled;
@@ -68,17 +67,7 @@ namespace Artemis.UI.Screens.ProfileEditor.LayerProperties.DataBindings
             get => _isDataBindingEnabled;
             set => SetAndNotify(ref _isDataBindingEnabled, value);
         }
-
-        public bool ApplyTestResultToLayer
-        {
-            get => _applyTestResultToLayer;
-            set
-            {
-                if (!SetAndNotify(ref _applyTestResultToLayer, value)) return;
-                _profileEditorService.UpdateProfilePreview();
-            }
-        }
-
+        
         public TimelineEasingViewModel SelectedEasingViewModel
         {
             get => _selectedEasingViewModel;
@@ -121,7 +110,6 @@ namespace Artemis.UI.Screens.ProfileEditor.LayerProperties.DataBindings
 
             _updateTimer.Start();
             _updateTimer.Elapsed += OnUpdateTimerOnElapsed;
-            Registration.LayerProperty.Updated += LayerPropertyOnUpdated;
 
             CreateDataBindingModeModeViewModel();
             Update();
@@ -239,15 +227,8 @@ namespace Artemis.UI.Screens.ProfileEditor.LayerProperties.DataBindings
             {
                 TestResultValue.UpdateValue(Registration.DataBinding != null ? Registration.DataBinding.GetValue(default) : default);
             }
-
-            if (ApplyTestResultToLayer)
-            {
-                // TODO: A bit crappy, the ProfileEditorService should really be doing this
-                bool playing = ((Parent as Screen)?.Parent as LayerPropertiesViewModel)?.Playing ?? true;
-                if (!playing)
-                    _profileEditorService.UpdateProfilePreview();
-            }
-
+            
+            _profileEditorService.UpdateProfilePreview();
             _updatingTestResult = false;
         }
 
@@ -276,12 +257,6 @@ namespace Artemis.UI.Screens.ProfileEditor.LayerProperties.DataBindings
             UpdateTestResult();
         }
 
-        private void LayerPropertyOnUpdated(object sender, LayerPropertyEventArgs<TLayerProperty> e)
-        {
-            if (ApplyTestResultToLayer)
-                Registration.DataBinding?.Apply();
-        }
-
         #region IDisposable
 
         /// <inheritdoc />
@@ -289,8 +264,6 @@ namespace Artemis.UI.Screens.ProfileEditor.LayerProperties.DataBindings
         {
             _updateTimer.Dispose();
             _updateTimer.Elapsed -= OnUpdateTimerOnElapsed;
-
-            Registration.LayerProperty.Updated -= LayerPropertyOnUpdated;
         }
 
         #endregion