GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions 7 Packages Projects Releases Wiki Activity

Handle zero case correctly by disabling value boxes on zero.

Browse Source
This commit is contained in:
Chandler Cox
2023-05-31 14:31:01 -05:00
parent 70cb4d3cd9
commit 5c67c4f5d4
2 changed files with 46 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
Source/Editor/CustomEditors/Editors/ActorTransformEditor.cs
View File

@@ -128,9 +128,38 @@ namespace FlaxEditor.CustomEditors.Editors
{
LinkValues = !LinkValues;
Editor.Instance.Windows.PropertiesWin.ScaleLinked = LinkValues;
ToggleEnabled();
SetLinkStyle();
}
/// <summary>
/// Toggles enables on value boxes.
/// </summary>
public void ToggleEnabled()
{
if (LinkValues)
{
if (Mathf.NearEqual(((Float3)Values[0]).X, 0))
{
XElement.ValueBox.Enabled = false;
}
if (Mathf.NearEqual(((Float3)Values[0]).Y, 0))
{
YElement.ValueBox.Enabled = false;
}
if (Mathf.NearEqual(((Float3)Values[0]).Z, 0))
{
ZElement.ValueBox.Enabled = false;
}
}
else
{
XElement.ValueBox.Enabled = true;
YElement.ValueBox.Enabled = true;
ZElement.ValueBox.Enabled = true;
}
}
private void SetLinkStyle()
{
var style = FlaxEngine.GUI.Style.Current;

19
Source/Editor/CustomEditors/Editors/Vector3Editor.cs
View File

@@ -122,7 +122,7 @@ namespace FlaxEditor.CustomEditors.Editors
{
if (IsSetBlocked)
return;
var xValue = XElement.ValueBox.Value;
var yValue = YElement.ValueBox.Value;
var zValue = ZElement.ValueBox.Value;
@@ -134,16 +134,31 @@ namespace FlaxEditor.CustomEditors.Editors
{
case ValueChanged.X:
valueRatio = GetRatio(xValue, ((Float3)Values[0]).X);
if (Mathf.NearEqual(valueRatio, 0))
{
XElement.ValueBox.Enabled = false;
valueRatio = 1;
}
yValue = NewLinkedValue(yValue, valueRatio);
zValue = NewLinkedValue(zValue, valueRatio);
break;
case ValueChanged.Y:
valueRatio = GetRatio(yValue, ((Float3)Values[0]).Y);
if (Mathf.NearEqual(valueRatio, 0))
{
YElement.ValueBox.Enabled = false;
valueRatio = 1;
}
xValue = NewLinkedValue(xValue, valueRatio);
zValue = NewLinkedValue(zValue, valueRatio);
break;
case ValueChanged.Z:
valueRatio = GetRatio(zValue, ((Float3)Values[0]).Z);
if (Mathf.NearEqual(valueRatio, 0))
{
ZElement.ValueBox.Enabled = false;
valueRatio = 1;
}
xValue = NewLinkedValue(xValue, valueRatio);
yValue = NewLinkedValue(yValue, valueRatio);
break;
@@ -166,7 +181,7 @@ namespace FlaxEditor.CustomEditors.Editors
private float GetRatio(float value, float initialValue)
{
return (initialValue == 0) ? Mathf.Abs(value / 0.0001f) : Mathf.Abs(value / initialValue);
return Mathf.NearEqual(initialValue, 0) ? 0 : value / initialValue;
}
private float NewLinkedValue(float value, float valueRatio)