diff --git a/Source/Editor/CustomEditors/Dedicated/NavMeshBoundsVolumeEditor.cs b/Source/Editor/CustomEditors/Dedicated/NavMeshBoundsVolumeEditor.cs new file mode 100644 index 000000000..2cbf01e41 --- /dev/null +++ b/Source/Editor/CustomEditors/Dedicated/NavMeshBoundsVolumeEditor.cs @@ -0,0 +1,38 @@ +// Copyright (c) Wojciech Figat. All rights reserved. + +using FlaxEngine; + +namespace FlaxEditor.CustomEditors.Dedicated +{ + /// + /// Custom editor for . + /// + /// + [CustomEditor(typeof(NavMeshBoundsVolume)), DefaultEditor] + internal class NavMeshBoundsVolumeEditor : ActorEditor + { + /// + public override void Initialize(LayoutElementsContainer layout) + { + base.Initialize(layout); + + if (Values.HasDifferentTypes == false) + { + var button = layout.Button("Build"); + button.Button.Clicked += OnBuildClicked; + } + } + + private void OnBuildClicked() + { + foreach (var value in Values) + { + if (value is NavMeshBoundsVolume volume) + { + Navigation.BuildNavMesh(volume.Box, volume.Scene); + Editor.Instance.Scene.MarkSceneEdited(volume.Scene); + } + } + } + } +} diff --git a/Source/Editor/Editor.cs b/Source/Editor/Editor.cs index 58466e35d..c881d9dcd 100644 --- a/Source/Editor/Editor.cs +++ b/Source/Editor/Editor.cs @@ -23,6 +23,7 @@ using FlaxEngine.Assertions; using FlaxEngine.GUI; using FlaxEngine.Interop; using FlaxEngine.Json; +using FlaxEngine.Utilities; #pragma warning disable CS1591 @@ -1370,7 +1371,7 @@ namespace FlaxEditor public void BuildCSG() { var scenes = Level.Scenes; - scenes.ToList().ForEach(x => x.BuildCSG(0)); + scenes.ForEach(x => x.BuildCSG(0)); Scene.MarkSceneEdited(scenes); } @@ -1380,7 +1381,7 @@ namespace FlaxEditor public void BuildNavMesh() { var scenes = Level.Scenes; - scenes.ToList().ForEach(x => Navigation.BuildNavMesh(x, 0)); + Navigation.BuildNavMesh(); Scene.MarkSceneEdited(scenes); } diff --git a/Source/Editor/GUI/ContextMenu/ContextMenu.cs b/Source/Editor/GUI/ContextMenu/ContextMenu.cs index 896bd5bc2..f5705c6f5 100644 --- a/Source/Editor/GUI/ContextMenu/ContextMenu.cs +++ b/Source/Editor/GUI/ContextMenu/ContextMenu.cs @@ -502,6 +502,7 @@ namespace FlaxEditor.GUI.ContextMenu if (base.OnKeyDown(key)) return true; + // Keyboard navigation around the menu switch (key) { case KeyboardKeys.ArrowDown: @@ -526,6 +527,20 @@ namespace FlaxEditor.GUI.ContextMenu } } break; + case KeyboardKeys.ArrowRight: + for (int i = 0; i < _panel.Children.Count; i++) + { + if (_panel.Children[i] is ContextMenuChildMenu item && item.Visible && item.IsFocused && !item.ContextMenu.IsOpened) + { + item.ShowChild(this); + item.ContextMenu._panel.Children.FirstOrDefault(x => x is ContextMenuButton && x.Visible)?.Focus(); + break; + } + } + break; + case KeyboardKeys.ArrowLeft: + ParentCM?.RootWindow.Focus(); + break; } return false; diff --git a/Source/Editor/GUI/ContextMenu/ContextMenuBase.cs b/Source/Editor/GUI/ContextMenu/ContextMenuBase.cs index 0261792e7..2f517d903 100644 --- a/Source/Editor/GUI/ContextMenu/ContextMenuBase.cs +++ b/Source/Editor/GUI/ContextMenu/ContextMenuBase.cs @@ -72,6 +72,11 @@ namespace FlaxEditor.GUI.ContextMenu /// public bool HasChildCMOpened => _childCM != null; + /// + /// Gets the parent context menu (if exists). + /// + public ContextMenuBase ParentCM => _parentCM; + /// /// Gets the topmost context menu. /// @@ -81,9 +86,7 @@ namespace FlaxEditor.GUI.ContextMenu { var cm = this; while (cm._parentCM != null && cm._isSubMenu) - { cm = cm._parentCM; - } return cm; } } @@ -108,6 +111,11 @@ namespace FlaxEditor.GUI.ContextMenu /// public bool UseInput = true; + /// + /// Optional flag that can disable UI navigation (tab/enter). + /// + public bool UseNavigation = true; + /// /// Initializes a new instance of the class. /// @@ -594,6 +602,21 @@ namespace FlaxEditor.GUI.ContextMenu case KeyboardKeys.Escape: Hide(); return true; + case KeyboardKeys.Return: + if (UseNavigation && Root?.FocusedControl != null) + { + Root.SubmitFocused(); + return true; + } + break; + case KeyboardKeys.Tab: + if (UseNavigation && Root != null) + { + bool shiftDown = Root.GetKey(KeyboardKeys.Shift); + Root.Navigate(shiftDown ? NavDirection.Previous : NavDirection.Next); + return true; + } + break; } return false; } diff --git a/Source/Editor/GUI/ContextMenu/ContextMenuChildMenu.cs b/Source/Editor/GUI/ContextMenu/ContextMenuChildMenu.cs index 74ab560fb..78337d011 100644 --- a/Source/Editor/GUI/ContextMenu/ContextMenuChildMenu.cs +++ b/Source/Editor/GUI/ContextMenu/ContextMenuChildMenu.cs @@ -29,7 +29,7 @@ namespace FlaxEditor.GUI.ContextMenu CloseMenuOnClick = false; } - private void ShowChild(ContextMenu parentContextMenu) + internal void ShowChild(ContextMenu parentContextMenu) { // Hide parent CM popups and set itself as child var vAlign = parentContextMenu.ItemsAreaMargin.Top; diff --git a/Source/Editor/GUI/CurveEditor.Contents.cs b/Source/Editor/GUI/CurveEditor.Contents.cs index c2831046b..75f37d457 100644 --- a/Source/Editor/GUI/CurveEditor.Contents.cs +++ b/Source/Editor/GUI/CurveEditor.Contents.cs @@ -522,6 +522,16 @@ namespace FlaxEditor.GUI cm.AddButton("Show whole curve", _editor.ShowWholeCurve); cm.AddButton("Reset view", _editor.ResetView); } + cm.AddSeparator(); + var presetCm = cm.AddChildMenu("Apply preset"); + foreach (var value in Enum.GetValues(typeof(CurvePreset))) + { + CurvePreset preset = (CurvePreset)value; + string name = Utilities.Utils.GetPropertyNameUI(preset.ToString()); + var b = presetCm.ContextMenu.AddButton(name, () => _editor.ApplyPreset(preset)); + b.Enabled = !(_editor is LinearCurveEditor && (preset != CurvePreset.Constant && preset != CurvePreset.Linear)); + } + _editor.OnShowContextMenu(cm, selectionCount); cm.Show(this, location); } @@ -619,6 +629,33 @@ namespace FlaxEditor.GUI } } + /// + /// A list of avaliable curve presets for the . + /// + public enum CurvePreset + { + /// + /// A curve where every point has the same value. + /// + Constant, + /// + /// A curve linear curve. + /// + Linear, + /// + /// A curve that starts a slowly and then accelerates until the end. + /// + EaseIn, + /// + /// A curve that starts a steep and then flattens until the end. + /// + EaseOut, + /// + /// A combination of the and preset. + /// + Smoothstep + } + /// public override void OnKeyframesDeselect(IKeyframesEditor editor) { diff --git a/Source/Editor/GUI/CurveEditor.cs b/Source/Editor/GUI/CurveEditor.cs index 706d07b32..4fb727ea1 100644 --- a/Source/Editor/GUI/CurveEditor.cs +++ b/Source/Editor/GUI/CurveEditor.cs @@ -19,6 +19,48 @@ namespace FlaxEditor.GUI /// public abstract partial class CurveEditor : CurveEditorBase where T : new() { + /// + /// Represents a single point in a . + /// + protected struct CurvePresetPoint + { + /// + /// The time. + /// + public float Time; + + /// + /// The value. + /// + public float Value; + + /// + /// The in tangent. Will be ignored in + /// + public float TangentIn; + + /// + /// The out tangent. Will be ignored in + /// + public float TangentOut; + } + + /// + /// A curve preset. + /// + protected struct CurveEditorPreset() + { + /// + /// If the tangents will be linear or smooth. + /// + public bool LinearTangents; + + /// + /// The points of the preset. + /// + public List Points; + } + private class Popup : ContextMenuBase { private CustomEditorPresenter _presenter; @@ -26,11 +68,12 @@ namespace FlaxEditor.GUI private List _keyframeIndices; private bool _isDirty; - public Popup(CurveEditor editor, object[] selection, List keyframeIndices = null, float height = 140.0f) - : this(editor, height) + public Popup(CurveEditor editor, object[] selection, List keyframeIndices = null, float maxHeight = 140.0f) + : this(editor, maxHeight) { _presenter.Select(selection); _presenter.OpenAllGroups(); + Size = new Float2(Size.X, Mathf.Min(_presenter.ContainerControl.Size.Y, maxHeight)); _keyframeIndices = keyframeIndices; if (keyframeIndices != null && selection.Length != keyframeIndices.Count) throw new Exception(); @@ -169,7 +212,7 @@ namespace FlaxEditor.GUI if (IsSelected) color = Editor.ContainsFocus ? style.SelectionBorder : Color.Lerp(style.ForegroundDisabled, style.SelectionBorder, 0.4f); if (IsMouseOver) - color *= 1.1f; + color *= 1.5f; Render2D.FillRectangle(rect, color); } @@ -285,7 +328,7 @@ namespace FlaxEditor.GUI /// /// The keyframes size. /// - protected static readonly Float2 KeyframesSize = new Float2(7.0f); + protected static readonly Float2 KeyframesSize = new Float2(8.0f); /// /// The colors for the keyframe points. @@ -326,6 +369,63 @@ namespace FlaxEditor.GUI private Color _labelsColor; private Font _labelsFont; + /// + /// Preset values for to be applied to a . + /// + protected Dictionary Presets = new Dictionary + { + { CurvePreset.Constant, new CurveEditorPreset + { + LinearTangents = true, + Points = new List + { + new CurvePresetPoint { Time = 0f, Value = 0.5f, TangentIn = 0f, TangentOut = 0f }, + new CurvePresetPoint { Time = 1f, Value = 0.5f, TangentIn = 0f, TangentOut = 0f }, + } + } + }, + { CurvePreset.EaseIn, new CurveEditorPreset + { + LinearTangents = false, + Points = new List + { + new CurvePresetPoint { Time = 0f, Value = 0f, TangentIn = 0f, TangentOut = 0f }, + new CurvePresetPoint { Time = 1f, Value = 1f, TangentIn = -1.4f, TangentOut = 0f }, + } + } + }, + { CurvePreset.EaseOut, new CurveEditorPreset + { + LinearTangents = false, + Points = new List + { + new CurvePresetPoint { Time = 1f, Value = 1f, TangentIn = 0f, TangentOut = 0f }, + new CurvePresetPoint { Time = 0f, Value = 0f, TangentIn = 0f, TangentOut = 1.4f }, + } + } + }, + { CurvePreset.Linear, new CurveEditorPreset + { + LinearTangents = true, + Points = new List + { + new CurvePresetPoint { Time = 0f, Value = 0f, TangentIn = 0f, TangentOut = 0f }, + new CurvePresetPoint { Time = 1f, Value = 1f, TangentIn = 0f, TangentOut = 0f }, + } + } + }, + { CurvePreset.Smoothstep, new CurveEditorPreset + { + LinearTangents = false, + Points = new List + { + new CurvePresetPoint { Time = 0f, Value = 0f, TangentIn = 0f, TangentOut = 0f }, + new CurvePresetPoint { Time = 1f, Value = 1f, TangentIn = 0f, TangentOut = 0f }, + } + } + }, + }; + /// /// The keyframe UI points. /// @@ -568,6 +668,28 @@ namespace FlaxEditor.GUI /// The list of indices of the keyframes to remove. protected abstract void RemoveKeyframesInternal(HashSet indicesToRemove); + /// + /// Tries to convert a float to the type of the type wildcard of the curve editor. + /// + /// The float. + /// The converted value. + public static object ConvertCurvePresetValueToCurveEditorType(float value) + { + if (typeof(T) == typeof(Float2)) + return new Float2(value); + if (typeof(T) == typeof(Float3)) + return new Float3(value); + if (typeof(T) == typeof(Float4)) + return new Float4(value); + if (typeof(T) == typeof(Vector2)) + return new Vector2(value); + if (typeof(T) == typeof(Vector3)) + return new Vector3(value); + if (typeof(T) == typeof(Vector4)) + return new Vector4(value); + return value; + } + /// /// Called when showing a context menu. Can be used to add custom buttons with actions. /// @@ -752,6 +874,17 @@ namespace FlaxEditor.GUI ShowCurve(false); } + /// + /// Applies a to the curve editor. + /// + /// The preset. + public virtual void ApplyPreset(CurvePreset preset) + { + // Remove existing keyframes + SelectAll(); + RemoveKeyframes(); + } + /// public override void Evaluate(out object result, float time, bool loop = false) { @@ -1028,6 +1161,31 @@ namespace FlaxEditor.GUI return true; } + bool left = key == KeyboardKeys.ArrowLeft; + bool right = key == KeyboardKeys.ArrowRight; + bool up = key == KeyboardKeys.ArrowUp; + bool down = key == KeyboardKeys.ArrowDown; + + if (left || right || up || down) + { + bool shift = Root.GetKey(KeyboardKeys.Shift); + bool alt = Root.GetKey(KeyboardKeys.Alt); + float deltaValue = 10f; + if (shift || alt) + deltaValue = shift ? 2.5f : 5f; + + Float2 moveDelta = Float2.Zero; + if (left || right) + moveDelta.X = left ? -deltaValue : deltaValue; + if (up || down) + moveDelta.Y = up ? -deltaValue : deltaValue; + + _contents.OnMoveStart(Float2.Zero); + _contents.OnMove(moveDelta); + _contents.OnMoveEnd(Float2.Zero); + return true; + } + return false; } @@ -1526,6 +1684,22 @@ namespace FlaxEditor.GUI _tangents[i].Visible = false; } + /// + public override void ApplyPreset(CurvePreset preset) + { + base.ApplyPreset(preset); + + CurveEditorPreset data = Presets[preset]; + foreach (var point in data.Points) + { + float time = point.Time; + object value = ConvertCurvePresetValueToCurveEditorType((float)point.Value); + AddKeyframe(time, value); + } + + ShowWholeCurve(); + } + /// protected override void DrawCurve(ref Rectangle viewRect) { @@ -2312,6 +2486,30 @@ namespace FlaxEditor.GUI } } + /// + public override void ApplyPreset(CurvePreset preset) + { + base.ApplyPreset(preset); + + CurveEditorPreset data = Presets[preset]; + + foreach (var point in data.Points) + { + float time = point.Time; + object value = ConvertCurvePresetValueToCurveEditorType((float)point.Value); + object tangentIn = ConvertCurvePresetValueToCurveEditorType((float)point.TangentIn); + object tangentOut = ConvertCurvePresetValueToCurveEditorType((float)point.TangentOut); + + AddKeyframe(time, value, tangentIn, tangentOut); + } + + SelectAll(); + if (data.LinearTangents) + SetTangentsLinear(); + + ShowWholeCurve(); + } + /// protected override void SetScaleInternal(ref Float2 scale) { diff --git a/Source/Editor/GUI/Docking/DockPanel.cs b/Source/Editor/GUI/Docking/DockPanel.cs index bfac161f0..c8900dcba 100644 --- a/Source/Editor/GUI/Docking/DockPanel.cs +++ b/Source/Editor/GUI/Docking/DockPanel.cs @@ -469,7 +469,7 @@ namespace FlaxEditor.GUI.Docking var childPanels = _childPanels.ToArray(); if (childPanels.Length != 0) { - // Move tabs from child panels into this one + // Fallback: move tabs from child panels into this one. DockWindow selectedTab = null; foreach (var childPanel in childPanels) { @@ -490,7 +490,8 @@ namespace FlaxEditor.GUI.Docking { // Unlink splitter var splitterParent = splitter.Parent; - Assert.IsNotNull(splitterParent); + if (splitterParent == null) + return; splitter.Parent = null; // Move controls from second split panel to the split panel parent @@ -507,17 +508,63 @@ namespace FlaxEditor.GUI.Docking splitter.Dispose(); } } + else if (IsMaster && _childPanels.Count != 0) + { + if (TryCollapseSplitter(_tabsProxy?.Parent as Panel)) + return; + } else if (!IsMaster) { throw new InvalidOperationException(); } } + else if (_childPanels.Count != 0) + { + if (TryCollapseSplitter(_tabsProxy?.Parent as Panel)) + return; + } else if (!IsMaster) { throw new InvalidOperationException(); } } + internal bool CollapseEmptyTabsProxy() + { + if (TabsCount == 0 && ChildPanelsCount > 0) + { + return TryCollapseSplitter(_tabsProxy?.Parent as Panel); + } + return false; + } + + private bool TryCollapseSplitter(Panel removedPanelParent) + { + if (removedPanelParent == null) + return false; + if (!(removedPanelParent.Parent is SplitPanel tabsSplitter)) + return false; + + var splitterParent = tabsSplitter.Parent; + if (splitterParent == null) + return false; + tabsSplitter.Parent = null; + + var scrPanel = removedPanelParent == tabsSplitter.Panel2 ? tabsSplitter.Panel1 : tabsSplitter.Panel2; + var srcPanelChildrenCount = scrPanel.ChildrenCount; + for (int i = srcPanelChildrenCount - 1; i >= 0 && scrPanel.ChildrenCount > 0; i--) + { + scrPanel.GetChild(i).Parent = splitterParent; + } + Assert.IsTrue(scrPanel.ChildrenCount == 0); + Assert.IsTrue(splitterParent.ChildrenCount == srcPanelChildrenCount); + + tabsSplitter.Dispose(); + if (_tabsProxy != null && _tabsProxy.Parent == removedPanelParent) + _tabsProxy = null; + return true; + } + internal virtual void DockWindowInternal(DockState state, DockWindow window, bool autoSelect = true, float? splitterValue = null) { DockWindow(state, window, autoSelect, splitterValue); diff --git a/Source/Editor/GUI/Tree/TreeNode.cs b/Source/Editor/GUI/Tree/TreeNode.cs index ed1257819..b0ce8c251 100644 --- a/Source/Editor/GUI/Tree/TreeNode.cs +++ b/Source/Editor/GUI/Tree/TreeNode.cs @@ -1140,8 +1140,11 @@ namespace FlaxEditor.GUI.Tree ParentTree.DraggedOverNode = this; // Expand node if mouse goes over arrow - if (ArrowRect.Contains(location) && HasAnyVisibleChild) + if (ArrowRect.Contains(location) && HasAnyVisibleChild && IsCollapsed) + { Expand(true); + ParentTree?.FlushPendingPerformLayout(); + } result = OnDragEnterHeader(data); } @@ -1172,8 +1175,11 @@ namespace FlaxEditor.GUI.Tree ParentTree.DraggedOverNode = this; // Expand node if mouse goes over arrow - if (ArrowRect.Contains(location) && HasAnyVisibleChild) + if (ArrowRect.Contains(location) && HasAnyVisibleChild && IsCollapsed) + { Expand(true); + ParentTree?.FlushPendingPerformLayout(); + } if (!_isDragOverHeader) result = OnDragEnterHeader(data); diff --git a/Source/Editor/Modules/SceneEditingModule.cs b/Source/Editor/Modules/SceneEditingModule.cs index c36866bc3..b1a5be6f1 100644 --- a/Source/Editor/Modules/SceneEditingModule.cs +++ b/Source/Editor/Modules/SceneEditingModule.cs @@ -229,7 +229,7 @@ namespace FlaxEditor.Modules if (!isPlayMode && options.General.AutoRebuildNavMesh && actor.Scene && node.AffectsNavigationWithChildren) { var bounds = actor.BoxWithChildren; - Navigation.BuildNavMesh(actor.Scene, bounds, options.General.AutoRebuildNavMeshTimeoutMs); + Navigation.BuildNavMesh(bounds, options.General.AutoRebuildNavMeshTimeoutMs); } } diff --git a/Source/Editor/Modules/WindowsModule.cs b/Source/Editor/Modules/WindowsModule.cs index 218394a3b..162fa3a40 100644 --- a/Source/Editor/Modules/WindowsModule.cs +++ b/Source/Editor/Modules/WindowsModule.cs @@ -491,10 +491,15 @@ namespace FlaxEditor.Modules Editor.LogWarning("Empty panel inside layout."); p.RemoveIt(); } + else + { + p.CollapseEmptyTabsProxy(); + } } } panel.SelectTab(selectedTab); + panel.CollapseEmptyTabsProxy(); } private static void SaveBounds(XmlWriter writer, Window win) diff --git a/Source/Editor/SceneGraph/Actors/SplineNode.cs b/Source/Editor/SceneGraph/Actors/SplineNode.cs index de319ca1d..515939526 100644 --- a/Source/Editor/SceneGraph/Actors/SplineNode.cs +++ b/Source/Editor/SceneGraph/Actors/SplineNode.cs @@ -555,7 +555,7 @@ namespace FlaxEditor.SceneGraph.Actors var options = Editor.Instance.Options.Options.General; if (options.AutoRebuildNavMesh) { - Navigation.BuildNavMesh(collider.Scene, collider.Box, options.AutoRebuildNavMeshTimeoutMs); + Navigation.BuildNavMesh(collider.Box, options.AutoRebuildNavMeshTimeoutMs); } } } diff --git a/Source/Editor/Surface/Archetypes/Material.cs b/Source/Editor/Surface/Archetypes/Material.cs index e46038639..9ac43082e 100644 --- a/Source/Editor/Surface/Archetypes/Material.cs +++ b/Source/Editor/Surface/Archetypes/Material.cs @@ -304,25 +304,14 @@ namespace FlaxEditor.Surface.Archetypes } } - internal sealed class CustomCodeNode : SurfaceNode + internal sealed class CustomCodeNode : ResizableSurfaceNode { - private Rectangle _resizeButtonRect; - private Float2 _startResizingSize; - private Float2 _startResizingCornerOffset; - private bool _isResizing; private CustomCodeTextBox _textBox; - private int SizeValueIndex => Archetype.TypeID == 8 ? 1 : 3; // Index of the Size stored in Values array - - private Float2 SizeValue - { - get => (Float2)Values[SizeValueIndex]; - set => SetValue(SizeValueIndex, value, false); - } - public CustomCodeNode(uint id, VisjectSurfaceContext context, NodeArchetype nodeArch, GroupArchetype groupArch) : base(id, context, nodeArch, groupArch) { + _sizeValueIndex = Archetype.TypeID == 8 ? 1 : 3; // Index of the Size stored in Values array Float2 pos = new Float2(FlaxEditor.Surface.Constants.NodeMarginX, FlaxEditor.Surface.Constants.NodeMarginY + FlaxEditor.Surface.Constants.NodeHeaderSize), size; if (nodeArch.TypeID == 8) { @@ -345,126 +334,19 @@ namespace FlaxEditor.Surface.Archetypes _textBox.EditEnd += () => SetValue(0, _textBox.Text); } - public override bool CanSelect(ref Float2 location) - { - return base.CanSelect(ref location) && !_resizeButtonRect.MakeOffsetted(Location).Contains(ref location); - } - public override void OnSurfaceLoaded(SurfaceNodeActions action) { base.OnSurfaceLoaded(action); _textBox.Text = (string)Values[0]; - - var size = SizeValue; - if (Surface != null && Surface.GridSnappingEnabled) - size = Surface.SnapToGrid(size, true); - Resize(size.X, size.Y); } public override void OnValuesChanged() { base.OnValuesChanged(); - var size = SizeValue; - Resize(size.X, size.Y); _textBox.Text = (string)Values[0]; } - - protected override void UpdateRectangles() - { - base.UpdateRectangles(); - - const float buttonMargin = FlaxEditor.Surface.Constants.NodeCloseButtonMargin; - const float buttonSize = FlaxEditor.Surface.Constants.NodeCloseButtonSize; - _resizeButtonRect = new Rectangle(_closeButtonRect.Left, Height - buttonSize - buttonMargin - 4, buttonSize, buttonSize); - } - - public override void Draw() - { - base.Draw(); - - var style = Style.Current; - if (_isResizing) - { - Render2D.FillRectangle(_resizeButtonRect, style.Selection); - Render2D.DrawRectangle(_resizeButtonRect, style.SelectionBorder); - } - Render2D.DrawSprite(style.Scale, _resizeButtonRect, _resizeButtonRect.Contains(_mousePosition) && Surface.CanEdit ? style.Foreground : style.ForegroundGrey); - } - - public override void OnLostFocus() - { - if (_isResizing) - EndResizing(); - - base.OnLostFocus(); - } - - public override void OnEndMouseCapture() - { - if (_isResizing) - EndResizing(); - - base.OnEndMouseCapture(); - } - - public override bool OnMouseDown(Float2 location, MouseButton button) - { - if (base.OnMouseDown(location, button)) - return true; - - if (button == MouseButton.Left && _resizeButtonRect.Contains(ref location) && Surface.CanEdit) - { - // Start sliding - _isResizing = true; - _startResizingSize = Size; - _startResizingCornerOffset = Size - location; - StartMouseCapture(); - Cursor = CursorType.SizeNWSE; - return true; - } - - return false; - } - - public override void OnMouseMove(Float2 location) - { - if (_isResizing) - { - var emptySize = CalculateNodeSize(0, 0); - var size = Float2.Max(location - emptySize + _startResizingCornerOffset, new Float2(240, 160)); - Resize(size.X, size.Y); - } - else - { - base.OnMouseMove(location); - } - } - - public override bool OnMouseUp(Float2 location, MouseButton button) - { - if (button == MouseButton.Left && _isResizing) - { - EndResizing(); - return true; - } - - return base.OnMouseUp(location, button); - } - - private void EndResizing() - { - Cursor = CursorType.Default; - EndMouseCapture(); - _isResizing = false; - if (_startResizingSize != Size) - { - var emptySize = CalculateNodeSize(0, 0); - SizeValue = Size - emptySize; - Surface.MarkAsEdited(false); - } - } } internal enum MaterialTemplateInputsMapping diff --git a/Source/Editor/Surface/Archetypes/Tools.cs b/Source/Editor/Surface/Archetypes/Tools.cs index aacebd189..68a733197 100644 --- a/Source/Editor/Surface/Archetypes/Tools.cs +++ b/Source/Editor/Surface/Archetypes/Tools.cs @@ -453,7 +453,7 @@ namespace FlaxEditor.Surface.Archetypes } } - private class CurveNode : SurfaceNode where T : struct + private class CurveNode : ResizableSurfaceNode where T : struct { private BezierCurveEditor _curve; private bool _isSavingCurve; @@ -467,7 +467,7 @@ namespace FlaxEditor.Surface.Archetypes Create = (id, context, arch, groupArch) => new CurveNode(id, context, arch, groupArch), Description = "An animation spline represented by a set of keyframes, each representing an endpoint of a Bezier curve.", Flags = NodeFlags.AllGraphs, - Size = new Float2(400, 180.0f), + Size = new Float2(400, 180), DefaultValues = new object[] { // Keyframes count @@ -491,6 +491,8 @@ namespace FlaxEditor.Surface.Archetypes 0.0f, zero, zero, zero, 0.0f, zero, zero, zero, 0.0f, zero, zero, zero, + + new Float2(400, 180), }, Elements = new[] { @@ -504,30 +506,52 @@ namespace FlaxEditor.Surface.Archetypes public CurveNode(uint id, VisjectSurfaceContext context, NodeArchetype nodeArch, GroupArchetype groupArch) : base(id, context, nodeArch, groupArch) { + _sizeValueIndex = 29; // Index of the Size stored in Values array } - + /// public override void OnLoaded(SurfaceNodeActions action) { base.OnLoaded(action); + // Create curve editor var upperLeft = GetBox(0).BottomLeft; var upperRight = GetBox(1).BottomRight; float curveMargin = 20.0f; - _curve = new BezierCurveEditor { MaxKeyframes = 7, Bounds = new Rectangle(upperLeft + new Float2(curveMargin, 10.0f), upperRight.X - upperLeft.X - curveMargin * 2.0f, 140.0f), - Parent = this + Parent = this, + AnchorMax = Float2.One, }; _curve.Edited += OnCurveEdited; _curve.UnlockChildrenRecursive(); _curve.PerformLayout(); + // Sync keyframes UpdateCurveKeyframes(); } + /// + public override void OnSurfaceLoaded(SurfaceNodeActions action) + { + base.OnSurfaceLoaded(action); + + // Ensure the whole curve is shown + _curve.ShowWholeCurve(); + } + + public override void OnValuesChanged() + { + base.OnValuesChanged(); + + if (!_isSavingCurve) + { + UpdateCurveKeyframes(); + } + } + private void OnCurveEdited() { if (_isSavingCurve) @@ -553,17 +577,6 @@ namespace FlaxEditor.Surface.Archetypes _isSavingCurve = false; } - /// - public override void OnValuesChanged() - { - base.OnValuesChanged(); - - if (!_isSavingCurve) - { - UpdateCurveKeyframes(); - } - } - private void UpdateCurveKeyframes() { var count = (int)Values[0]; @@ -1575,7 +1588,7 @@ namespace FlaxEditor.Surface.Archetypes DefaultValues = new object[] { Guid.Empty, - string.Empty + string.Empty, }, Elements = new[] { diff --git a/Source/Editor/Surface/ResizableSurfaceNode.cs b/Source/Editor/Surface/ResizableSurfaceNode.cs new file mode 100644 index 000000000..259c29836 --- /dev/null +++ b/Source/Editor/Surface/ResizableSurfaceNode.cs @@ -0,0 +1,182 @@ +// Copyright (c) Wojciech Figat. All rights reserved. + +using FlaxEngine; +using FlaxEngine.GUI; + +namespace FlaxEditor.Surface +{ + /// + /// Visject Surface node control that cna be resized. + /// + /// + [HideInEditor] + public class ResizableSurfaceNode : SurfaceNode + { + private Float2 _startResizingSize; + private Float2 _startResizingCornerOffset; + + /// + /// Indicates whether the node is currently being resized. + /// + protected bool _isResizing; + + /// + /// Index of the Float2 value in the node values list to store node size. + /// + protected int _sizeValueIndex = -1; + + /// + /// Minimum node size. + /// + protected Float2 _sizeMin = new Float2(240, 160); + + /// + /// Node resizing rectangle bounds. + /// + protected Rectangle _resizeButtonRect; + + private Float2 SizeValue + { + get => (Float2)Values[_sizeValueIndex]; + set => SetValue(_sizeValueIndex, value, false); + } + + /// + public ResizableSurfaceNode(uint id, VisjectSurfaceContext context, NodeArchetype nodeArch, GroupArchetype groupArch) + : base(id, context, nodeArch, groupArch) + { + } + + /// + public override bool CanSelect(ref Float2 location) + { + return base.CanSelect(ref location) && !_resizeButtonRect.MakeOffsetted(Location).Contains(ref location); + } + + /// + public override void OnSurfaceLoaded(SurfaceNodeActions action) + { + // Reapply the curve node size + var size = SizeValue; + if (Surface != null && Surface.GridSnappingEnabled) + size = Surface.SnapToGrid(size, true); + Resize(size.X, size.Y); + + base.OnSurfaceLoaded(action); + } + + /// + public override void OnValuesChanged() + { + base.OnValuesChanged(); + + var size = SizeValue; + Resize(size.X, size.Y); + } + + /// + public override void Draw() + { + base.Draw(); + + if (Surface.CanEdit) + { + var style = Style.Current; + if (_isResizing) + { + Render2D.FillRectangle(_resizeButtonRect, style.Selection); + Render2D.DrawRectangle(_resizeButtonRect, style.SelectionBorder); + } + Render2D.DrawSprite(style.Scale, _resizeButtonRect, _resizeButtonRect.Contains(_mousePosition) ? style.Foreground : style.ForegroundGrey); + } + } + + /// + public override void OnLostFocus() + { + if (_isResizing) + EndResizing(); + + base.OnLostFocus(); + } + + /// + public override void OnEndMouseCapture() + { + if (_isResizing) + EndResizing(); + + base.OnEndMouseCapture(); + } + + /// + public override bool OnMouseDown(Float2 location, MouseButton button) + { + if (base.OnMouseDown(location, button)) + return true; + + if (button == MouseButton.Left && _resizeButtonRect.Contains(ref location) && Surface.CanEdit) + { + // Start resizing + _isResizing = true; + _startResizingSize = Size; + _startResizingCornerOffset = Size - location; + StartMouseCapture(); + Cursor = CursorType.SizeNWSE; + return true; + } + + return false; + } + + /// + public override void OnMouseMove(Float2 location) + { + if (_isResizing) + { + var emptySize = CalculateNodeSize(0, 0); + var size = Float2.Max(location - emptySize + _startResizingCornerOffset, _sizeMin); + Resize(size.X, size.Y); + } + else + { + base.OnMouseMove(location); + } + } + + /// + public override bool OnMouseUp(Float2 location, MouseButton button) + { + if (button == MouseButton.Left && _isResizing) + { + EndResizing(); + return true; + } + + return base.OnMouseUp(location, button); + } + + /// + protected override void UpdateRectangles() + { + base.UpdateRectangles(); + + const float buttonMargin = Constants.NodeCloseButtonMargin; + const float buttonSize = Constants.NodeCloseButtonSize; + _resizeButtonRect = new Rectangle(_closeButtonRect.Left, Height - buttonSize - buttonMargin - 4, buttonSize, buttonSize); + } + + private void EndResizing() + { + Cursor = CursorType.Default; + EndMouseCapture(); + _isResizing = false; + if (_startResizingSize != Size) + { + var emptySize = CalculateNodeSize(0, 0); + SizeValue = Size - emptySize; + Surface.MarkAsEdited(false); + } + } + } +} diff --git a/Source/Editor/Surface/SurfaceComment.cs b/Source/Editor/Surface/SurfaceComment.cs index 10e9fc776..a76fa245d 100644 --- a/Source/Editor/Surface/SurfaceComment.cs +++ b/Source/Editor/Surface/SurfaceComment.cs @@ -14,18 +14,11 @@ namespace FlaxEditor.Surface /// /// [HideInEditor] - public class SurfaceComment : SurfaceNode + public class SurfaceComment : ResizableSurfaceNode { private Rectangle _colorButtonRect; - private Rectangle _resizeButtonRect; - private Float2 _startResizingSize; private readonly TextBox _renameTextBox; - /// - /// True if sizing tool is in use. - /// - protected bool _isResizing; - /// /// True if rename textbox is active in order to rename comment /// @@ -52,12 +45,6 @@ namespace FlaxEditor.Surface set => SetValue(1, value, false); } - private Float2 SizeValue - { - get => (Float2)Values[2]; - set => SetValue(2, value, false); - } - private int OrderValue { get => (int)Values[3]; @@ -68,6 +55,8 @@ namespace FlaxEditor.Surface public SurfaceComment(uint id, VisjectSurfaceContext context, NodeArchetype nodeArch, GroupArchetype groupArch) : base(id, context, nodeArch, groupArch) { + _sizeValueIndex = 2; // Index of the Size stored in Values array + _sizeMin = new Float2(140.0f, Constants.NodeHeaderSize); _renameTextBox = new TextBox(false, 0, 0, Width) { Height = Constants.NodeHeaderSize, @@ -86,10 +75,6 @@ namespace FlaxEditor.Surface // Read node data Title = TitleValue; Color = ColorValue; - var size = SizeValue; - if (Surface != null && Surface.GridSnappingEnabled) - size = Surface.SnapToGrid(size, true); - Size = size; // Order // Backwards compatibility - When opening with an older version send the old comments to the back @@ -126,27 +111,6 @@ namespace FlaxEditor.Surface // Read node data Title = TitleValue; Color = ColorValue; - Size = SizeValue; - } - - private void EndResizing() - { - // Clear state - _isResizing = false; - - if (_startResizingSize != Size) - { - SizeValue = Size; - Surface.MarkAsEdited(false); - } - - EndMouseCapture(); - } - - /// - public override bool CanSelect(ref Float2 location) - { - return _headerRect.MakeOffsetted(Location).Contains(ref location) && !_resizeButtonRect.MakeOffsetted(Location).Contains(ref location); } /// @@ -158,6 +122,8 @@ namespace FlaxEditor.Surface /// protected override void UpdateRectangles() { + base.UpdateRectangles(); + const float headerSize = Constants.NodeHeaderSize; const float buttonMargin = Constants.NodeCloseButtonMargin; const float buttonSize = Constants.NodeCloseButtonSize; @@ -222,16 +188,13 @@ namespace FlaxEditor.Surface // Color button Render2D.DrawSprite(style.Settings, _colorButtonRect, _colorButtonRect.Contains(_mousePosition) && Surface.CanEdit ? style.Foreground : style.ForegroundGrey); - // Check if is resizing + // Resize button if (_isResizing) { - // Draw overlay Render2D.FillRectangle(_resizeButtonRect, style.Selection); Render2D.DrawRectangle(_resizeButtonRect, style.SelectionBorder); } - - // Resize button - Render2D.DrawSprite(style.Scale, _resizeButtonRect, _resizeButtonRect.Contains(_mousePosition) && Surface.CanEdit ? style.Foreground : style.ForegroundGrey); + Render2D.DrawSprite(style.Scale, _resizeButtonRect, _resizeButtonRect.Contains(_mousePosition) ? style.Foreground : style.ForegroundGrey); } // Selection outline @@ -247,88 +210,28 @@ namespace FlaxEditor.Surface /// protected override Float2 CalculateNodeSize(float width, float height) { - return Size; + // No margins or headers + return new Float2(width, height); } /// public override void OnLostFocus() { - // Check if was resizing - if (_isResizing) - { - EndResizing(); - } - - // Check if was renaming if (_isRenaming) { Rename(_renameTextBox.Text); StopRenaming(); } - // Base base.OnLostFocus(); } - /// - public override void OnEndMouseCapture() - { - // Check if was resizing - if (_isResizing) - { - EndResizing(); - } - else - { - base.OnEndMouseCapture(); - } - } - /// public override bool ContainsPoint(ref Float2 location, bool precise) { return _headerRect.Contains(ref location) || _resizeButtonRect.Contains(ref location); } - /// - public override bool OnMouseDown(Float2 location, MouseButton button) - { - if (base.OnMouseDown(location, button)) - return true; - - // Check if can start resizing - if (button == MouseButton.Left && _resizeButtonRect.Contains(ref location) && Surface.CanEdit) - { - // Start sliding - _isResizing = true; - _startResizingSize = Size; - StartMouseCapture(); - - return true; - } - - return false; - } - - /// - public override void OnMouseMove(Float2 location) - { - // Check if is resizing - if (_isResizing) - { - // Update size - var size = Float2.Max(location, new Float2(140.0f, _headerRect.Bottom)); - if (Surface.GridSnappingEnabled) - size = Surface.SnapToGrid(size, true); - Size = size; - } - else - { - // Base - base.OnMouseMove(location); - } - } - /// public override bool OnMouseDoubleClick(Float2 location, MouseButton button) { @@ -394,12 +297,6 @@ namespace FlaxEditor.Surface /// public override bool OnMouseUp(Float2 location, MouseButton button) { - if (button == MouseButton.Left && _isResizing) - { - EndResizing(); - return true; - } - if (base.OnMouseUp(location, button)) return true; diff --git a/Source/Editor/Tools/Terrain/EditTab.cs b/Source/Editor/Tools/Terrain/EditTab.cs index 551a47974..6a6191122 100644 --- a/Source/Editor/Tools/Terrain/EditTab.cs +++ b/Source/Editor/Tools/Terrain/EditTab.cs @@ -192,7 +192,7 @@ namespace FlaxEditor.Tools.Terrain { if (terrain.Scene && terrain.HasStaticFlag(StaticFlags.Navigation)) { - Navigation.BuildNavMesh(terrain.Scene, patchBounds, editorOptions.General.AutoRebuildNavMeshTimeoutMs); + Navigation.BuildNavMesh(patchBounds, editorOptions.General.AutoRebuildNavMeshTimeoutMs); } } } diff --git a/Source/Editor/Tools/Terrain/EditTerrainGizmo.cs b/Source/Editor/Tools/Terrain/EditTerrainGizmo.cs index 54a6d7fa4..5fc0e894f 100644 --- a/Source/Editor/Tools/Terrain/EditTerrainGizmo.cs +++ b/Source/Editor/Tools/Terrain/EditTerrainGizmo.cs @@ -209,7 +209,7 @@ namespace FlaxEditor.Tools.Terrain { if (terrain.Scene && terrain.HasStaticFlag(StaticFlags.Navigation)) { - Navigation.BuildNavMesh(terrain.Scene, patchBounds, editorOptions.General.AutoRebuildNavMeshTimeoutMs); + Navigation.BuildNavMesh(patchBounds, editorOptions.General.AutoRebuildNavMeshTimeoutMs); } } } diff --git a/Source/Editor/Tools/Terrain/Undo/EditTerrainMapAction.cs b/Source/Editor/Tools/Terrain/Undo/EditTerrainMapAction.cs index 87b0c3cc9..afac0948e 100644 --- a/Source/Editor/Tools/Terrain/Undo/EditTerrainMapAction.cs +++ b/Source/Editor/Tools/Terrain/Undo/EditTerrainMapAction.cs @@ -172,7 +172,7 @@ namespace FlaxEditor.Tools.Terrain.Undo if (_navmeshBoundsModifications != null) { foreach (var bounds in _navmeshBoundsModifications) - Navigation.BuildNavMesh(scene, bounds, _dirtyNavMeshTimeoutMs); + Navigation.BuildNavMesh(bounds, _dirtyNavMeshTimeoutMs); } Editor.Instance.Scene.MarkSceneEdited(scene); @@ -217,11 +217,10 @@ namespace FlaxEditor.Tools.Terrain.Undo } // Update navmesh - var scene = Terrain.Scene; if (_navmeshBoundsModifications != null) { foreach (var bounds in _navmeshBoundsModifications) - Navigation.BuildNavMesh(scene, bounds, _dirtyNavMeshTimeoutMs); + Navigation.BuildNavMesh(bounds, _dirtyNavMeshTimeoutMs); } Editor.Instance.Scene.MarkSceneEdited(Terrain.Scene); diff --git a/Source/Editor/Undo/Actions/DeleteActorsAction.cs b/Source/Editor/Undo/Actions/DeleteActorsAction.cs index 75594ecb9..19ffb1e3f 100644 --- a/Source/Editor/Undo/Actions/DeleteActorsAction.cs +++ b/Source/Editor/Undo/Actions/DeleteActorsAction.cs @@ -303,7 +303,7 @@ namespace FlaxEditor.Actions if (_nodeParents[i] is ActorNode node && node.Actor && node.Actor.Scene && node.AffectsNavigationWithChildren) { var bounds = node.Actor.BoxWithChildren; - Navigation.BuildNavMesh(node.Actor.Scene, bounds, options.General.AutoRebuildNavMeshTimeoutMs); + Navigation.BuildNavMesh(bounds, options.General.AutoRebuildNavMeshTimeoutMs); } } } diff --git a/Source/Editor/Undo/Actions/TransformObjectsAction.cs b/Source/Editor/Undo/Actions/TransformObjectsAction.cs index ebed61174..df013e20e 100644 --- a/Source/Editor/Undo/Actions/TransformObjectsAction.cs +++ b/Source/Editor/Undo/Actions/TransformObjectsAction.cs @@ -121,12 +121,12 @@ namespace FlaxEditor // Handle simple case where objects were moved just a little and use one navmesh build request to improve performance if (data.BeforeBounds.Intersects(ref data.AfterBounds)) { - Navigation.BuildNavMesh(data.Scene, BoundingBox.Merge(data.BeforeBounds, data.AfterBounds), options.General.AutoRebuildNavMeshTimeoutMs); + Navigation.BuildNavMesh(BoundingBox.Merge(data.BeforeBounds, data.AfterBounds), options.General.AutoRebuildNavMeshTimeoutMs); } else { - Navigation.BuildNavMesh(data.Scene, data.BeforeBounds, options.General.AutoRebuildNavMeshTimeoutMs); - Navigation.BuildNavMesh(data.Scene, data.AfterBounds, options.General.AutoRebuildNavMeshTimeoutMs); + Navigation.BuildNavMesh(data.BeforeBounds, options.General.AutoRebuildNavMeshTimeoutMs); + Navigation.BuildNavMesh(data.AfterBounds, options.General.AutoRebuildNavMeshTimeoutMs); } } } diff --git a/Source/Engine/Debug/DebugCommands.cpp b/Source/Engine/Debug/DebugCommands.cpp index fa171d5dd..58cf2894b 100644 --- a/Source/Engine/Debug/DebugCommands.cpp +++ b/Source/Engine/Debug/DebugCommands.cpp @@ -8,6 +8,7 @@ #include "Engine/Threading/Threading.h" #include "Engine/Threading/Task.h" #include "Engine/Profiler/ProfilerCPU.h" +#include "Engine/Profiler/ProfilerMemory.h" #include "Engine/Scripting/BinaryModule.h" #include "Engine/Scripting/Scripting.h" #include "Engine/Scripting/ManagedCLR/MAssembly.h" @@ -219,6 +220,7 @@ namespace if (module == GetBinaryModuleCorlib()) return; PROFILE_CPU(); + PROFILE_MEM(EngineDebug); #if USE_CSHARP if (auto* managedModule = dynamic_cast(module)) @@ -381,6 +383,7 @@ DebugCommandsService DebugCommandsServiceInstance; void DebugCommands::Execute(StringView command) { + PROFILE_MEM(EngineDebug); // TODO: fix missing string handle on 1st command execution (command gets invalid after InitCommands due to dotnet GC or dotnet interop handles flush) String commandCopy = command; command = commandCopy; @@ -423,6 +426,7 @@ void DebugCommands::Search(StringView searchText, Array& matches, bo { if (searchText.IsEmpty()) return; + PROFILE_MEM(EngineDebug); // TODO: fix missing string handle on 1st command execution (command gets invalid after InitCommands due to dotnet GC or dotnet interop handles flush) String searchTextCopy = searchText; searchText = searchTextCopy; diff --git a/Source/Engine/Debug/DebugDraw.cpp b/Source/Engine/Debug/DebugDraw.cpp index bea9e76f4..18552dcec 100644 --- a/Source/Engine/Debug/DebugDraw.cpp +++ b/Source/Engine/Debug/DebugDraw.cpp @@ -480,6 +480,7 @@ DebugDrawCall WriteLists(int32& vertexCounter, const Array& listA, const Arra FORCE_INLINE DebugTriangle* AppendTriangles(int32 count, float duration, bool depthTest) { + PROFILE_MEM(EngineDebug); Array* list; if (depthTest) list = duration > 0 ? &Context->DebugDrawDepthTest.DefaultTriangles : &Context->DebugDrawDepthTest.OneFrameTriangles; @@ -492,6 +493,7 @@ FORCE_INLINE DebugTriangle* AppendTriangles(int32 count, float duration, bool de FORCE_INLINE DebugTriangle* AppendWireTriangles(int32 count, float duration, bool depthTest) { + PROFILE_MEM(EngineDebug); Array* list; if (depthTest) list = duration > 0 ? &Context->DebugDrawDepthTest.DefaultWireTriangles : &Context->DebugDrawDepthTest.OneFrameWireTriangles; @@ -539,7 +541,7 @@ DebugDrawService DebugDrawServiceInstance; bool DebugDrawService::Init() { - PROFILE_MEM(Graphics); + PROFILE_MEM(EngineDebug); Context = &GlobalContext; // Init wireframe sphere cache @@ -658,7 +660,7 @@ void DebugDrawService::Update() } PROFILE_CPU(); - PROFILE_MEM(Graphics); + PROFILE_MEM(EngineDebug); // Update lists float deltaTime = Time::Update.DeltaTime.GetTotalSeconds(); @@ -1114,6 +1116,7 @@ void DebugDraw::DrawRay(const Ray& ray, const Color& color, float length, float void DebugDraw::DrawLine(const Vector3& start, const Vector3& end, const Color& color, float duration, bool depthTest) { + PROFILE_MEM(EngineDebug); const Float3 startF = start - Context->Origin, endF = end - Context->Origin; auto& debugDrawData = depthTest ? Context->DebugDrawDepthTest : Context->DebugDrawDefault; if (duration > 0) @@ -1132,6 +1135,7 @@ void DebugDraw::DrawLine(const Vector3& start, const Vector3& end, const Color& void DebugDraw::DrawLine(const Vector3& start, const Vector3& end, const Color& startColor, const Color& endColor, float duration, bool depthTest) { + PROFILE_MEM(EngineDebug); const Float3 startF = start - Context->Origin, endF = end - Context->Origin; auto& debugDrawData = depthTest ? Context->DebugDrawDepthTest : Context->DebugDrawDefault; if (duration > 0) @@ -1161,6 +1165,7 @@ void DebugDraw::DrawLines(const Span& lines, const Matrix& transform, co } // Draw lines + PROFILE_MEM(EngineDebug); const Float3* p = lines.Get(); auto& debugDrawData = depthTest ? Context->DebugDrawDepthTest : Context->DebugDrawDefault; const Matrix transformF = transform * Matrix::Translation(-Context->Origin); @@ -1200,6 +1205,7 @@ void DebugDraw::DrawLines(GPUBuffer* lines, const Matrix& transform, float durat } // Draw lines + PROFILE_MEM(EngineDebug); auto& debugDrawData = depthTest ? Context->DebugDrawDepthTest : Context->DebugDrawDefault; auto& geometry = debugDrawData.GeometryBuffers.AddOne(); geometry.Buffer = lines; @@ -1224,6 +1230,7 @@ void DebugDraw::DrawLines(const Span& lines, const Matrix& transform, c } // Draw lines + PROFILE_MEM(EngineDebug); const Double3* p = lines.Get(); auto& debugDrawData = depthTest ? Context->DebugDrawDepthTest : Context->DebugDrawDefault; const Matrix transformF = transform * Matrix::Translation(-Context->Origin); @@ -1270,6 +1277,7 @@ void DebugDraw::DrawBezier(const Vector3& p1, const Vector3& p2, const Vector3& const float segmentCountInv = 1.0f / (float)segmentCount; // Draw segmented curve from lines + PROFILE_MEM(EngineDebug); auto& debugDrawData = depthTest ? Context->DebugDrawDepthTest : Context->DebugDrawDefault; if (duration > 0) { @@ -1310,6 +1318,7 @@ void DebugDraw::DrawWireBox(const BoundingBox& box, const Color& color, float du c -= Context->Origin; // Draw lines + PROFILE_MEM(EngineDebug); auto& debugDrawData = depthTest ? Context->DebugDrawDepthTest : Context->DebugDrawDefault; if (duration > 0) { @@ -1344,6 +1353,7 @@ void DebugDraw::DrawWireFrustum(const BoundingFrustum& frustum, const Color& col c -= Context->Origin; // Draw lines + PROFILE_MEM(EngineDebug); auto& debugDrawData = depthTest ? Context->DebugDrawDepthTest : Context->DebugDrawDefault; if (duration > 0) { @@ -1378,6 +1388,7 @@ void DebugDraw::DrawWireBox(const OrientedBoundingBox& box, const Color& color, c -= Context->Origin; // Draw lines + PROFILE_MEM(EngineDebug); auto& debugDrawData = depthTest ? Context->DebugDrawDepthTest : Context->DebugDrawDefault; if (duration > 0) { @@ -1419,6 +1430,7 @@ void DebugDraw::DrawWireSphere(const BoundingSphere& sphere, const Color& color, auto& cache = SphereCache[index]; // Draw lines of the unit sphere after linear transform + PROFILE_MEM(EngineDebug); auto& debugDrawData = depthTest ? Context->DebugDrawDepthTest : Context->DebugDrawDefault; if (duration > 0) { @@ -1454,6 +1466,7 @@ void DebugDraw::DrawSphere(const BoundingSphere& sphere, const Color& color, flo list = duration > 0 ? &Context->DebugDrawDepthTest.DefaultTriangles : &Context->DebugDrawDepthTest.OneFrameTriangles; else list = duration > 0 ? &Context->DebugDrawDefault.DefaultTriangles : &Context->DebugDrawDefault.OneFrameTriangles; + PROFILE_MEM(EngineDebug); list->EnsureCapacity(list->Count() + SphereTriangleCache.Count()); const Float3 centerF = sphere.Center - Context->Origin; @@ -1485,6 +1498,7 @@ void DebugDraw::DrawCircle(const Vector3& position, const Float3& normal, float Matrix::Multiply(scale, world, matrix); // Draw lines of the unit circle after linear transform + PROFILE_MEM(EngineDebug); Float3 prev = Float3::Transform(CircleCache[0], matrix); auto& debugDrawData = depthTest ? Context->DebugDrawDepthTest : Context->DebugDrawDefault; for (int32 i = 1; i < DEBUG_DRAW_CIRCLE_VERTICES;) @@ -1515,6 +1529,7 @@ void DebugDraw::DrawWireTriangle(const Vector3& v0, const Vector3& v1, const Vec void DebugDraw::DrawTriangle(const Vector3& v0, const Vector3& v1, const Vector3& v2, const Color& color, float duration, bool depthTest) { + PROFILE_MEM(EngineDebug); DebugTriangle t; t.Color = Color32(color); t.TimeLeft = duration; @@ -1570,6 +1585,7 @@ void DebugDraw::DrawTriangles(GPUBuffer* triangles, const Matrix& transform, flo DebugLog::ThrowException("Cannot draw debug lines with incorrect amount of items in array"); return; } + PROFILE_MEM(EngineDebug); auto& debugDrawData = depthTest ? Context->DebugDrawDepthTest : Context->DebugDrawDefault; auto& geometry = debugDrawData.GeometryBuffers.AddOne(); geometry.Buffer = triangles; @@ -1859,6 +1875,7 @@ void DebugDraw::DrawWireCapsule(const Vector3& position, const Quaternion& orien Matrix::Multiply(rotation, translation, world); // Write vertices + PROFILE_MEM(EngineDebug); auto& debugDrawData = depthTest ? Context->DebugDrawDepthTest : Context->DebugDrawDefault; Color32 color32(color); if (duration > 0) @@ -1953,6 +1970,7 @@ namespace void DrawCylinder(Array* list, const Vector3& position, const Quaternion& orientation, float radius, float height, const Color& color, float duration) { // Setup cache + PROFILE_MEM(EngineDebug); Float3 CylinderCache[DEBUG_DRAW_CYLINDER_VERTICES]; const float angleBetweenFacets = TWO_PI / DEBUG_DRAW_CYLINDER_RESOLUTION; const float verticalOffset = height * 0.5f; @@ -2024,6 +2042,7 @@ namespace void DrawCone(Array* list, const Vector3& position, const Quaternion& orientation, float radius, float angleXY, float angleXZ, const Color& color, float duration) { + PROFILE_MEM(EngineDebug); const float tolerance = 0.001f; const float angle1 = Math::Clamp(angleXY, tolerance, PI - tolerance); const float angle2 = Math::Clamp(angleXZ, tolerance, PI - tolerance); @@ -2113,6 +2132,7 @@ void DebugDraw::DrawArc(const Vector3& position, const Quaternion& orientation, { if (angle <= 0) return; + PROFILE_MEM(EngineDebug); if (angle > TWO_PI) angle = TWO_PI; Array* list; @@ -2145,6 +2165,7 @@ void DebugDraw::DrawWireArc(const Vector3& position, const Quaternion& orientati { if (angle <= 0) return; + PROFILE_MEM(EngineDebug); if (angle > TWO_PI) angle = TWO_PI; const int32 resolution = Math::CeilToInt((float)DEBUG_DRAW_CONE_RESOLUTION / TWO_PI * angle); @@ -2211,6 +2232,7 @@ void DebugDraw::DrawBox(const BoundingBox& box, const Color& color, float durati list = duration > 0 ? &Context->DebugDrawDepthTest.DefaultTriangles : &Context->DebugDrawDepthTest.OneFrameTriangles; else list = duration > 0 ? &Context->DebugDrawDefault.DefaultTriangles : &Context->DebugDrawDefault.OneFrameTriangles; + PROFILE_MEM(EngineDebug); list->EnsureCapacity(list->Count() + 36); for (int i0 = 0; i0 < 36;) { @@ -2239,6 +2261,7 @@ void DebugDraw::DrawBox(const OrientedBoundingBox& box, const Color& color, floa list = duration > 0 ? &Context->DebugDrawDepthTest.DefaultTriangles : &Context->DebugDrawDepthTest.OneFrameTriangles; else list = duration > 0 ? &Context->DebugDrawDefault.DefaultTriangles : &Context->DebugDrawDefault.OneFrameTriangles; + PROFILE_MEM(EngineDebug); list->EnsureCapacity(list->Count() + 36); for (int i0 = 0; i0 < 36;) { @@ -2254,6 +2277,7 @@ void DebugDraw::DrawText(const StringView& text, const Float2& position, const C { if (text.Length() == 0 || size < 4) return; + PROFILE_MEM(EngineDebug); Array* list = duration > 0 ? &Context->DebugDrawDefault.DefaultText2D : &Context->DebugDrawDefault.OneFrameText2D; auto& t = list->AddOne(); t.Text.Resize(text.Length() + 1); @@ -2269,6 +2293,7 @@ void DebugDraw::DrawText(const StringView& text, const Vector3& position, const { if (text.Length() == 0 || size < 4) return; + PROFILE_MEM(EngineDebug); Array* list = duration > 0 ? &Context->DebugDrawDefault.DefaultText3D : &Context->DebugDrawDefault.OneFrameText3D; auto& t = list->AddOne(); t.Text.Resize(text.Length() + 1); @@ -2286,6 +2311,7 @@ void DebugDraw::DrawText(const StringView& text, const Transform& transform, con { if (text.Length() == 0 || size < 4) return; + PROFILE_MEM(EngineDebug); Array* list = duration > 0 ? &Context->DebugDrawDefault.DefaultText3D : &Context->DebugDrawDefault.OneFrameText3D; auto& t = list->AddOne(); t.Text.Resize(text.Length() + 1); diff --git a/Source/Engine/Graphics/Shaders/GPUVertexLayout.cpp b/Source/Engine/Graphics/Shaders/GPUVertexLayout.cpp index 23382673f..05c6d605a 100644 --- a/Source/Engine/Graphics/Shaders/GPUVertexLayout.cpp +++ b/Source/Engine/Graphics/Shaders/GPUVertexLayout.cpp @@ -59,7 +59,7 @@ namespace elements.Get()[j].Slot = (byte)slot; } } - GPUVertexLayout* result = anyValid ? GPUVertexLayout::Get(elements) : nullptr; + GPUVertexLayout* result = anyValid ? GPUVertexLayout::Get(elements, true) : nullptr; VertexBufferCache.Add(key, result); return result; } @@ -97,6 +97,7 @@ GPUVertexLayout::GPUVertexLayout() void GPUVertexLayout::SetElements(const Elements& elements, bool explicitOffsets) { uint32 offsets[GPU_MAX_VB_BINDED + 1] = {}; + uint32 maxOffset[GPU_MAX_VB_BINDED + 1] = {}; _elements = elements; for (int32 i = 0; i < _elements.Count(); i++) { @@ -108,9 +109,10 @@ void GPUVertexLayout::SetElements(const Elements& elements, bool explicitOffsets else e.Offset = (byte)offset; offset += PixelFormatExtensions::SizeInBytes(e.Format); + maxOffset[e.Slot] = Math::Max(maxOffset[e.Slot], offset); } _stride = 0; - for (uint32 offset : offsets) + for (uint32 offset : maxOffset) _stride += offset; } @@ -139,7 +141,7 @@ VertexElement GPUVertexLayout::FindElement(VertexElement::Types type) const GPUVertexLayout* GPUVertexLayout::Get(const Elements& elements, bool explicitOffsets) { // Hash input layout - uint32 hash = 0; + uint32 hash = explicitOffsets ? 131 : 0; for (const VertexElement& element : elements) { CombineHash(hash, GetHash(element)); diff --git a/Source/Engine/GraphicsDevice/DirectX/DX11/GPUShaderProgramDX11.h b/Source/Engine/GraphicsDevice/DirectX/DX11/GPUShaderProgramDX11.h index 319e1a939..567cbb618 100644 --- a/Source/Engine/GraphicsDevice/DirectX/DX11/GPUShaderProgramDX11.h +++ b/Source/Engine/GraphicsDevice/DirectX/DX11/GPUShaderProgramDX11.h @@ -4,6 +4,7 @@ #include "Engine/Graphics/Shaders/GPUShaderProgram.h" #include "Engine/Core/Types/DataContainer.h" +#include "Engine/Core/Collections/Dictionary.h" #include "../IncludeDirectXHeaders.h" #if GRAPHICS_API_DIRECTX11 diff --git a/Source/Engine/GraphicsDevice/DirectX/DX12/GPUContextDX12.cpp b/Source/Engine/GraphicsDevice/DirectX/DX12/GPUContextDX12.cpp index 98143c7c3..4dc923234 100644 --- a/Source/Engine/GraphicsDevice/DirectX/DX12/GPUContextDX12.cpp +++ b/Source/Engine/GraphicsDevice/DirectX/DX12/GPUContextDX12.cpp @@ -3,16 +3,9 @@ #if GRAPHICS_API_DIRECTX12 #include "Engine/Graphics/Config.h" +#include "Engine/Platform/Platform.h" +#include "../IncludeDirectXHeaders.h" #if USE_PIX && GPU_ALLOW_PROFILE_EVENTS -// Include these header files before pix3 -#define WIN32_LEAN_AND_MEAN -#define NOMINMAX -#define NOGDI -#define NODRAWTEXT -//#define NOCTLMGR -#define NOFLATSBAPIS -#include -#include #include #endif #include "GPUContextDX12.h" diff --git a/Source/Engine/Navigation/NavMesh.cpp b/Source/Engine/Navigation/NavMesh.cpp index 5593d732a..5932607a0 100644 --- a/Source/Engine/Navigation/NavMesh.cpp +++ b/Source/Engine/Navigation/NavMesh.cpp @@ -25,6 +25,7 @@ NavMesh::NavMesh(const SpawnParams& params) void NavMesh::SaveNavMesh() { #if COMPILE_WITH_ASSETS_IMPORTER + PROFILE_MEM(NavigationMesh); // Skip if scene is missing const auto scene = GetScene(); @@ -111,7 +112,7 @@ void NavMesh::OnAssetLoaded(Asset* asset, void* caller) if (Data.Tiles.HasItems()) return; ScopeLock lock(DataAsset->Locker); - PROFILE_MEM(Navigation); + PROFILE_MEM(NavigationMesh); // Remove added tiles if (_navMeshActive) diff --git a/Source/Engine/Navigation/NavMeshBoundsVolume.cpp b/Source/Engine/Navigation/NavMeshBoundsVolume.cpp index 56351fded..c54f2f072 100644 --- a/Source/Engine/Navigation/NavMeshBoundsVolume.cpp +++ b/Source/Engine/Navigation/NavMeshBoundsVolume.cpp @@ -6,7 +6,7 @@ #if USE_EDITOR #include "Editor/Editor.h" #include "Editor/Managed/ManagedEditor.h" -#include "NavMeshBuilder.h" +#include "Navigation.h" #endif NavMeshBoundsVolume::NavMeshBoundsVolume(const SpawnParams& params) @@ -55,9 +55,30 @@ void NavMeshBoundsVolume::OnBoundsChanged(const BoundingBox& prevBounds) // Auto-rebuild modified navmesh area if (IsDuringPlay() && IsActiveInHierarchy() && !Editor::IsPlayMode && Editor::Managed->CanAutoBuildNavMesh()) { - BoundingBox dirtyBounds; - BoundingBox::Merge(prevBounds, _box, dirtyBounds); - NavMeshBuilder::Build(GetScene(), dirtyBounds, ManagedEditor::ManagedEditorOptions.AutoRebuildNavMeshTimeoutMs); + if (_box.Intersects(prevBounds)) + { + // Bounds were moved a bit so merge into a single request (for performance reasons) + BoundingBox dirtyBounds; + BoundingBox::Merge(prevBounds, _box, dirtyBounds); + Navigation::BuildNavMesh(dirtyBounds, ManagedEditor::ManagedEditorOptions.AutoRebuildNavMeshTimeoutMs); + } + else + { + // Dirty each bounds in separate + Navigation::BuildNavMesh(prevBounds, ManagedEditor::ManagedEditorOptions.AutoRebuildNavMeshTimeoutMs); + Navigation::BuildNavMesh(_box, ManagedEditor::ManagedEditorOptions.AutoRebuildNavMeshTimeoutMs); + } + } +} + +void NavMeshBoundsVolume::OnActiveInTreeChanged() +{ + BoxVolume::OnActiveInTreeChanged(); + + // Auto-rebuild + if (IsDuringPlay() && !Editor::IsPlayMode && Editor::Managed->CanAutoBuildNavMesh()) + { + Navigation::BuildNavMesh(_box, ManagedEditor::ManagedEditorOptions.AutoRebuildNavMeshTimeoutMs); } } diff --git a/Source/Engine/Navigation/NavMeshBoundsVolume.h b/Source/Engine/Navigation/NavMeshBoundsVolume.h index c04bc0483..80df5035a 100644 --- a/Source/Engine/Navigation/NavMeshBoundsVolume.h +++ b/Source/Engine/Navigation/NavMeshBoundsVolume.h @@ -30,6 +30,7 @@ protected: void OnDisable() override; #if USE_EDITOR void OnBoundsChanged(const BoundingBox& prevBounds) override; + void OnActiveInTreeChanged() override; Color GetWiresColor() override; #endif }; diff --git a/Source/Engine/Navigation/NavMeshBuilder.cpp b/Source/Engine/Navigation/NavMeshBuilder.cpp index e92173846..896cf4217 100644 --- a/Source/Engine/Navigation/NavMeshBuilder.cpp +++ b/Source/Engine/Navigation/NavMeshBuilder.cpp @@ -3,6 +3,7 @@ #if COMPILE_WITH_NAV_MESH_BUILDER #include "NavMeshBuilder.h" +#include "Navigation.h" #include "NavMesh.h" #include "NavigationSettings.h" #include "NavMeshBoundsVolume.h" @@ -706,6 +707,7 @@ struct BuildRequest ScriptingObjectReference Scene; DateTime Time; BoundingBox DirtyBounds; + bool SpecificScene; }; CriticalSection NavBuildQueueLocker; @@ -713,6 +715,7 @@ Array NavBuildQueue; CriticalSection NavBuildTasksLocker; int32 NavBuildTasksMaxCount = 0; +bool NavBuildCheckMissingNavMeshes = false; Array NavBuildTasks; class NavMeshTileBuildTask : public ThreadPoolTask @@ -733,7 +736,7 @@ public: bool Run() override { PROFILE_CPU_NAMED("BuildNavMeshTile"); - PROFILE_MEM(Navigation); + PROFILE_MEM(NavigationBuilding); const auto navMesh = NavMesh.Get(); if (!navMesh) return false; @@ -776,13 +779,13 @@ void CancelNavMeshTileBuildTasks(NavMeshRuntime* runtime) NavBuildTasksLocker.Unlock(); } -void CancelNavMeshTileBuildTasks(NavMeshRuntime* runtime, int32 x, int32 y) +void CancelNavMeshTileBuildTasks(NavMeshRuntime* runtime, int32 x, int32 y, NavMesh* navMesh) { NavBuildTasksLocker.Lock(); for (int32 i = 0; i < NavBuildTasks.Count(); i++) { auto task = NavBuildTasks[i]; - if (task->Runtime == runtime && task->X == x && task->Y == y) + if (task->Runtime == runtime && task->X == x && task->Y == y && task->NavMesh == navMesh) { NavBuildTasksLocker.Unlock(); @@ -838,7 +841,7 @@ void NavMeshBuilder::Init() Level::SceneUnloading.Bind(); } -bool NavMeshBuilder::IsBuildingNavMesh() +bool Navigation::IsBuildingNavMesh() { NavBuildTasksLocker.Lock(); const bool hasAnyTask = NavBuildTasks.HasItems(); @@ -847,7 +850,7 @@ bool NavMeshBuilder::IsBuildingNavMesh() return hasAnyTask; } -float NavMeshBuilder::GetNavMeshBuildingProgress() +float Navigation::GetNavMeshBuildingProgress() { NavBuildTasksLocker.Lock(); float result = 1.0f; @@ -907,15 +910,13 @@ void BuildDirtyBounds(Scene* scene, NavMesh* navMesh, const BoundingBox& dirtyBo // Align dirty bounds to tile size BoundingBox dirtyBoundsNavMesh; BoundingBox::Transform(dirtyBounds, worldToNavMesh, dirtyBoundsNavMesh); - BoundingBox dirtyBoundsAligned; - dirtyBoundsAligned.Minimum = Float3::Floor(dirtyBoundsNavMesh.Minimum / tileSize) * tileSize; - dirtyBoundsAligned.Maximum = Float3::Ceil(dirtyBoundsNavMesh.Maximum / tileSize) * tileSize; + dirtyBoundsNavMesh.Minimum = Float3::Floor(dirtyBoundsNavMesh.Minimum / tileSize) * tileSize; + dirtyBoundsNavMesh.Maximum = Float3::Ceil(dirtyBoundsNavMesh.Maximum / tileSize) * tileSize; // Calculate tiles range for the given navigation dirty bounds (aligned to tiles size) - const Int3 tilesMin(dirtyBoundsAligned.Minimum / tileSize); - const Int3 tilesMax(dirtyBoundsAligned.Maximum / tileSize); - const int32 tilesX = tilesMax.X - tilesMin.X; - const int32 tilesY = tilesMax.Z - tilesMin.Z; + const Int3 tilesMin(dirtyBoundsNavMesh.Minimum / tileSize); + const Int3 tilesMax(dirtyBoundsNavMesh.Maximum / tileSize); + const int32 tilesXZ = (tilesMax.X - tilesMin.X) * (tilesMax.Z - tilesMin.Z); { PROFILE_CPU_NAMED("Prepare"); @@ -932,18 +933,18 @@ void BuildDirtyBounds(Scene* scene, NavMesh* navMesh, const BoundingBox& dirtyBo // Remove all tiles from navmesh runtime runtime->RemoveTiles(navMesh); runtime->SetTileSize(tileSize); - runtime->EnsureCapacity(tilesX * tilesY); + runtime->EnsureCapacity(tilesXZ); // Remove all tiles from navmesh data navMesh->Data.TileSize = tileSize; navMesh->Data.Tiles.Clear(); - navMesh->Data.Tiles.EnsureCapacity(tilesX * tilesX); + navMesh->Data.Tiles.EnsureCapacity(tilesXZ); navMesh->IsDataDirty = true; } else { // Ensure to have enough memory for tiles - runtime->EnsureCapacity(tilesX * tilesY); + runtime->EnsureCapacity(tilesXZ); } runtime->Locker.Unlock(); @@ -959,11 +960,10 @@ void BuildDirtyBounds(Scene* scene, NavMesh* navMesh, const BoundingBox& dirtyBo // Cache navmesh volumes Array> volumes; - for (int32 i = 0; i < scene->Navigation.Volumes.Count(); i++) + for (const NavMeshBoundsVolume* volume : scene->Navigation.Volumes) { - const auto volume = scene->Navigation.Volumes.Get()[i]; if (!volume->AgentsMask.IsNavMeshSupported(navMesh->Properties) || - !volume->GetBox().Intersects(dirtyBoundsAligned)) + !volume->GetBox().Intersects(dirtyBoundsNavMesh)) continue; auto& bounds = volumes.AddOne(); BoundingBox::Transform(volume->GetBox(), worldToNavMesh, bounds); @@ -1026,7 +1026,7 @@ void BuildDirtyBounds(Scene* scene, NavMesh* navMesh, const BoundingBox& dirtyBo for (const auto& tile : unusedTiles) { // Wait for any async tasks that are producing this tile - CancelNavMeshTileBuildTasks(runtime, tile.X, tile.Y); + CancelNavMeshTileBuildTasks(runtime, tile.X, tile.Y, navMesh); } runtime->Locker.Lock(); for (const auto& tile : unusedTiles) @@ -1095,6 +1095,7 @@ void BuildDirtyBounds(Scene* scene, const BoundingBox& dirtyBounds, bool rebuild else if (settings->AutoAddMissingNavMeshes) { // Spawn missing navmesh + PROFILE_MEM(Navigation); navMesh = New(); navMesh->SetStaticFlags(StaticFlags::FullyStatic); navMesh->SetName(TEXT("NavMesh.") + navMeshProperties.Name); @@ -1108,39 +1109,6 @@ void BuildDirtyBounds(Scene* scene, const BoundingBox& dirtyBounds, bool rebuild { BuildDirtyBounds(scene, navMesh, dirtyBounds, rebuild); } - - // Remove unused navmeshes - if (settings->AutoRemoveMissingNavMeshes) - { - for (NavMesh* navMesh : scene->Navigation.Meshes) - { - // Skip used navmeshes - if (navMesh->Data.Tiles.HasItems()) - continue; - - // Skip navmeshes during async building - int32 usageCount = 0; - NavBuildTasksLocker.Lock(); - for (int32 i = 0; i < NavBuildTasks.Count(); i++) - { - if (NavBuildTasks.Get()[i]->NavMesh == navMesh) - usageCount++; - } - NavBuildTasksLocker.Unlock(); - if (usageCount != 0) - continue; - - navMesh->DeleteObject(); - } - } -} - -void BuildWholeScene(Scene* scene) -{ - // Compute total navigation area bounds - const BoundingBox worldBounds = scene->Navigation.GetNavigationBounds(); - - BuildDirtyBounds(scene, worldBounds, true); } void ClearNavigation(Scene* scene) @@ -1154,22 +1122,58 @@ void ClearNavigation(Scene* scene) } } +void BuildNavigation(BuildRequest& request) +{ + // If scene is not specified then build all loaded scenes + if (!request.Scene) + { + for (Scene* scene : Level::Scenes) + { + request.Scene = scene; + BuildNavigation(request); + } + return; + } + + // Early out if scene is not using navigation + if (request.Scene->Navigation.Volumes.IsEmpty()) + { + ClearNavigation(request.Scene); + return; + } + + // Check if similar request is already in a queue + for (auto& e : NavBuildQueue) + { + if (e.Scene == request.Scene && (e.DirtyBounds == request.DirtyBounds || request.DirtyBounds == BoundingBox::Empty)) + { + e = request; + return; + } + } + + // Enqueue request + NavBuildQueue.Add(request); +} + void NavMeshBuilder::Update() { - PROFILE_MEM(Navigation); + PROFILE_MEM(NavigationBuilding); ScopeLock lock(NavBuildQueueLocker); // Process nav mesh building requests and kick the tasks const auto now = DateTime::NowUTC(); + bool didRebuild = false; for (int32 i = 0; NavBuildQueue.HasItems() && i < NavBuildQueue.Count(); i++) { auto req = NavBuildQueue.Get()[i]; if (now - req.Time >= 0) { NavBuildQueue.RemoveAt(i--); - const auto scene = req.Scene.Get(); + Scene* scene = req.Scene.Get(); if (!scene) continue; + bool rebuild = req.DirtyBounds == BoundingBox::Empty; // Early out if scene has no bounds volumes to define nav mesh area if (scene->Navigation.Volumes.IsEmpty()) @@ -1179,80 +1183,69 @@ void NavMeshBuilder::Update() } // Check if build a custom dirty bounds or whole scene - if (req.DirtyBounds == BoundingBox::Empty) - { - BuildWholeScene(scene); - } + if (rebuild) + req.DirtyBounds = scene->Navigation.GetNavigationBounds(); // Compute total navigation area bounds + if (didRebuild) + rebuild = false; // When rebuilding navmesh for multiple scenes, rebuild only the first one (other scenes will use additive update) else + didRebuild = true; + BuildDirtyBounds(scene, req.DirtyBounds, rebuild); + NavBuildCheckMissingNavMeshes = true; + } + } + + // Remove unused navmeshes (when all active tasks are done) + // TODO: ignore AutoRemoveMissingNavMeshes in game and make it editor-only? + if (NavBuildCheckMissingNavMeshes && NavBuildTasksMaxCount == 0 && NavigationSettings::Get()->AutoRemoveMissingNavMeshes) + { + NavBuildCheckMissingNavMeshes = false; + NavBuildTasksLocker.Lock(); + int32 taskCount = NavBuildTasks.Count(); + NavBuildTasksLocker.Unlock(); + if (taskCount == 0) + { + for (Scene* scene : Level::Scenes) { - BuildDirtyBounds(scene, req.DirtyBounds, false); + for (NavMesh* navMesh : scene->Navigation.Meshes) + { + if (!navMesh->Data.Tiles.HasItems()) + { + navMesh->DeleteObject(); + } + } } } } } -void NavMeshBuilder::Build(Scene* scene, float timeoutMs) +void Navigation::BuildNavMesh(Scene* scene, float timeoutMs) { - if (!scene) - { - LOG(Warning, "Could not generate navmesh without scene."); - return; - } - - // Early out if scene is not using navigation - if (scene->Navigation.Volumes.IsEmpty()) - { - ClearNavigation(scene); - return; - } - - PROFILE_CPU_NAMED("NavMeshBuilder"); - PROFILE_MEM(Navigation); + PROFILE_CPU(); + PROFILE_MEM(NavigationBuilding); ScopeLock lock(NavBuildQueueLocker); BuildRequest req; req.Scene = scene; req.Time = DateTime::NowUTC() + TimeSpan::FromMilliseconds(timeoutMs); req.DirtyBounds = BoundingBox::Empty; - - for (int32 i = 0; i < NavBuildQueue.Count(); i++) - { - auto& e = NavBuildQueue.Get()[i]; - if (e.Scene == scene && e.DirtyBounds == req.DirtyBounds) - { - e = req; - return; - } - } - - NavBuildQueue.Add(req); + req.SpecificScene = scene != nullptr; + BuildNavigation(req); } -void NavMeshBuilder::Build(Scene* scene, const BoundingBox& dirtyBounds, float timeoutMs) +void Navigation::BuildNavMesh(const BoundingBox& dirtyBounds, Scene* scene, float timeoutMs) { - if (!scene) - { - LOG(Warning, "Could not generate navmesh without scene."); - return; - } - - // Early out if scene is not using navigation - if (scene->Navigation.Volumes.IsEmpty()) - { - ClearNavigation(scene); - return; - } - - PROFILE_CPU_NAMED("NavMeshBuilder"); - PROFILE_MEM(Navigation); + if (dirtyBounds.GetVolume() <= ZeroTolerance) + return; // Skip updating empty bounds + PROFILE_CPU(); + PROFILE_MEM(NavigationBuilding); ScopeLock lock(NavBuildQueueLocker); BuildRequest req; req.Scene = scene; req.Time = DateTime::NowUTC() + TimeSpan::FromMilliseconds(timeoutMs); req.DirtyBounds = dirtyBounds; - - NavBuildQueue.Add(req); + req.SpecificScene = scene != nullptr; + BuildNavigation(req); } #endif diff --git a/Source/Engine/Navigation/NavMeshBuilder.h b/Source/Engine/Navigation/NavMeshBuilder.h index a3477db27..355bac7de 100644 --- a/Source/Engine/Navigation/NavMeshBuilder.h +++ b/Source/Engine/Navigation/NavMeshBuilder.h @@ -15,11 +15,7 @@ class FLAXENGINE_API NavMeshBuilder { public: static void Init(); - static bool IsBuildingNavMesh(); - static float GetNavMeshBuildingProgress(); static void Update(); - static void Build(Scene* scene, float timeoutMs); - static void Build(Scene* scene, const BoundingBox& dirtyBounds, float timeoutMs); }; #endif diff --git a/Source/Engine/Navigation/NavMeshRuntime.cpp b/Source/Engine/Navigation/NavMeshRuntime.cpp index 2758077c6..0ace29415 100644 --- a/Source/Engine/Navigation/NavMeshRuntime.cpp +++ b/Source/Engine/Navigation/NavMeshRuntime.cpp @@ -5,6 +5,9 @@ #include "NavMesh.h" #include "Engine/Core/Log.h" #include "Engine/Core/Random.h" +#if COMPILE_WITH_DEBUG_DRAW +#include "Engine/Level/Scene/Scene.h" +#endif #include "Engine/Profiler/ProfilerCPU.h" #include "Engine/Profiler/ProfilerMemory.h" #include "Engine/Threading/Threading.h" @@ -326,7 +329,7 @@ void NavMeshRuntime::EnsureCapacity(int32 tilesToAddCount) if (newTilesCount <= capacity) return; PROFILE_CPU_NAMED("NavMeshRuntime.EnsureCapacity"); - PROFILE_MEM(Navigation); + PROFILE_MEM(NavigationMesh); // Navmesh tiles capacity growing rule int32 newCapacity = capacity ? capacity : 32; @@ -387,7 +390,7 @@ void NavMeshRuntime::AddTiles(NavMesh* navMesh) return; auto& data = navMesh->Data; PROFILE_CPU_NAMED("NavMeshRuntime.AddTiles"); - PROFILE_MEM(Navigation); + PROFILE_MEM(NavigationMesh); ScopeLock lock(Locker); // Validate data (must match navmesh) or init navmesh to match the tiles options @@ -419,7 +422,7 @@ void NavMeshRuntime::AddTile(NavMesh* navMesh, NavMeshTileData& tileData) ASSERT(navMesh); auto& data = navMesh->Data; PROFILE_CPU_NAMED("NavMeshRuntime.AddTile"); - PROFILE_MEM(Navigation); + PROFILE_MEM(NavigationMesh); ScopeLock lock(Locker); // Validate data (must match navmesh) or init navmesh to match the tiles options @@ -603,7 +606,21 @@ void NavMeshRuntime::DebugDraw() if (!tile->header) continue; - //DebugDraw::DrawWireBox(*(BoundingBox*)&tile->header->bmin[0], Color::CadetBlue); +#if 0 + // Debug draw tile bounds and owner scene name + BoundingBox tileBounds = *(BoundingBox*)&tile->header->bmin[0]; + DebugDraw::DrawWireBox(tileBounds, Color::CadetBlue); + // TODO: build map from tile coords to tile data to avoid this loop + for (const auto& e : _tiles) + { + if (e.X == tile->header->x && e.Y == tile->header->y && e.Layer == tile->header->layer) + { + if (e.NavMesh && e.NavMesh->GetScene()) + DebugDraw::DrawText(e.NavMesh->GetScene()->GetName(), tileBounds.Minimum + tileBounds.GetSize() * Float3(0.5f, 0.8f, 0.5f), Color::CadetBlue); + break; + } + } +#endif for (int i = 0; i < tile->header->polyCount; i++) { diff --git a/Source/Engine/Navigation/NavMeshRuntime.h b/Source/Engine/Navigation/NavMeshRuntime.h index 1ca6607b9..9e1165196 100644 --- a/Source/Engine/Navigation/NavMeshRuntime.h +++ b/Source/Engine/Navigation/NavMeshRuntime.h @@ -111,7 +111,7 @@ public: /// The start position. /// The result hit information. Valid only when query succeed. /// The maximum distance to search for wall (search radius). - /// True if ray hits an matching object, otherwise false. + /// True if ray hits a matching object, otherwise false. API_FUNCTION() bool FindDistanceToWall(const Vector3& startPosition, NavMeshHit& hitInfo, float maxDistance = MAX_float) const; /// @@ -187,7 +187,7 @@ public: /// The start position. /// The end position. /// The result hit information. Valid only when query succeed. - /// True if ray hits an matching object, otherwise false. + /// True if ray hits a matching object, otherwise false. API_FUNCTION() bool RayCast(const Vector3& startPosition, const Vector3& endPosition, API_PARAM(Out) NavMeshHit& hitInfo) const; public: diff --git a/Source/Engine/Navigation/NavModifierVolume.cpp b/Source/Engine/Navigation/NavModifierVolume.cpp index 9e1295f70..aa71e7aa1 100644 --- a/Source/Engine/Navigation/NavModifierVolume.cpp +++ b/Source/Engine/Navigation/NavModifierVolume.cpp @@ -2,7 +2,7 @@ #include "NavModifierVolume.h" #include "NavigationSettings.h" -#include "NavMeshBuilder.h" +#include "Navigation.h" #include "Engine/Level/Scene/Scene.h" #include "Engine/Serialization/Serialization.h" #if USE_EDITOR @@ -83,7 +83,7 @@ void NavModifierVolume::OnBoundsChanged(const BoundingBox& prevBounds) #else const float timeoutMs = 0.0f; #endif - NavMeshBuilder::Build(GetScene(), dirtyBounds, timeoutMs); + Navigation::BuildNavMesh(dirtyBounds, GetScene(), timeoutMs); } #endif } diff --git a/Source/Engine/Navigation/Navigation.cpp b/Source/Engine/Navigation/Navigation.cpp index 34983652f..908819765 100644 --- a/Source/Engine/Navigation/Navigation.cpp +++ b/Source/Engine/Navigation/Navigation.cpp @@ -180,7 +180,7 @@ NavigationService NavigationServiceInstance; void* dtAllocDefault(size_t size, dtAllocHint) { - PROFILE_MEM(Navigation); + PROFILE_MEM(NavigationMesh); return Allocator::Allocate(size); } @@ -382,30 +382,6 @@ bool Navigation::RayCast(const Vector3& startPosition, const Vector3& endPositio return NavMeshes.First()->RayCast(startPosition, endPosition, hitInfo); } -#if COMPILE_WITH_NAV_MESH_BUILDER - -bool Navigation::IsBuildingNavMesh() -{ - return NavMeshBuilder::IsBuildingNavMesh(); -} - -float Navigation::GetNavMeshBuildingProgress() -{ - return NavMeshBuilder::GetNavMeshBuildingProgress(); -} - -void Navigation::BuildNavMesh(Scene* scene, float timeoutMs) -{ - NavMeshBuilder::Build(scene, timeoutMs); -} - -void Navigation::BuildNavMesh(Scene* scene, const BoundingBox& dirtyBounds, float timeoutMs) -{ - NavMeshBuilder::Build(scene, dirtyBounds, timeoutMs); -} - -#endif - #if COMPILE_WITH_DEBUG_DRAW void Navigation::DrawNavMesh() diff --git a/Source/Engine/Navigation/Navigation.h b/Source/Engine/Navigation/Navigation.h index 4d8b181e7..80c8eb84a 100644 --- a/Source/Engine/Navigation/Navigation.h +++ b/Source/Engine/Navigation/Navigation.h @@ -19,7 +19,7 @@ public: /// The start position. /// The result hit information. Valid only when query succeed. /// The maximum distance to search for wall (search radius). - /// True if ray hits an matching object, otherwise false. + /// True if ray hits a matching object, otherwise false. API_FUNCTION() static bool FindDistanceToWall(const Vector3& startPosition, API_PARAM(Out) NavMeshHit& hitInfo, float maxDistance = MAX_float); /// @@ -81,12 +81,10 @@ public: /// The start position. /// The end position. /// The result hit information. Valid only when query succeed. - /// True if ray hits an matching object, otherwise false. + /// True if ray hits a matching object, otherwise false. API_FUNCTION() static bool RayCast(const Vector3& startPosition, const Vector3& endPosition, API_PARAM(Out) NavMeshHit& hitInfo); -public: #if COMPILE_WITH_NAV_MESH_BUILDER - /// /// Returns true if navigation system is during navmesh building (any request is valid or async task active). /// @@ -100,32 +98,49 @@ public: /// /// Builds the Nav Mesh for the given scene (discards all its tiles). /// - /// - /// Requests are enqueued till the next game scripts update. Actual navmesh building in done via Thread Pool tasks in a background to prevent game thread stalls. - /// - /// The scene. + /// Requests are enqueued till the next game scripts update. Actual navmesh building in done via Thread Pool tasks in a background to prevent game thread stalls. + /// The scene. Pass null to build navmesh for all loaded scenes. /// The timeout to wait before building Nav Mesh (in milliseconds). - API_FUNCTION() static void BuildNavMesh(Scene* scene, float timeoutMs = 50); + API_FUNCTION() static void BuildNavMesh(Scene* scene = nullptr, float timeoutMs = 50); /// /// Builds the Nav Mesh for the given scene (builds only the tiles overlapping the given bounding box). /// - /// - /// Requests are enqueued till the next game scripts update. Actual navmesh building in done via Thread Pool tasks in a background to prevent game thread stalls. - /// + /// Requests are enqueued till the next game scripts update. Actual navmesh building in done via Thread Pool tasks in a background to prevent game thread stalls. + /// The bounds in world-space to build overlapping tiles. + /// The scene. Pass null to build navmesh for all loaded scenes that intersect with a given bounds. + /// The timeout to wait before building Nav Mesh (in milliseconds). + API_FUNCTION() static void BuildNavMesh(const BoundingBox& dirtyBounds, Scene* scene = nullptr, float timeoutMs = 50); + + /// + /// Builds the Nav Mesh for all the loaded scenes (builds only the tiles overlapping the given bounding box). + /// + /// Requests are enqueued till the next game scripts update. Actual navmesh building in done via Thread Pool tasks in a background to prevent game thread stalls. + /// The bounds in world-space to build overlapping tiles. + /// The timeout to wait before building Nav Mesh (in milliseconds). + API_FUNCTION() static void BuildNavMesh(const BoundingBox& dirtyBounds, float timeoutMs = 50) + { + BuildNavMesh(dirtyBounds, nullptr, timeoutMs); + } + + /// + /// Builds the Nav Mesh for the given scene (builds only the tiles overlapping the given bounding box). + /// [Deprecated in v1.12] + /// + /// Requests are enqueued till the next game scripts update. Actual navmesh building in done via Thread Pool tasks in a background to prevent game thread stalls. /// The scene. /// The bounds in world-space to build overlapping tiles. /// The timeout to wait before building Nav Mesh (in milliseconds). - API_FUNCTION() static void BuildNavMesh(Scene* scene, const BoundingBox& dirtyBounds, float timeoutMs = 50); - + API_FUNCTION() DEPRECATED("Use BuildNavMesh with reordered arguments instead") static void BuildNavMesh(Scene* scene, const BoundingBox& dirtyBounds, float timeoutMs = 50) + { + BuildNavMesh(dirtyBounds, scene, timeoutMs); + } #endif #if COMPILE_WITH_DEBUG_DRAW - /// /// Draws the navigation for all the scenes (uses DebugDraw interface). /// static void DrawNavMesh(); - #endif }; diff --git a/Source/Engine/Physics/PhysX/PhysicsBackendPhysX.cpp b/Source/Engine/Physics/PhysX/PhysicsBackendPhysX.cpp index 3edfaa0c6..8c3d3610e 100644 --- a/Source/Engine/Physics/PhysX/PhysicsBackendPhysX.cpp +++ b/Source/Engine/Physics/PhysX/PhysicsBackendPhysX.cpp @@ -2784,6 +2784,69 @@ float PhysicsBackend::ComputeShapeSqrDistanceToPoint(void* shape, const Vector3& { auto shapePhysX = (PxShape*)shape; const PxTransform trans(C2P(position), C2P(orientation)); + + // Special case for heightfield collider (not implemented in PhysX) + if (shapePhysX->getGeometryType() == PxGeometryType::eHEIGHTFIELD) + { + // Do a bunch of raycasts in all directions to find the closest point on the heightfield + PxVec3 origin = C2P(point); + Array unitDirections; + constexpr int32 resolution = 32; + unitDirections.EnsureCapacity((resolution + 1) * (resolution + 1)); + for (int32 i = 0; i <= resolution; i++) + { + float phi = PI * (float)i / resolution; + float sinPhi = Math::Sin(phi); + float cosPhi = Math::Cos(phi); + for (int32 j = 0; j <= resolution; j++) + { + float theta = 2.0f * PI * (float)j / resolution; + float cosTheta = Math::Cos(theta); + float sinTheta = Math::Sin(theta); + + PxVec3 v; + v.x = cosTheta * sinPhi; + v.y = cosPhi; + v.z = sinTheta * sinPhi; + + // All generated vectors are unit vectors (length 1) + unitDirections.Add(v); + } + } + + PxReal maxDistance = PX_MAX_REAL; // Search indefinitely + PxQueryFilterData filterData; + filterData.data.word0 = (PxU32)shapePhysX->getSimulationFilterData().word0; + PxHitFlags hitFlags = PxHitFlag::ePOSITION | PxHitFlag::eMESH_BOTH_SIDES; // Both sides added for if it is underneath the height field + PxRaycastBuffer buffer; + auto scene = shapePhysX->getActor()->getScene(); + + PxReal closestDistance = maxDistance; + PxVec3 tempClosestPoint; + for (PxVec3& unitDir : unitDirections) + { + bool hitResult = scene->raycast(origin, unitDir, maxDistance, buffer, hitFlags, filterData); + if (hitResult) + { + auto& hit = buffer.getAnyHit(0); + if (hit.distance < closestDistance && hit.distance > 0.0f) + { + tempClosestPoint = hit.position; + closestDistance = hit.distance; + } + } + } + + if (closestDistance < maxDistance) + { + *closestPoint = P2C(tempClosestPoint); + return closestDistance * closestDistance; // Result is squared distance + } + + return -1.0f; + } + + // Default point distance for other collider queries #if USE_LARGE_WORLDS PxVec3 closestPointPx; float result = PxGeometryQuery::pointDistance(C2P(point), shapePhysX->getGeometry(), trans, &closestPointPx); diff --git a/Source/Engine/Physics/Physics.h b/Source/Engine/Physics/Physics.h index 2fc116020..85cd5e77b 100644 --- a/Source/Engine/Physics/Physics.h +++ b/Source/Engine/Physics/Physics.h @@ -102,7 +102,7 @@ public: /// The end position of the line. /// The layer mask used to filter the results. /// If set to true triggers will be hit, otherwise will skip them. - /// True if ray hits an matching object, otherwise false. + /// True if ray hits a matching object, otherwise false. API_FUNCTION() static bool LineCast(const Vector3& start, const Vector3& end, uint32 layerMask = MAX_uint32, bool hitTriggers = true); /// @@ -113,18 +113,18 @@ public: /// The result hit information. Valid only when method returns true. /// The layer mask used to filter the results. /// If set to true triggers will be hit, otherwise will skip them. - /// True if ray hits an matching object, otherwise false. + /// True if ray hits a matching object, otherwise false. API_FUNCTION() static bool LineCast(const Vector3& start, const Vector3& end, API_PARAM(Out) RayCastHit& hitInfo, uint32 layerMask = MAX_uint32, bool hitTriggers = true); // - /// Performs a line between two points in the scene, returns all hitpoints infos. + /// Performs a line between two points in the scene, returns all hit points info. /// /// The origin of the ray. /// The end position of the line. /// The result hits. Valid only when method returns true. /// The layer mask used to filter the results. /// If set to true triggers will be hit, otherwise will skip them. - /// True if ray hits an matching object, otherwise false. + /// True if ray hits a matching object, otherwise false. API_FUNCTION() static bool LineCastAll(const Vector3& start, const Vector3& end, API_PARAM(Out) Array& results, uint32 layerMask = MAX_uint32, bool hitTriggers = true); /// @@ -135,7 +135,7 @@ public: /// The maximum distance the ray should check for collisions. /// The layer mask used to filter the results. /// If set to true triggers will be hit, otherwise will skip them. - /// True if ray hits an matching object, otherwise false. + /// True if ray hits a matching object, otherwise false. API_FUNCTION() static bool RayCast(const Vector3& origin, const Vector3& direction, float maxDistance = MAX_float, uint32 layerMask = MAX_uint32, bool hitTriggers = true); /// @@ -147,7 +147,7 @@ public: /// The maximum distance the ray should check for collisions. /// The layer mask used to filter the results. /// If set to true triggers will be hit, otherwise will skip them. - /// True if ray hits an matching object, otherwise false. + /// True if ray hits a matching object, otherwise false. API_FUNCTION() static bool RayCast(const Vector3& origin, const Vector3& direction, API_PARAM(Out) RayCastHit& hitInfo, float maxDistance = MAX_float, uint32 layerMask = MAX_uint32, bool hitTriggers = true); /// @@ -159,7 +159,7 @@ public: /// The maximum distance the ray should check for collisions. /// The layer mask used to filter the results. /// If set to true triggers will be hit, otherwise will skip them. - /// True if ray hits an matching object, otherwise false. + /// True if ray hits a matching object, otherwise false. API_FUNCTION() static bool RayCastAll(const Vector3& origin, const Vector3& direction, API_PARAM(Out) Array& results, float maxDistance = MAX_float, uint32 layerMask = MAX_uint32, bool hitTriggers = true); /// @@ -172,7 +172,7 @@ public: /// The maximum distance the ray should check for collisions. /// The layer mask used to filter the results. /// If set to true triggers will be hit, otherwise will skip them. - /// True if box hits an matching object, otherwise false. + /// True if box hits a matching object, otherwise false. API_FUNCTION() static bool BoxCast(const Vector3& center, const Vector3& halfExtents, const Vector3& direction, const Quaternion& rotation = Quaternion::Identity, float maxDistance = MAX_float, uint32 layerMask = MAX_uint32, bool hitTriggers = true); /// @@ -186,7 +186,7 @@ public: /// The maximum distance the ray should check for collisions. /// The layer mask used to filter the results. /// If set to true triggers will be hit, otherwise will skip them. - /// True if box hits an matching object, otherwise false. + /// True if box hits a matching object, otherwise false. API_FUNCTION() static bool BoxCast(const Vector3& center, const Vector3& halfExtents, const Vector3& direction, API_PARAM(Out) RayCastHit& hitInfo, const Quaternion& rotation = Quaternion::Identity, float maxDistance = MAX_float, uint32 layerMask = MAX_uint32, bool hitTriggers = true); /// @@ -200,7 +200,7 @@ public: /// The maximum distance the ray should check for collisions. /// The layer mask used to filter the results. /// If set to true triggers will be hit, otherwise will skip them. - /// True if box hits an matching object, otherwise false. + /// True if box hits a matching object, otherwise false. API_FUNCTION() static bool BoxCastAll(const Vector3& center, const Vector3& halfExtents, const Vector3& direction, API_PARAM(Out) Array& results, const Quaternion& rotation = Quaternion::Identity, float maxDistance = MAX_float, uint32 layerMask = MAX_uint32, bool hitTriggers = true); /// @@ -212,7 +212,7 @@ public: /// The maximum distance the ray should check for collisions. /// The layer mask used to filter the results. /// If set to true triggers will be hit, otherwise will skip them. - /// True if sphere hits an matching object, otherwise false. + /// True if sphere hits a matching object, otherwise false. API_FUNCTION() static bool SphereCast(const Vector3& center, float radius, const Vector3& direction, float maxDistance = MAX_float, uint32 layerMask = MAX_uint32, bool hitTriggers = true); /// @@ -225,7 +225,7 @@ public: /// The maximum distance the ray should check for collisions. /// The layer mask used to filter the results. /// If set to true triggers will be hit, otherwise will skip them. - /// True if sphere hits an matching object, otherwise false. + /// True if sphere hits a matching object, otherwise false. API_FUNCTION() static bool SphereCast(const Vector3& center, float radius, const Vector3& direction, API_PARAM(Out) RayCastHit& hitInfo, float maxDistance = MAX_float, uint32 layerMask = MAX_uint32, bool hitTriggers = true); /// @@ -238,7 +238,7 @@ public: /// The maximum distance the ray should check for collisions. /// The layer mask used to filter the results. /// If set to true triggers will be hit, otherwise will skip them. - /// True if sphere hits an matching object, otherwise false. + /// True if sphere hits a matching object, otherwise false. API_FUNCTION() static bool SphereCastAll(const Vector3& center, float radius, const Vector3& direction, API_PARAM(Out) Array& results, float maxDistance = MAX_float, uint32 layerMask = MAX_uint32, bool hitTriggers = true); /// @@ -252,7 +252,7 @@ public: /// The maximum distance the ray should check for collisions. /// The layer mask used to filter the results. /// If set to true triggers will be hit, otherwise will skip them. - /// True if capsule hits an matching object, otherwise false. + /// True if capsule hits a matching object, otherwise false. API_FUNCTION() static bool CapsuleCast(const Vector3& center, float radius, float height, const Vector3& direction, const Quaternion& rotation = Quaternion::Identity, float maxDistance = MAX_float, uint32 layerMask = MAX_uint32, bool hitTriggers = true); /// @@ -267,7 +267,7 @@ public: /// The maximum distance the ray should check for collisions. /// The layer mask used to filter the results. /// If set to true triggers will be hit, otherwise will skip them. - /// True if capsule hits an matching object, otherwise false. + /// True if capsule hits a matching object, otherwise false. API_FUNCTION() static bool CapsuleCast(const Vector3& center, float radius, float height, const Vector3& direction, API_PARAM(Out) RayCastHit& hitInfo, const Quaternion& rotation = Quaternion::Identity, float maxDistance = MAX_float, uint32 layerMask = MAX_uint32, bool hitTriggers = true); /// @@ -282,7 +282,7 @@ public: /// The maximum distance the ray should check for collisions. /// The layer mask used to filter the results. /// If set to true triggers will be hit, otherwise will skip them. - /// True if capsule hits an matching object, otherwise false. + /// True if capsule hits a matching object, otherwise false. API_FUNCTION() static bool CapsuleCastAll(const Vector3& center, float radius, float height, const Vector3& direction, API_PARAM(Out) Array& results, const Quaternion& rotation = Quaternion::Identity, float maxDistance = MAX_float, uint32 layerMask = MAX_uint32, bool hitTriggers = true); /// @@ -296,7 +296,7 @@ public: /// The maximum distance the ray should check for collisions. /// The layer mask used to filter the results. /// If set to true triggers will be hit, otherwise will skip them. - /// True if convex mesh hits an matching object, otherwise false. + /// True if convex mesh hits a matching object, otherwise false. API_FUNCTION() static bool ConvexCast(const Vector3& center, const CollisionData* convexMesh, const Vector3& scale, const Vector3& direction, const Quaternion& rotation = Quaternion::Identity, float maxDistance = MAX_float, uint32 layerMask = MAX_uint32, bool hitTriggers = true); /// @@ -311,7 +311,7 @@ public: /// The maximum distance the ray should check for collisions. /// The layer mask used to filter the results. /// If set to true triggers will be hit, otherwise will skip them. - /// True if convex mesh hits an matching object, otherwise false. + /// True if convex mesh hits a matching object, otherwise false. API_FUNCTION() static bool ConvexCast(const Vector3& center, const CollisionData* convexMesh, const Vector3& scale, const Vector3& direction, API_PARAM(Out) RayCastHit& hitInfo, const Quaternion& rotation = Quaternion::Identity, float maxDistance = MAX_float, uint32 layerMask = MAX_uint32, bool hitTriggers = true); /// @@ -326,7 +326,7 @@ public: /// The maximum distance the ray should check for collisions. /// The layer mask used to filter the results. /// If set to true triggers will be hit, otherwise will skip them. - /// True if convex mesh hits an matching object, otherwise false. + /// True if convex mesh hits a matching object, otherwise false. API_FUNCTION() static bool ConvexCastAll(const Vector3& center, const CollisionData* convexMesh, const Vector3& scale, const Vector3& direction, API_PARAM(Out) Array& results, const Quaternion& rotation = Quaternion::Identity, float maxDistance = MAX_float, uint32 layerMask = MAX_uint32, bool hitTriggers = true); /// @@ -375,7 +375,7 @@ public: API_FUNCTION() static bool CheckConvex(const Vector3& center, const CollisionData* convexMesh, const Vector3& scale, const Quaternion& rotation = Quaternion::Identity, uint32 layerMask = MAX_uint32, bool hitTriggers = true); /// - /// Finds all colliders touching or inside of the given box. + /// Finds all colliders touching or inside the given box. /// /// The box center. /// The half size of the box in each direction. @@ -387,7 +387,7 @@ public: API_FUNCTION() static bool OverlapBox(const Vector3& center, const Vector3& halfExtents, API_PARAM(Out) Array& results, const Quaternion& rotation = Quaternion::Identity, uint32 layerMask = MAX_uint32, bool hitTriggers = true); /// - /// Finds all colliders touching or inside of the given sphere. + /// Finds all colliders touching or inside the given sphere. /// /// The sphere center. /// The radius of the sphere. @@ -398,7 +398,7 @@ public: API_FUNCTION() static bool OverlapSphere(const Vector3& center, float radius, API_PARAM(Out) Array& results, uint32 layerMask = MAX_uint32, bool hitTriggers = true); /// - /// Finds all colliders touching or inside of the given capsule. + /// Finds all colliders touching or inside the given capsule. /// /// The capsule center. /// The radius of the capsule. @@ -411,7 +411,7 @@ public: API_FUNCTION() static bool OverlapCapsule(const Vector3& center, float radius, float height, API_PARAM(Out) Array& results, const Quaternion& rotation = Quaternion::Identity, uint32 layerMask = MAX_uint32, bool hitTriggers = true); /// - /// Finds all colliders touching or inside of the given convex mesh. + /// Finds all colliders touching or inside the given convex mesh. /// /// The convex mesh center. /// Collision data of the convex mesh. @@ -424,7 +424,7 @@ public: API_FUNCTION() static bool OverlapConvex(const Vector3& center, const CollisionData* convexMesh, const Vector3& scale, API_PARAM(Out) Array& results, const Quaternion& rotation = Quaternion::Identity, uint32 layerMask = MAX_uint32, bool hitTriggers = true); /// - /// Finds all colliders touching or inside of the given box. + /// Finds all colliders touching or inside the given box. /// /// The box center. /// The half size of the box in each direction. @@ -436,7 +436,7 @@ public: API_FUNCTION() static bool OverlapBox(const Vector3& center, const Vector3& halfExtents, API_PARAM(Out) Array& results, const Quaternion& rotation = Quaternion::Identity, uint32 layerMask = MAX_uint32, bool hitTriggers = true); /// - /// Finds all colliders touching or inside of the given sphere. + /// Finds all colliders touching or inside the given sphere. /// /// The sphere center. /// The radius of the sphere. @@ -447,7 +447,7 @@ public: API_FUNCTION() static bool OverlapSphere(const Vector3& center, float radius, API_PARAM(Out) Array& results, uint32 layerMask = MAX_uint32, bool hitTriggers = true); /// - /// Finds all colliders touching or inside of the given capsule. + /// Finds all colliders touching or inside the given capsule. /// /// The capsule center. /// The radius of the capsule. @@ -460,7 +460,7 @@ public: API_FUNCTION() static bool OverlapCapsule(const Vector3& center, float radius, float height, API_PARAM(Out) Array& results, const Quaternion& rotation = Quaternion::Identity, uint32 layerMask = MAX_uint32, bool hitTriggers = true); /// - /// Finds all colliders touching or inside of the given convex mesh. + /// Finds all colliders touching or inside the given convex mesh. /// /// The convex mesh center. /// Collision data of the convex mesh. diff --git a/Source/Engine/Physics/PhysicsScene.h b/Source/Engine/Physics/PhysicsScene.h index 602e6f713..a7cb91cbe 100644 --- a/Source/Engine/Physics/PhysicsScene.h +++ b/Source/Engine/Physics/PhysicsScene.h @@ -140,7 +140,7 @@ public: /// The end position of the line. /// The layer mask used to filter the results. /// If set to true triggers will be hit, otherwise will skip them. - /// True if ray hits an matching object, otherwise false. + /// True if ray hits a matching object, otherwise false. API_FUNCTION() bool LineCast(const Vector3& start, const Vector3& end, uint32 layerMask = MAX_uint32, bool hitTriggers = true); /// @@ -151,18 +151,18 @@ public: /// The result hit information. Valid only when method returns true. /// The layer mask used to filter the results. /// If set to true triggers will be hit, otherwise will skip them. - /// True if ray hits an matching object, otherwise false. + /// True if ray hits a matching object, otherwise false. API_FUNCTION() bool LineCast(const Vector3& start, const Vector3& end, API_PARAM(Out) RayCastHit& hitInfo, uint32 layerMask = MAX_uint32, bool hitTriggers = true); // - /// Performs a line between two points in the scene, returns all hitpoints infos. + /// Performs a line between two points in the scene, returns all hit points info. /// /// The origin of the ray. /// The normalized direction of the ray. /// The result hits. Valid only when method returns true. /// The layer mask used to filter the results. /// If set to true triggers will be hit, otherwise will skip them. - /// True if ray hits an matching object, otherwise false. + /// True if ray hits a matching object, otherwise false. API_FUNCTION() bool LineCastAll(const Vector3& start, const Vector3& end, API_PARAM(Out) Array& results, uint32 layerMask = MAX_uint32, bool hitTriggers = true); /// @@ -173,7 +173,7 @@ public: /// The maximum distance the ray should check for collisions. /// The layer mask used to filter the results. /// If set to true triggers will be hit, otherwise will skip them. - /// True if ray hits an matching object, otherwise false. + /// True if ray hits a matching object, otherwise false. API_FUNCTION() bool RayCast(const Vector3& origin, const Vector3& direction, float maxDistance = MAX_float, uint32 layerMask = MAX_uint32, bool hitTriggers = true); /// @@ -185,7 +185,7 @@ public: /// The maximum distance the ray should check for collisions. /// The layer mask used to filter the results. /// If set to true triggers will be hit, otherwise will skip them. - /// True if ray hits an matching object, otherwise false. + /// True if ray hits a matching object, otherwise false. API_FUNCTION() bool RayCast(const Vector3& origin, const Vector3& direction, API_PARAM(Out) RayCastHit& hitInfo, float maxDistance = MAX_float, uint32 layerMask = MAX_uint32, bool hitTriggers = true); /// @@ -197,7 +197,7 @@ public: /// The maximum distance the ray should check for collisions. /// The layer mask used to filter the results. /// If set to true triggers will be hit, otherwise will skip them. - /// True if ray hits an matching object, otherwise false. + /// True if ray hits a matching object, otherwise false. API_FUNCTION() bool RayCastAll(const Vector3& origin, const Vector3& direction, API_PARAM(Out) Array& results, float maxDistance = MAX_float, uint32 layerMask = MAX_uint32, bool hitTriggers = true); /// @@ -210,7 +210,7 @@ public: /// The maximum distance the ray should check for collisions. /// The layer mask used to filter the results. /// If set to true triggers will be hit, otherwise will skip them. - /// True if box hits an matching object, otherwise false. + /// True if box hits a matching object, otherwise false. API_FUNCTION() bool BoxCast(const Vector3& center, const Vector3& halfExtents, const Vector3& direction, const Quaternion& rotation = Quaternion::Identity, float maxDistance = MAX_float, uint32 layerMask = MAX_uint32, bool hitTriggers = true); /// @@ -224,7 +224,7 @@ public: /// The maximum distance the ray should check for collisions. /// The layer mask used to filter the results. /// If set to true triggers will be hit, otherwise will skip them. - /// True if box hits an matching object, otherwise false. + /// True if box hits a matching object, otherwise false. API_FUNCTION() bool BoxCast(const Vector3& center, const Vector3& halfExtents, const Vector3& direction, API_PARAM(Out) RayCastHit& hitInfo, const Quaternion& rotation = Quaternion::Identity, float maxDistance = MAX_float, uint32 layerMask = MAX_uint32, bool hitTriggers = true); /// @@ -238,7 +238,7 @@ public: /// The maximum distance the ray should check for collisions. /// The layer mask used to filter the results. /// If set to true triggers will be hit, otherwise will skip them. - /// True if box hits an matching object, otherwise false. + /// True if box hits a matching object, otherwise false. API_FUNCTION() bool BoxCastAll(const Vector3& center, const Vector3& halfExtents, const Vector3& direction, API_PARAM(Out) Array& results, const Quaternion& rotation = Quaternion::Identity, float maxDistance = MAX_float, uint32 layerMask = MAX_uint32, bool hitTriggers = true); /// @@ -250,7 +250,7 @@ public: /// The maximum distance the ray should check for collisions. /// The layer mask used to filter the results. /// If set to true triggers will be hit, otherwise will skip them. - /// True if sphere hits an matching object, otherwise false. + /// True if sphere hits a matching object, otherwise false. API_FUNCTION() bool SphereCast(const Vector3& center, float radius, const Vector3& direction, float maxDistance = MAX_float, uint32 layerMask = MAX_uint32, bool hitTriggers = true); /// @@ -263,7 +263,7 @@ public: /// The maximum distance the ray should check for collisions. /// The layer mask used to filter the results. /// If set to true triggers will be hit, otherwise will skip them. - /// True if sphere hits an matching object, otherwise false. + /// True if sphere hits a matching object, otherwise false. API_FUNCTION() bool SphereCast(const Vector3& center, float radius, const Vector3& direction, API_PARAM(Out) RayCastHit& hitInfo, float maxDistance = MAX_float, uint32 layerMask = MAX_uint32, bool hitTriggers = true); /// @@ -276,7 +276,7 @@ public: /// The maximum distance the ray should check for collisions. /// The layer mask used to filter the results. /// If set to true triggers will be hit, otherwise will skip them. - /// True if sphere hits an matching object, otherwise false. + /// True if sphere hits a matching object, otherwise false. API_FUNCTION() bool SphereCastAll(const Vector3& center, float radius, const Vector3& direction, API_PARAM(Out) Array& results, float maxDistance = MAX_float, uint32 layerMask = MAX_uint32, bool hitTriggers = true); /// @@ -290,7 +290,7 @@ public: /// The maximum distance the ray should check for collisions. /// The layer mask used to filter the results. /// If set to true triggers will be hit, otherwise will skip them. - /// True if capsule hits an matching object, otherwise false. + /// True if capsule hits a matching object, otherwise false. API_FUNCTION() bool CapsuleCast(const Vector3& center, float radius, float height, const Vector3& direction, const Quaternion& rotation = Quaternion::Identity, float maxDistance = MAX_float, uint32 layerMask = MAX_uint32, bool hitTriggers = true); /// @@ -305,7 +305,7 @@ public: /// The maximum distance the ray should check for collisions. /// The layer mask used to filter the results. /// If set to true triggers will be hit, otherwise will skip them. - /// True if capsule hits an matching object, otherwise false. + /// True if capsule hits a matching object, otherwise false. API_FUNCTION() bool CapsuleCast(const Vector3& center, float radius, float height, const Vector3& direction, API_PARAM(Out) RayCastHit& hitInfo, const Quaternion& rotation = Quaternion::Identity, float maxDistance = MAX_float, uint32 layerMask = MAX_uint32, bool hitTriggers = true); /// @@ -320,7 +320,7 @@ public: /// The maximum distance the ray should check for collisions. /// The layer mask used to filter the results. /// If set to true triggers will be hit, otherwise will skip them. - /// True if capsule hits an matching object, otherwise false. + /// True if capsule hits a matching object, otherwise false. API_FUNCTION() bool CapsuleCastAll(const Vector3& center, float radius, float height, const Vector3& direction, API_PARAM(Out) Array& results, const Quaternion& rotation = Quaternion::Identity, float maxDistance = MAX_float, uint32 layerMask = MAX_uint32, bool hitTriggers = true); /// @@ -334,7 +334,7 @@ public: /// The maximum distance the ray should check for collisions. /// The layer mask used to filter the results. /// If set to true triggers will be hit, otherwise will skip them. - /// True if convex mesh hits an matching object, otherwise false. + /// True if convex mesh hits a matching object, otherwise false. API_FUNCTION() bool ConvexCast(const Vector3& center, const CollisionData* convexMesh, const Vector3& scale, const Vector3& direction, const Quaternion& rotation = Quaternion::Identity, float maxDistance = MAX_float, uint32 layerMask = MAX_uint32, bool hitTriggers = true); /// @@ -349,7 +349,7 @@ public: /// The maximum distance the ray should check for collisions. /// The layer mask used to filter the results. /// If set to true triggers will be hit, otherwise will skip them. - /// True if convex mesh hits an matching object, otherwise false. + /// True if convex mesh hits a matching object, otherwise false. API_FUNCTION() bool ConvexCast(const Vector3& center, const CollisionData* convexMesh, const Vector3& scale, const Vector3& direction, API_PARAM(Out) RayCastHit& hitInfo, const Quaternion& rotation = Quaternion::Identity, float maxDistance = MAX_float, uint32 layerMask = MAX_uint32, bool hitTriggers = true); /// @@ -364,7 +364,7 @@ public: /// The maximum distance the ray should check for collisions. /// The layer mask used to filter the results. /// If set to true triggers will be hit, otherwise will skip them. - /// True if convex mesh hits an matching object, otherwise false. + /// True if convex mesh hits a matching object, otherwise false. API_FUNCTION() bool ConvexCastAll(const Vector3& center, const CollisionData* convexMesh, const Vector3& scale, const Vector3& direction, API_PARAM(Out) Array& results, const Quaternion& rotation = Quaternion::Identity, float maxDistance = MAX_float, uint32 layerMask = MAX_uint32, bool hitTriggers = true); /// @@ -413,7 +413,7 @@ public: API_FUNCTION() bool CheckConvex(const Vector3& center, const CollisionData* convexMesh, const Vector3& scale, const Quaternion& rotation = Quaternion::Identity, uint32 layerMask = MAX_uint32, bool hitTriggers = true); /// - /// Finds all colliders touching or inside of the given box. + /// Finds all colliders touching or inside the given box. /// /// The box center. /// The half size of the box in each direction. @@ -425,7 +425,7 @@ public: API_FUNCTION() bool OverlapBox(const Vector3& center, const Vector3& halfExtents, API_PARAM(Out) Array& results, const Quaternion& rotation = Quaternion::Identity, uint32 layerMask = MAX_uint32, bool hitTriggers = true); /// - /// Finds all colliders touching or inside of the given sphere. + /// Finds all colliders touching or inside the given sphere. /// /// The sphere center. /// The radius of the sphere. @@ -436,7 +436,7 @@ public: API_FUNCTION() bool OverlapSphere(const Vector3& center, float radius, API_PARAM(Out) Array& results, uint32 layerMask = MAX_uint32, bool hitTriggers = true); /// - /// Finds all colliders touching or inside of the given capsule. + /// Finds all colliders touching or inside the given capsule. /// /// The capsule center. /// The radius of the capsule. @@ -449,7 +449,7 @@ public: API_FUNCTION() bool OverlapCapsule(const Vector3& center, float radius, float height, API_PARAM(Out) Array& results, const Quaternion& rotation = Quaternion::Identity, uint32 layerMask = MAX_uint32, bool hitTriggers = true); /// - /// Finds all colliders touching or inside of the given convex mesh. + /// Finds all colliders touching or inside the given convex mesh. /// /// The convex mesh center. /// Collision data of the convex mesh. @@ -462,7 +462,7 @@ public: API_FUNCTION() bool OverlapConvex(const Vector3& center, const CollisionData* convexMesh, const Vector3& scale, API_PARAM(Out) Array& results, const Quaternion& rotation = Quaternion::Identity, uint32 layerMask = MAX_uint32, bool hitTriggers = true); /// - /// Finds all colliders touching or inside of the given box. + /// Finds all colliders touching or inside the given box. /// /// The box center. /// The half size of the box in each direction. @@ -474,7 +474,7 @@ public: API_FUNCTION() bool OverlapBox(const Vector3& center, const Vector3& halfExtents, API_PARAM(Out) Array& results, const Quaternion& rotation = Quaternion::Identity, uint32 layerMask = MAX_uint32, bool hitTriggers = true); /// - /// Finds all colliders touching or inside of the given sphere. + /// Finds all colliders touching or inside the given sphere. /// /// The sphere center. /// The radius of the sphere. @@ -485,7 +485,7 @@ public: API_FUNCTION() bool OverlapSphere(const Vector3& center, float radius, API_PARAM(Out) Array& results, uint32 layerMask = MAX_uint32, bool hitTriggers = true); /// - /// Finds all colliders touching or inside of the given capsule. + /// Finds all colliders touching or inside the given capsule. /// /// The capsule center. /// The radius of the capsule. @@ -498,7 +498,7 @@ public: API_FUNCTION() bool OverlapCapsule(const Vector3& center, float radius, float height, API_PARAM(Out) Array& results, const Quaternion& rotation = Quaternion::Identity, uint32 layerMask = MAX_uint32, bool hitTriggers = true); /// - /// Finds all colliders touching or inside of the given convex mesh. + /// Finds all colliders touching or inside the given convex mesh. /// /// The convex mesh center. /// Collision data of the convex mesh. diff --git a/Source/Engine/Profiler/ProfilerMemory.cpp b/Source/Engine/Profiler/ProfilerMemory.cpp index c936ff5b2..6b8f18ce3 100644 --- a/Source/Engine/Profiler/ProfilerMemory.cpp +++ b/Source/Engine/Profiler/ProfilerMemory.cpp @@ -243,6 +243,7 @@ void InitProfilerMemory(const Char* cmdLine, int32 stage) #define INIT_PARENT(parent, child) GroupParents[(int32)ProfilerMemory::Groups::child] = (uint8)ProfilerMemory::Groups::parent INIT_PARENT(Engine, EngineThreading); INIT_PARENT(Engine, EngineDelegate); + INIT_PARENT(Engine, EngineDebug); INIT_PARENT(Malloc, MallocArena); INIT_PARENT(Graphics, GraphicsTextures); INIT_PARENT(Graphics, GraphicsRenderTargets); @@ -260,6 +261,8 @@ void InitProfilerMemory(const Char* cmdLine, int32 stage) INIT_PARENT(Content, ContentFiles); INIT_PARENT(Level, LevelFoliage); INIT_PARENT(Level, LevelTerrain); + INIT_PARENT(Navigation, NavigationMesh); + INIT_PARENT(Navigation, NavigationBuilding); INIT_PARENT(Scripting, ScriptingVisual); INIT_PARENT(Scripting, ScriptingCSharp); INIT_PARENT(ScriptingCSharp, ScriptingCSharpGCCommitted); diff --git a/Source/Engine/Profiler/ProfilerMemory.h b/Source/Engine/Profiler/ProfilerMemory.h index 5dddb912b..9177ae6e7 100644 --- a/Source/Engine/Profiler/ProfilerMemory.h +++ b/Source/Engine/Profiler/ProfilerMemory.h @@ -44,6 +44,8 @@ public: EngineThreading, // Memory used by Delegate (engine events system to store all references). EngineDelegate, + // Memory used by debug tools (eg. DebugDraw, DebugCommands or DebugLog). + EngineDebug, // Total graphics memory usage. Graphics, @@ -105,6 +107,10 @@ public: // Total navigation system memory. Navigation, + // Navigation mesh memory. + NavigationMesh, + // Navigation mesh builder memory. + NavigationBuilding, // Total networking system memory. Networking, diff --git a/Source/Engine/Threading/Task.cpp b/Source/Engine/Threading/Task.cpp index a640019d1..cef08b0bc 100644 --- a/Source/Engine/Threading/Task.cpp +++ b/Source/Engine/Threading/Task.cpp @@ -148,9 +148,8 @@ Task* Task::StartNew(Function::Signature& action, Object* target) void Task::Execute() { - if (IsCanceled()) + if (!IsQueued()) return; - ASSERT(IsQueued()); SetState(TaskState::Running); // Perform an operation diff --git a/Source/Engine/UI/GUI/CanvasScaler.cs b/Source/Engine/UI/GUI/CanvasScaler.cs index 6bd18ea51..1e30fd22f 100644 --- a/Source/Engine/UI/GUI/CanvasScaler.cs +++ b/Source/Engine/UI/GUI/CanvasScaler.cs @@ -449,8 +449,7 @@ namespace FlaxEngine.GUI /// public override bool RayCast(ref Float2 location, out Control hit) { - var p = location / _scale; - if (RayCastChildren(ref p, out hit)) + if (RayCastChildren(ref location, out hit)) return true; return base.RayCast(ref location, out hit); } diff --git a/Source/Engine/UI/GUI/Common/RichTextBox.Parsing.cs b/Source/Engine/UI/GUI/Common/RichTextBox.Parsing.cs index 20ef1c401..bb6ee22a5 100644 --- a/Source/Engine/UI/GUI/Common/RichTextBox.Parsing.cs +++ b/Source/Engine/UI/GUI/Common/RichTextBox.Parsing.cs @@ -143,6 +143,40 @@ namespace FlaxEngine.GUI context.Caret.X = 0; OnLineAdded(ref context, _text.Length - 1); } + + // Organize lines vertically + if (_textBlocks.Count != 0) + { + var lastBlock = _textBlocks[_textBlocks.Count - 1]; + + // Get style (global or leftover from style stack or the last lime) + var verticalAlignments = _textStyle.Alignment; + if (context.StyleStack.Count > 1) + verticalAlignments = context.StyleStack.Peek().Alignment; + else if ((lastBlock.Style.Alignment & TextBlockStyle.Alignments.VerticalMask) != TextBlockStyle.Alignments.Baseline) + verticalAlignments = lastBlock.Style.Alignment; + + var totalSize = lastBlock.Bounds.BottomRight; + var sizeOffset = Size - totalSize; + var textBlocks = CollectionsMarshal.AsSpan(_textBlocks); + if ((verticalAlignments & TextBlockStyle.Alignments.Middle) == TextBlockStyle.Alignments.Middle) + { + sizeOffset.Y *= 0.5f; + for (int i = 0; i < _textBlocks.Count; i++) + { + ref TextBlock textBlock = ref textBlocks[i]; + textBlock.Bounds.Location.Y += sizeOffset.Y; + } + } + else if ((verticalAlignments & TextBlockStyle.Alignments.Bottom) == TextBlockStyle.Alignments.Bottom) + { + for (int i = 0; i < _textBlocks.Count; i++) + { + ref TextBlock textBlock = ref textBlocks[i]; + textBlock.Bounds.Location.Y += sizeOffset.Y; + } + } + } } /// @@ -239,14 +273,15 @@ namespace FlaxEngine.GUI } // Organize text blocks within line - var horizontalAlignments = TextBlockStyle.Alignments.Baseline; - var verticalAlignments = TextBlockStyle.Alignments.Baseline; + var lineAlignments = TextBlockStyle.Alignments.Baseline; for (int i = context.LineStartTextBlockIndex; i < _textBlocks.Count; i++) { ref TextBlock textBlock = ref textBlocks[i]; var vOffset = lineSize.Y - textBlock.Bounds.Height; - horizontalAlignments |= textBlock.Style.Alignment & TextBlockStyle.Alignments.HorizontalMask; - verticalAlignments |= textBlock.Style.Alignment & TextBlockStyle.Alignments.VerticalMask; + if (i == context.LineStartTextBlockIndex) + lineAlignments = textBlock.Style.Alignment; + else + lineAlignments &= textBlock.Style.Alignment; switch (textBlock.Style.Alignment & TextBlockStyle.Alignments.VerticalMask) { case TextBlockStyle.Alignments.Baseline: @@ -275,9 +310,9 @@ namespace FlaxEngine.GUI } } - // Organize blocks within whole container + // Organize whole line horizontally var sizeOffset = Size - lineSize; - if ((horizontalAlignments & TextBlockStyle.Alignments.Center) == TextBlockStyle.Alignments.Center) + if ((lineAlignments & TextBlockStyle.Alignments.Center) == TextBlockStyle.Alignments.Center) { sizeOffset.X *= 0.5f; for (int i = context.LineStartTextBlockIndex; i < _textBlocks.Count; i++) @@ -286,7 +321,7 @@ namespace FlaxEngine.GUI textBlock.Bounds.Location.X += sizeOffset.X; } } - else if ((horizontalAlignments & TextBlockStyle.Alignments.Right) == TextBlockStyle.Alignments.Right) + else if ((lineAlignments & TextBlockStyle.Alignments.Right) == TextBlockStyle.Alignments.Right) { for (int i = context.LineStartTextBlockIndex; i < _textBlocks.Count; i++) { @@ -294,23 +329,6 @@ namespace FlaxEngine.GUI textBlock.Bounds.Location.X += sizeOffset.X; } } - if ((verticalAlignments & TextBlockStyle.Alignments.Middle) == TextBlockStyle.Alignments.Middle) - { - sizeOffset.Y *= 0.5f; - for (int i = context.LineStartTextBlockIndex; i < _textBlocks.Count; i++) - { - ref TextBlock textBlock = ref textBlocks[i]; - textBlock.Bounds.Location.Y += sizeOffset.Y; - } - } - else if ((verticalAlignments & TextBlockStyle.Alignments.Bottom) == TextBlockStyle.Alignments.Bottom) - { - for (int i = context.LineStartTextBlockIndex; i < _textBlocks.Count; i++) - { - ref TextBlock textBlock = ref textBlocks[i]; - textBlock.Bounds.Location.Y += sizeOffset.Y; - } - } // Move to the next line context.LineStartCharacterIndex = lineEnd + 1; diff --git a/Source/Engine/UI/GUI/Common/RichTextBox.Tags.cs b/Source/Engine/UI/GUI/Common/RichTextBox.Tags.cs index b57fac47d..3bb99762f 100644 --- a/Source/Engine/UI/GUI/Common/RichTextBox.Tags.cs +++ b/Source/Engine/UI/GUI/Common/RichTextBox.Tags.cs @@ -175,7 +175,7 @@ namespace FlaxEngine.GUI // Setup size var font = imageBlock.Style.Font.GetFont(); if (font) - imageBlock.Bounds.Size = new Float2(font.Height); + imageBlock.Bounds.Size = new Float2(font.Ascender); var imageSize = image.Size; imageBlock.Bounds.Size.X *= imageSize.X / imageSize.Y; // Keep original aspect ratio bool hasWidth = TryParseNumberTag(ref tag, "width", imageBlock.Bounds.Width, out var width); @@ -215,16 +215,16 @@ namespace FlaxEngine.GUI switch (valign) { case "top": - style.Alignment = TextBlockStyle.Alignments.Top; + style.Alignment |= TextBlockStyle.Alignments.Top; break; case "bottom": - style.Alignment = TextBlockStyle.Alignments.Bottom; + style.Alignment |= TextBlockStyle.Alignments.Bottom; break; case "middle": - style.Alignment = TextBlockStyle.Alignments.Middle; + style.Alignment |= TextBlockStyle.Alignments.Middle; break; case "baseline": - style.Alignment = TextBlockStyle.Alignments.Baseline; + style.Alignment |= TextBlockStyle.Alignments.Baseline; break; } } @@ -243,17 +243,17 @@ namespace FlaxEngine.GUI var style = context.StyleStack.Peek(); if (tag.Attributes.TryGetValue(string.Empty, out var valign)) { - style.Alignment &= ~TextBlockStyle.Alignments.VerticalMask; + style.Alignment &= ~TextBlockStyle.Alignments.HorizontalMask; switch (valign) { case "left": - style.Alignment = TextBlockStyle.Alignments.Left; + style.Alignment |= TextBlockStyle.Alignments.Left; break; case "right": - style.Alignment = TextBlockStyle.Alignments.Right; + style.Alignment |= TextBlockStyle.Alignments.Right; break; case "center": - style.Alignment = TextBlockStyle.Alignments.Center; + style.Alignment |= TextBlockStyle.Alignments.Center; break; } } @@ -270,7 +270,8 @@ namespace FlaxEngine.GUI else { var style = context.StyleStack.Peek(); - style.Alignment = TextBlockStyle.Alignments.Center; + style.Alignment &= ~TextBlockStyle.Alignments.HorizontalMask; + style.Alignment |= TextBlockStyle.Alignments.Center; context.StyleStack.Push(style); } }