diff --git a/client/Assets/ArticyImporter/Content/Generated/ArticyEditorSettings.asset b/client/Assets/ArticyImporter/Content/Generated/ArticyEditorSettings.asset index 1e488d1..3db0432 100644 --- a/client/Assets/ArticyImporter/Content/Generated/ArticyEditorSettings.asset +++ b/client/Assets/ArticyImporter/Content/Generated/ArticyEditorSettings.asset @@ -21,6 +21,6 @@ MonoBehaviour: mLastUsedPackagesHash: 1177269412 mLastUsedPackagesCount: 1 mLastBuildCode: 1 - mLastEditorStartupTimeTicks: 638214140384323514 + mLastEditorStartupTimeTicks: 638214577776899968 mNewVersionAvailable: 1 mLastAttachedFlowPlayerValue: 0 diff --git a/client/Assets/Plugins/FluidBehaviorTree/Editor/BehaviorTree/Printer/NodePrintController.cs b/client/Assets/Plugins/FluidBehaviorTree/Editor/BehaviorTree/Printer/NodePrintController.cs index 4c2d460..f6d145e 100644 --- a/client/Assets/Plugins/FluidBehaviorTree/Editor/BehaviorTree/Printer/NodePrintController.cs +++ b/client/Assets/Plugins/FluidBehaviorTree/Editor/BehaviorTree/Printer/NodePrintController.cs @@ -2,8 +2,10 @@ using System.Linq; using CleverCrow.Fluid.BTs.TaskParents; using UnityEngine; -namespace CleverCrow.Fluid.BTs.Trees.Editors { - public class NodePrintController { +namespace CleverCrow.Fluid.BTs.Trees.Editors +{ + public class NodePrintController + { private readonly VisualTask _node; private readonly IGraphBox _box; private readonly IGraphBox _divider; @@ -17,44 +19,51 @@ namespace CleverCrow.Fluid.BTs.Trees.Editors { private static GuiStyleCollection Styles => BehaviorTreePrinter.SharedStyles; - public NodePrintController (VisualTask node) { + public NodePrintController(VisualTask node) + { _node = node; _box = node.Box; _divider = node.Divider; _iconMain = new TextureLoader(_node.Task.IconPath); } - - public void Print (bool taskIsActive) { + + public void Print(bool taskIsActive) + { if (!(_node.Task is TaskRoot)) PaintVerticalTop(); _faders.Update(taskIsActive); - + PaintBody(); - - if (_node.Children.Count > 0) { + + if (_node.Children.Count > 0) + { PaintDivider(); PaintVerticalBottom(); } } - private void PaintBody () { + private void PaintBody() + { var prevBackgroundColor = GUI.backgroundColor; - + var rect = new Rect( - _box.GlobalPositionX + _box.PaddingX, + _box.GlobalPositionX + _box.PaddingX, _box.GlobalPositionY + _box.PaddingY, - _box.Width - _box.PaddingX, + _box.Width - _box.PaddingX, _box.Height - _box.PaddingY); - if (_node.Task.HasBeenActive) { + if (_node.Task.HasBeenActive) + { GUI.backgroundColor = _faders.BackgroundFader.CurrentColor; GUI.Box(rect, GUIContent.none, Styles.BoxActive.Style); GUI.backgroundColor = prevBackgroundColor; - + PrintLastStatus(rect); - } else { + } + else + { GUI.Box(rect, GUIContent.none, Styles.BoxInactive.Style); } - + PrintIcon(); Styles.Title.normal.textColor = _faders.TextFader.CurrentColor; @@ -64,7 +73,8 @@ namespace CleverCrow.Fluid.BTs.Trees.Editors { GUI.Label(rect, _node.Task.Info?.Invoke(), Styles.Info); } - private void PrintLastStatus (Rect rect) { + private void PrintLastStatus(Rect rect) + { const float sidePadding = 1.5f; var icon = BehaviorTreePrinter.StatusIcons.GetIcon(_node.Task.LastStatus); @@ -76,72 +86,80 @@ namespace CleverCrow.Fluid.BTs.Trees.Editors { new Color(1, 1, 1, 0.7f)); } - private void PrintIcon () { + private void PrintIcon() + { const float iconWidth = 15; const float iconHeight = 15; _iconMain.Paint( new Rect( - _box.GlobalPositionX + _box.PaddingX / 2 - iconWidth / 2 + _node.Task.IconPadding / 2, + _box.GlobalPositionX + _box.PaddingX / 2 + _node.Task.IconPadding / 2, _box.GlobalPositionY + _box.PaddingX / 2 + 3 + _node.Task.IconPadding / 2, iconWidth - _node.Task.IconPadding, iconHeight - _node.Task.IconPadding), _faders.MainIconFader.CurrentColor); } - private void PaintDivider () { + private void PaintDivider() + { const int graphicSizeIncrease = 5; - - if (_dividerGraphic == null) { + + if (_dividerGraphic == null) + { _dividerGraphic = CreateTexture( - (int)_divider.Width + graphicSizeIncrease, - 1, - Color.black); + (int)_divider.Width + graphicSizeIncrease, + 2, + Color.white); } var position = new Rect( - _divider.GlobalPositionX + _box.PaddingY / 2 + _node.DividerLeftOffset - 2, + _divider.GlobalPositionX + _box.PaddingY / 2 + _node.DividerLeftOffset - 2, // @TODO Should not need to offset this _divider.GlobalPositionY + _box.PaddingY / 2, - _divider.Width + graphicSizeIncrease, + _divider.Width + graphicSizeIncrease, 10); - + GUI.Label(position, _dividerGraphic); } - private void PaintVerticalBottom () { - if (_verticalBottom == null) { - _verticalBottom = CreateTexture(1, (int)_box.PaddingY, Color.black); + private void PaintVerticalBottom() + { + if (_verticalBottom == null) + { + _verticalBottom = CreateTexture(2, (int)_box.PaddingY, Color.white); } var position = new Rect( - _box.GlobalPositionX + _node.Width / 2 + _box.PaddingX - 2, + _box.GlobalPositionX + _node.Width / 2 + _box.PaddingX - 2, _box.GlobalPositionY + _node.Height + _box.PaddingY - 1, - 100, + 100, _box.PaddingY - 1); - + GUI.Label(position, _verticalBottom); } - - private void PaintVerticalTop () { - if (_verticalTop == null) { - _verticalTop = CreateTexture(1, Mathf.RoundToInt(_box.PaddingY / 2), Color.black); + + private void PaintVerticalTop() + { + if (_verticalTop == null) + { + _verticalTop = CreateTexture(2, Mathf.RoundToInt(_box.PaddingY / 2), Color.white); } var position = new Rect( - _box.GlobalPositionX + _node.Width / 2 + _box.PaddingX - 2, + _box.GlobalPositionX + _node.Width / 2 + _box.PaddingX - 2, _box.GlobalPositionY + _box.PaddingY / 2, - 100, + 100, 10); - + GUI.Label(position, _verticalTop); } - - private static Texture2D CreateTexture (int width, int height, Color color) { + + private static Texture2D CreateTexture(int width, int height, Color color) + { var texture = new Texture2D(width, height, TextureFormat.ARGB32, false); texture.SetPixels(Enumerable.Repeat(color, width * height).ToArray()); texture.Apply(); - + return texture; } } -} +} \ No newline at end of file