From 9c591b3c08fa04bbc216110a7460fe6000f8ebfa Mon Sep 17 00:00:00 2001 From: Chandler Cox Date: Sat, 4 Feb 2023 21:56:18 -0600 Subject: [PATCH 1/6] Add scale lock button --- .../Editors/ActorTransformEditor.cs | 46 ++++++++++ .../CustomEditors/Editors/Vector3Editor.cs | 91 ++++++++++++++++++- 2 files changed, 133 insertions(+), 4 deletions(-) diff --git a/Source/Editor/CustomEditors/Editors/ActorTransformEditor.cs b/Source/Editor/CustomEditors/Editors/ActorTransformEditor.cs index f65bb4b06..f04d079b5 100644 --- a/Source/Editor/CustomEditors/Editors/ActorTransformEditor.cs +++ b/Source/Editor/CustomEditors/Editors/ActorTransformEditor.cs @@ -1,6 +1,8 @@ // Copyright (c) 2012-2023 Wojciech Figat. All rights reserved. +using FlaxEditor.CustomEditors.GUI; using FlaxEngine; +using FlaxEngine.GUI; namespace FlaxEditor.CustomEditors.Editors { @@ -87,10 +89,54 @@ namespace FlaxEditor.CustomEditors.Editors var grayOutFactor = 0.6f; XElement.ValueBox.BorderColor = Color.Lerp(AxisColorX, back, grayOutFactor); XElement.ValueBox.BorderSelectedColor = AxisColorX; + + if (XElement.ValueBox.Parent.Parent is PropertiesList list) + { + foreach (var child in list.Children) + { + if (!(child is PropertyNameLabel)) + continue; + + var nameLabel = child as PropertyNameLabel; + if (!string.Equals(nameLabel.Text, "Scale")) + continue; + + var lockButton = new Button + { + Parent = nameLabel, + Width = 18, + Height = 18, + BackgroundBrush = new SpriteBrush(Editor.Instance.Icons.Link32), + BackgroundColor = Color.White, + BorderColor = Color.Transparent, + BorderColorSelected = Color.Transparent, + BorderColorHighlighted = Color.Transparent, + AnchorPreset = AnchorPresets.TopLeft, + TooltipText = "Locks/Unlocks setting the scale values.", + }; + lockButton.LocalX += 40; + lockButton.LocalY += 1; + lockButton.Clicked += () => + { + ChangeValuesTogether = !ChangeValuesTogether; + // TODO: change image + Debug.Log(ChangeValuesTogether); + }; + + break; + } + } + YElement.ValueBox.BorderColor = Color.Lerp(AxisColorY, back, grayOutFactor); YElement.ValueBox.BorderSelectedColor = AxisColorY; ZElement.ValueBox.BorderColor = Color.Lerp(AxisColorZ, back, grayOutFactor); ZElement.ValueBox.BorderSelectedColor = AxisColorZ; + + Debug.Log(YElement.ValueBox.Parent); + Debug.Log(YElement.ValueBox.Parent.Parent); + Debug.Log(YElement.ValueBox.Parent.Parent.Parent); + Debug.Log(YElement.ValueBox.Parent.Parent.Parent.Parent); + Debug.Log(YElement.ValueBox.Parent.Parent.Parent.Parent.Parent); } } } diff --git a/Source/Editor/CustomEditors/Editors/Vector3Editor.cs b/Source/Editor/CustomEditors/Editors/Vector3Editor.cs index 8ea21e988..83d09b887 100644 --- a/Source/Editor/CustomEditors/Editors/Vector3Editor.cs +++ b/Source/Editor/CustomEditors/Editors/Vector3Editor.cs @@ -44,6 +44,14 @@ namespace FlaxEditor.CustomEditors.Editors /// public override DisplayStyle Style => DisplayStyle.Inline; + /// + /// If true, when one value is changed, the other 2 will change as well. + /// + protected bool ChangeValuesTogether = false; + private bool _xChanged; + private bool _yChanged; + private bool _zChanged; + /// public override void Initialize(LayoutElementsContainer layout) { @@ -63,28 +71,96 @@ namespace FlaxEditor.CustomEditors.Editors XElement = grid.FloatValue(); XElement.SetLimits(limit); - XElement.ValueBox.ValueChanged += OnValueChanged; + XElement.ValueBox.ValueChanged += OnXValueChanged; XElement.ValueBox.SlidingEnd += ClearToken; YElement = grid.FloatValue(); YElement.SetLimits(limit); - YElement.ValueBox.ValueChanged += OnValueChanged; + YElement.ValueBox.ValueChanged += OnYValueChanged; YElement.ValueBox.SlidingEnd += ClearToken; ZElement = grid.FloatValue(); ZElement.SetLimits(limit); - ZElement.ValueBox.ValueChanged += OnValueChanged; + ZElement.ValueBox.ValueChanged += OnZValueChanged; ZElement.ValueBox.SlidingEnd += ClearToken; } + private void OnXValueChanged() + { + if (IsSetBlocked) + return; + if (ChangeValuesTogether) + { + _xChanged = true; + _yChanged = false; + _zChanged = false; + } + OnValueChanged(); + } + + private void OnYValueChanged() + { + if (IsSetBlocked) + return; + if (ChangeValuesTogether) + { + _xChanged = false; + _yChanged = true; + _zChanged = false; + } + OnValueChanged(); + } + + private void OnZValueChanged() + { + if (IsSetBlocked) + return; + if (ChangeValuesTogether) + { + _xChanged = false; + _yChanged = false; + _zChanged = true; + } + OnValueChanged(); + } + private void OnValueChanged() { if (IsSetBlocked) return; + var xValue = XElement.ValueBox.Value; + var yValue = YElement.ValueBox.Value; + var zValue = ZElement.ValueBox.Value; + + if (ChangeValuesTogether) + { + var adder = 0.0f; + if (_xChanged) + { + adder = xValue - ((Float3)Values[0]).X; + yValue += adder; + zValue += adder; + } + + if (_yChanged) + { + adder = yValue - ((Float3)Values[0]).Y; + xValue += adder; + zValue += adder; + } + + if (_zChanged) + { + adder = zValue - ((Float3)Values[0]).Z; + xValue += adder; + yValue += adder; + } + } + var isSliding = XElement.IsSliding || YElement.IsSliding || ZElement.IsSliding; var token = isSliding ? this : null; - var value = new Float3(XElement.ValueBox.Value, YElement.ValueBox.Value, ZElement.ValueBox.Value); + var value = new Float3(xValue, yValue, zValue); object v = Values[0]; if (v is Vector3) v = (Vector3)value; @@ -93,6 +169,13 @@ namespace FlaxEditor.CustomEditors.Editors else if (v is Double3) v = (Double3)value; SetValue(v, token); + + if (ChangeValuesTogether) + { + _xChanged = false; + _yChanged = false; + _zChanged = false; + } } /// From 03f299bc3bbf472f9d96056c572127652e436a3b Mon Sep 17 00:00:00 2001 From: Chandler Cox Date: Sat, 4 Feb 2023 22:20:18 -0600 Subject: [PATCH 2/6] Added apply across actors. --- .../Editors/ActorTransformEditor.cs | 15 ++++++++------- Source/Editor/Windows/PropertiesWindow.cs | 19 +++++++++++++++++++ 2 files changed, 27 insertions(+), 7 deletions(-) diff --git a/Source/Editor/CustomEditors/Editors/ActorTransformEditor.cs b/Source/Editor/CustomEditors/Editors/ActorTransformEditor.cs index f04d079b5..1249d18d2 100644 --- a/Source/Editor/CustomEditors/Editors/ActorTransformEditor.cs +++ b/Source/Editor/CustomEditors/Editors/ActorTransformEditor.cs @@ -82,6 +82,12 @@ namespace FlaxEditor.CustomEditors.Editors /// public override void Initialize(LayoutElementsContainer layout) { + var scaleLocked = Editor.Instance.Windows.PropertiesWin.ScaleLocked; + if (scaleLocked) + { + ChangeValuesTogether = scaleLocked; + } + base.Initialize(layout); // Override colors @@ -106,7 +112,7 @@ namespace FlaxEditor.CustomEditors.Editors Parent = nameLabel, Width = 18, Height = 18, - BackgroundBrush = new SpriteBrush(Editor.Instance.Icons.Link32), + BackgroundBrush = new SpriteBrush(Editor.Instance.Icons.Link32), // TODO change on scale lock BackgroundColor = Color.White, BorderColor = Color.Transparent, BorderColorSelected = Color.Transparent, @@ -119,6 +125,7 @@ namespace FlaxEditor.CustomEditors.Editors lockButton.Clicked += () => { ChangeValuesTogether = !ChangeValuesTogether; + Editor.Instance.Windows.PropertiesWin.ScaleLocked = ChangeValuesTogether; // TODO: change image Debug.Log(ChangeValuesTogether); }; @@ -131,12 +138,6 @@ namespace FlaxEditor.CustomEditors.Editors YElement.ValueBox.BorderSelectedColor = AxisColorY; ZElement.ValueBox.BorderColor = Color.Lerp(AxisColorZ, back, grayOutFactor); ZElement.ValueBox.BorderSelectedColor = AxisColorZ; - - Debug.Log(YElement.ValueBox.Parent); - Debug.Log(YElement.ValueBox.Parent.Parent); - Debug.Log(YElement.ValueBox.Parent.Parent.Parent); - Debug.Log(YElement.ValueBox.Parent.Parent.Parent.Parent); - Debug.Log(YElement.ValueBox.Parent.Parent.Parent.Parent.Parent); } } } diff --git a/Source/Editor/Windows/PropertiesWindow.cs b/Source/Editor/Windows/PropertiesWindow.cs index 3c2d06852..05b8c0efc 100644 --- a/Source/Editor/Windows/PropertiesWindow.cs +++ b/Source/Editor/Windows/PropertiesWindow.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.Linq; +using System.Xml; using FlaxEditor.CustomEditors; using FlaxEngine.GUI; @@ -21,6 +22,11 @@ namespace FlaxEditor.Windows /// public readonly CustomEditorPresenter Presenter; + /// + /// Indication of if the scale is locked. + /// + public bool ScaleLocked = false; + /// /// Initializes a new instance of the class. /// @@ -52,5 +58,18 @@ namespace FlaxEditor.Windows var objects = Editor.SceneEditing.Selection.ConvertAll(x => x.EditableObject).Distinct(); Presenter.Select(objects); } + + /// + public override void OnLayoutSerialize(XmlWriter writer) + { + writer.WriteAttributeString("ScaleLocked", ScaleLocked.ToString()); + } + + /// + public override void OnLayoutDeserialize(XmlElement node) + { + if (bool.TryParse(node.GetAttribute("ScaleLocked"), out bool value1)) + ScaleLocked = value1; + } } } From b113bdb7742dfaf47d4c5f8c03e3e0a4c1c4d3e8 Mon Sep 17 00:00:00 2001 From: Chandler Cox Date: Sat, 4 Feb 2023 22:28:34 -0600 Subject: [PATCH 3/6] Changed to use enum for simplification --- .../CustomEditors/Editors/Vector3Editor.cs | 58 ++++++++----------- 1 file changed, 24 insertions(+), 34 deletions(-) diff --git a/Source/Editor/CustomEditors/Editors/Vector3Editor.cs b/Source/Editor/CustomEditors/Editors/Vector3Editor.cs index 83d09b887..bca22b29c 100644 --- a/Source/Editor/CustomEditors/Editors/Vector3Editor.cs +++ b/Source/Editor/CustomEditors/Editors/Vector3Editor.cs @@ -48,9 +48,15 @@ namespace FlaxEditor.CustomEditors.Editors /// If true, when one value is changed, the other 2 will change as well. /// protected bool ChangeValuesTogether = false; - private bool _xChanged; - private bool _yChanged; - private bool _zChanged; + + private enum ValueChanged + { + X = 0, + Y = 1, + Z = 2 + } + + private ValueChanged _valueChanged; /// public override void Initialize(LayoutElementsContainer layout) @@ -90,11 +96,8 @@ namespace FlaxEditor.CustomEditors.Editors if (IsSetBlocked) return; if (ChangeValuesTogether) - { - _xChanged = true; - _yChanged = false; - _zChanged = false; - } + _valueChanged = ValueChanged.X; + OnValueChanged(); } @@ -103,11 +106,8 @@ namespace FlaxEditor.CustomEditors.Editors if (IsSetBlocked) return; if (ChangeValuesTogether) - { - _xChanged = false; - _yChanged = true; - _zChanged = false; - } + _valueChanged = ValueChanged.Y; + OnValueChanged(); } @@ -116,11 +116,8 @@ namespace FlaxEditor.CustomEditors.Editors if (IsSetBlocked) return; if (ChangeValuesTogether) - { - _xChanged = false; - _yChanged = false; - _zChanged = true; - } + _valueChanged = ValueChanged.Z; + OnValueChanged(); } @@ -136,25 +133,25 @@ namespace FlaxEditor.CustomEditors.Editors if (ChangeValuesTogether) { var adder = 0.0f; - if (_xChanged) + switch (_valueChanged) { + case ValueChanged.X: adder = xValue - ((Float3)Values[0]).X; yValue += adder; zValue += adder; - } - - if (_yChanged) - { + break; + case ValueChanged.Y: adder = yValue - ((Float3)Values[0]).Y; xValue += adder; zValue += adder; - } - - if (_zChanged) - { + break; + case ValueChanged.Z: adder = zValue - ((Float3)Values[0]).Z; xValue += adder; yValue += adder; + break; + default: + break; } } @@ -169,13 +166,6 @@ namespace FlaxEditor.CustomEditors.Editors else if (v is Double3) v = (Double3)value; SetValue(v, token); - - if (ChangeValuesTogether) - { - _xChanged = false; - _yChanged = false; - _zChanged = false; - } } /// From e4afc49ac65db852f8e92b78bb9f53575c5137c9 Mon Sep 17 00:00:00 2001 From: Chandler Cox Date: Sun, 5 Feb 2023 15:07:12 -0600 Subject: [PATCH 4/6] Added saving the users choice in the properties window and adding link and unlink to the scale context menu. --- .../Editors/ActorTransformEditor.cs | 78 ++++++++----------- .../CustomEditors/Editors/Vector3Editor.cs | 30 +++---- Source/Editor/Windows/PropertiesWindow.cs | 3 + 3 files changed, 51 insertions(+), 60 deletions(-) diff --git a/Source/Editor/CustomEditors/Editors/ActorTransformEditor.cs b/Source/Editor/CustomEditors/Editors/ActorTransformEditor.cs index 1249d18d2..8d969485d 100644 --- a/Source/Editor/CustomEditors/Editors/ActorTransformEditor.cs +++ b/Source/Editor/CustomEditors/Editors/ActorTransformEditor.cs @@ -79,66 +79,54 @@ namespace FlaxEditor.CustomEditors.Editors /// public class ScaleEditor : Float3Editor { + + private Image _linkImage; + /// public override void Initialize(LayoutElementsContainer layout) { - var scaleLocked = Editor.Instance.Windows.PropertiesWin.ScaleLocked; - if (scaleLocked) - { - ChangeValuesTogether = scaleLocked; - } - base.Initialize(layout); + + LinkValuesTogether = Editor.Instance.Windows.PropertiesWin.ScaleLocked; + + _linkImage = new Image + { + Parent = LinkedLabel, + Width = 18, + Height = 18, + Brush = LinkValuesTogether ? new SpriteBrush(Editor.Instance.Icons.Link32) : new SpriteBrush(), + AnchorPreset = AnchorPresets.TopLeft, + TooltipText = "Scale values are linked together.", + }; + _linkImage.LocalX += 40; + _linkImage.LocalY += 1; + + LinkedLabel.SetupContextMenu += (label, menu, editor) => + { + menu.AddSeparator(); + menu.AddButton(LinkValuesTogether ? "Unlink" : "Link", ToggleLink); + }; // Override colors var back = FlaxEngine.GUI.Style.Current.TextBoxBackground; var grayOutFactor = 0.6f; XElement.ValueBox.BorderColor = Color.Lerp(AxisColorX, back, grayOutFactor); XElement.ValueBox.BorderSelectedColor = AxisColorX; - - if (XElement.ValueBox.Parent.Parent is PropertiesList list) - { - foreach (var child in list.Children) - { - if (!(child is PropertyNameLabel)) - continue; - - var nameLabel = child as PropertyNameLabel; - if (!string.Equals(nameLabel.Text, "Scale")) - continue; - - var lockButton = new Button - { - Parent = nameLabel, - Width = 18, - Height = 18, - BackgroundBrush = new SpriteBrush(Editor.Instance.Icons.Link32), // TODO change on scale lock - BackgroundColor = Color.White, - BorderColor = Color.Transparent, - BorderColorSelected = Color.Transparent, - BorderColorHighlighted = Color.Transparent, - AnchorPreset = AnchorPresets.TopLeft, - TooltipText = "Locks/Unlocks setting the scale values.", - }; - lockButton.LocalX += 40; - lockButton.LocalY += 1; - lockButton.Clicked += () => - { - ChangeValuesTogether = !ChangeValuesTogether; - Editor.Instance.Windows.PropertiesWin.ScaleLocked = ChangeValuesTogether; - // TODO: change image - Debug.Log(ChangeValuesTogether); - }; - - break; - } - } - YElement.ValueBox.BorderColor = Color.Lerp(AxisColorY, back, grayOutFactor); YElement.ValueBox.BorderSelectedColor = AxisColorY; ZElement.ValueBox.BorderColor = Color.Lerp(AxisColorZ, back, grayOutFactor); ZElement.ValueBox.BorderSelectedColor = AxisColorZ; } + + /// + /// Toggles the linking functionality. + /// + public void ToggleLink() + { + LinkValuesTogether = !LinkValuesTogether; + Editor.Instance.Windows.PropertiesWin.ScaleLocked = LinkValuesTogether; + _linkImage.Brush = LinkValuesTogether ? new SpriteBrush(Editor.Instance.Icons.Link32) : new SpriteBrush(); + } } } } diff --git a/Source/Editor/CustomEditors/Editors/Vector3Editor.cs b/Source/Editor/CustomEditors/Editors/Vector3Editor.cs index bca22b29c..ffdcfb825 100644 --- a/Source/Editor/CustomEditors/Editors/Vector3Editor.cs +++ b/Source/Editor/CustomEditors/Editors/Vector3Editor.cs @@ -47,7 +47,7 @@ namespace FlaxEditor.CustomEditors.Editors /// /// If true, when one value is changed, the other 2 will change as well. /// - protected bool ChangeValuesTogether = false; + public bool LinkValuesTogether = false; private enum ValueChanged { @@ -95,7 +95,7 @@ namespace FlaxEditor.CustomEditors.Editors { if (IsSetBlocked) return; - if (ChangeValuesTogether) + if (LinkValuesTogether) _valueChanged = ValueChanged.X; OnValueChanged(); @@ -105,7 +105,7 @@ namespace FlaxEditor.CustomEditors.Editors { if (IsSetBlocked) return; - if (ChangeValuesTogether) + if (LinkValuesTogether) _valueChanged = ValueChanged.Y; OnValueChanged(); @@ -115,7 +115,7 @@ namespace FlaxEditor.CustomEditors.Editors { if (IsSetBlocked) return; - if (ChangeValuesTogether) + if (LinkValuesTogether) _valueChanged = ValueChanged.Z; OnValueChanged(); @@ -130,25 +130,25 @@ namespace FlaxEditor.CustomEditors.Editors var yValue = YElement.ValueBox.Value; var zValue = ZElement.ValueBox.Value; - if (ChangeValuesTogether) + if (LinkValuesTogether) { - var adder = 0.0f; + var valueChange = 0.0f; switch (_valueChanged) { case ValueChanged.X: - adder = xValue - ((Float3)Values[0]).X; - yValue += adder; - zValue += adder; + valueChange = xValue - ((Float3)Values[0]).X; + yValue += valueChange; + zValue += valueChange; break; case ValueChanged.Y: - adder = yValue - ((Float3)Values[0]).Y; - xValue += adder; - zValue += adder; + valueChange = yValue - ((Float3)Values[0]).Y; + xValue += valueChange; + zValue += valueChange; break; case ValueChanged.Z: - adder = zValue - ((Float3)Values[0]).Z; - xValue += adder; - yValue += adder; + valueChange = zValue - ((Float3)Values[0]).Z; + xValue += valueChange; + yValue += valueChange; break; default: break; diff --git a/Source/Editor/Windows/PropertiesWindow.cs b/Source/Editor/Windows/PropertiesWindow.cs index 05b8c0efc..21c7d0faf 100644 --- a/Source/Editor/Windows/PropertiesWindow.cs +++ b/Source/Editor/Windows/PropertiesWindow.cs @@ -17,6 +17,9 @@ namespace FlaxEditor.Windows { private IEnumerable undoRecordObjects; + /// + public override bool UseLayoutData => true; + /// /// The editor. /// From 0f38fdda306e1408cf7ba97d58edfe711023700d Mon Sep 17 00:00:00 2001 From: Chandler Cox Date: Sun, 5 Feb 2023 15:12:04 -0600 Subject: [PATCH 5/6] Remove unused include. --- Source/Editor/CustomEditors/Editors/ActorTransformEditor.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/Source/Editor/CustomEditors/Editors/ActorTransformEditor.cs b/Source/Editor/CustomEditors/Editors/ActorTransformEditor.cs index 8d969485d..79c08a596 100644 --- a/Source/Editor/CustomEditors/Editors/ActorTransformEditor.cs +++ b/Source/Editor/CustomEditors/Editors/ActorTransformEditor.cs @@ -1,6 +1,5 @@ // Copyright (c) 2012-2023 Wojciech Figat. All rights reserved. -using FlaxEditor.CustomEditors.GUI; using FlaxEngine; using FlaxEngine.GUI; From d5d5fb698f0245f4c0f17d70aaf3052aeca57db8 Mon Sep 17 00:00:00 2001 From: Chandler Cox Date: Sun, 5 Feb 2023 20:17:21 -0600 Subject: [PATCH 6/6] Small name changes --- .../CustomEditors/Editors/ActorTransformEditor.cs | 12 ++++++------ Source/Editor/CustomEditors/Editors/Vector3Editor.cs | 10 +++++----- Source/Editor/Windows/PropertiesWindow.cs | 8 ++++---- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/Source/Editor/CustomEditors/Editors/ActorTransformEditor.cs b/Source/Editor/CustomEditors/Editors/ActorTransformEditor.cs index 79c08a596..ac520fd7a 100644 --- a/Source/Editor/CustomEditors/Editors/ActorTransformEditor.cs +++ b/Source/Editor/CustomEditors/Editors/ActorTransformEditor.cs @@ -86,14 +86,14 @@ namespace FlaxEditor.CustomEditors.Editors { base.Initialize(layout); - LinkValuesTogether = Editor.Instance.Windows.PropertiesWin.ScaleLocked; + LinkValues = Editor.Instance.Windows.PropertiesWin.ScaleLinked; _linkImage = new Image { Parent = LinkedLabel, Width = 18, Height = 18, - Brush = LinkValuesTogether ? new SpriteBrush(Editor.Instance.Icons.Link32) : new SpriteBrush(), + Brush = LinkValues ? new SpriteBrush(Editor.Instance.Icons.Link32) : new SpriteBrush(), AnchorPreset = AnchorPresets.TopLeft, TooltipText = "Scale values are linked together.", }; @@ -103,7 +103,7 @@ namespace FlaxEditor.CustomEditors.Editors LinkedLabel.SetupContextMenu += (label, menu, editor) => { menu.AddSeparator(); - menu.AddButton(LinkValuesTogether ? "Unlink" : "Link", ToggleLink); + menu.AddButton(LinkValues ? "Unlink" : "Link", ToggleLink); }; // Override colors @@ -122,9 +122,9 @@ namespace FlaxEditor.CustomEditors.Editors /// public void ToggleLink() { - LinkValuesTogether = !LinkValuesTogether; - Editor.Instance.Windows.PropertiesWin.ScaleLocked = LinkValuesTogether; - _linkImage.Brush = LinkValuesTogether ? new SpriteBrush(Editor.Instance.Icons.Link32) : new SpriteBrush(); + LinkValues = !LinkValues; + Editor.Instance.Windows.PropertiesWin.ScaleLinked = LinkValues; + _linkImage.Brush = LinkValues ? new SpriteBrush(Editor.Instance.Icons.Link32) : new SpriteBrush(); } } } diff --git a/Source/Editor/CustomEditors/Editors/Vector3Editor.cs b/Source/Editor/CustomEditors/Editors/Vector3Editor.cs index ffdcfb825..ad67a4b13 100644 --- a/Source/Editor/CustomEditors/Editors/Vector3Editor.cs +++ b/Source/Editor/CustomEditors/Editors/Vector3Editor.cs @@ -47,7 +47,7 @@ namespace FlaxEditor.CustomEditors.Editors /// /// If true, when one value is changed, the other 2 will change as well. /// - public bool LinkValuesTogether = false; + public bool LinkValues = false; private enum ValueChanged { @@ -95,7 +95,7 @@ namespace FlaxEditor.CustomEditors.Editors { if (IsSetBlocked) return; - if (LinkValuesTogether) + if (LinkValues) _valueChanged = ValueChanged.X; OnValueChanged(); @@ -105,7 +105,7 @@ namespace FlaxEditor.CustomEditors.Editors { if (IsSetBlocked) return; - if (LinkValuesTogether) + if (LinkValues) _valueChanged = ValueChanged.Y; OnValueChanged(); @@ -115,7 +115,7 @@ namespace FlaxEditor.CustomEditors.Editors { if (IsSetBlocked) return; - if (LinkValuesTogether) + if (LinkValues) _valueChanged = ValueChanged.Z; OnValueChanged(); @@ -130,7 +130,7 @@ namespace FlaxEditor.CustomEditors.Editors var yValue = YElement.ValueBox.Value; var zValue = ZElement.ValueBox.Value; - if (LinkValuesTogether) + if (LinkValues) { var valueChange = 0.0f; switch (_valueChanged) diff --git a/Source/Editor/Windows/PropertiesWindow.cs b/Source/Editor/Windows/PropertiesWindow.cs index 21c7d0faf..601717f38 100644 --- a/Source/Editor/Windows/PropertiesWindow.cs +++ b/Source/Editor/Windows/PropertiesWindow.cs @@ -28,7 +28,7 @@ namespace FlaxEditor.Windows /// /// Indication of if the scale is locked. /// - public bool ScaleLocked = false; + public bool ScaleLinked = false; /// /// Initializes a new instance of the class. @@ -65,14 +65,14 @@ namespace FlaxEditor.Windows /// public override void OnLayoutSerialize(XmlWriter writer) { - writer.WriteAttributeString("ScaleLocked", ScaleLocked.ToString()); + writer.WriteAttributeString("ScaleLinked", ScaleLinked.ToString()); } /// public override void OnLayoutDeserialize(XmlElement node) { - if (bool.TryParse(node.GetAttribute("ScaleLocked"), out bool value1)) - ScaleLocked = value1; + if (bool.TryParse(node.GetAttribute("ScaleLinked"), out bool value1)) + ScaleLinked = value1; } } }