From 66d5850a763c47462f4df62d0023805020338d6b Mon Sep 17 00:00:00 2001 From: Wojciech Figat Date: Fri, 20 Jan 2023 12:02:40 +0100 Subject: [PATCH] Asset update --- Content/Shaders/GI/DDGI.flax | 4 +-- Content/Shaders/GI/GlobalSurfaceAtlas.flax | 4 +-- Content/Shaders/TAA.flax | 4 +-- Content/Shaders/VolumetricFog.flax | 4 +-- .../Editor/CustomEditors/Editors/TagEditor.cs | 30 +++++++++---------- 5 files changed, 23 insertions(+), 23 deletions(-) diff --git a/Content/Shaders/GI/DDGI.flax b/Content/Shaders/GI/DDGI.flax index c8f8eee9d..daaac6317 100644 --- a/Content/Shaders/GI/DDGI.flax +++ b/Content/Shaders/GI/DDGI.flax @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6b00a1519c9fe2303a05c10ae4061649c4073a3f65a3bd8c2af848cdc7bf5e53 -size 23702 +oid sha256:da77e6d9cfc596990d6286fe5b3a7976357cccd95cb0e7ed6a3fdcc23695d212 +size 24284 diff --git a/Content/Shaders/GI/GlobalSurfaceAtlas.flax b/Content/Shaders/GI/GlobalSurfaceAtlas.flax index f74572140..a90a8c5ab 100644 --- a/Content/Shaders/GI/GlobalSurfaceAtlas.flax +++ b/Content/Shaders/GI/GlobalSurfaceAtlas.flax @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8b69d6b93baa29702789073f911dbe784dc65ccd66a43cef837a217959d24d13 -size 12612 +oid sha256:32bf53278f501fbdcb61ba7da32dd1a37e6f87608401be4a256b9cc9bf687d7f +size 12952 diff --git a/Content/Shaders/TAA.flax b/Content/Shaders/TAA.flax index e9575793e..b57642b07 100644 --- a/Content/Shaders/TAA.flax +++ b/Content/Shaders/TAA.flax @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:26cf20668dc0d93fdffa3ea715130b618e9c491e73dc8be779c1d182e73b255b -size 3257 +oid sha256:8d22fd7b1f4008b56a9f95e0c6263f8f66a26244bb40437c724344633a4ea4bc +size 3343 diff --git a/Content/Shaders/VolumetricFog.flax b/Content/Shaders/VolumetricFog.flax index 18eddae16..8de7291ce 100644 --- a/Content/Shaders/VolumetricFog.flax +++ b/Content/Shaders/VolumetricFog.flax @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:72415ba69a685e9a739d1a08d08c6eb9efd3cab31d8cc0c949cb187a9bad19a5 -size 13841 +oid sha256:d25529ed77efff338892f54c103d007e98102328382497a5bb0ca5b047ef6acb +size 14255 diff --git a/Source/Editor/CustomEditors/Editors/TagEditor.cs b/Source/Editor/CustomEditors/Editors/TagEditor.cs index 8f330da29..e9bcd97a9 100644 --- a/Source/Editor/CustomEditors/Editors/TagEditor.cs +++ b/Source/Editor/CustomEditors/Editors/TagEditor.cs @@ -160,7 +160,7 @@ namespace FlaxEditor.CustomEditors.Editors { if (string.IsNullOrEmpty(input)) return; - + // Ensure that name is unique if (Tags.List.Contains(input)) return; @@ -177,7 +177,7 @@ namespace FlaxEditor.CustomEditors.Editors { continue; } - + // Check all entered subtags and create any that dont exist for (int j = 0; j <= i; j++) { @@ -189,7 +189,7 @@ namespace FlaxEditor.CustomEditors.Editors tagString = string.Empty; continue; } - + if (Tags.List.Contains(tagString)) { // Find next parent node @@ -197,11 +197,11 @@ namespace FlaxEditor.CustomEditors.Editors { if (!(child is TreeNode childNode)) continue; - + var tagValue = (Tag)childNode.Tag; if (!string.Equals(tagValue.ToString(), tagString)) continue; - + parentNode = childNode; parentCount += 1; } @@ -216,11 +216,11 @@ namespace FlaxEditor.CustomEditors.Editors { if (!(child is TreeNode childNode)) continue; - + var tagValue = (Tag)childNode.Tag; if (!string.Equals(tagValue.ToString(), lastTagString)) continue; - + parentNode = childNode; parentCount += 1; } @@ -266,13 +266,13 @@ namespace FlaxEditor.CustomEditors.Editors }; node.Addons.Add(addButton); addButton.ButtonClicked += button => OnAddSubTagButtonClicked(((Tag)node.Tag).ToString(), textBox, dropPanel); - + // Link node.Parent = parentNode; node.IndexInParent = 0; parentNode.Expand(true); ((Panel)tree.Parent.Parent).ScrollViewTo(node); - + // Get tag name var tagName = tagString; var tagShortName = tagName.Substring(parentCount == 0 ? lastTagString.Length : lastTagString.Length + 1); @@ -355,7 +355,7 @@ namespace FlaxEditor.CustomEditors.Editors { IsMultiline = false, WatermarkText = "X.Y.Z", - Size = new Float2(addTagDropPanel.Width * 0.7f, 0), + Size = new Float2(addTagDropPanel.Width * 0.7f, 0), Parent = tagNamePanel, EndEditOnClick = false, }; @@ -395,7 +395,7 @@ namespace FlaxEditor.CustomEditors.Editors nameTextBox.BorderSelectedColor = FlaxEngine.GUI.Style.Current.BackgroundSelected; return; } - + OnAddTagButtonClicked(nameTextBox.Text, tree, nameTextBox, addTagDropPanel, pickerData); }; @@ -416,10 +416,10 @@ namespace FlaxEditor.CustomEditors.Editors { if (!uniqueText) return; - + OnAddTagButtonClicked(nameTextBox.Text, tree, nameTextBox, addTagDropPanel, pickerData); }; - + // Used for how far everything should drop when the drop down panel is opened var dropPanelOpenHeight = tagNamePanel.Height + addButtonPanel.Height + 4; @@ -454,7 +454,7 @@ namespace FlaxEditor.CustomEditors.Editors tagShortName = tagName.Substring(lastDotIndex + 1); tagParentName = tagName.Substring(0, lastDotIndex); } - + // Create node var node = new TreeNodeWithAddons { @@ -513,7 +513,7 @@ namespace FlaxEditor.CustomEditors.Editors }; buttonsPanel.Y += addTagDropPanel.HeaderHeight + 4; buttonsPanel.X += 2; - + var buttonsSize = new Float2((menu.Width - 2 - buttonsPanel.Margin.Width) / 3.0f - buttonsPanel.Spacing, 18.0f); var buttonExpandAll = new Button {