Merge branch 'master' into controls-toolbox

Source/Editor/CustomEditors/Editors/StringEditor.cs

@@ -13,6 +13,9 @@ namespace FlaxEditor.CustomEditors.Editors
     public sealed class StringEditor : CustomEditor
     {
         private TextBoxElement _element;
+        private string _watermarkText;
+        private Color _watermarkColor;
+        private Color _defaultWatermarkColor;
 
         /// <inheritdoc />
         public override DisplayStyle Style => DisplayStyle.Inline;
@@ -21,15 +24,26 @@ namespace FlaxEditor.CustomEditors.Editors
         public override void Initialize(LayoutElementsContainer layout)
         {
             bool isMultiLine = false;
+            _watermarkText = string.Empty;
 
             var attributes = Values.GetAttributes();
             var multiLine = attributes?.FirstOrDefault(x => x is MultilineTextAttribute);
+            var watermarkAttribute = attributes?.FirstOrDefault(x => x is WatermarkAttribute);
             if (multiLine != null)
             {
                 isMultiLine = true;
             }
 
             _element = layout.TextBox(isMultiLine);
+            _defaultWatermarkColor = _element.TextBox.WatermarkTextColor;
+            if (watermarkAttribute is WatermarkAttribute watermark)
+            {
+                _watermarkText = watermark.WatermarkText;
+                var watermarkColor = watermark.WatermarkColor > 0 ? Color.FromRGBA(watermark.WatermarkColor) : FlaxEngine.GUI.Style.Current.ForegroundDisabled;
+                _watermarkColor = watermarkColor;
+                _element.TextBox.WatermarkText = watermark.WatermarkText;
+                _element.TextBox.WatermarkTextColor = watermarkColor;
+            }
             _element.TextBox.EditEnd += () => SetValue(_element.Text);
         }
 
@@ -41,12 +55,14 @@ namespace FlaxEditor.CustomEditors.Editors
             if (HasDifferentValues)
             {
                 _element.TextBox.Text = string.Empty;
+                _element.TextBox.WatermarkTextColor = _defaultWatermarkColor;
                 _element.TextBox.WatermarkText = "Different values";
             }
             else
             {
                 _element.TextBox.Text = (string)Values[0];
-                _element.TextBox.WatermarkText = string.Empty;
+                _element.TextBox.WatermarkTextColor = _watermarkColor;
+                _element.TextBox.WatermarkText = _watermarkText;
             }
         }
     }

Source/Editor/GUI/Tree/TreeNode.cs

@@ -730,12 +730,15 @@ namespace FlaxEditor.GUI.Tree
                 // Try to estimate the rough location of the first node, assuming the node height is constant
                 var firstChildGlobalRect = GetChildGlobalRectangle(children[0], ref globalTransform);
                 var firstVisibleChild = Math.Clamp((int)Math.Floor((globalClipping.Y - firstChildGlobalRect.Top) / firstChildGlobalRect.Height) + 1, 0, children.Count - 1);
-                if (GetChildGlobalRectangle(children[firstVisibleChild], ref globalTransform).Top > globalClipping.Top)
+                if (GetChildGlobalRectangle(children[firstVisibleChild], ref globalTransform).Top > globalClipping.Top || !children[firstVisibleChild].Visible)
                 {
-                    // Overshoot...
+                    // Estimate overshoot, either it's partially visible or hidden in the tree
                     for (; firstVisibleChild > 0; firstVisibleChild--)
                     {
                         var child = children[firstVisibleChild];
+                        if (!child.Visible)
+                            continue;
+
                         if (GetChildGlobalRectangle(child, ref globalTransform).Top < globalClipping.Top)
                             break;
                     }
@@ -744,19 +747,17 @@ namespace FlaxEditor.GUI.Tree
                 for (int i = firstVisibleChild; i < children.Count; i++)
                 {
                     var child = children[i];
-                    if (child.Visible)
+                    if (!child.Visible)
-                    {
+                        continue;
+
                     var childGlobalRect = GetChildGlobalRectangle(child, ref globalTransform);
-                        if (globalClipping.Intersects(ref childGlobalRect))
+                    if (!globalClipping.Intersects(ref childGlobalRect))
-                        {
+                        break;
+
                     Render2D.PushTransform(ref child._cachedTransform);
                     child.Draw();
                     Render2D.PopTransform();
                 }
-                        else
-                            break;
-                    }
-                }
 
                 static Rectangle GetChildGlobalRectangle(Control control, ref Matrix3x3 globalTransform)
                 {

Source/Editor/Modules/UIModule.cs

@@ -640,7 +640,7 @@ namespace FlaxEditor.Modules
             cm.AddButton("Visual Script Debugger", Editor.Windows.VisualScriptDebuggerWin.FocusOrShow);
             cm.AddSeparator();
             cm.AddButton("Save window layout", Editor.Windows.SaveLayout);
-            _menuWindowApplyWindowLayout = cm.AddChildMenu("Apply window layout");
+            _menuWindowApplyWindowLayout = cm.AddChildMenu("Window layouts");
             cm.AddButton("Restore default layout", Editor.Windows.LoadDefaultLayout);
 
             // Help

Source/Editor/Surface/Archetypes/Animation.MultiBlend.cs

@@ -186,6 +186,18 @@ namespace FlaxEditor.Surface.Archetypes
 
                 base.OnEndMouseCapture();
             }
+
+            /// <inheritdoc />
+            public override bool OnKeyDown(KeyboardKeys key)
+            {
+                switch (key)
+                {
+                case KeyboardKeys.Delete:
+                    _editor.SetAsset(_index, Guid.Empty);
+                    return true;
+                }
+                return base.OnKeyDown(key);
+            }
         }
 
         /// <summary>

Source/Editor/Surface/Undo/AddRemoveNodeAction.cs

@@ -66,6 +66,8 @@ namespace FlaxEditor.Surface.Undo
             // Initialize
             if (node.Values != null && node.Values.Length == _nodeValues.Length)
                 Array.Copy(_nodeValues, node.Values, _nodeValues.Length);
+            else if (_nodeValues != null && (node.Archetype.Flags & NodeFlags.VariableValuesSize) != 0)
+                node.Values = (object[])_nodeValues.Clone();
             else if (_nodeValues != null && _nodeValues.Length != 0)
                 throw new InvalidOperationException("Invalid node values.");
             node.Location = _nodeLocation;

Source/Editor/Windows/Assets/PrefabWindow.Hierarchy.cs

@@ -485,6 +485,7 @@ namespace FlaxEditor.Windows.Assets
             // Create undo action
             var action = new CustomDeleteActorsAction(new List<SceneGraphNode>(1) { actorNode }, true);
             Undo.AddAction(action);
+            Focus();
             Select(actorNode);
         }
 

Source/Engine/GraphicsDevice/Vulkan/Config.h

@@ -33,6 +33,14 @@
 #define VULKAN_USE_DEBUG_LAYER GPU_ENABLE_DIAGNOSTICS
 #define VULKAN_USE_DEBUG_DATA (GPU_ENABLE_DIAGNOSTICS && COMPILE_WITH_DEV_ENV)
 
+#ifndef VULKAN_USE_VALIDATION_CACHE
+#ifdef VK_EXT_validation_cache
+#define VULKAN_USE_VALIDATION_CACHE VK_EXT_validation_cache
+#else
+#define VULKAN_USE_VALIDATION_CACHE 0
+#endif
+#endif
+
 #ifndef VULKAN_USE_QUERIES
 #define VULKAN_USE_QUERIES 1
 #endif

Source/Engine/GraphicsDevice/Vulkan/GPUDeviceVulkan.Layers.cpp

@@ -39,7 +39,7 @@ static const char* GInstanceExtensions[] =
     VK_KHR_PORTABILITY_ENUMERATION_EXTENSION_NAME,
     VK_KHR_GET_PHYSICAL_DEVICE_PROPERTIES_2_EXTENSION_NAME,
 #endif
-#if VK_EXT_validation_cache
+#if VULKAN_USE_VALIDATION_CACHE
     VK_EXT_VALIDATION_CACHE_EXTENSION_NAME,
 #endif
 #if defined(VK_KHR_display) && 0
@@ -57,7 +57,7 @@ static const char* GDeviceExtensions[] =
 #if VK_KHR_maintenance1
     VK_KHR_MAINTENANCE1_EXTENSION_NAME,
 #endif
-#if VK_EXT_validation_cache
+#if VULKAN_USE_VALIDATION_CACHE
     VK_EXT_VALIDATION_CACHE_EXTENSION_NAME,
 #endif
 #if VK_KHR_sampler_mirror_clamp_to_edge
@@ -582,7 +582,7 @@ void GPUDeviceVulkan::ParseOptionalDeviceExtensions(const Array<const char*>& de
     OptionalDeviceExtensions.HasKHRMaintenance2 = RenderToolsVulkan::HasExtension(deviceExtensions, VK_KHR_MAINTENANCE2_EXTENSION_NAME);
 #endif
     OptionalDeviceExtensions.HasMirrorClampToEdge = RenderToolsVulkan::HasExtension(deviceExtensions, VK_KHR_SAMPLER_MIRROR_CLAMP_TO_EDGE_EXTENSION_NAME);
-#if VK_EXT_validation_cache
+#if VULKAN_USE_VALIDATION_CACHE
     OptionalDeviceExtensions.HasEXTValidationCache = RenderToolsVulkan::HasExtension(deviceExtensions, VK_EXT_VALIDATION_CACHE_EXTENSION_NAME);
 #endif
 }

Source/Engine/GraphicsDevice/Vulkan/GPUDeviceVulkan.cpp

@@ -1439,7 +1439,7 @@ bool GPUDeviceVulkan::SavePipelineCache()
     return File::WriteAllBytes(path, data);
 }
 
-#if VK_EXT_validation_cache
+#if VULKAN_USE_VALIDATION_CACHE
 
 void GetValidationCachePath(String& path)
 {
@@ -1900,7 +1900,7 @@ bool GPUDeviceVulkan::Init()
         const VkResult result = vkCreatePipelineCache(Device, &pipelineCacheCreateInfo, nullptr, &PipelineCache);
         LOG_VULKAN_RESULT(result);
     }
-#if VK_EXT_validation_cache
+#if VULKAN_USE_VALIDATION_CACHE
     if (OptionalDeviceExtensions.HasEXTValidationCache && vkCreateValidationCacheEXT && vkDestroyValidationCacheEXT)
     {
         Array<uint8> data;
@@ -1915,16 +1915,16 @@ bool GPUDeviceVulkan::Init()
                 int32* dataPtr = (int32*)data.Get();
                 if (*dataPtr > 0)
                 {
-                    dataPtr++;
+                    const int32 cacheSize = *dataPtr++;
-                    const int32 version = *dataPtr++;
+                    const int32 cacheVersion = *dataPtr++;
-                    const int32 versionExpected = VK_PIPELINE_CACHE_HEADER_VERSION_ONE;
+                    const int32 cacheVersionExpected = VK_PIPELINE_CACHE_HEADER_VERSION_ONE;
-                    if (version == versionExpected)
+                    if (cacheVersion == cacheVersionExpected)
                     {
                         dataPtr += VK_UUID_SIZE / sizeof(int32);
                     }
                     else
                     {
-                        LOG(Warning, "Bad validation cache file, version: {0}, expected: {1}", version, versionExpected);
+                        LOG(Warning, "Bad validation cache file, version: {0}, expected: {1}", cacheVersion, cacheVersionExpected);
                         data.Clear();
                     }
                 }
@@ -2003,7 +2003,7 @@ void GPUDeviceVulkan::Dispose()
         vkDestroyPipelineCache(Device, PipelineCache, nullptr);
         PipelineCache = VK_NULL_HANDLE;
     }
-#if VK_EXT_validation_cache
+#if VULKAN_USE_VALIDATION_CACHE
     if (ValidationCache != VK_NULL_HANDLE)
     {
         if (SaveValidationCache())

Source/Engine/GraphicsDevice/Vulkan/GPUDeviceVulkan.h

@@ -400,7 +400,9 @@ public:
         uint32 HasKHRMaintenance1 : 1;
         uint32 HasKHRMaintenance2 : 1;
         uint32 HasMirrorClampToEdge : 1;
+#if VULKAN_USE_VALIDATION_CACHE
         uint32 HasEXTValidationCache : 1;
+#endif
     };
 
     static void GetInstanceLayersAndExtensions(Array<const char*>& outInstanceExtensions, Array<const char*>& outInstanceLayers, bool& outDebugUtils);
@@ -496,13 +498,11 @@ public:
     /// </summary>
     VkPipelineCache PipelineCache = VK_NULL_HANDLE;
 
-#if VK_EXT_validation_cache
+#if VULKAN_USE_VALIDATION_CACHE
-
     /// <summary>
     /// The optional validation cache.
     /// </summary>
     VkValidationCacheEXT ValidationCache = VK_NULL_HANDLE;
-
 #endif
 
     /// <summary>
@@ -584,12 +584,10 @@ public:
     bool SavePipelineCache();
 
 #if VK_EXT_validation_cache
-
     /// <summary>
     /// Saves the validation cache.
     /// </summary>
     bool SaveValidationCache();
-
 #endif
 
 private:

Source/Engine/GraphicsDevice/Vulkan/GPUShaderVulkan.cpp

@@ -116,7 +116,7 @@ GPUShaderProgram* GPUShaderVulkan::CreateGPUShaderProgram(ShaderStage type, cons
     RenderToolsVulkan::ZeroStruct(createInfo, VK_STRUCTURE_TYPE_SHADER_MODULE_CREATE_INFO);
     createInfo.codeSize = (size_t)spirv.Length();
     createInfo.pCode = (const uint32_t*)spirv.Get();
-#if VK_EXT_validation_cache
+#if VULKAN_USE_VALIDATION_CACHE
     VkShaderModuleValidationCacheCreateInfoEXT validationInfo;
     if (_device->ValidationCache != VK_NULL_HANDLE)
     {

Source/Engine/GraphicsDevice/Vulkan/IncludeVulkanHeaders.h

@@ -14,6 +14,7 @@
 #include <vulkan/vulkan.h>
 #undef VK_EXT_debug_utils
 #undef VK_EXT_validation_cache
+#define VULKAN_USE_VALIDATION_CACHE 0
 #pragma clang diagnostic ignored "-Wpointer-bool-conversion"
 #pragma clang diagnostic ignored "-Wtautological-pointer-compare"
 

Source/Engine/GraphicsDevice/Vulkan/Linux/LinuxVulkanPlatform.h

@@ -9,6 +9,9 @@
 // Support more backbuffers in case driver decides to use more (https://gitlab.freedesktop.org/apinheiro/mesa/-/issues/9)
 #define VULKAN_BACK_BUFFERS_COUNT_MAX 8
 
+// Prevent wierd error 'Invalid VkValidationCacheEXT Object'
+#define VULKAN_USE_VALIDATION_CACHE 0
+
 /// <summary>
 /// The implementation for the Vulkan API support for Linux platform.
 /// </summary>

Source/Engine/Scripting/Attributes/Editor/WatermarkAttribute.cs

@@ -0,0 +1,42 @@
+using System;
+
+namespace FlaxEngine;
+
+/// <summary>
+/// Used to add a watermark to a string textbox in the editor field
+/// </summary>
+[Serializable]
+[AttributeUsage(AttributeTargets.Field | AttributeTargets.Property)]
+public class WatermarkAttribute : Attribute
+{
+    /// <summary>
+    /// The watermark text.
+    /// </summary>
+    public string WatermarkText;
+
+    /// <summary>
+    /// The watermark color.
+    /// </summary>
+    public uint WatermarkColor;
+
+    /// <summary>
+    /// Initializes a new instance of the  <see cref="WatermarkAttribute"/> class.
+    /// </summary>
+    /// <param name="text">The watermark text.</param>
+    public WatermarkAttribute(string text)
+    {
+        WatermarkText = text;
+        WatermarkColor = 0; // default color of watermark in textbox
+    }
+
+    /// <summary>
+    /// Initializes a new instance of the  <see cref="WatermarkAttribute"/> class.
+    /// </summary>
+    /// <param name="text">The watermark text.</param>
+    /// <param name="color">The watermark color. 0 to use default.</param>
+    public WatermarkAttribute(string text, uint color)
+    {
+        WatermarkText = text;
+        WatermarkColor = color;
+    }
+}

Source/Engine/UI/GUI/Common/TextBox.cs

@@ -214,7 +214,7 @@ namespace FlaxEngine.GUI
                     color *= 0.6f;
                 Render2D.DrawText(font, _text, color, ref _layout, TextMaterial);
             }
-            else if (!string.IsNullOrEmpty(_watermarkText) && !IsFocused)
+            else if (!string.IsNullOrEmpty(_watermarkText))
             {
                 Render2D.DrawText(font, _watermarkText, WatermarkTextColor, ref _layout, TextMaterial);
             }

Source/Engine/UI/GUI/Common/TextBoxBase.cs

@@ -1203,7 +1203,7 @@ namespace FlaxEngine.GUI
             if (base.OnMouseDown(location, button))
                 return true;
 
-            if (button == MouseButton.Left && _text.Length > 0 && _isSelectable)
+            if (button == MouseButton.Left && _isSelectable)
             {
                 Focus();
                 OnSelectingBegin();
@@ -1219,6 +1219,10 @@ namespace FlaxEngine.GUI
                     else
                         SetSelection(_selectionStart, hitPos);
                 }
+                else if (string.IsNullOrEmpty(_text))
+                {
+                    SetSelection(0);
+                }
                 else
                 {
                     SetSelection(hitPos);