Skip to content

Commit 306b76c

Browse files
committed
Fixed issues with property value prediction
1 parent 08bbac9 commit 306b76c

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

Editor/Elements/CombinatoryFieldElement.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,6 @@ private void UpdateElement(SerializedProperty property)
228228
case FloatField floatField:
229229
floatField.UnregisterValueChangedCallback(_floatChange);
230230
_floatChange = evt => mainAnalogProperty.SetValue(evt.newValue);
231-
floatField.RegisterValueChangedCallback(_floatChange);
232231

233232
var isBlendShape = nameProperty.stringValue.StartsWith("blendShape.");
234233
var maxSliderValue = isBlendShape ? 100f : 1f;
@@ -246,6 +245,7 @@ private void UpdateElement(SerializedProperty property)
246245
});
247246
var defaultValue = getAnalog(mainAnalogProperty);
248247
floatField.value = defaultValue;
248+
floatField.RegisterValueChangedCallback(_floatChange);
249249

250250
var shouldBeEnabled = defaultValue >= 0 && defaultValue <= maxSliderValue && enabledSelf;
251251
_slider.SetEnabled(shouldBeEnabled);

Editor/Windows/PropertySelectorWindow.cs

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -146,11 +146,14 @@ void SetProperty(FlarePseudoProperty? pseudoProperty = null)
146146
if (type is PropertyValueType.Float)
147147
{
148148
var menuInfo = control.MenuItem;
149-
var oppositeTarget = binding.Source is FlarePropertySource.Blendshape ? 100f : 1f;
149+
var nonZeroTarget = binding.Source is FlarePropertySource.Blendshape ? 100f : 1f;
150150

151151
var defaultValue = binder.GetPropertyValue<float>(binding);
152-
if (oppositeTarget >= defaultValue && defaultValue >= 0)
153-
predictiveValue = defaultValue is 0 ? oppositeTarget : 0f;
152+
153+
predictiveValue = defaultValue == 0 ? nonZeroTarget : 0;
154+
155+
//if (oppositeTarget >= defaultValue && defaultValue >= 0)
156+
// predictiveValue = defaultValue is 0 ? oppositeTarget : 0f;
154157

155158
var predictiveDisable = menuInfo.Type is MenuItemType.Toggle && menuInfo.DefaultState;
156159
property.Property(nameof(PropertyInfo.State))

0 commit comments

Comments
 (0)