Add support for Zed code editor

.github/ISSUE_TEMPLATE/1-bug.yaml

@@ -31,7 +31,7 @@ body:
         - '1.10'
         - '1.11'
         - master branch
-      default: 3
+      default: 2
     validations:
       required: true
   - type: textarea

Flax.flaxproj

@@ -4,7 +4,7 @@
     "Major": 1,
     "Minor": 11,
     "Revision": 0,
-    "Build": 6805
+    "Build": 6802
   },
   "Company": "Flax",
   "Copyright": "Copyright (c) 2012-2025 Wojciech Figat. All rights reserved.",

Source/Editor/Content/Items/VisualScriptItem.cs

@@ -281,13 +281,6 @@ namespace FlaxEditor.Content
 
         private void CacheData()
         {
-            if (!_asset)
-            {
-                _parameters = Utils.GetEmptyArray<ScriptMemberInfo>();
-                _methods = Utils.GetEmptyArray<ScriptMemberInfo>();
-                _attributes = Utils.GetEmptyArray<Attribute>();
-                return;
-            }
             if (_parameters != null)
                 return;
             if (_asset.WaitForLoaded())
@@ -351,13 +344,13 @@ namespace FlaxEditor.Content
         }
 
         /// <inheritdoc />
-        public string Name => _asset ? Path.GetFileNameWithoutExtension(_asset.Path) : null;
+        public string Name => Path.GetFileNameWithoutExtension(_asset.Path);
 
         /// <inheritdoc />
         public string Namespace => string.Empty;
 
         /// <inheritdoc />
-        public string TypeName => _asset ? JsonSerializer.GetStringID(_asset.ID) : null;
+        public string TypeName => JsonSerializer.GetStringID(_asset.ID);
 
         /// <inheritdoc />
         public bool IsPublic => true;

Source/Editor/Cooker/Platform/GDK/GDKPlatformTools.cpp

@@ -15,32 +15,26 @@
 #include "Editor/ProjectInfo.h"
 #include "Editor/Utilities/EditorUtilities.h"
 
-String GetGDK()
+GDKPlatformTools::GDKPlatformTools()
 {
-    String gdk;
-    Platform::GetEnvironmentVariable(TEXT("GameDKLatest"), gdk);
-    if (gdk.IsEmpty() || !FileSystem::DirectoryExists(gdk))
+    // Find GDK
+    Platform::GetEnvironmentVariable(TEXT("GameDKLatest"), _gdkPath);
+    if (_gdkPath.IsEmpty() || !FileSystem::DirectoryExists(_gdkPath))
     {
-        gdk.Clear();
-        Platform::GetEnvironmentVariable(TEXT("GRDKLatest"), gdk);
-        if (gdk.IsEmpty() || !FileSystem::DirectoryExists(gdk))
+        _gdkPath.Clear();
+        Platform::GetEnvironmentVariable(TEXT("GRDKLatest"), _gdkPath);
+        if (_gdkPath.IsEmpty() || !FileSystem::DirectoryExists(_gdkPath))
         {
-            gdk.Clear();
+            _gdkPath.Clear();
         }
         else
         {
-            if (gdk.EndsWith(TEXT("GRDK\\")))
-                gdk.Remove(gdk.Length() - 6);
-            else if (gdk.EndsWith(TEXT("GRDK")))
-                gdk.Remove(gdk.Length() - 5);
+            if (_gdkPath.EndsWith(TEXT("GRDK\\")))
+                _gdkPath.Remove(_gdkPath.Length() - 6);
+            else if (_gdkPath.EndsWith(TEXT("GRDK")))
+                _gdkPath.Remove(_gdkPath.Length() - 5);
         }
     }
-    return gdk;
-}
-
-GDKPlatformTools::GDKPlatformTools()
-{
-    _gdkPath = GetGDK();
 }
 
 DotNetAOTModes GDKPlatformTools::UseAOT() const
@@ -127,7 +121,7 @@ bool GDKPlatformTools::OnPostProcess(CookingData& data, GDKPlatformSettings* pla
         validName.Add('\0');
 
         sb.Append(TEXT("<?xml version=\"1.0\" encoding=\"utf-8\"?>\n"));
-        sb.Append(TEXT("<Game configVersion=\"1\">\n"));
+        sb.Append(TEXT("<Game configVersion=\"0\">\n"));
         sb.AppendFormat(TEXT("  <Identity Name=\"{0}\" Publisher=\"{1}\" Version=\"{2}\"/>\n"),
                         validName.Get(),
                         platformSettings->PublisherName.HasChars() ? platformSettings->PublisherName : TEXT("CN=") + gameSettings->CompanyName,

Source/Editor/Cooker/Steps/CompileScriptsStep.cpp

@@ -10,10 +10,9 @@
 #include "Engine/Serialization/JsonTools.h"
 #include "Engine/Serialization/JsonWriters.h"
 #include "Editor/Cooker/PlatformTools.h"
-#include "Engine/Engine/Globals.h"
 #include "Editor/Editor.h"
 #include "Editor/ProjectInfo.h"
-#include "Editor/Utilities/EditorUtilities.h"
+#include "Engine/Engine/Globals.h"
 #if PLATFORM_MAC
 #include <sys/stat.h>
 #endif
@@ -128,7 +127,7 @@ bool CompileScriptsStep::DeployBinaries(CookingData& data, const String& path, c
         const String dst = dstPath / StringUtils::GetFileName(file);
         if (dst == file)
             continue;
-        if (EditorUtilities::CopyFileIfNewer(dst, file))
+        if (FileSystem::CopyFile(dst, file))
         {
             data.Error(String::Format(TEXT("Failed to copy file from {0} to {1}."), file, dst));
             return true;

Source/Editor/Cooker/Steps/CookAssetsStep.cpp

@@ -526,7 +526,6 @@ bool ProcessShaderBase(CookAssetsStep::AssetCookData& data, ShaderAssetBase* ass
 #if PLATFORM_TOOLS_XBOX_SCARLETT
     case BuildPlatform::XboxScarlett:
     {
-        options.Platform = PlatformType::XboxScarlett;
         const char* platformDefineName = "PLATFORM_XBOX_SCARLETT";
         COMPILE_PROFILE(DirectX_SM6, SHADER_FILE_CHUNK_INTERNAL_D3D_SM6_CACHE);
         break;
@@ -1368,10 +1367,7 @@ bool CookAssetsStep::Perform(CookingData& data)
             {
                 typeName = e.TypeName;
             }
-            if (e.Count == 1)
-                LOG(Info, "{0}:    1 asset  of total size {1}", typeName, Utilities::BytesToText(e.ContentSize));
-            else
-                LOG(Info, "{0}: {1:>4} assets of total size {2}", typeName, e.Count, Utilities::BytesToText(e.ContentSize));
+            LOG(Info, "{0}: {1:>4} assets of total size {2}", typeName, e.Count, Utilities::BytesToText(e.ContentSize));
         }
         LOG(Info, "");
     }

Source/Editor/Cooker/Steps/DeployDataStep.cpp

@@ -265,7 +265,7 @@ bool DeployDataStep::Perform(CookingData& data)
                         }
                         if (version.IsEmpty())
                         {
-                            data.Error(String::Format(TEXT("Failed to find supported .NET {} version (min {}) for {} platform."), maxVer, minVer, platformName));
+                            data.Error(String::Format(TEXT("Failed to find supported .NET {} version (min {}) for the current host platform."), maxVer, minVer));
                             return true;
                         }
                     }

Source/Editor/Cooker/Steps/PrecompileAssembliesStep.cpp

@@ -59,7 +59,6 @@ bool PrecompileAssembliesStep::Perform(CookingData& data)
     data.StepProgress(infoMsg, 0);
 
     // Override Newtonsoft.Json with AOT-version (one that doesn't use System.Reflection.Emit)
-    // TODO: remove it since EngineModule does properly reference AOT lib now
     EditorUtilities::CopyFileIfNewer(data.ManagedCodeOutputPath / TEXT("Newtonsoft.Json.dll"), Globals::StartupFolder / TEXT("Source/Platforms/DotNet/AOT/Newtonsoft.Json.dll"));
     FileSystem::DeleteFile(data.ManagedCodeOutputPath / TEXT("Newtonsoft.Json.xml"));
     FileSystem::DeleteFile(data.ManagedCodeOutputPath / TEXT("Newtonsoft.Json.pdb"));

Source/Editor/CustomEditors/Dedicated/EnvironmentProbeEditor.cs

@@ -1,7 +1,6 @@
 // Copyright (c) Wojciech Figat. All rights reserved.
 
 using FlaxEngine;
-using FlaxEngine.GUI;
 
 namespace FlaxEditor.CustomEditors.Dedicated
 {
@@ -12,7 +11,7 @@ namespace FlaxEditor.CustomEditors.Dedicated
     [CustomEditor(typeof(EnvironmentProbe)), DefaultEditor]
     public class EnvironmentProbeEditor : ActorEditor
     {
-        private Button _bake;
+        private FlaxEngine.GUI.Button _bake;
 
         /// <inheritdoc />
         public override void Initialize(LayoutElementsContainer layout)
@@ -21,9 +20,8 @@ namespace FlaxEditor.CustomEditors.Dedicated
 
             if (Values.HasDifferentTypes == false)
             {
-                var group = layout.Group("Bake");
-                group.Panel.ItemsMargin = new Margin(Utilities.Constants.UIMargin * 2);
-                _bake = group.Button("Bake").Button;
+                layout.Space(10);
+                _bake = layout.Button("Bake").Button;
                 _bake.Clicked += BakeButtonClicked;
             }
         }

Source/Editor/CustomEditors/Dedicated/ScriptsEditor.cs

@@ -914,11 +914,9 @@ namespace FlaxEditor.CustomEditors.Dedicated
                 // Remove drop down arrows and containment lines if no objects in the group
                 if (group.Children.Count == 0)
                 {
-                    group.Panel.Close();
                     group.Panel.ArrowImageOpened = null;
                     group.Panel.ArrowImageClosed = null;
                     group.Panel.EnableContainmentLines = false;
-                    group.Panel.CanOpenClose = false;
                 }
 
                 // Scripts arrange bar

Source/Editor/CustomEditors/Dedicated/SkyLightEditor.cs

@@ -1,7 +1,6 @@
 // Copyright (c) Wojciech Figat. All rights reserved.
 
 using FlaxEngine;
-using FlaxEngine.GUI;
 
 namespace FlaxEditor.CustomEditors.Dedicated
 {
@@ -20,9 +19,8 @@ namespace FlaxEditor.CustomEditors.Dedicated
             if (Values.HasDifferentTypes == false)
             {
                 // Add 'Bake' button
-                var group = layout.Group("Bake");
-                group.Panel.ItemsMargin = new Margin(Utilities.Constants.UIMargin * 2);
-                var button = group.Button("Bake");
+                layout.Space(10);
+                var button = layout.Button("Bake");
                 button.Button.Clicked += BakeButtonClicked;
             }
         }

Source/Editor/CustomEditors/Editors/AssetRefEditor.cs

@@ -123,8 +123,6 @@ namespace FlaxEditor.CustomEditors.Editors
         {
             base.Refresh();
 
-            if (Picker == null)
-                return;
             var differentValues = HasDifferentValues;
             Picker.DifferentValues = differentValues;
             if (!differentValues)

Source/Editor/CustomEditors/Editors/CollectionEditor.cs

@@ -650,7 +650,7 @@ namespace FlaxEditor.CustomEditors.Editors
                 panel.Panel.Size = new Float2(0, 18);
                 panel.Panel.Margin = new Margin(0, 0, Utilities.Constants.UIMargin, 0);
 
-                var removeButton = panel.Button("-", "Remove the last item.");
+                var removeButton = panel.Button("-", "Remove the last item");
                 removeButton.Button.Size = new Float2(16, 16);
                 removeButton.Button.Enabled = size > _minCount;
                 removeButton.Button.AnchorPreset = AnchorPresets.TopRight;
@@ -661,7 +661,7 @@ namespace FlaxEditor.CustomEditors.Editors
                     Resize(Count - 1);
                 };
 
-                var addButton = panel.Button("+", "Add a new item.");
+                var addButton = panel.Button("+", "Add a new item");
                 addButton.Button.Size = new Float2(16, 16);
                 addButton.Button.Enabled = (!NotNullItems || size > 0) && size < _maxCount;
                 addButton.Button.AnchorPreset = AnchorPresets.TopRight;

Source/Editor/CustomEditors/Editors/TypeEditor.cs

@@ -104,7 +104,7 @@ namespace FlaxEditor.CustomEditors.Editors
         public event Action<TypePickerControl> TypePickerValueChanged;
 
         /// <summary>
-        /// The custom callback for types validation. Can be used to implement a rule for types to pick.
+        /// The custom callback for types validation. Cane be used to implement a rule for types to pick.
         /// </summary>
         public Func<ScriptType, bool> CheckValid;
 
@@ -353,13 +353,7 @@ namespace FlaxEditor.CustomEditors.Editors
                     }
                     if (!string.IsNullOrEmpty(typeReference.CheckMethod))
                     {
-                        var parentEditor = ParentEditor;
-                        // Find actual parent editor if parent editor is collection editor
-                        while (parentEditor.GetType().IsAssignableTo(typeof(CollectionEditor)))
-                            parentEditor = parentEditor.ParentEditor;
-                            
-                        var parentType = parentEditor.Values[0].GetType();
-
+                        var parentType = ParentEditor.Values[0].GetType();
                         var method = parentType.GetMethod(typeReference.CheckMethod, BindingFlags.Instance | BindingFlags.Static | BindingFlags.Public | BindingFlags.NonPublic);
                         if (method != null)
                         {

Source/Editor/Editor.cs

@@ -1390,7 +1390,6 @@ namespace FlaxEditor
         public void BuildAllMeshesSDF()
         {
             var models = new List<Model>();
-            var forceRebuild = Input.GetKey(KeyboardKeys.F);
             Scene.ExecuteOnGraph(node =>
             {
                 if (node is StaticModelNode staticModelNode && staticModelNode.Actor is StaticModel staticModel)
@@ -1400,7 +1399,7 @@ namespace FlaxEditor
                         model != null &&
                         !models.Contains(model) &&
                         !model.IsVirtual &&
-                        (forceRebuild || model.SDF.Texture == null))
+                        model.SDF.Texture == null)
                     {
                         models.Add(model);
                     }
@@ -1413,17 +1412,7 @@ namespace FlaxEditor
                 {
                     var model = models[i];
                     Log($"[{i}/{models.Count}] Generating SDF for {model}");
-                    float resolutionScale = 1.0f, backfacesThreshold = 0.6f;
-                    int lodIndex = 6;
-                    bool useGPU = true;
-                    var sdf = model.SDF;
-                    if (sdf.Texture != null)
-                    {
-                        // Preserve options set on this model
-                        resolutionScale = sdf.ResolutionScale;
-                        lodIndex = sdf.LOD;
-                    }
-                    if (!model.GenerateSDF(resolutionScale, lodIndex, true, backfacesThreshold, useGPU))
+                    if (!model.GenerateSDF())
                         model.Save();
                 }
             });
@@ -1598,7 +1587,7 @@ namespace FlaxEditor
                 if (dockedTo != null && dockedTo.SelectedTab != gameWin && dockedTo.SelectedTab != null)
                     result = dockedTo.SelectedTab.Size;
                 else
-                    result = gameWin.Viewport.ContentSize;
+                    result = gameWin.Viewport.Size;
 
                 result *= root.DpiScale;
                 result = Float2.Round(result);

Source/Editor/Modules/SourceCodeEditing/DefaultSourceCodeEditor.cs

@@ -40,10 +40,11 @@ namespace FlaxEditor.Modules.SourceCodeEditing
             var codeEditing = Editor.Instance.CodeEditing;
             var vsCode = codeEditing.GetInBuildEditor(CodeEditorTypes.VSCode);
             var rider = codeEditing.GetInBuildEditor(CodeEditorTypes.Rider);
+            var zed = codeEditing.GetInBuildEditor(CodeEditorTypes.Zed);
 
 #if PLATFORM_WINDOW
             // Favor the newest Visual Studio
-            for (int i = (int)CodeEditorTypes.VS2019; i >= (int)CodeEditorTypes.VS2008; i--)
+            for (int i = (int)CodeEditorTypes.VS2026; i >= (int)CodeEditorTypes.VS2008; i--)
             {
                 var visualStudio = codeEditing.GetInBuildEditor((CodeEditorTypes)i);
                 if (visualStudio != null)
@@ -66,6 +67,8 @@ namespace FlaxEditor.Modules.SourceCodeEditing
                 _currentEditor = vsCode;
             else if (rider != null)
                 _currentEditor = rider;
+            else if (zed != null)
+                _currentEditor = zed;
             else
                 _currentEditor = codeEditing.GetInBuildEditor(CodeEditorTypes.SystemDefault);
         }

Source/Editor/Modules/SourceCodeEditing/InBuildSourceCodeEditor.cs

@@ -66,6 +66,9 @@ namespace FlaxEditor.Modules.SourceCodeEditing
             case CodeEditorTypes.Rider:
                 Name = "Rider";
                 break;
+            case CodeEditorTypes.Zed:
+                Name = "Zed";
+                break;
             default: throw new ArgumentOutOfRangeException(nameof(type), type, null);
             }
         }
@@ -83,6 +86,7 @@ namespace FlaxEditor.Modules.SourceCodeEditing
                 case CodeEditorTypes.VSCodeInsiders:
                 case CodeEditorTypes.VSCode: return "-vscode -vs2022";
                 case CodeEditorTypes.Rider: return "-vs2022";
+                case CodeEditorTypes.Zed: return "-vs2022";
                 default: return null;
                 }
             }

Source/Editor/Modules/UIModule.cs

@@ -714,7 +714,6 @@ namespace FlaxEditor.Modules
             _menuToolsBuildCSGMesh = cm.AddButton("Build CSG mesh", inputOptions.BuildCSG, Editor.BuildCSG);
             _menuToolsBuildNavMesh = cm.AddButton("Build Nav Mesh", inputOptions.BuildNav, Editor.BuildNavMesh);
             _menuToolsBuildAllMeshesSDF = cm.AddButton("Build all meshes SDF", inputOptions.BuildSDF, Editor.BuildAllMeshesSDF);
-            _menuToolsBuildAllMeshesSDF.LinkTooltip("Generates Sign Distance Field texture for all meshes used in loaded scenes. Use with 'F' key pressed to force rebuild SDF for meshes with existing one.");
             cm.AddSeparator();
             cm.AddButton("Game Cooker", Editor.Windows.GameCookerWin.FocusOrShow);
             _menuToolsCancelBuilding = cm.AddButton("Cancel building game", () => GameCooker.Cancel());

Source/Editor/Modules/WindowsModule.cs

@@ -896,11 +896,9 @@ namespace FlaxEditor.Modules
 
                     if (type.IsAssignableTo(typeof(AssetEditorWindow)))
                     {
+                        var ctor = type.GetConstructor(new Type[] { typeof(Editor), typeof(AssetItem) });
                         var assetItem = Editor.ContentDatabase.FindAsset(winData.AssetItemID);
-                        var assetType = assetItem.GetType();
-                        var ctor = type.GetConstructor(new Type[] { typeof(Editor), assetType });
                         var win = (AssetEditorWindow)ctor.Invoke(new object[] { Editor.Instance, assetItem });
-
                         win.Show(winData.DockState, winData.DockState != DockState.Float ? winData.DockedTo : null, winData.SelectOnShow, winData.SplitterValue);
                         if (winData.DockState == DockState.Float)
                         {

Source/Editor/Scripting/CodeEditor.cpp

@@ -6,6 +6,7 @@
 #include "ScriptsBuilder.h"
 #include "CodeEditors/VisualStudioCodeEditor.h"
 #include "CodeEditors/RiderCodeEditor.h"
+#include "CodeEditors/ZedEditor.h"
 #if USE_VISUAL_STUDIO_DTE
 #include "CodeEditors/VisualStudio/VisualStudioEditor.h"
 #endif
@@ -241,6 +242,7 @@ bool CodeEditingManagerService::Init()
 #endif
     VisualStudioCodeEditor::FindEditors(&CodeEditors);
     RiderCodeEditor::FindEditors(&CodeEditors);
+    ZedEditor::FindEditors(&CodeEditors);
     CodeEditors.Add(New<SystemDefaultCodeEditor>());
 
     return false;

Source/Editor/Scripting/CodeEditor.h

@@ -77,6 +77,11 @@ API_ENUM(Namespace="FlaxEditor", Attributes="HideInEditor") enum class CodeEdito
     /// </summary>
     VSCodeInsiders,
 
+    /// <summary>
+    /// Zed
+    /// </summary>
+    Zed,
+
     /// <summary>
     /// Rider
     /// </summary>

Source/Editor/Scripting/CodeEditors/ZedEditor.cpp

@@ -0,0 +1,171 @@
+// Copyright (c) Wojciech Figat. All rights reserved.
+
+#include "ZedEditor.h"
+#include "Engine/Platform/FileSystem.h"
+#include "Engine/Platform/CreateProcessSettings.h"
+#include "Engine/Core/Log.h"
+#include "Editor/Editor.h"
+#include "Editor/ProjectInfo.h"
+#include "Editor/Scripting/ScriptsBuilder.h"
+#include "Engine/Engine/Globals.h"
+#if PLATFORM_LINUX
+#include <stdio.h>
+#elif PLATFORM_WINDOWS
+#include "Engine/Platform/Win32/IncludeWindowsHeaders.h"
+#elif PLATFORM_MAC
+#include "Engine/Platform/Apple/AppleUtils.h"
+#include <AppKit/AppKit.h>
+#endif
+
+ZedEditor::ZedEditor(const String& execPath)
+    : _execPath(execPath)
+    , _workspacePath(Globals::ProjectFolder)
+{
+}
+
+void ZedEditor::FindEditors(Array<CodeEditor*>* output)
+{
+#if PLATFORM_WINDOWS
+    String cmd;
+    if (Platform::ReadRegValue(HKEY_CURRENT_USER, TEXT("SOFTWARE\\Classes\\Applications\\Zed.exe\\shell\\open\\command"), TEXT(""), &cmd) || cmd.IsEmpty())
+    {
+        if (Platform::ReadRegValue(HKEY_LOCAL_MACHINE, TEXT("SOFTWARE\\Classes\\Applications\\Zed.exe\\shell\\open\\command"), TEXT(""), &cmd) || cmd.IsEmpty())
+        {
+            // No hits in registry, try default path instead
+        }
+    }
+    String path;
+    if (cmd.IsEmpty())
+    {
+        path = cmd.Substring(1, cmd.Length() - String(TEXT("\" \"%1\"")).Length() - 1);
+    }
+    else
+    {
+        String localAppDataPath;
+        FileSystem::GetSpecialFolderPath(SpecialFolder::LocalAppData, localAppDataPath);
+        path = localAppDataPath / TEXT("Programs/Zed/Zed.exe");
+    }
+    if (FileSystem::FileExists(path))
+    {
+        output->Add(New<ZedEditor>(path));
+    }
+#elif PLATFORM_LINUX
+    char buffer[128];
+    FILE* pipe = popen("/bin/bash -c \"type -p code\"", "r");
+    if (pipe)
+    {
+        StringAnsi pathAnsi;
+        while (fgets(buffer, sizeof(buffer), pipe) != NULL)
+            pathAnsi += buffer;
+        pclose(pipe);
+        const String path(pathAnsi.Get(), pathAnsi.Length() != 0 ? pathAnsi.Length() - 1 : 0);
+        if (FileSystem::FileExists(path))
+        {
+            output->Add(New<VisualStudioCodeEditor>(path, false));
+            return;
+        }
+    }
+    {
+        const String path(TEXT("/usr/bin/code"));
+        if (FileSystem::FileExists(path))
+        {
+            output->Add(New<VisualStudioCodeEditor>(path, false));
+            return;
+        }
+    }
+
+    // Detect Flatpak installations
+    {
+        CreateProcessSettings procSettings;
+        procSettings.FileName = TEXT("/bin/bash -c \"flatpak list --app --columns=application | grep com.visualstudio.code -c\"");
+        procSettings.HiddenWindow = true;
+        if (Platform::CreateProcess(procSettings) == 0)
+        {
+            const String runPath(TEXT("flatpak run com.visualstudio.code"));
+            output->Add(New<VisualStudioCodeEditor>(runPath, false));
+            return;
+        }
+    }
+#elif PLATFORM_MAC
+    // System installed app
+    NSURL* AppURL = [[NSWorkspace sharedWorkspace]URLForApplicationWithBundleIdentifier:@"com.microsoft.VSCode"];
+    if (AppURL != nullptr)
+    {
+        const String path = AppleUtils::ToString((CFStringRef)[AppURL path]);
+        output->Add(New<VisualStudioCodeEditor>(path, false));
+        return;
+    }
+
+    // Predefined locations
+    String userFolder;
+    FileSystem::GetSpecialFolderPath(SpecialFolder::Documents, userFolder);
+    String paths[3] =
+    {
+        TEXT("/Applications/Visual Studio Code.app"),
+        userFolder + TEXT("/../Visual Studio Code.app"),
+        userFolder + TEXT("/../Downloads/Visual Studio Code.app"),
+    };
+    for (const String& path : paths)
+    {
+        if (FileSystem::DirectoryExists(path))
+        {
+            output->Add(New<VisualStudioCodeEditor>(path, false));
+            break;
+        }
+    }
+#endif
+}
+
+CodeEditorTypes ZedEditor::GetType() const
+{
+    return CodeEditorTypes::Zed;
+}
+
+String ZedEditor::GetName() const
+{
+    return TEXT("Zed");
+}
+
+void ZedEditor::OpenFile(const String& path, int32 line)
+{
+    // Generate VS solution files for intellisense
+    if (!FileSystem::FileExists(Globals::ProjectFolder / Editor::Project->Name + TEXT(".sln")))
+    {
+        ScriptsBuilder::GenerateProject(TEXT("-vs2022"));
+    }
+
+    // Open file
+    line = line > 0 ? line : 1;
+    CreateProcessSettings procSettings;
+    procSettings.FileName = _execPath;
+    procSettings.Arguments = String::Format(TEXT("\"{0}\" \"{1}:{2}\""), _workspacePath, path, line);
+    procSettings.HiddenWindow = false;
+    procSettings.WaitForEnd = false;
+    procSettings.LogOutput = false;
+    procSettings.ShellExecute = true;
+    Platform::CreateProcess(procSettings);
+}
+
+void ZedEditor::OpenSolution()
+{
+    // Generate VS solution files for intellisense
+    if (!FileSystem::FileExists(Globals::ProjectFolder / Editor::Project->Name + TEXT(".sln")))
+    {
+        ScriptsBuilder::GenerateProject(TEXT("-vs2022"));
+    }
+
+    // Open solution
+    CreateProcessSettings procSettings;
+    procSettings.FileName = _execPath;
+    procSettings.Arguments = String::Format(TEXT("\"{0}\""), _workspacePath);
+    procSettings.HiddenWindow = false;
+    procSettings.WaitForEnd = false;
+    procSettings.LogOutput = false;
+    procSettings.ShellExecute = true;
+    Platform::CreateProcess(procSettings);
+}
+
+bool ZedEditor::UseAsyncForOpen() const
+{
+    return false;
+}

Source/Editor/Scripting/CodeEditors/ZedEditor.h

@@ -0,0 +1,41 @@
+// Copyright (c) Wojciech Figat. All rights reserved.
+
+#pragma once
+
+#include "Editor/Scripting/CodeEditor.h"
+
+/// <summary>
+/// Implementation of code editor utility that is using Microsoft Visual Studio Code.
+/// </summary>
+class ZedEditor : public CodeEditor
+{
+private:
+
+    String _execPath;
+    String _workspacePath;
+
+public:
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="VisualStudioEditor"/> class.
+    /// </summary>
+    /// <param name="execPath">Executable file path</param>
+    ZedEditor(const String& execPath);
+
+public:
+
+    /// <summary>
+    /// Tries to find installed Visual Studio Code instance. Adds them to the result list.
+    /// </summary>
+    /// <param name="output">The output editors.</param>
+    static void FindEditors(Array<CodeEditor*>* output);
+
+public:
+
+    // [CodeEditor]
+    CodeEditorTypes GetType() const override;
+    String GetName() const override;
+    void OpenFile(const String& path, int32 line) override;
+    void OpenSolution() override;
+    bool UseAsyncForOpen() const override;
+};

Source/Editor/Scripting/TypeUtils.cs

@@ -406,8 +406,6 @@ namespace FlaxEngine.Utilities
         {
             if (type == ScriptType.Null)
                 return null;
-            if (type.BaseType == null)
-                return type.Type;
             while (type.Type == null)
                 type = type.BaseType;
             return type.Type;

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

@@ -726,7 +726,7 @@ namespace FlaxEditor.Surface.Archetypes
 
             private void OnSurfaceMouseUp(ref Float2 mouse, MouseButton buttons, ref bool handled)
             {
-                if (handled || Surface.Context != Context)
+                if (handled)
                     return;
 
                 // Check click over the connection
@@ -751,7 +751,7 @@ namespace FlaxEditor.Surface.Archetypes
 
             private void OnSurfaceMouseDoubleClick(ref Float2 mouse, MouseButton buttons, ref bool handled)
             {
-                if (handled || Surface.Context != Context)
+                if (handled)
                     return;
 
                 // Check double click over the connection

Source/Editor/Surface/AttributesEditor.cs

@@ -2,8 +2,11 @@
 
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
 using System.Reflection;
+using System.Runtime.Loader;
+using System.Runtime.Serialization.Formatters.Binary;
 using FlaxEditor.CustomEditors;
 using FlaxEditor.CustomEditors.Editors;
 using FlaxEditor.GUI.ContextMenu;
@@ -15,7 +18,6 @@ namespace FlaxEditor.Surface
     class AttributesEditor : ContextMenuBase
     {
         private CustomEditorPresenter _presenter;
-        private Proxy _proxy;
         private byte[] _oldData;
 
         private class Proxy
@@ -70,11 +72,11 @@ namespace FlaxEditor.Surface
         /// Initializes a new instance of the <see cref="AttributesEditor"/> class.
         /// </summary>
         /// <param name="attributes">The attributes list to edit.</param>
-        /// <param name="attributeTypes">The allowed attribute types to use.</param>
-        public AttributesEditor(Attribute[] attributes, IList<Type> attributeTypes)
+        /// <param name="attributeType">The allowed attribute types to use.</param>
+        public AttributesEditor(Attribute[] attributes, IList<Type> attributeType)
         {
             // Context menu dimensions
-            const float width = 375.0f;
+            const float width = 340.0f;
             const float height = 370.0f;
             Size = new Float2(width, height);
 
@@ -86,68 +88,61 @@ namespace FlaxEditor.Surface
                 Parent = this
             };
 
-            // Ok and Cancel Buttons
-            float buttonsWidth = (width - 12.0f) * 0.5f;
+            // Buttons
+            float buttonsWidth = (width - 16.0f) * 0.5f;
             float buttonsHeight = 20.0f;
-            var okButton = new Button(4.0f, Bottom - 4.0f - buttonsHeight, buttonsWidth, buttonsHeight)
-            {
-                Text = "Ok",
-                Parent = this
-            };
-            okButton.Clicked += OnOkButtonClicked;
-            var cancelButton = new Button(okButton.Right + 4.0f, okButton.Y, buttonsWidth, buttonsHeight)
+            var cancelButton = new Button(4.0f, title.Bottom + 4.0f, buttonsWidth, buttonsHeight)
             {
                 Text = "Cancel",
                 Parent = this
             };
             cancelButton.Clicked += Hide;
+            var okButton = new Button(cancelButton.Right + 4.0f, cancelButton.Y, buttonsWidth, buttonsHeight)
+            {
+                Text = "OK",
+                Parent = this
+            };
+            okButton.Clicked += OnOkButtonClicked;
 
-            // Actual panel used to display attributes
+            // Actual panel
             var panel1 = new Panel(ScrollBars.Vertical)
             {
-                Bounds = new Rectangle(0, title.Bottom + 4.0f, width, height - buttonsHeight - title.Height - 14.0f),
+                Bounds = new Rectangle(0, okButton.Bottom + 4.0f, width, height - okButton.Bottom - 2.0f),
                 Parent = this
             };
             var editor = new CustomEditorPresenter(null);
             editor.Panel.AnchorPreset = AnchorPresets.HorizontalStretchTop;
             editor.Panel.IsScrollable = true;
             editor.Panel.Parent = panel1;
-            editor.Panel.Tag = attributeTypes;
+            editor.Panel.Tag = attributeType;
             _presenter = editor;
 
             // Cache 'previous' state to check if attributes were edited after operation
             _oldData = SurfaceMeta.GetAttributesData(attributes);
 
-            _proxy = new Proxy
+            editor.Select(new Proxy
             {
                 Value = attributes,
-            };
-            editor.Select(_proxy);
-
-            _presenter.Modified += OnPresenterModified;
-            OnPresenterModified();
-        }
-
-        private void OnPresenterModified()
-        {
-            if (_proxy.Value.Length == 0)
-            {
-                var label = _presenter.Label("No attributes.\nPress the \"+\" button to add a new one and then select an attribute type using the \"Type\" dropdown.", TextAlignment.Center);
-                label.Label.Wrapping = TextWrapping.WrapWords;
-                label.Control.Height = 35f;
-                label.Label.Margin = new Margin(10f);
-                label.Label.TextColor = label.Label.TextColorHighlighted = Style.Current.ForegroundGrey;
-            }
+            });
         }
 
         private void OnOkButtonClicked()
         {
             var newValue = ((Proxy)_presenter.Selection[0]).Value;
-            newValue = newValue.Where(v => v != null).ToArray();
+            for (int i = 0; i < newValue.Length; i++)
+            {
+                if (newValue[i] == null)
+                {
+                    MessageBox.Show("One of the attributes is null. Please set it to the valid object.", "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                    return;
+                }
+            }
 
             var newData = SurfaceMeta.GetAttributesData(newValue);
             if (!_oldData.SequenceEqual(newData))
+            {
                 Edited?.Invoke(newValue);
+            }
 
             Hide();
         }
@@ -188,9 +183,7 @@ namespace FlaxEditor.Surface
         {
             _presenter = null;
             _oldData = null;
-            _proxy = null;
             Edited = null;
-            _presenter.Modified -= OnPresenterModified;
 
             base.OnDestroy();
         }

Source/Editor/Surface/SurfaceComment.cs

@@ -214,26 +214,23 @@ namespace FlaxEditor.Surface
             if (!_isRenaming)
                 Render2D.DrawText(style.FontLarge, Title, _headerRect, style.Foreground, TextAlignment.Center, TextAlignment.Center);
 
-            if (Surface.CanEdit)
+            // Close button
+            Render2D.DrawSprite(style.Cross, _closeButtonRect, _closeButtonRect.Contains(_mousePosition) && Surface.CanEdit ? style.Foreground : style.ForegroundGrey);
+
+            // Color button
+            Render2D.DrawSprite(style.Settings, _colorButtonRect, _colorButtonRect.Contains(_mousePosition) && Surface.CanEdit ? style.Foreground : style.ForegroundGrey);
+
+            // Check if is resizing
+            if (_isResizing)
             {
-                // Close button
-                Render2D.DrawSprite(style.Cross, _closeButtonRect, _closeButtonRect.Contains(_mousePosition) && Surface.CanEdit ? style.Foreground : style.ForegroundGrey);
-
-                // Color button
-                Render2D.DrawSprite(style.Settings, _colorButtonRect, _colorButtonRect.Contains(_mousePosition) && Surface.CanEdit ? style.Foreground : style.ForegroundGrey);
-
-                // Check if is resizing
-                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);
+                // 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);
+
             // Selection outline
             if (_isSelected)
             {

Source/Editor/Surface/SurfaceNode.cs

@@ -431,6 +431,27 @@ namespace FlaxEditor.Surface
         /// </summary>
         public bool HasIndependentBoxes => Archetype.IndependentBoxes != null;
 
+        /// <summary>
+        /// Gets a value indicating whether this node has dependent boxes with assigned valid types. Otherwise any box has no dependent type assigned.
+        /// </summary>
+        public bool HasDependentBoxesSetup
+        {
+            get
+            {
+                if (Archetype.DependentBoxes == null || Archetype.IndependentBoxes == null)
+                    return true;
+
+                for (int i = 0; i < Archetype.DependentBoxes.Length; i++)
+                {
+                    var b = GetBox(Archetype.DependentBoxes[i]);
+                    if (b != null && b.CurrentType == b.DefaultType)
+                        return false;
+                }
+
+                return true;
+            }
+        }
+
         private static readonly List<SurfaceNode> UpdateStack = new List<SurfaceNode>();
 
         /// <summary>

Source/Editor/Surface/SurfaceUtils.cs

@@ -400,7 +400,7 @@ namespace FlaxEditor.Surface
                 return scriptType.GetGenericTypeDefinition() == typeof(Dictionary<,>);
             }
             var managedType = TypeUtils.GetType(scriptType);
-            return managedType != null && !TypeUtils.IsDelegate(managedType);
+            return !TypeUtils.IsDelegate(managedType);
         }
 
         internal static bool IsValidVisualScriptFunctionType(ScriptType scriptType)
@@ -408,7 +408,7 @@ namespace FlaxEditor.Surface
             if (scriptType.IsGenericType || scriptType.IsStatic || !scriptType.IsPublic || scriptType.HasAttribute(typeof(HideInEditorAttribute), true))
                 return false;
             var managedType = TypeUtils.GetType(scriptType);
-            return managedType != null && !TypeUtils.IsDelegate(managedType);
+            return !TypeUtils.IsDelegate(managedType);
         }
 
         internal static string GetVisualScriptTypeDescription(ScriptType type)

Source/Editor/Surface/VisjectSurface.Input.cs

@@ -469,8 +469,7 @@ namespace FlaxEditor.Surface
             bool handled = base.OnMouseDown(location, button);
             if (!handled)
                 CustomMouseDown?.Invoke(ref location, button, ref handled);
-            var root = Root;
-            if (handled || root == null)
+            if (handled)
             {
                 // Clear flags
                 _isMovingSelection = false;
@@ -524,11 +523,11 @@ namespace FlaxEditor.Surface
                 if (_leftMouseDown && controlUnderMouse.CanSelect(ref cLocation))
                 {
                     // Check if user is pressing control
-                    if (root.GetKey(KeyboardKeys.Control))
+                    if (Root.GetKey(KeyboardKeys.Control))
                     {
                         AddToSelection(controlUnderMouse);
                     }
-                    else if (root.GetKey(KeyboardKeys.Shift))
+                    else if (Root.GetKey(KeyboardKeys.Shift))
                     {
                         RemoveFromSelection(controlUnderMouse);
                     }
@@ -540,7 +539,7 @@ namespace FlaxEditor.Surface
                     }
 
                     // Start moving selected nodes
-                    if (!root.GetKey(KeyboardKeys.Shift))
+                    if (!Root.GetKey(KeyboardKeys.Shift))
                     {
                         StartMouseCapture();
                         _movingSelectionViewPos = _rootControl.Location;
@@ -560,7 +559,7 @@ namespace FlaxEditor.Surface
                     // Start selecting or commenting
                     StartMouseCapture();
 
-                    if (!root.GetKey(KeyboardKeys.Control) && !root.GetKey(KeyboardKeys.Shift))
+                    if (!Root.GetKey(KeyboardKeys.Control) && !Root.GetKey(KeyboardKeys.Shift))
                     {
                         ClearSelection();
                     }

Source/Editor/Surface/VisjectSurfaceContext.Serialization.cs

@@ -178,31 +178,19 @@ namespace FlaxEditor.Surface
 
                 // Update boxes types for nodes that dependant box types based on incoming connections
                 {
-                    bool keepUpdating = true;
-                    int updatesMin = 2, updatesMax = 100;
+                    bool keepUpdating = false;
+                    int updateLimit = 100;
                     do
                     {
-                        keepUpdating = false;
                         for (int i = 0; i < RootControl.Children.Count; i++)
                         {
-                            if (RootControl.Children[i] is SurfaceNode node)
+                            if (RootControl.Children[i] is SurfaceNode node && !node.HasDependentBoxesSetup)
                             {
                                 node.UpdateBoxesTypes();
-                                var arch = node.Archetype;
-                                if (arch.DependentBoxes != null && arch.IndependentBoxes != null)
-                                {
-                                    foreach (var boxId in arch.DependentBoxes)
-                                    {
-                                        var b = node.GetBox(boxId);
-                                        if (b != null && b.CurrentType == b.DefaultType)
-                                        {
-                                            keepUpdating = true;
-                                        }
-                                    }
-                                }
+                                keepUpdating = true;
                             }
                         }
-                    } while ((keepUpdating && --updatesMax > 0) || --updatesMin > 0);
+                    } while (keepUpdating && updateLimit-- > 0);
                 }
 
                 Loaded?.Invoke(this);

Source/Editor/Tools/Terrain/TerrainTools.cpp

@@ -74,6 +74,11 @@ struct TextureDataResult
     PixelFormat Format;
     Int2 Mip0Size;
     BytesContainer* Mip0DataPtr;
+
+    TextureDataResult()
+        : Lock(FlaxStorage::LockData::Invalid)
+    {
+    }
 };
 
 bool GetTextureDataForSampling(Texture* texture, TextureDataResult& data, bool hdr = false)

Source/Editor/Windows/AssetReferencesGraphWindow.cs

@@ -140,7 +140,7 @@ namespace FlaxEditor.Windows
         }
 
         private string _cacheFolder;
-        private AssetItem _item;
+        private Guid _assetId;
         private Surface _surface;
         private Label _loadingLabel;
         private CancellationTokenSource _token;
@@ -163,13 +163,13 @@ namespace FlaxEditor.Windows
         public AssetReferencesGraphWindow(Editor editor, AssetItem assetItem)
         : base(editor, false, ScrollBars.None)
         {
-            _item = assetItem;
-            Title = _item.ShortName + " References";
+            Title = assetItem.ShortName + " References";
 
             _tempFolder = StringUtils.NormalizePath(Path.GetDirectoryName(Globals.TemporaryFolder));
             _cacheFolder = Path.Combine(Globals.ProjectCacheFolder, "References");
             if (!Directory.Exists(_cacheFolder))
                 Directory.CreateDirectory(_cacheFolder);
+            _assetId = assetItem.ID;
             _surface = new Surface(this)
             {
                 AnchorPreset = AnchorPresets.StretchAll,
@@ -194,7 +194,6 @@ namespace FlaxEditor.Windows
             _nodesAssets.Add(assetId);
             var node = new AssetNode((uint)_nodes.Count + 1, _surface.Context, GraphNodes[0], GraphGroups[0], assetId);
             _nodes.Add(node);
-
             return node;
         }
 
@@ -393,7 +392,8 @@ namespace FlaxEditor.Windows
             _nodesAssets = new HashSet<Guid>();
             var searchLevel = 4; // TODO: make it as an option (somewhere in window UI)
             // TODO: add option to filter assets by type (eg. show only textures as leaf nodes)
-            var assetNode = SpawnNode(_item.ID);
+            var assetNode = SpawnNode(_assetId);
+            // TODO: add some outline or tint color to the main node
             BuildGraph(assetNode, searchLevel, false);
             ArrangeGraph(assetNode, false);
             BuildGraph(assetNode, searchLevel, true);
@@ -402,10 +402,6 @@ namespace FlaxEditor.Windows
                 return;
             _progress = 100.0f;
 
-            var commentRect = assetNode.EditorBounds;
-            commentRect.Expand(80f);
-            _surface.Context.CreateComment(ref commentRect, _item.ShortName, Color.Green);
-
             // Update UI
             FlaxEngine.Scripting.InvokeOnUpdate(() =>
             {

Source/Editor/Windows/Assets/MaterialInstanceWindow.cs

@@ -14,6 +14,7 @@ using FlaxEditor.Surface;
 using FlaxEditor.Viewport.Previews;
 using FlaxEngine;
 using FlaxEngine.GUI;
+using FlaxEngine.Utilities;
 
 namespace FlaxEditor.Windows.Assets
 {
@@ -429,7 +430,7 @@ namespace FlaxEditor.Windows.Assets
             for (var i = 0; i < parameters.Length; i++)
             {
                 var p = parameters[i];
-                if (p.IsOverride && p.IsPublic)
+                if (p.IsOverride)
                 {
                     p.IsOverride = false;
                     actions.Add(new EditParamOverrideAction

Source/Editor/Windows/Assets/ModelWindow.cs

@@ -90,15 +90,25 @@ namespace FlaxEditor.Windows.Assets
 
                     var gpu = group.Checkbox("Bake on GPU", "If checked, SDF generation will be calculated using GPU on Compute Shader, otherwise CPU will use Job System. GPU generation is fast but result in artifacts in various meshes (eg. foliage).");
                     gpu.CheckBox.Checked = sdfOptions.GPU;
-                    gpu.CheckBox.StateChanged += c => { Window._sdfOptions.GPU = c.Checked; };
 
                     var backfacesThresholdProp = group.AddPropertyItem("Backfaces Threshold", "Custom threshold (in range 0-1) for adjusting mesh internals detection based on the percentage of test rays hit triangle backfaces. Use lower value for more dense mesh.");
                     var backfacesThreshold = backfacesThresholdProp.FloatValue();
+                    var backfacesThresholdLabel = backfacesThresholdProp.Labels.Last();
                     backfacesThreshold.ValueBox.MinValue = 0.001f;
                     backfacesThreshold.ValueBox.MaxValue = 1.0f;
                     backfacesThreshold.ValueBox.Value = sdfOptions.BackfacesThreshold;
                     backfacesThreshold.ValueBox.BoxValueChanged += b => { Window._sdfOptions.BackfacesThreshold = b.Value; };
 
+                    // Toggle Backfaces Threshold visibility (CPU-only option)
+                    gpu.CheckBox.StateChanged += c =>
+                    {
+                        Window._sdfOptions.GPU = c.Checked;
+                        backfacesThresholdLabel.Visible = !c.Checked;
+                        backfacesThreshold.ValueBox.Visible = !c.Checked;
+                    };
+                    backfacesThresholdLabel.Visible = !gpu.CheckBox.Checked;
+                    backfacesThreshold.ValueBox.Visible = !gpu.CheckBox.Checked;
+
                     var lodIndex = group.IntegerValue("LOD Index", "Index of the model Level of Detail to use for SDF data building. By default uses the lowest quality LOD for fast building.");
                     lodIndex.IntValue.MinValue = 0;
                     lodIndex.IntValue.MaxValue = Asset.LODsCount - 1;

Source/Editor/Windows/ContentWindow.cs

@@ -142,7 +142,6 @@ namespace FlaxEditor.Windows
         {
             Title = "Content";
             Icon = editor.Icons.Folder32;
-            var style = Style.Current;
 
             FlaxEditor.Utilities.Utils.SetupCommonInputActions(this);
 
@@ -165,8 +164,6 @@ namespace FlaxEditor.Windows
             _navigationBar = new NavigationBar
             {
                 Parent = _toolStrip,
-                ScrollbarTrackColor = style.Background,
-                ScrollbarThumbColor = style.ForegroundGrey,
             };
 
             // Split panel
@@ -182,7 +179,7 @@ namespace FlaxEditor.Windows
             var headerPanel = new ContainerControl
             {
                 AnchorPreset = AnchorPresets.HorizontalStretchTop,
-                BackgroundColor = style.Background,
+                BackgroundColor = Style.Current.Background,
                 IsScrollable = false,
                 Offsets = new Margin(0, 0, 0, 18 + 6),
             };

Source/Editor/Windows/GameWindow.cs

@@ -10,117 +10,17 @@ using FlaxEditor.Modules;
 using FlaxEditor.Options;
 using FlaxEngine;
 using FlaxEngine.GUI;
+using FlaxEngine.Json;
 
 namespace FlaxEditor.Windows
 {
-    /// <summary>
-    /// Render output control with content scaling support.
-    /// </summary>
-    public class ScaledRenderOutputControl : RenderOutputControl
-    {
-        /// <summary>
-        /// Custom scale.
-        /// </summary>
-        public float ContentScale = 1.0f;
-
-        /// <summary>
-        /// Actual bounds size for content (incl. scale).
-        /// </summary>
-        public Float2 ContentSize => Size / ContentScale;
-
-        /// <inheritdoc />
-        public ScaledRenderOutputControl(SceneRenderTask task)
-        : base(task)
-        {
-        }
-
-        /// <inheritdoc />
-        public override void Draw()
-        {
-            DrawSelf();
-
-            // Draw children with scale
-            var scaling = new Float3(ContentScale, ContentScale, 1);
-            Matrix3x3.Scaling(ref scaling, out Matrix3x3 scale);
-            Render2D.PushTransform(scale);
-            if (ClipChildren)
-            {
-                GetDesireClientArea(out var clientArea);
-                Render2D.PushClip(ref clientArea);
-                DrawChildren();
-                Render2D.PopClip();
-            }
-            else
-            {
-                DrawChildren();
-            }
-
-            Render2D.PopTransform();
-        }
-
-        /// <inheritdoc />
-        public override void GetDesireClientArea(out Rectangle rect)
-        {
-            // Scale the area for the client controls
-            rect = new Rectangle(Float2.Zero, Size / ContentScale);
-        }
-
-        /// <inheritdoc />
-        public override bool IntersectsContent(ref Float2 locationParent, out Float2 location)
-        {
-            // Skip local PointFromParent but use base code
-            location = base.PointFromParent(ref locationParent);
-            return ContainsPoint(ref location);
-        }
-
-        /// <inheritdoc />
-        public override bool IntersectsChildContent(Control child, Float2 location, out Float2 childSpaceLocation)
-        {
-            location /= ContentScale;
-            return base.IntersectsChildContent(child, location, out childSpaceLocation);
-        }
-
-        /// <inheritdoc />
-        public override bool ContainsPoint(ref Float2 location, bool precise = false)
-        {
-            if (precise) // Ignore as utility-only element
-                return false;
-            return base.ContainsPoint(ref location, precise);
-        }
-
-        /// <inheritdoc />
-        public override bool RayCast(ref Float2 location, out Control hit)
-        {
-            var p = location / ContentScale;
-            if (RayCastChildren(ref p, out hit))
-                return true;
-            return base.RayCast(ref location, out hit);
-        }
-
-        /// <inheritdoc />
-        public override Float2 PointToParent(ref Float2 location)
-        {
-            var result = base.PointToParent(ref location);
-            result *= ContentScale;
-            return result;
-        }
-
-        /// <inheritdoc />
-        public override Float2 PointFromParent(ref Float2 location)
-        {
-            var result = base.PointFromParent(ref location);
-            result /= ContentScale;
-            return result;
-        }
-    }
-
     /// <summary>
     /// Provides in-editor play mode simulation.
     /// </summary>
     /// <seealso cref="FlaxEditor.Windows.EditorWindow" />
     public class GameWindow : EditorWindow
     {
-        private readonly ScaledRenderOutputControl _viewport;
+        private readonly RenderOutputControl _viewport;
         private readonly GameRoot _guiRoot;
         private bool _showGUI = true, _editGUI = true;
         private bool _showDebugDraw = false;
@@ -177,7 +77,7 @@ namespace FlaxEditor.Windows
         /// <summary>
         /// Gets the viewport.
         /// </summary>
-        public ScaledRenderOutputControl Viewport => _viewport;
+        public RenderOutputControl Viewport => _viewport;
 
         /// <summary>
         /// Gets or sets a value indicating whether show game GUI in the view or keep it hidden.
@@ -395,7 +295,7 @@ namespace FlaxEditor.Windows
             var task = MainRenderTask.Instance;
 
             // Setup viewport
-            _viewport = new ScaledRenderOutputControl(task)
+            _viewport = new RenderOutputControl(task)
             {
                 AnchorPreset = AnchorPresets.StretchAll,
                 Offsets = Margin.Zero,
@@ -496,8 +396,11 @@ namespace FlaxEditor.Windows
         {
             if (v == null)
                 return;
+
             if (v.Size.Y <= 0 || v.Size.X <= 0)
+            {
                 return;
+            }
 
             if (string.Equals(v.Label, "Free Aspect", StringComparison.Ordinal) && v.Size == new Int2(1, 1))
             {
@@ -545,7 +448,15 @@ namespace FlaxEditor.Windows
 
         private void ResizeViewport()
         {
-            _windowAspectRatio = _freeAspect ? 1 : Width / Height;
+            if (!_freeAspect)
+            {
+                _windowAspectRatio = Width / Height;
+            }
+            else
+            {
+                _windowAspectRatio = 1;
+            }
+
             var scaleWidth = _viewportAspectRatio / _windowAspectRatio;
             var scaleHeight = _windowAspectRatio / _viewportAspectRatio;
 
@@ -557,24 +468,6 @@ namespace FlaxEditor.Windows
             {
                 _viewport.Bounds = new Rectangle(Width * (1 - scaleWidth) / 2, 0, Width * scaleWidth, Height);
             }
-
-            if (_viewport.KeepAspectRatio)
-            {
-                var resolution = _viewport.CustomResolution.HasValue ? (Float2)_viewport.CustomResolution.Value : Size;
-                if (scaleHeight < 1)
-                {
-                    _viewport.ContentScale = _viewport.Width / resolution.X;
-                }
-                else
-                {
-                    _viewport.ContentScale = _viewport.Height / resolution.Y;
-                }
-            }
-            else
-            {
-                _viewport.ContentScale = 1;
-            }
-
             _viewport.SyncBackbufferSize();
             PerformLayout();
         }
@@ -1014,7 +907,6 @@ namespace FlaxEditor.Windows
                         return child.OnNavigate(direction, Float2.Zero, this, visited);
                 }
             }
-
             return null;
         }
 
@@ -1065,7 +957,7 @@ namespace FlaxEditor.Windows
                 else
                     _defaultScaleActiveIndex = 0;
             }
-
+            
             if (_customScaleActiveIndex != -1)
             {
                 var options = Editor.UI.CustomViewportScaleOptions;

Source/Editor/Windows/Profiler/MemoryGPU.cs

@@ -296,15 +296,13 @@ namespace FlaxEditor.Windows.Profiler
             var resources = _resources.Get(_memoryUsageChart.SelectedSampleIndex);
             if (resources == null || resources.Length == 0)
                 return;
-            var resourcesOrdered = resources.OrderByDescending(x => x?.MemoryUsage ?? 0);
+            var resourcesOrdered = resources.OrderByDescending(x => x.MemoryUsage);
 
             // Add rows
             var rowColor2 = Style.Current.Background * 1.4f;
             int rowIndex = 0;
             foreach (var e in resourcesOrdered)
             {
-                if (e == null)
-                    continue;
                 ClickableRow row;
                 if (_tableRowsCache.Count != 0)
                 {

Source/Editor/Windows/SplashScreen.cpp

@@ -137,7 +137,6 @@ const Char* SplashScreenQuotes[] =
     TEXT("Good Luck Have Fun"),
     TEXT("GG Well Played"),
     TEXT("Now with documentation."),
-    TEXT("We do this not because it is easy,\nbut because we thought it would be easy"),
 };
 
 SplashScreen::~SplashScreen()

Source/Engine/Animations/Graph/AnimGroup.Animation.cpp

@@ -246,19 +246,11 @@ void AnimGraphExecutor::ProcessAnimEvents(AnimGraphNode* node, bool loop, float
             const float duration = k.Value.Duration > 1 ? k.Value.Duration : 0.0f;
 #define ADD_OUTGOING_EVENT(type) context.Data->OutgoingEvents.Add({ k.Value.Instance, (AnimatedModel*)context.Data->Object, anim, eventTime, eventDeltaTime, AnimGraphInstanceData::OutgoingEvent::type })
             if ((k.Time <= eventTimeMax && eventTimeMin <= k.Time + duration
-                && (Math::FloorToInt(animPos) != 0 && Math::CeilToInt(animPrevPos) != Math::CeilToInt(anim->GetDuration())
-                    && Math::FloorToInt(animPrevPos) != 0 && Math::CeilToInt(animPos) != Math::CeilToInt(anim->GetDuration())))
+                && (Math::FloorToInt(animPos) != 0 && Math::CeilToInt(animPrevPos) != Math::CeilToInt(anim->GetDuration()) && Math::FloorToInt(animPrevPos) != 0 && Math::CeilToInt(animPos) != Math::CeilToInt(anim->GetDuration())))
                 // Handle the edge case of an event on 0 or on max animation duration during looping
-                || (!loop && duration == 0.0f && Math::CeilToInt(animPos) == Math::CeilToInt(anim->GetDuration()) && Math::CeilToInt(animPrevPos) == Math::CeilToInt(anim->GetDuration()) - 1 && Math::NearEqual(k.Time, anim->GetDuration()))
+                || (loop && duration == 0.0f && Math::CeilToInt(animPos) == Math::CeilToInt(anim->GetDuration()) && k.Time == anim->GetDuration())
                 || (loop && Math::FloorToInt(animPos) == 0 && Math::CeilToInt(animPrevPos) == Math::CeilToInt(anim->GetDuration()) && k.Time == 0.0f)
                 || (loop && Math::FloorToInt(animPrevPos) == 0 && Math::CeilToInt(animPos) == Math::CeilToInt(anim->GetDuration()) && k.Time == 0.0f)
-                || (loop && Math::FloorToInt(animPos) == 0 && Math::CeilToInt(animPrevPos) == Math::CeilToInt(anim->GetDuration()) && Math::NearEqual(k.Time, anim->GetDuration()))
-                || (loop && Math::FloorToInt(animPrevPos) == 0 && Math::CeilToInt(animPos) == Math::CeilToInt(anim->GetDuration()) && Math::NearEqual(k.Time, anim->GetDuration()))
-                || (Math::FloorToInt(animPos) == 1 && Math::FloorToInt(animPrevPos) == 0 && k.Time == 1.0f)
-                || (Math::FloorToInt(animPos) == 0 && Math::FloorToInt(animPrevPos) == 1 && k.Time == 1.0f)
-                || (Math::CeilToInt(animPos) == Math::CeilToInt(anim->GetDuration()) && Math::CeilToInt(animPrevPos) == Math::CeilToInt(anim->GetDuration()) - 1 && Math::NearEqual(k.Time, anim->GetDuration() - 1.0f))
-                || (Math::CeilToInt(animPos) == Math::CeilToInt(anim->GetDuration()) - 1 && Math::CeilToInt(animPrevPos) == Math::CeilToInt(anim->GetDuration()) && Math::NearEqual(k.Time, anim->GetDuration() - 1.0f))
-                || (Math::FloorToInt(animPos) == 0 && Math::FloorToInt(animPrevPos) == 0 && k.Time == 0.0f)
                 )
             {
                 int32 stateIndex = -1;
@@ -2441,14 +2433,10 @@ void AnimGraphExecutor::ProcessGroupAnimation(Box* boxBase, Node* nodeBase, Valu
         {
             if (bucket.LoopsLeft == 0)
             {
-                // End playing animation and reset bucket params
+                // End playing animation
                 value = tryGetValue(node->GetBox(1), Value::Null);
                 bucket.Index = -1;
                 slot.Animation = nullptr;
-                bucket.TimePosition = 0.0f;
-                bucket.BlendInPosition = 0.0f;
-                bucket.BlendOutPosition = 0.0f;
-                bucket.LoopsDone = 0;
                 return;
             }
 
@@ -2557,15 +2545,9 @@ void AnimGraphExecutor::ProcessGroupFunction(Box* boxBase, Node* node, Value& va
     // Function Input
     case 1:
     {
-        // Skip when graph is too small (eg. preview) and fallback with default value from the function graph
-        if (context.GraphStack.Count() < 2)
-        {
-            value = tryGetValue(node->TryGetBox(1), Value::Zero);
-            break;
-        }
-
         // Find the function call
         AnimGraphNode* functionCallNode = nullptr;
+        ASSERT(context.GraphStack.Count() >= 2);
         Graph* graph;
         for (int32 i = context.CallStack.Count() - 1; i >= 0; i--)
         {

Source/Engine/Content/Asset.cpp

@@ -666,7 +666,7 @@ void Asset::onLoaded()
     {
         onLoaded_MainThread();
     }
-    else if (OnLoaded.IsBinded() || _references.HasItems())
+    else if (OnLoaded.IsBinded())
     {
         Function<void()> action;
         action.Bind<Asset, &Asset::onLoaded>(this);

Source/Engine/Content/Assets/MaterialInstance.cpp

@@ -218,14 +218,10 @@ Asset::LoadResult MaterialInstance::load()
     Guid baseMaterialId;
     headerStream.Read(baseMaterialId);
     auto baseMaterial = Content::LoadAsync<MaterialBase>(baseMaterialId);
-    if (baseMaterial)
-        baseMaterial->AddReference();
 
     // Load parameters
     if (Params.Load(&headerStream))
     {
-        if (baseMaterial)
-            baseMaterial->RemoveReference();
         LOG(Warning, "Cannot load material parameters.");
         return LoadResult::CannotLoadData;
     }
@@ -243,8 +239,6 @@ Asset::LoadResult MaterialInstance::load()
         ParamsChanged();
     }
 
-    if (baseMaterial)
-        baseMaterial->RemoveReference();
     return LoadResult::Ok;
 }
 

Source/Engine/Content/Assets/Model.cpp

@@ -262,7 +262,6 @@ bool Model::GenerateSDF(float resolutionScale, int32 lodIndex, bool cacheData, f
         LOG(Warning, "Cannot generate SDF for virtual models on a main thread.");
         return true;
     }
-    auto chunkLocks = Storage ? Storage->Lock() : FlaxStorage::LockData();
     lodIndex = Math::Clamp(lodIndex, HighestResidentLODIndex(), LODs.Count() - 1);
 
     // Generate SDF

Source/Engine/Content/Assets/ModelBase.cpp

@@ -61,7 +61,7 @@ public:
         model->GetLODData(_lodIndex, data);
         if (data.IsInvalid())
         {
-            LOG(Warning, "Missing data chunk with LOD{} for model '{}'", _lodIndex, model->ToString());
+            LOG(Warning, "Missing data chunk");
             return true;
         }
         MemoryReadStream stream(data.Get(), data.Length());
@@ -234,7 +234,6 @@ bool ModelBase::Save(bool withMeshDataFromGpu, const StringView& path)
         LOG(Error, "To save virtual model asset you need to specify 'withMeshDataFromGpu' (it has no other storage container to get data).");
         return true;
     }
-    auto chunkLocks = Storage ? Storage->Lock() : FlaxStorage::LockData();
     ScopeLock lock(Locker);
 
     // Use a temporary chunks for data storage for virtual assets

Source/Engine/Content/AssetsContainer.h

@@ -18,7 +18,7 @@ public:
     /// <param name="id">The asset id.</param>
     /// <returns>Loaded asset of null.</returns>
     template<typename T>
-    T* Load(const Guid& id)
+    T* LoadAsync(const Guid& id)
     {
         for (auto& e : *this)
         {
@@ -26,10 +26,8 @@ public:
                 return (T*)e.Get();
         }
         auto asset = (T*)::LoadAsset(id, T::TypeInitializer);
-        if (asset && !asset->WaitForLoaded())
+        if (asset)
             Add(asset);
-        else
-            asset = nullptr;
         return asset;
     }
 

Source/Engine/Content/Content.cpp

@@ -30,7 +30,6 @@
 #include "Engine/Profiler/ProfilerCPU.h"
 #include "Engine/Profiler/ProfilerMemory.h"
 #include "Engine/Scripting/ManagedCLR/MClass.h"
-#include "Engine/Scripting/Internal/InternalCalls.h"
 #include "Engine/Scripting/Scripting.h"
 #if USE_EDITOR
 #include "Editor/Editor.h"
@@ -347,21 +346,17 @@ int32 LoadingThread::Run()
     ContentLoadTask* task;
     ThisLoadThread = this;
 
-    MONO_THREAD_INFO_TYPE* monoThreadInfo = nullptr;
     while (Platform::AtomicRead(&_exitFlag) == 0)
     {
         if (LoadTasks.try_dequeue(task))
         {
             Run(task);
-            MONO_THREAD_INFO_GET(monoThreadInfo);
         }
         else
         {
-            MONO_ENTER_GC_SAFE_WITH_INFO(monoThreadInfo);
             LoadTasksMutex.Lock();
             LoadTasksSignal.Wait(LoadTasksMutex);
             LoadTasksMutex.Unlock();
-            MONO_EXIT_GC_SAFE_WITH_INFO;
         }
     }
 
@@ -705,7 +700,6 @@ Asset* Content::GetAsset(const StringView& outputPath)
 {
     if (outputPath.IsEmpty())
         return nullptr;
-    PROFILE_CPU();
     ScopeLock lock(AssetsLocker);
     for (auto i = Assets.Begin(); i.IsNotEnd(); ++i)
     {

Source/Engine/Content/Storage/FlaxChunk.h

@@ -87,10 +87,6 @@ public:
     /// </summary>
     double LastAccessTime = 0.0;
 
-    /// <summary>
-    /// Flag set to indicate that chunk is during loading (atomic access to sync multiple reading threads).
-    /// </summary>
-    int64 IsLoading = 0;
     /// <summary>
     /// The chunk data.
     /// </summary>
@@ -150,7 +146,7 @@ public:
     /// </summary>
     FORCE_INLINE bool IsLoaded() const
     {
-        return Data.IsValid() && Platform::AtomicRead(&IsLoading) == 0;
+        return Data.IsValid();
     }
 
     /// <summary>
@@ -158,7 +154,7 @@ public:
     /// </summary>
     FORCE_INLINE bool IsMissing() const
     {
-        return !IsLoaded();
+        return Data.IsInvalid();
     }
 
     /// <summary>

Source/Engine/Content/Storage/FlaxStorage.cpp

@@ -5,7 +5,6 @@
 #include "FlaxPackage.h"
 #include "ContentStorageManager.h"
 #include "Engine/Core/Log.h"
-#include "Engine/Core/ScopeExit.h"
 #include "Engine/Core/Types/TimeSpan.h"
 #include "Engine/Platform/File.h"
 #include "Engine/Profiler/ProfilerCPU.h"
@@ -75,6 +74,8 @@ FlaxChunk* FlaxChunk::Clone() const
 
 const int32 FlaxStorage::MagicCode = 1180124739;
 
+FlaxStorage::LockData FlaxStorage::LockData::Invalid(nullptr);
+
 struct Header
 {
     int32 MagicCode;
@@ -245,7 +246,6 @@ FlaxStorage::~FlaxStorage()
     ASSERT(IsDisposed());
     CHECK(_chunksLock == 0);
     CHECK(_refCount == 0);
-    CHECK(_isUnloadingData == 0);
     ASSERT(_chunks.IsEmpty());
 
 #if USE_EDITOR
@@ -261,22 +261,6 @@ FlaxStorage::~FlaxStorage()
 #endif
 }
 
-void FlaxStorage::LockChunks()
-{
-RETRY:
-    Platform::InterlockedIncrement(&_chunksLock);
-    if (Platform::AtomicRead(&_isUnloadingData) != 0)
-    {
-        // Someone else is closing file handles or freeing chunks so wait for it to finish and retry
-        Platform::InterlockedDecrement(&_chunksLock);
-        do
-        {
-            Platform::Sleep(1);
-        } while (Platform::AtomicRead(&_isUnloadingData) != 0);
-        goto RETRY;
-    }
-}
-
 FlaxStorage::LockData FlaxStorage::LockSafe()
 {
     auto lock = LockData(this);
@@ -705,6 +689,7 @@ bool FlaxStorage::LoadAssetHeader(const Guid& id, AssetInitData& data)
         return true;
     }
 
+    // Load header
     return LoadAssetHeader(e, data);
 }
 
@@ -714,10 +699,7 @@ bool FlaxStorage::LoadAssetChunk(FlaxChunk* chunk)
     ASSERT(IsLoaded());
     ASSERT(chunk != nullptr && _chunks.Contains(chunk));
 
-    // Protect against loading the same chunk from multiple threads at once
-    while (Platform::InterlockedCompareExchange(&chunk->IsLoading, 1, 0) != 0)
-        Platform::Sleep(1);
-    SCOPE_EXIT{ Platform::AtomicStore(&chunk->IsLoading, 0); };
+    // Check if already loaded
     if (chunk->IsLoaded())
         return false;
 
@@ -794,10 +776,12 @@ bool FlaxStorage::LoadAssetChunk(FlaxChunk* chunk)
             // Raw data
             chunk->Data.Read(stream, size);
         }
+        ASSERT(chunk->IsLoaded());
         chunk->RegisterUsage();
     }
 
     UnlockChunks();
+
     return failed;
 }
 
@@ -1436,12 +1420,10 @@ FileReadStream* FlaxStorage::OpenFile()
 
 bool FlaxStorage::CloseFileHandles()
 {
-    // Guard the whole process so if new thread wants to lock the chunks will need to wait for this to end
-    Platform::InterlockedIncrement(&_isUnloadingData);
-    SCOPE_EXIT{ Platform::InterlockedDecrement(&_isUnloadingData); };
-
     if (Platform::AtomicRead(&_chunksLock) == 0 && Platform::AtomicRead(&_files) == 0)
-        return false; // Early out when no files are opened
+    {
+        return false;
+    }
     PROFILE_CPU();
     PROFILE_MEM(ContentFiles);
 
@@ -1514,21 +1496,9 @@ void FlaxStorage::Tick(double time)
     {
         auto chunk = _chunks.Get()[i];
         const bool wasUsed = (time - chunk->LastAccessTime) < unusedDataChunksLifetime;
-        if (!wasUsed && 
-            chunk->IsLoaded() && 
-            EnumHasNoneFlags(chunk->Flags, FlaxChunkFlags::KeepInMemory) && 
-            Platform::AtomicRead(&chunk->IsLoading) == 0)
+        if (!wasUsed && chunk->IsLoaded() && EnumHasNoneFlags(chunk->Flags, FlaxChunkFlags::KeepInMemory))
         {
-            // Guard the unloading so if other thread wants to lock the chunks will need to wait for this to end
-            Platform::InterlockedIncrement(&_isUnloadingData);
-            if (Platform::AtomicRead(&_chunksLock) != 0 || Platform::AtomicRead(&chunk->IsLoading) != 0)
-            {
-                // Someone started loading so skip ticking
-                Platform::InterlockedDecrement(&_isUnloadingData);
-                return;
-            }
             chunk->Unload();
-            Platform::InterlockedDecrement(&_isUnloadingData);
         }
         wasAnyUsed |= wasUsed;
     }

Source/Engine/Content/Storage/FlaxStorage.h

@@ -90,7 +90,6 @@ protected:
     int64 _refCount = 0;
     int64 _chunksLock = 0;
     int64 _files = 0;
-    int64 _isUnloadingData = 0;
     double _lastRefLostTime;
     CriticalSection _loadLocker;
 
@@ -130,7 +129,10 @@ public:
     /// <summary>
     /// Locks the storage chunks data to prevent disposing them. Also ensures that file handles won't be closed while chunks are locked.
     /// </summary>
-    void LockChunks();
+    FORCE_INLINE void LockChunks()
+    {
+        Platform::InterlockedIncrement(&_chunksLock);
+    }
 
     /// <summary>
     /// Unlocks the storage chunks data.
@@ -146,6 +148,7 @@ public:
     struct LockData
     {
         friend FlaxStorage;
+        static LockData Invalid;
 
     private:
         FlaxStorage* _storage;
@@ -158,11 +161,6 @@ public:
         }
 
     public:
-        LockData()
-            : _storage(nullptr)
-        {
-        }
-
         LockData(const LockData& other)
             : _storage(other._storage)
         {

Source/Engine/Core/Collections/Array.h

@@ -658,10 +658,7 @@ public:
         --_count;
         T* data = _allocation.Get();
         if (index < _count)
-        {
-            for (int32 i = index; i < _count; i++)
-                data[i] = MoveTemp(data[i + 1]);
-        }
+            Memory::MoveAssignItems(data + index, data + (index + 1), _count - index);
         Memory::DestructItems(data + _count, 1);
     }
 

Source/Engine/Core/Collections/HashSetBase.h

@@ -409,36 +409,27 @@ protected:
         else
         {
             // Rebuild entire table completely
-            const int32 elementsCount = _elementsCount;
-            const int32 oldSize = _size;
             AllocationData oldAllocation;
-            AllocationUtils::MoveToEmpty<BucketType, AllocationType>(oldAllocation, _allocation, oldSize, oldSize);
+            AllocationUtils::MoveToEmpty<BucketType, AllocationType>(oldAllocation, _allocation, _size, _size);
             _allocation.Allocate(_size);
             BucketType* data = _allocation.Get();
-            for (int32 i = 0; i < oldSize; ++i)
+            for (int32 i = 0; i < _size; ++i)
                 data[i]._state = HashSetBucketState::Empty;
             BucketType* oldData = oldAllocation.Get();
             FindPositionResult pos;
-            for (int32 i = 0; i < oldSize; ++i)
+            for (int32 i = 0; i < _size; ++i)
             {
                 BucketType& oldBucket = oldData[i];
                 if (oldBucket.IsOccupied())
                 {
                     FindPosition(oldBucket.GetKey(), pos);
-                    if (pos.FreeSlotIndex == -1)
-                    {
-                        // Grow and retry to handle pathological cases (eg. heavy collisions)
-                        EnsureCapacity(_size + 1, true);
-                        FindPosition(oldBucket.GetKey(), pos);
-                        ASSERT(pos.FreeSlotIndex != -1);
-                    }
+                    ASSERT(pos.FreeSlotIndex != -1);
                     BucketType& bucket = _allocation.Get()[pos.FreeSlotIndex];
                     bucket = MoveTemp(oldBucket);
                 }
             }
-            for (int32 i = 0; i < oldSize; ++i)
+            for (int32 i = 0; i < _size; ++i)
                 oldData[i].Free();
-            _elementsCount = elementsCount;
         }
         _deletedCount = 0;
     }

Source/Engine/Core/Compiler.h

@@ -4,9 +4,8 @@
 
 #if defined(__clang__)
 
-#define DLLEXPORT __attribute__((__visibility__("default")))
+#define DLLEXPORT __attribute__ ((__visibility__ ("default")))
 #define DLLIMPORT
-#define USED __attribute__((used))
 #define THREADLOCAL __thread
 #define STDCALL __attribute__((stdcall))
 #define CDECL __attribute__((cdecl))
@@ -20,7 +19,7 @@
 #define PACK_BEGIN()
 #define PACK_END() __attribute__((__packed__))
 #define ALIGN_BEGIN(_align)
-#define ALIGN_END(_align) __attribute__((aligned(_align)))
+#define ALIGN_END(_align) __attribute__( (aligned(_align) ) )
 #define OFFSET_OF(X, Y) __builtin_offsetof(X, Y)
 #define PRAGMA_DISABLE_DEPRECATION_WARNINGS \
     _Pragma("clang diagnostic push") \
@@ -38,9 +37,8 @@
 
 #elif defined(__GNUC__)
 
-#define DLLEXPORT __attribute__((__visibility__("default")))
+#define DLLEXPORT __attribute__ ((__visibility__ ("default")))
 #define DLLIMPORT
-#define USED __attribute__((used))
 #define THREADLOCAL __thread
 #define STDCALL __attribute__((stdcall))
 #define CDECL __attribute__((cdecl))
@@ -54,7 +52,7 @@
 #define PACK_BEGIN()
 #define PACK_END() __attribute__((__packed__))
 #define ALIGN_BEGIN(_align)
-#define ALIGN_END(_align) __attribute__((aligned(_align)))
+#define ALIGN_END(_align) __attribute__( (aligned(_align) ) )
 #define OFFSET_OF(X, Y) __builtin_offsetof(X, Y)
 #define PRAGMA_DISABLE_DEPRECATION_WARNINGS
 #define PRAGMA_ENABLE_DEPRECATION_WARNINGS
@@ -69,7 +67,6 @@
 
 #define DLLEXPORT __declspec(dllexport)
 #define DLLIMPORT __declspec(dllimport)
-#define USED
 #define THREADLOCAL __declspec(thread)
 #define STDCALL __stdcall
 #define CDECL __cdecl

Source/Engine/Core/Math/CollisionsHelper.cpp

@@ -620,9 +620,14 @@ bool Collision::RayIntersectsTriangle(const Ray& ray, const Vector3& a, const Ve
     Real rayDistance = edge2.X * distanceCrossEdge1.X + edge2.Y * distanceCrossEdge1.Y + edge2.Z * distanceCrossEdge1.Z;
     rayDistance *= inverseDeterminant;
 
-    // Check if the triangle is in front the ray origin
+    // Check if the triangle is behind the ray origin
+    if (rayDistance < 0.0f)
+    {
+        return false;
+    }
+
     distance = rayDistance;
-    return rayDistance >= 0.0f;
+    return true;
 }
 
 bool CollisionsHelper::RayIntersectsTriangle(const Ray& ray, const Vector3& vertex1, const Vector3& vertex2, const Vector3& vertex3, Real& distance, Vector3& normal)

Source/Engine/Core/Math/Ray.cpp

@@ -12,6 +12,11 @@ String Ray::ToString() const
     return String::Format(TEXT("{}"), *this);
 }
 
+Vector3 Ray::GetPoint(Real distance) const
+{
+    return Position + Direction * distance;
+}
+
 Ray Ray::GetPickRay(float x, float y, const Viewport& viewport, const Matrix& vp)
 {
     Vector3 nearPoint(x, y, 0.0f);

Source/Engine/Core/Math/Ray.h

@@ -79,10 +79,7 @@ public:
     /// </summary>
     /// <param name="distance">The distance from ray origin.</param>
     /// <returns>The calculated point.</returns>
-    FORCE_INLINE Vector3 GetPoint(Real distance) const
-    {
-        return Position + Direction * distance;
-    }
+    Vector3 GetPoint(Real distance) const;
 
     /// <summary>
     /// Determines if there is an intersection between ray and a point.

Source/Engine/Core/Memory/Allocation.h

@@ -18,7 +18,9 @@ namespace AllocationUtils
         capacity |= capacity >> 8;
         capacity |= capacity >> 16;
         uint64 capacity64 = (uint64)(capacity + 1) * 2;
-        return capacity64 >= MAX_int32 ? MAX_int32 : (int32)capacity64 / 2;
+        if (capacity64 > MAX_int32)
+            capacity64 = MAX_int32;
+        return (int32)capacity64;
     }
 
     // Aligns the input value to the next power of 2 to be used as bigger memory allocation block.

Source/Engine/Core/Types/StringBuilder.h

@@ -215,11 +215,6 @@ public:
         return String(_data.Get(), _data.Count());
     }
 
-    StringAnsi ToStringAnsi() const
-    {
-        return StringAnsi(_data.Get(), _data.Count());
-    }
-
     StringView ToStringView() const;
 };
 

Source/Engine/Engine/NativeInterop.cs

@@ -79,11 +79,10 @@ namespace FlaxEngine.Interop
             NativeLibrary.SetDllImportResolver(Assembly.GetExecutingAssembly(), NativeLibraryImportResolver);
 
             // Change default culture to match with Mono runtime default culture
-            var culture = CultureInfo.InvariantCulture;
-            CultureInfo.DefaultThreadCurrentCulture = culture;
-            CultureInfo.DefaultThreadCurrentUICulture = culture;
-            System.Threading.Thread.CurrentThread.CurrentCulture = culture;
-            System.Threading.Thread.CurrentThread.CurrentUICulture = culture;
+            CultureInfo.DefaultThreadCurrentCulture = CultureInfo.InvariantCulture;
+            CultureInfo.DefaultThreadCurrentUICulture = CultureInfo.InvariantCulture;
+            System.Threading.Thread.CurrentThread.CurrentCulture = CultureInfo.InvariantCulture;
+            System.Threading.Thread.CurrentThread.CurrentUICulture = CultureInfo.InvariantCulture;
 
         }
 
@@ -426,8 +425,6 @@ namespace FlaxEngine.Interop
                 var fieldOffsetPtr = (IntPtr*)field.FieldHandle.Value; // Pointer to MonoClassField
                 fieldOffsetPtr += 3; // Skip three pointers (type, name, parent_and_flags)
                 return *(int*)fieldOffsetPtr - IntPtr.Size * 2; // Load the value of a pointer (4 bytes, int32), then subtracting 16 bytes from it (2 pointers for vtable and threadsync)
-#else
-                throw new NotImplementedException();
 #endif
             }
 

Source/Engine/Graphics/GPUContext.cpp

@@ -67,7 +67,7 @@ void GPUContext::FrameBegin()
 
 void GPUContext::FrameEnd()
 {
-    ResetState();
+    ClearState();
     FlushState();
 }
 

Source/Engine/Graphics/GPUContext.h

@@ -189,7 +189,7 @@ public:
     /// [Deprecated in v1.10]
     /// </summary>
     /// <returns><c>true</c> if  depth buffer is binded; otherwise, <c>false</c>.</returns>
-    DEPRECATED("IsDepthBufferBinded has been deprecated and will be removed in future")
+    DEPRECATED("IsDepthBufferBinded has been deprecated and will be removed in ")
     virtual bool IsDepthBufferBinded() = 0;
 
 public:
@@ -617,17 +617,8 @@ public:
 
     /// <summary>
     /// Clears the context state.
-    /// [Deprecated in v1.12]
     /// </summary>
-    API_FUNCTION() DEPRECATED("Use ResetState instead") void ClearState()
-    {
-        ResetState();
-    }
-
-    /// <summary>
-    /// Resets the context state.
-    /// </summary>
-    API_FUNCTION() virtual void ResetState() = 0;
+    API_FUNCTION() virtual void ClearState() = 0;
 
     /// <summary>
     /// Flushes the internal cached context state with a command buffer.

Source/Engine/Graphics/Materials/DeferredMaterialShader.cpp

@@ -201,7 +201,6 @@ bool DeferredMaterialShader::Load()
     psDesc.DepthWriteEnable = true;
     psDesc.DepthEnable = true;
     psDesc.DepthFunc = ComparisonFunc::Less;
-    psDesc.BlendMode.RenderTargetWriteMask = BlendingMode::ColorWrite::None;
     psDesc.HS = nullptr;
     psDesc.DS = nullptr;
     GPUShaderProgramVS* instancedDepthPassVS;

Source/Engine/Graphics/Materials/ForwardMaterialShader.cpp

@@ -195,10 +195,5 @@ bool ForwardMaterialShader::Load()
     psDesc.VS = _shader->GetVS("VS_Skinned");
     _cache.DepthSkinned.Init(psDesc);
 
-#if PLATFORM_PS5
-    // Fix shader binding issues on forward shading materials on PS5
-    _drawModes = DrawPass::None;
-#endif
-
     return false;
 }

Source/Engine/Graphics/Materials/ParticleMaterialShader.cpp

@@ -264,10 +264,5 @@ bool ParticleMaterialShader::Load()
     // Lazy initialization
     _cacheVolumetricFog.Desc.PS = nullptr;
 
-#if PLATFORM_PS5
-    // Fix shader binding issues on forward shading materials on PS5
-    _drawModes = DrawPass::None;
-#endif
-
     return false;
 }

Source/Engine/Graphics/RenderBuffers.cpp

@@ -113,8 +113,7 @@ GPUTexture* RenderBuffers::RequestHalfResDepth(GPUContext* context)
 
 PixelFormat RenderBuffers::GetOutputFormat() const
 {
-    // TODO: fix incorrect alpha leaking into reflections on PS5 with R11G11B10_Float
-    return _useAlpha || PLATFORM_PS5 ? PixelFormat::R16G16B16A16_Float : PixelFormat::R11G11B10_Float;
+    return _useAlpha ? PixelFormat::R16G16B16A16_Float : PixelFormat::R11G11B10_Float;
 }
 
 bool RenderBuffers::GetUseAlpha() const

Source/Engine/Graphics/RenderTask.h

@@ -450,7 +450,7 @@ public:
 /// <summary>
 /// The high-level renderer context. Used to collect the draw calls for the scene rendering. Can be used to perform a custom rendering.
 /// </summary>
-API_STRUCT(NoDefault) struct FLAXENGINE_API RenderContext
+API_STRUCT(NoDefault) struct RenderContext
 {
     DECLARE_SCRIPTING_TYPE_MINIMAL(RenderContext);
 
@@ -491,7 +491,7 @@ API_STRUCT(NoDefault) struct FLAXENGINE_API RenderContext
 /// <summary>
 /// The high-level renderer context batch that encapsulates multiple rendering requests within a single task (eg. optimize main view scene rendering and shadow projections at once).
 /// </summary>
-API_STRUCT(NoDefault) struct FLAXENGINE_API RenderContextBatch
+API_STRUCT(NoDefault) struct RenderContextBatch
 {
     DECLARE_SCRIPTING_TYPE_MINIMAL(RenderContextBatch);
 

Source/Engine/Graphics/Shaders/GPUVertexLayout.cpp

@@ -216,21 +216,20 @@ GPUVertexLayout* GPUVertexLayout::Get(const Span<GPUVertexLayout*>& layouts)
     return result;
 }
 
-GPUVertexLayout* GPUVertexLayout::Merge(GPUVertexLayout* base, GPUVertexLayout* reference, bool removeUnused, bool addMissing, int32 missingSlotOverride, bool referenceOrder)
+GPUVertexLayout* GPUVertexLayout::Merge(GPUVertexLayout* base, GPUVertexLayout* reference, bool removeUnused, bool addMissing, int32 missingSlotOverride)
 {
     GPUVertexLayout* result = base ? base : reference;
     if (base && reference && base != reference)
     {
         bool elementsModified = false;
         Elements newElements = base->GetElements();
-        const Elements& refElements = reference->GetElements();
         if (removeUnused)
         {
             for (int32 i = newElements.Count() - 1; i >= 0; i--)
             {
                 bool missing = true;
                 const VertexElement& e = newElements.Get()[i];
-                for (const VertexElement& ee : refElements)
+                for (const VertexElement& ee : reference->GetElements())
                 {
                     if (ee.Type == e.Type)
                     {
@@ -248,7 +247,7 @@ GPUVertexLayout* GPUVertexLayout::Merge(GPUVertexLayout* base, GPUVertexLayout*
         }
         if (addMissing)
         {
-            for (const VertexElement& e : refElements)
+            for (const VertexElement& e : reference->GetElements())
             {
                 bool missing = true;
                 for (const VertexElement& ee : base->GetElements())
@@ -283,32 +282,6 @@ GPUVertexLayout* GPUVertexLayout::Merge(GPUVertexLayout* base, GPUVertexLayout*
                 }
             }
         }
-        if (referenceOrder)
-        {
-            for (int32 i = 0, j = 0; i < newElements.Count() && j < refElements.Count(); j++)
-            {
-                if (newElements[i].Type == refElements[j].Type)
-                {
-                    // Elements match so move forward
-                    i++;
-                    continue;
-                }
-
-                // Find reference element in a new list
-                for (int32 k = i + 1; k < newElements.Count(); k++)
-                {
-                    if (newElements[k].Type == refElements[j].Type)
-                    {
-                        // Move matching element to the reference position
-                        VertexElement e = newElements[k];
-                        newElements.RemoveAt(k);
-                        newElements.Insert(i, e);
-                        i++;
-                        break;
-                    }
-                }
-            }
-        }
         if (elementsModified)
             result = Get(newElements, true);
     }

Source/Engine/Graphics/Shaders/GPUVertexLayout.h

@@ -84,9 +84,8 @@ public:
     /// <param name="removeUnused">True to remove elements from base layout that don't exist in a reference layout.</param>
     /// <param name="addMissing">True to add missing elements to base layout that exist in a reference layout.</param>
     /// <param name="missingSlotOverride">Allows to override the input slot for missing elements. Use value -1 to inherit slot from the reference layout.</param>
-    /// <param name="referenceOrder">True to reorder result elements to match the reference layout. For example, if input vertex buffer layout is different than vertex shader then it can match those.</param>
     /// <returns>Vertex layout object. Doesn't need to be cleared as it's cached for an application lifetime.</returns>
-    static GPUVertexLayout* Merge(GPUVertexLayout* base, GPUVertexLayout* reference, bool removeUnused = false, bool addMissing = true, int32 missingSlotOverride = -1, bool referenceOrder = false);
+    static GPUVertexLayout* Merge(GPUVertexLayout* base, GPUVertexLayout* reference, bool removeUnused = false, bool addMissing = true, int32 missingSlotOverride = -1);
 
 public:
     // [GPUResource]

Source/Engine/Graphics/Textures/StreamingTexture.cpp

@@ -338,10 +338,10 @@ public:
     StreamTextureMipTask(StreamingTexture* texture, int32 mipIndex, Task* rootTask)
         : GPUUploadTextureMipTask(texture->GetTexture(), mipIndex, Span<byte>(nullptr, 0), 0, 0, false)
         , _streamingTexture(texture)
-        , _rootTask(rootTask)
+        , _rootTask(rootTask ? rootTask : this)
         , _dataLock(_streamingTexture->GetOwner()->LockData())
     {
-        _streamingTexture->_streamingTasks.Add(this);
+        _streamingTexture->_streamingTasks.Add(_rootTask);
         _texture.Released.Bind<StreamTextureMipTask, &StreamTextureMipTask::OnResourceReleased2>(this);
     }
 
@@ -357,7 +357,7 @@ private:
         if (_streamingTexture)
         {
             ScopeLock lock(_streamingTexture->GetOwner()->GetOwnerLocker());
-            _streamingTexture->_streamingTasks.Remove(this);
+            _streamingTexture->_streamingTasks.Remove(_rootTask);
             _streamingTexture = nullptr;
         }
     }
@@ -422,15 +422,6 @@ protected:
 
         GPUUploadTextureMipTask::OnFail();
     }
-
-    void OnCancel() override
-    {
-        GPUUploadTextureMipTask::OnCancel();
-
-        // Cancel the root task too (eg. mip loading from asset)
-        if (_rootTask != nullptr)
-            _rootTask->Cancel();
-    }
 };
 
 Task* StreamingTexture::CreateStreamingTask(int32 residency)

Source/Engine/Graphics/Textures/TextureBase.cpp

@@ -771,7 +771,7 @@ Task* TextureBase::RequestMipDataAsync(int32 mipIndex)
 
 FlaxStorage::LockData TextureBase::LockData()
 {
-    return _parent->Storage ? _parent->Storage->Lock() : FlaxStorage::LockData();
+    return _parent->Storage ? _parent->Storage->Lock() : FlaxStorage::LockData::Invalid;
 }
 
 void TextureBase::GetMipData(int32 mipIndex, BytesContainer& data) const

Source/Engine/GraphicsDevice/DirectX/DX11/GPUContextDX11.cpp

@@ -724,7 +724,7 @@ void GPUContextDX11::SetState(GPUPipelineState* state)
     }
 }
 
-void GPUContextDX11::ResetState()
+void GPUContextDX11::ClearState()
 {
     if (!_context)
         return;

Source/Engine/GraphicsDevice/DirectX/DX11/GPUContextDX11.h

@@ -158,7 +158,7 @@ public:
     void SetScissor(const Rectangle& scissorRect) override;
     GPUPipelineState* GetState() const override;
     void SetState(GPUPipelineState* state) override;
-    void ResetState() override;
+    void ClearState() override;
     void FlushState() override;
     void Flush() override;
     void UpdateBuffer(GPUBuffer* buffer, const void* data, uint32 size, uint32 offset) override;

Source/Engine/GraphicsDevice/DirectX/DX11/GPUTimerQueryDX11.cpp

@@ -92,8 +92,9 @@ float GPUTimerQueryDX11::GetResult()
 {
     if (!_finalized)
     {
-        if (!HasResult())
-            return 0;
+#if BUILD_DEBUG
+        ASSERT(HasResult());
+#endif
 
         UINT64 timeStart, timeEnd;
         auto context = _device->GetIM();

Source/Engine/GraphicsDevice/DirectX/DX12/CommandQueueDX12.cpp

@@ -143,8 +143,6 @@ void CommandQueueDX12::WaitForFence(uint64 fenceValue)
 
 void CommandQueueDX12::WaitForGPU()
 {
-    PROFILE_CPU();
-    ZoneColor(TracyWaitZoneColor);
     const uint64 value = _fence.Signal(this);
     _fence.WaitCPU(value);
 }

Source/Engine/GraphicsDevice/DirectX/DX12/GPUBufferDX12.cpp

@@ -137,7 +137,7 @@ bool GPUBufferDX12::OnInit()
     // Create resource
     ID3D12Resource* resource;
 #if PLATFORM_WINDOWS
-    D3D12_HEAP_FLAGS heapFlags = EnumHasAnyFlags(_desc.Flags, GPUBufferFlags::VertexBuffer | GPUBufferFlags::IndexBuffer) || _desc.InitData ? D3D12_HEAP_FLAG_CREATE_NOT_ZEROED : D3D12_HEAP_FLAG_NONE;
+    D3D12_HEAP_FLAGS heapFlags = D3D12_HEAP_FLAG_CREATE_NOT_ZEROED;
 #else
     D3D12_HEAP_FLAGS heapFlags = D3D12_HEAP_FLAG_NONE;
 #endif

Source/Engine/GraphicsDevice/DirectX/DX12/GPUContextDX12.cpp

@@ -29,7 +29,6 @@
 #include "GPUVertexLayoutDX12.h"
 #include "CommandQueueDX12.h"
 #include "DescriptorHeapDX12.h"
-#include "RootSignatureDX12.h"
 #include "Engine/Graphics/RenderTask.h"
 #include "Engine/GraphicsDevice/DirectX/RenderToolsDX.h"
 #include "Engine/Debug/Exceptions/NotImplementedException.h"
@@ -308,7 +307,6 @@ void GPUContextDX12::Reset()
         _device->DummyVB = _device->CreateBuffer(TEXT("DummyVertexBuffer"));
         auto* layout = GPUVertexLayout::Get({ { VertexElement::Types::Attribute3, 0, 0, 0, PixelFormat::R32G32B32A32_Float } });
         _device->DummyVB->Init(GPUBufferDescription::Vertex(layout, sizeof(Color), 1, &Color::Transparent));
-        SetResourceState(_device->DummyVB, D3D12_RESOURCE_STATE_VERTEX_AND_CONSTANT_BUFFER, 0);
     }
     ((GPUBufferDX12*)_device->DummyVB)->GetVBView(dummyVBView);
     _commandList->IASetVertexBuffers(GPU_MAX_VB_BINDED, 1, &dummyVBView);
@@ -630,9 +628,7 @@ void GPUContextDX12::flushPS()
             LOG(Error, "Missing Vertex Layout (not assigned to GPUBuffer). Vertex Shader won't read valid data resulting incorrect visuals.");
         }
 #endif
-        ID3D12PipelineState* pso = _currentState->GetState(_rtDepth, _rtCount, _rtHandles, _vertexLayout);
-        ASSERT(pso);
-        _commandList->SetPipelineState(pso);
+        _commandList->SetPipelineState(_currentState->GetState(_rtDepth, _rtCount, _rtHandles, _vertexLayout));
         if (_primitiveTopology != _currentState->PrimitiveTopology)
         {
             _primitiveTopology = _currentState->PrimitiveTopology;
@@ -1304,7 +1300,7 @@ void GPUContextDX12::SetState(GPUPipelineState* state)
     }
 }
 
-void GPUContextDX12::ResetState()
+void GPUContextDX12::ClearState()
 {
     if (!_commandList)
         return;

Source/Engine/GraphicsDevice/DirectX/DX12/GPUContextDX12.h

@@ -201,7 +201,7 @@ public:
     void SetScissor(const Rectangle& scissorRect) override;
     GPUPipelineState* GetState() const override;
     void SetState(GPUPipelineState* state) override;
-    void ResetState() override;
+    void ClearState() override;
     void FlushState() override;
     void Flush() override;
     void UpdateBuffer(GPUBuffer* buffer, const void* data, uint32 size, uint32 offset) override;

Source/Engine/GraphicsDevice/DirectX/DX12/GPUDeviceDX12.cpp

@@ -12,9 +12,6 @@
 #include "GPUSamplerDX12.h"
 #include "GPUVertexLayoutDX12.h"
 #include "GPUSwapChainDX12.h"
-#include "RootSignatureDX12.h"
-#include "UploadBufferDX12.h"
-#include "CommandQueueDX12.h"
 #include "Engine/Engine/Engine.h"
 #include "Engine/Engine/CommandLine.h"
 #include "Engine/Graphics/RenderTask.h"
@@ -24,23 +21,20 @@
 #include "Engine/Profiler/ProfilerMemory.h"
 #include "Engine/Core/Log.h"
 #include "Engine/Core/Config/PlatformSettings.h"
-#include "Engine/Core/Types/StringBuilder.h"
+#include "UploadBufferDX12.h"
+#include "CommandQueueDX12.h"
 #include "Engine/Core/Utilities.h"
 #include "Engine/Threading/Threading.h"
 #include "CommandSignatureDX12.h"
 
 static bool CheckDX12Support(IDXGIAdapter* adapter)
 {
-#if PLATFORM_XBOX_SCARLETT || PLATFORM_XBOX_ONE
-    return true;
-#else
     // Try to create device
     if (SUCCEEDED(D3D12CreateDevice(adapter, D3D_FEATURE_LEVEL_11_0, _uuidof(ID3D12Device), nullptr)))
     {
         return true;
     }
     return false;
-#endif
 }
 
 GPUVertexLayoutDX12::GPUVertexLayoutDX12(GPUDeviceDX12* device, const Elements& elements, bool explicitOffsets)
@@ -61,310 +55,6 @@ GPUVertexLayoutDX12::GPUVertexLayoutDX12(GPUDeviceDX12* device, const Elements&
     }
 }
 
-RootSignatureDX12::RootSignatureDX12()
-{
-    // Clear structures
-    Platform::MemoryClear(this, sizeof(*this));
-
-    // Descriptor tables
-    {
-        // SRVs
-        D3D12_DESCRIPTOR_RANGE& range = _ranges[0];
-        range.RangeType = D3D12_DESCRIPTOR_RANGE_TYPE_SRV;
-        range.NumDescriptors = GPU_MAX_SR_BINDED;
-        range.BaseShaderRegister = 0;
-        range.RegisterSpace = 0;
-        range.OffsetInDescriptorsFromTableStart = D3D12_DESCRIPTOR_RANGE_OFFSET_APPEND;
-    }
-    {
-        // UAVs
-        D3D12_DESCRIPTOR_RANGE& range = _ranges[1];
-        range.RangeType = D3D12_DESCRIPTOR_RANGE_TYPE_UAV;
-        range.NumDescriptors = GPU_MAX_UA_BINDED;
-        range.BaseShaderRegister = 0;
-        range.RegisterSpace = 0;
-        range.OffsetInDescriptorsFromTableStart = D3D12_DESCRIPTOR_RANGE_OFFSET_APPEND;
-    }
-    {
-        // Samplers
-        D3D12_DESCRIPTOR_RANGE& range = _ranges[2];
-        range.RangeType = D3D12_DESCRIPTOR_RANGE_TYPE_SAMPLER;
-        range.NumDescriptors = GPU_MAX_SAMPLER_BINDED - GPU_STATIC_SAMPLERS_COUNT;
-        range.BaseShaderRegister = GPU_STATIC_SAMPLERS_COUNT;
-        range.RegisterSpace = 0;
-        range.OffsetInDescriptorsFromTableStart = D3D12_DESCRIPTOR_RANGE_OFFSET_APPEND;
-    }
-
-    // Root parameters
-    for (int32 i = 0; i < GPU_MAX_CB_BINDED; i++)
-    {
-        // CBs
-        D3D12_ROOT_PARAMETER& param = _parameters[DX12_ROOT_SIGNATURE_CB + i];
-        param.ParameterType = D3D12_ROOT_PARAMETER_TYPE_CBV;
-        param.ShaderVisibility = D3D12_SHADER_VISIBILITY_ALL;
-        param.Descriptor.ShaderRegister = i;
-        param.Descriptor.RegisterSpace = 0;
-    }
-    {
-        // SRVs
-        D3D12_ROOT_PARAMETER& param = _parameters[DX12_ROOT_SIGNATURE_SR];
-        param.ParameterType = D3D12_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE;
-        param.ShaderVisibility = D3D12_SHADER_VISIBILITY_ALL;
-        param.DescriptorTable.NumDescriptorRanges = 1;
-        param.DescriptorTable.pDescriptorRanges = &_ranges[0];
-    }
-    {
-        // UAVs
-        D3D12_ROOT_PARAMETER& param = _parameters[DX12_ROOT_SIGNATURE_UA];
-        param.ParameterType = D3D12_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE;
-        param.ShaderVisibility = D3D12_SHADER_VISIBILITY_ALL;
-        param.DescriptorTable.NumDescriptorRanges = 1;
-        param.DescriptorTable.pDescriptorRanges = &_ranges[1];
-    }
-    {
-        // Samplers
-        D3D12_ROOT_PARAMETER& param = _parameters[DX12_ROOT_SIGNATURE_SAMPLER];
-        param.ParameterType = D3D12_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE;
-        param.ShaderVisibility = D3D12_SHADER_VISIBILITY_ALL;
-        param.DescriptorTable.NumDescriptorRanges = 1;
-        param.DescriptorTable.pDescriptorRanges = &_ranges[2];
-    }
-
-    // Static samplers
-    static_assert(GPU_STATIC_SAMPLERS_COUNT == ARRAY_COUNT(_staticSamplers), "Update static samplers setup.");
-    // Linear Clamp
-    InitSampler(0, D3D12_FILTER_MIN_MAG_MIP_LINEAR, D3D12_TEXTURE_ADDRESS_MODE_CLAMP);
-    // Point Clamp
-    InitSampler(1, D3D12_FILTER_MIN_MAG_MIP_POINT, D3D12_TEXTURE_ADDRESS_MODE_CLAMP);
-    // Linear Wrap
-    InitSampler(2, D3D12_FILTER_MIN_MAG_MIP_LINEAR, D3D12_TEXTURE_ADDRESS_MODE_WRAP);
-    // Point Wrap
-    InitSampler(3, D3D12_FILTER_MIN_MAG_MIP_POINT, D3D12_TEXTURE_ADDRESS_MODE_WRAP);
-    // Shadow
-    InitSampler(4, D3D12_FILTER_COMPARISON_MIN_MAG_MIP_POINT, D3D12_TEXTURE_ADDRESS_MODE_CLAMP, D3D12_COMPARISON_FUNC_LESS_EQUAL);
-    // Shadow PCF
-    InitSampler(5, D3D12_FILTER_COMPARISON_MIN_MAG_MIP_LINEAR, D3D12_TEXTURE_ADDRESS_MODE_CLAMP, D3D12_COMPARISON_FUNC_LESS_EQUAL);
-
-    // Init
-    _desc.NumParameters = ARRAY_COUNT(_parameters);
-    _desc.pParameters = _parameters;
-    _desc.NumStaticSamplers = ARRAY_COUNT(_staticSamplers);
-    _desc.pStaticSamplers = _staticSamplers;
-    _desc.Flags = D3D12_ROOT_SIGNATURE_FLAG_ALLOW_INPUT_ASSEMBLER_INPUT_LAYOUT;
-}
-
-void RootSignatureDX12::InitSampler(int32 i, D3D12_FILTER filter, D3D12_TEXTURE_ADDRESS_MODE address, D3D12_COMPARISON_FUNC comparisonFunc)
-{
-    auto& sampler = _staticSamplers[i];
-    sampler.Filter = filter;
-    sampler.AddressU = address;
-    sampler.AddressV = address;
-    sampler.AddressW = address;
-    sampler.MipLODBias = 0.0f;
-    sampler.MaxAnisotropy = 1;
-    sampler.ComparisonFunc = comparisonFunc;
-    sampler.BorderColor = D3D12_STATIC_BORDER_COLOR_OPAQUE_BLACK;
-    sampler.MinLOD = 0;
-    sampler.MaxLOD = D3D12_FLOAT32_MAX;
-    sampler.ShaderRegister = i;
-    sampler.RegisterSpace = 0;
-    sampler.ShaderVisibility = D3D12_SHADER_VISIBILITY_ALL;
-}
-
-ComPtr<ID3DBlob> RootSignatureDX12::Serialize() const
-{
-    ComPtr<ID3DBlob> signature;
-    ComPtr<ID3DBlob> error;
-    VALIDATE_DIRECTX_CALL(D3D12SerializeRootSignature(&_desc, D3D_ROOT_SIGNATURE_VERSION_1_0, &signature, &error));
-    if (error.Get())
-    {
-        LOG(Error, "D3D12SerializeRootSignature failed with error: {}", String((const char*)error->GetBufferPointer()));
-    }
-    return signature;
-}
-
-#if USE_EDITOR
-
-const Char* GetRootSignatureShaderVisibility(D3D12_SHADER_VISIBILITY visibility)
-{
-    switch (visibility)
-    {
-    case D3D12_SHADER_VISIBILITY_VERTEX:
-        return TEXT(", visibility=SHADER_VISIBILITY_VERTEX");
-    case D3D12_SHADER_VISIBILITY_HULL:
-        return TEXT(", visibility=SHADER_VISIBILITY_HULL");
-    case D3D12_SHADER_VISIBILITY_DOMAIN:
-        return TEXT(", visibility=SHADER_VISIBILITY_DOMAIN");
-    case D3D12_SHADER_VISIBILITY_GEOMETRY:
-        return TEXT(", visibility=SHADER_VISIBILITY_GEOMETRY");
-    case D3D12_SHADER_VISIBILITY_PIXEL:
-        return TEXT(", visibility=SHADER_VISIBILITY_PIXEL");
-    case D3D12_SHADER_VISIBILITY_AMPLIFICATION:
-        return TEXT(", visibility=SHADER_VISIBILITY_AMPLIFICATION");
-    case D3D12_SHADER_VISIBILITY_MESH:
-        return TEXT(", visibility=SHADER_VISIBILITY_MESH");
-    case D3D12_SHADER_VISIBILITY_ALL:
-    default:
-        return TEXT(""); // Default
-    }
-}
-
-const Char* GetRootSignatureSamplerFilter(D3D12_FILTER filter)
-{
-    switch (filter)
-    {
-    case D3D12_FILTER_MIN_MAG_MIP_POINT:
-        return TEXT("FILTER_MIN_MAG_MIP_POINT");
-    case D3D12_FILTER_MIN_MAG_MIP_LINEAR:
-        return TEXT("FILTER_MIN_MAG_MIP_LINEAR");
-    case D3D12_FILTER_ANISOTROPIC:
-        return TEXT("FILTER_ANISOTROPIC");
-    case D3D12_FILTER_COMPARISON_MIN_MAG_MIP_POINT:
-        return TEXT("FILTER_COMPARISON_MIN_MAG_MIP_POINT");
-    case D3D12_FILTER_COMPARISON_MIN_MAG_MIP_LINEAR:
-        return TEXT("FILTER_COMPARISON_MIN_MAG_MIP_LINEAR");
-    default:
-        CRASH; // Not implemented
-    }
-}
-
-const Char* GetRootSignatureSamplerAddress(D3D12_TEXTURE_ADDRESS_MODE address)
-{
-    switch (address)
-    {
-    case D3D12_TEXTURE_ADDRESS_MODE_WRAP:
-        return TEXT("TEXTURE_ADDRESS_WRAP");
-    case D3D12_TEXTURE_ADDRESS_MODE_MIRROR:
-        return TEXT("TEXTURE_ADDRESS_MIRROR");
-    case D3D12_TEXTURE_ADDRESS_MODE_CLAMP:
-        return TEXT("TEXTURE_ADDRESS_CLAMP");
-    case D3D12_TEXTURE_ADDRESS_MODE_BORDER:
-        return TEXT("TEXTURE_ADDRESS_BORDER");
-    case D3D12_TEXTURE_ADDRESS_MODE_MIRROR_ONCE:
-        return TEXT("TEXTURE_ADDRESS_MIRROR_ONCE");
-    default:
-        return TEXT("");
-    }
-}
-
-const Char* GetRootSignatureSamplerComparisonFunc(D3D12_COMPARISON_FUNC func)
-{
-    switch (func)
-    {
-    case D3D12_COMPARISON_FUNC_NEVER:
-        return TEXT("COMPARISON_NEVER");
-    case D3D12_COMPARISON_FUNC_LESS:
-        return TEXT("COMPARISON_LESS");
-    case D3D12_COMPARISON_FUNC_EQUAL:
-        return TEXT("COMPARISON_EQUAL");
-    case D3D12_COMPARISON_FUNC_LESS_EQUAL:
-        return TEXT("COMPARISON_LESS_EQUAL");
-    case D3D12_COMPARISON_FUNC_GREATER:
-        return TEXT("COMPARISON_GREATER");
-    case D3D12_COMPARISON_FUNC_NOT_EQUAL:
-        return TEXT("COMPARISON_NOT_EQUAL");
-    case D3D12_COMPARISON_FUNC_GREATER_EQUAL:
-        return TEXT("COMPARISON_GREATER_EQUAL");
-    case D3D12_COMPARISON_FUNC_ALWAYS:
-    default:
-        return TEXT("COMPARISON_ALWAYS");
-    }
-}
-
-void RootSignatureDX12::ToString(StringBuilder& sb, bool singleLine) const
-{
-    // Flags
-    sb.Append(TEXT("RootFlags(ALLOW_INPUT_ASSEMBLER_INPUT_LAYOUT)"));
-
-    // Parameters
-    const Char newLine = singleLine ? ' ' : '\n';
-    for (const D3D12_ROOT_PARAMETER& param : _parameters)
-    {
-        const Char* visibility = GetRootSignatureShaderVisibility(param.ShaderVisibility);
-        switch (param.ParameterType)
-        {
-        case D3D12_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE:
-            sb.AppendFormat(TEXT(",{}DescriptorTable("), newLine);
-            for (uint32 rangeIndex = 0; rangeIndex < param.DescriptorTable.NumDescriptorRanges; rangeIndex++)
-            {
-                if (rangeIndex)
-                    sb.Append(TEXT(", "));
-                const D3D12_DESCRIPTOR_RANGE& range = param.DescriptorTable.pDescriptorRanges[rangeIndex];
-                switch (range.RangeType)
-                {
-                case D3D12_DESCRIPTOR_RANGE_TYPE_SRV:
-                    sb.AppendFormat(TEXT("SRV(t{}"), range.BaseShaderRegister);
-                    break;
-                case D3D12_DESCRIPTOR_RANGE_TYPE_UAV:
-                    sb.AppendFormat(TEXT("UAV(u{}"), range.BaseShaderRegister);
-                    break;
-                case D3D12_DESCRIPTOR_RANGE_TYPE_CBV:
-                    sb.AppendFormat(TEXT("CBV(b{}"), range.BaseShaderRegister);
-                    break;
-                case D3D12_DESCRIPTOR_RANGE_TYPE_SAMPLER:
-                    sb.AppendFormat(TEXT("Sampler(s{}"), range.BaseShaderRegister);
-                    break;
-                }
-                if (range.NumDescriptors != 1)
-                {
-                    if (range.NumDescriptors == UINT_MAX)
-                        sb.Append(TEXT(", numDescriptors=unbounded"));
-                    else
-                        sb.AppendFormat(TEXT(", numDescriptors={}"), range.NumDescriptors);
-                }
-                if (range.OffsetInDescriptorsFromTableStart != D3D12_DESCRIPTOR_RANGE_OFFSET_APPEND)
-                    sb.AppendFormat(TEXT(", offset={}"), range.OffsetInDescriptorsFromTableStart);
-                sb.Append(')');
-            }
-            sb.AppendFormat(TEXT("{})"), visibility);
-            break;
-        case D3D12_ROOT_PARAMETER_TYPE_32BIT_CONSTANTS:
-            sb.AppendFormat(TEXT(",{}RootConstants(num32BitConstants={}, b{}{})"), newLine, param.Constants.Num32BitValues, param.Constants.ShaderRegister, visibility);
-            break;
-        case D3D12_ROOT_PARAMETER_TYPE_CBV:
-            sb.AppendFormat(TEXT(",{}CBV(b{}{})"), newLine, param.Descriptor.ShaderRegister, visibility);
-            break;
-        case D3D12_ROOT_PARAMETER_TYPE_SRV:
-            sb.AppendFormat(TEXT(",{}SRV(t{}{})"), newLine, param.Descriptor.ShaderRegister, visibility);
-            break;
-        case D3D12_ROOT_PARAMETER_TYPE_UAV:
-            sb.AppendFormat(TEXT(",{}UAV(u{}{})"), newLine, param.Descriptor.ShaderRegister, visibility);
-            break;
-        }
-    }
-
-    // Static Samplers
-    for (const D3D12_STATIC_SAMPLER_DESC& sampler : _staticSamplers)
-    {
-        const Char* visibility = GetRootSignatureShaderVisibility(sampler.ShaderVisibility);
-        sb.AppendFormat(TEXT(",{}StaticSampler(s{}"), newLine, sampler.ShaderRegister);
-        sb.AppendFormat(TEXT(", filter={}"), GetRootSignatureSamplerFilter(sampler.Filter));
-        sb.AppendFormat(TEXT(", addressU={}"), GetRootSignatureSamplerAddress(sampler.AddressU));
-        sb.AppendFormat(TEXT(", addressV={}"), GetRootSignatureSamplerAddress(sampler.AddressV));
-        sb.AppendFormat(TEXT(", addressW={}"), GetRootSignatureSamplerAddress(sampler.AddressW));
-        sb.AppendFormat(TEXT(", comparisonFunc={}"), GetRootSignatureSamplerComparisonFunc(sampler.ComparisonFunc));
-        sb.AppendFormat(TEXT(", maxAnisotropy={}"), sampler.MaxAnisotropy);
-        sb.Append(TEXT(", borderColor=STATIC_BORDER_COLOR_OPAQUE_BLACK"));
-        sb.AppendFormat(TEXT("{})"), visibility);
-    }
-}
-
-String RootSignatureDX12::ToString() const
-{
-    StringBuilder sb;
-    ToString(sb);
-    return sb.ToString();
-}
-
-StringAnsi RootSignatureDX12::ToStringAnsi() const
-{
-    StringBuilder sb;
-    ToString(sb);
-    return sb.ToStringAnsi();
-}
-
-#endif
-
 GPUDevice* GPUDeviceDX12::Create()
 {
 #if PLATFORM_XBOX_SCARLETT || PLATFORM_XBOX_ONE
@@ -628,7 +318,6 @@ bool GPUDeviceDX12::Init()
     VALIDATE_DIRECTX_CALL(dxgiAdapter->EnumOutputs(0, dxgiOutput.GetAddressOf()));
     DXGI_FORMAT backbufferFormat = RenderToolsDX::ToDxgiFormat(GPU_BACK_BUFFER_PIXEL_FORMAT);
     UINT modesCount = 0;
-#ifdef _GAMING_XBOX_SCARLETT
     VALIDATE_DIRECTX_CALL(dxgiOutput->GetDisplayModeList(backbufferFormat, 0, &modesCount, NULL));
     Array<DXGIXBOX_MODE_DESC> modes;
     modes.Resize((int32)modesCount);
@@ -643,11 +332,6 @@ bool GPUDeviceDX12::Init()
         videoOutput.RefreshRate = Math::Max(videoOutput.RefreshRate, mode.RefreshRate.Numerator / (float)mode.RefreshRate.Denominator);
     }
     modes.Resize(0);
-#else
-    videoOutput.Width = 1920;
-    videoOutput.Height = 1080;
-    videoOutput.RefreshRate = 60;
-#endif
 
 #if PLATFORM_GDK
     GDKPlatform::Suspended.Bind<GPUDeviceDX12, &GPUDeviceDX12::OnSuspended>(this);
@@ -877,10 +561,170 @@ bool GPUDeviceDX12::Init()
     }
 
     // Create root signature
+    // TODO: maybe create set of different root signatures? for UAVs, for compute, for simple drawing, for post fx?
     {
-        RootSignatureDX12 signature;
-        ComPtr<ID3DBlob> signatureBlob = signature.Serialize();
-        VALIDATE_DIRECTX_CALL(_device->CreateRootSignature(0, signatureBlob->GetBufferPointer(), signatureBlob->GetBufferSize(), IID_PPV_ARGS(&_rootSignature)));
+        // Descriptor tables
+        D3D12_DESCRIPTOR_RANGE r[3]; // SRV+UAV+Sampler
+        {
+            D3D12_DESCRIPTOR_RANGE& range = r[0];
+            range.RangeType = D3D12_DESCRIPTOR_RANGE_TYPE_SRV;
+            range.NumDescriptors = GPU_MAX_SR_BINDED;
+            range.BaseShaderRegister = 0;
+            range.RegisterSpace = 0;
+            range.OffsetInDescriptorsFromTableStart = D3D12_DESCRIPTOR_RANGE_OFFSET_APPEND;
+        }
+        {
+            D3D12_DESCRIPTOR_RANGE& range = r[1];
+            range.RangeType = D3D12_DESCRIPTOR_RANGE_TYPE_UAV;
+            range.NumDescriptors = GPU_MAX_UA_BINDED;
+            range.BaseShaderRegister = 0;
+            range.RegisterSpace = 0;
+            range.OffsetInDescriptorsFromTableStart = D3D12_DESCRIPTOR_RANGE_OFFSET_APPEND;
+        }
+        {
+            D3D12_DESCRIPTOR_RANGE& range = r[2];
+            range.RangeType = D3D12_DESCRIPTOR_RANGE_TYPE_SAMPLER;
+            range.NumDescriptors = GPU_MAX_SAMPLER_BINDED - GPU_STATIC_SAMPLERS_COUNT;
+            range.BaseShaderRegister = GPU_STATIC_SAMPLERS_COUNT;
+            range.RegisterSpace = 0;
+            range.OffsetInDescriptorsFromTableStart = D3D12_DESCRIPTOR_RANGE_OFFSET_APPEND;
+        }
+
+        // Root parameters
+        D3D12_ROOT_PARAMETER rootParameters[GPU_MAX_CB_BINDED + 3];
+        for (int32 i = 0; i < GPU_MAX_CB_BINDED; i++)
+        {
+            // CB
+            D3D12_ROOT_PARAMETER& rootParam = rootParameters[DX12_ROOT_SIGNATURE_CB + i];
+            rootParam.ParameterType = D3D12_ROOT_PARAMETER_TYPE_CBV;
+            rootParam.ShaderVisibility = D3D12_SHADER_VISIBILITY_ALL;
+            rootParam.Descriptor.ShaderRegister = i;
+            rootParam.Descriptor.RegisterSpace = 0;
+        }
+        {
+            // SRVs
+            D3D12_ROOT_PARAMETER& rootParam = rootParameters[DX12_ROOT_SIGNATURE_SR];
+            rootParam.ParameterType = D3D12_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE;
+            rootParam.ShaderVisibility = D3D12_SHADER_VISIBILITY_ALL;
+            rootParam.DescriptorTable.NumDescriptorRanges = 1;
+            rootParam.DescriptorTable.pDescriptorRanges = &r[0];
+        }
+        {
+            // UAVs
+            D3D12_ROOT_PARAMETER& rootParam = rootParameters[DX12_ROOT_SIGNATURE_UA];
+            rootParam.ParameterType = D3D12_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE;
+            rootParam.ShaderVisibility = D3D12_SHADER_VISIBILITY_ALL;
+            rootParam.DescriptorTable.NumDescriptorRanges = 1;
+            rootParam.DescriptorTable.pDescriptorRanges = &r[1];
+        }
+        {
+            // Samplers
+            D3D12_ROOT_PARAMETER& rootParam = rootParameters[DX12_ROOT_SIGNATURE_SAMPLER];
+            rootParam.ParameterType = D3D12_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE;
+            rootParam.ShaderVisibility = D3D12_SHADER_VISIBILITY_ALL;
+            rootParam.DescriptorTable.NumDescriptorRanges = 1;
+            rootParam.DescriptorTable.pDescriptorRanges = &r[2];
+        }
+
+        // Static samplers
+        D3D12_STATIC_SAMPLER_DESC staticSamplers[6];
+        static_assert(GPU_STATIC_SAMPLERS_COUNT == ARRAY_COUNT(staticSamplers), "Update static samplers setup.");
+        // Linear Clamp
+        staticSamplers[0].Filter = D3D12_FILTER_MIN_MAG_MIP_LINEAR;
+        staticSamplers[0].AddressU = D3D12_TEXTURE_ADDRESS_MODE_CLAMP;
+        staticSamplers[0].AddressV = D3D12_TEXTURE_ADDRESS_MODE_CLAMP;
+        staticSamplers[0].AddressW = D3D12_TEXTURE_ADDRESS_MODE_CLAMP;
+        staticSamplers[0].MipLODBias = 0.0f;
+        staticSamplers[0].MaxAnisotropy = 1;
+        staticSamplers[0].BorderColor = D3D12_STATIC_BORDER_COLOR_OPAQUE_BLACK;
+        staticSamplers[0].MinLOD = 0;
+        staticSamplers[0].MaxLOD = D3D12_FLOAT32_MAX;
+        staticSamplers[0].ShaderRegister = 0;
+        staticSamplers[0].RegisterSpace = 0;
+        staticSamplers[0].ShaderVisibility = D3D12_SHADER_VISIBILITY_ALL;
+        // Point Clamp
+        staticSamplers[1].Filter = D3D12_FILTER_MIN_MAG_MIP_POINT;
+        staticSamplers[1].AddressU = D3D12_TEXTURE_ADDRESS_MODE_CLAMP;
+        staticSamplers[1].AddressV = D3D12_TEXTURE_ADDRESS_MODE_CLAMP;
+        staticSamplers[1].AddressW = D3D12_TEXTURE_ADDRESS_MODE_CLAMP;
+        staticSamplers[1].MipLODBias = 0.0f;
+        staticSamplers[1].MaxAnisotropy = 1;
+        staticSamplers[1].BorderColor = D3D12_STATIC_BORDER_COLOR_OPAQUE_BLACK;
+        staticSamplers[1].MinLOD = 0;
+        staticSamplers[1].MaxLOD = D3D12_FLOAT32_MAX;
+        staticSamplers[1].ShaderRegister = 1;
+        staticSamplers[1].RegisterSpace = 0;
+        staticSamplers[1].ShaderVisibility = D3D12_SHADER_VISIBILITY_ALL;
+        // Linear Wrap
+        staticSamplers[2].Filter = D3D12_FILTER_MIN_MAG_MIP_LINEAR;
+        staticSamplers[2].AddressU = D3D12_TEXTURE_ADDRESS_MODE_WRAP;
+        staticSamplers[2].AddressV = D3D12_TEXTURE_ADDRESS_MODE_WRAP;
+        staticSamplers[2].AddressW = D3D12_TEXTURE_ADDRESS_MODE_WRAP;
+        staticSamplers[2].MipLODBias = 0.0f;
+        staticSamplers[2].MaxAnisotropy = 1;
+        staticSamplers[2].BorderColor = D3D12_STATIC_BORDER_COLOR_OPAQUE_BLACK;
+        staticSamplers[2].MinLOD = 0;
+        staticSamplers[2].MaxLOD = D3D12_FLOAT32_MAX;
+        staticSamplers[2].ShaderRegister = 2;
+        staticSamplers[2].RegisterSpace = 0;
+        staticSamplers[2].ShaderVisibility = D3D12_SHADER_VISIBILITY_ALL;
+        // Point Wrap
+        staticSamplers[3].Filter = D3D12_FILTER_MIN_MAG_MIP_POINT;
+        staticSamplers[3].AddressU = D3D12_TEXTURE_ADDRESS_MODE_WRAP;
+        staticSamplers[3].AddressV = D3D12_TEXTURE_ADDRESS_MODE_WRAP;
+        staticSamplers[3].AddressW = D3D12_TEXTURE_ADDRESS_MODE_WRAP;
+        staticSamplers[3].MipLODBias = 0.0f;
+        staticSamplers[3].MaxAnisotropy = 1;
+        staticSamplers[3].BorderColor = D3D12_STATIC_BORDER_COLOR_OPAQUE_BLACK;
+        staticSamplers[3].MinLOD = 0;
+        staticSamplers[3].MaxLOD = D3D12_FLOAT32_MAX;
+        staticSamplers[3].ShaderRegister = 3;
+        staticSamplers[3].RegisterSpace = 0;
+        staticSamplers[3].ShaderVisibility = D3D12_SHADER_VISIBILITY_ALL;
+        // Shadow
+        staticSamplers[4].Filter = D3D12_FILTER_COMPARISON_MIN_MAG_MIP_POINT;
+        staticSamplers[4].AddressU = D3D12_TEXTURE_ADDRESS_MODE_CLAMP;
+        staticSamplers[4].AddressV = D3D12_TEXTURE_ADDRESS_MODE_CLAMP;
+        staticSamplers[4].AddressW = D3D12_TEXTURE_ADDRESS_MODE_CLAMP;
+        staticSamplers[4].MipLODBias = 0.0f;
+        staticSamplers[4].MaxAnisotropy = 1;
+        staticSamplers[4].ComparisonFunc = D3D12_COMPARISON_FUNC_LESS_EQUAL;
+        staticSamplers[4].BorderColor = D3D12_STATIC_BORDER_COLOR_OPAQUE_BLACK;
+        staticSamplers[4].MinLOD = 0;
+        staticSamplers[4].MaxLOD = D3D12_FLOAT32_MAX;
+        staticSamplers[4].ShaderRegister = 4;
+        staticSamplers[4].RegisterSpace = 0;
+        staticSamplers[4].ShaderVisibility = D3D12_SHADER_VISIBILITY_ALL;
+        // Shadow PCF
+        staticSamplers[5].Filter = D3D12_FILTER_COMPARISON_MIN_MAG_MIP_LINEAR;
+        staticSamplers[5].AddressU = D3D12_TEXTURE_ADDRESS_MODE_CLAMP;
+        staticSamplers[5].AddressV = D3D12_TEXTURE_ADDRESS_MODE_CLAMP;
+        staticSamplers[5].AddressW = D3D12_TEXTURE_ADDRESS_MODE_CLAMP;
+        staticSamplers[5].MipLODBias = 0.0f;
+        staticSamplers[5].MaxAnisotropy = 1;
+        staticSamplers[5].ComparisonFunc = D3D12_COMPARISON_FUNC_LESS_EQUAL;
+        staticSamplers[5].BorderColor = D3D12_STATIC_BORDER_COLOR_OPAQUE_BLACK;
+        staticSamplers[5].MinLOD = 0;
+        staticSamplers[5].MaxLOD = D3D12_FLOAT32_MAX;
+        staticSamplers[5].ShaderRegister = 5;
+        staticSamplers[5].RegisterSpace = 0;
+        staticSamplers[5].ShaderVisibility = D3D12_SHADER_VISIBILITY_ALL;
+
+        // Init
+        D3D12_ROOT_SIGNATURE_DESC rootSignatureDesc;
+        rootSignatureDesc.NumParameters = ARRAY_COUNT(rootParameters);
+        rootSignatureDesc.pParameters = rootParameters;
+        rootSignatureDesc.NumStaticSamplers = ARRAY_COUNT(staticSamplers);
+        rootSignatureDesc.pStaticSamplers = staticSamplers;
+        rootSignatureDesc.Flags = D3D12_ROOT_SIGNATURE_FLAG_ALLOW_INPUT_ASSEMBLER_INPUT_LAYOUT;
+
+        // Serialize
+        ComPtr<ID3DBlob> signature;
+        ComPtr<ID3DBlob> error;
+        VALIDATE_DIRECTX_CALL(D3D12SerializeRootSignature(&rootSignatureDesc, D3D_ROOT_SIGNATURE_VERSION_1, &signature, &error));
+
+        // Create
+        VALIDATE_DIRECTX_CALL(_device->CreateRootSignature(0, signature->GetBufferPointer(), signature->GetBufferSize(), IID_PPV_ARGS(&_rootSignature)));
     }
 
     if (TimestampQueryHeap.Init())

Source/Engine/GraphicsDevice/DirectX/DX12/GPUDeviceDX12.h

@@ -18,6 +18,11 @@
 #define DX12_BACK_BUFFER_COUNT 2
 #endif
 
+#define DX12_ROOT_SIGNATURE_CB 0
+#define DX12_ROOT_SIGNATURE_SR (GPU_MAX_CB_BINDED+0)
+#define DX12_ROOT_SIGNATURE_UA (GPU_MAX_CB_BINDED+1)
+#define DX12_ROOT_SIGNATURE_SAMPLER (GPU_MAX_CB_BINDED+2)
+
 class Engine;
 class WindowsWindow;
 class GPUContextDX12;

Source/Engine/GraphicsDevice/DirectX/DX12/GPUTextureDX12.cpp

@@ -159,7 +159,7 @@ bool GPUTextureDX12::OnInit()
         initialState = D3D12_RESOURCE_STATE_PIXEL_SHADER_RESOURCE | D3D12_RESOURCE_STATE_NON_PIXEL_SHADER_RESOURCE;
 
     // Create texture
-#if PLATFORM_WINDOWS && 0
+#if PLATFORM_WINDOWS
     D3D12_HEAP_FLAGS heapFlags = useRTV || useDSV ? D3D12_HEAP_FLAG_CREATE_NOT_ZEROED : D3D12_HEAP_FLAG_NONE;
 #else
     D3D12_HEAP_FLAGS heapFlags = D3D12_HEAP_FLAG_NONE;

Source/Engine/GraphicsDevice/DirectX/DX12/RootSignatureDX12.h

@@ -1,33 +0,0 @@
-// Copyright (c) Wojciech Figat. All rights reserved.
-
-#pragma once
-
-#include "Engine/Graphics/Config.h"
-#include "../IncludeDirectXHeaders.h"
-
-#define DX12_ROOT_SIGNATURE_CB 0
-#define DX12_ROOT_SIGNATURE_SR (GPU_MAX_CB_BINDED+0)
-#define DX12_ROOT_SIGNATURE_UA (GPU_MAX_CB_BINDED+1)
-#define DX12_ROOT_SIGNATURE_SAMPLER (GPU_MAX_CB_BINDED+2)
-
-struct RootSignatureDX12
-{
-private:
-    D3D12_ROOT_SIGNATURE_DESC _desc;
-    D3D12_DESCRIPTOR_RANGE _ranges[3];
-    D3D12_ROOT_PARAMETER _parameters[GPU_MAX_CB_BINDED + 3];
-    D3D12_STATIC_SAMPLER_DESC _staticSamplers[6];
-
-public:
-    RootSignatureDX12();
-
-	ComPtr<ID3DBlob> Serialize() const;
-#if USE_EDITOR
-    void ToString(class StringBuilder& sb, bool singleLine = false) const;
-    String ToString() const;
-    StringAnsi ToStringAnsi() const;
-#endif
-
-private:
-    void InitSampler(int32 i, D3D12_FILTER filter, D3D12_TEXTURE_ADDRESS_MODE address, D3D12_COMPARISON_FUNC comparisonFunc = D3D12_COMPARISON_FUNC_LESS_EQUAL);
-};

Source/Engine/GraphicsDevice/Null/GPUContextNull.h

@@ -177,7 +177,7 @@ public:
     {
     }
 
-    void ResetState() override
+    void ClearState() override
     {
     }
 

Source/Engine/GraphicsDevice/Vulkan/GPUContextVulkan.cpp

@@ -1329,7 +1329,7 @@ void GPUContextVulkan::SetState(GPUPipelineState* state)
     }
 }
 
-void GPUContextVulkan::ResetState()
+void GPUContextVulkan::ClearState()
 {
     ResetRenderTarget();
     ResetSR();

Source/Engine/GraphicsDevice/Vulkan/GPUContextVulkan.h

@@ -193,7 +193,7 @@ public:
     void SetScissor(const Rectangle& scissorRect) override;
     GPUPipelineState* GetState() const override;
     void SetState(GPUPipelineState* state) override;
-    void ResetState() override;
+    void ClearState() override;
     void FlushState() override;
     void Flush() override;
     void UpdateBuffer(GPUBuffer* buffer, const void* data, uint32 size, uint32 offset) override;

Source/Engine/Level/Actors/AnimatedModel.cpp

@@ -554,11 +554,10 @@ void AnimatedModel::StopSlotAnimation(const StringView& slotName, Animation* ani
 {
     for (auto& slot : GraphInstance.Slots)
     {
-        if ((slot.Animation == anim || anim == nullptr) && slot.Name == slotName)
+        if (slot.Animation == anim && slot.Name == slotName)
         {
             //slot.Animation = nullptr; // TODO: make an immediate version of this method and set the animation to nullptr.
-            if (slot.Animation != nullptr)
-                slot.Reset = true;
+            slot.Reset = true;
             break;
         }
     }
@@ -574,7 +573,7 @@ void AnimatedModel::PauseSlotAnimation(const StringView& slotName, Animation* an
 {
     for (auto& slot : GraphInstance.Slots)
     {
-        if ((slot.Animation == anim || anim == nullptr) && slot.Name == slotName)
+        if (slot.Animation == anim && slot.Name == slotName)
         {
             slot.Pause = true;
             break;
@@ -596,7 +595,7 @@ bool AnimatedModel::IsPlayingSlotAnimation(const StringView& slotName, Animation
 {
     for (auto& slot : GraphInstance.Slots)
     {
-        if ((slot.Animation == anim || anim == nullptr) && slot.Name == slotName && !slot.Pause)
+        if (slot.Animation == anim && slot.Name == slotName && !slot.Pause)
             return true;
     }
     return false;

Source/Engine/Level/Actors/AnimatedModel.h

@@ -412,8 +412,8 @@ public:
     /// Stops the animation playback on the slot in Anim Graph.
     /// </summary>
     /// <param name="slotName">The name of the slot.</param>
-    /// <param name="anim">The animation to check. Null to use slot name only.</param>
-    API_FUNCTION() void StopSlotAnimation(const StringView& slotName, Animation* anim = nullptr);
+    /// <param name="anim">The animation to stop.</param>
+    API_FUNCTION() void StopSlotAnimation(const StringView& slotName, Animation* anim);
 
     /// <summary>
     /// Pauses all the animations playback on the all slots in Anim Graph.
@@ -424,8 +424,8 @@ public:
     /// Pauses the animation playback on the slot in Anim Graph.
     /// </summary>
     /// <param name="slotName">The name of the slot.</param>
-    /// <param name="anim">The animation to check. Null to use slot name only.</param>
-    API_FUNCTION() void PauseSlotAnimation(const StringView& slotName, Animation* anim = nullptr);
+    /// <param name="anim">The animation to pause.</param>
+    API_FUNCTION() void PauseSlotAnimation(const StringView& slotName, Animation* anim);
 
     /// <summary>
     /// Checks if any  animation playback is active on any  slot in Anim Graph (not paused).
@@ -436,8 +436,8 @@ public:
     /// Checks if the animation playback is active on the slot in Anim Graph (not paused).
     /// </summary>
     /// <param name="slotName">The name of the slot.</param>
-    /// <param name="anim">The animation to check. Null to use slot name only.</param>
-    API_FUNCTION() bool IsPlayingSlotAnimation(const StringView& slotName, Animation* anim = nullptr);
+    /// <param name="anim">The animation to check.</param>
+    API_FUNCTION() bool IsPlayingSlotAnimation(const StringView& slotName, Animation* anim);
 
 private:
     void ApplyRootMotion(const Transform& rootMotionDelta);

Source/Engine/Level/Actors/EnvironmentProbe.h

@@ -42,38 +42,38 @@ public:
     /// <summary>
     /// The reflections texture resolution.
     /// </summary>
-    API_FIELD(Attributes="EditorOrder(0), EditorDisplay(\"Quality\")")
+    API_FIELD(Attributes="EditorOrder(0), EditorDisplay(\"Probe\")")
     ProbeCubemapResolution CubemapResolution = ProbeCubemapResolution::UseGraphicsSettings;
 
-    /// <summary>
-    /// The probe update mode.
-    /// </summary>
-    API_FIELD(Attributes = "EditorOrder(10), EditorDisplay(\"Quality\")")
-    ProbeUpdateMode UpdateMode = ProbeUpdateMode::Manual;
-
     /// <summary>
     /// The reflections brightness.
     /// </summary>
-    API_FIELD(Attributes="EditorOrder(0), Limit(0, 1000, 0.01f), EditorDisplay(\"Probe\")")
+    API_FIELD(Attributes="EditorOrder(10), Limit(0, 1000, 0.01f), EditorDisplay(\"Probe\")")
     float Brightness = 1.0f;
 
     /// <summary>
     /// The probe rendering order. The higher values are render later (on top).
     /// </summary>
-    API_FIELD(Attributes = "EditorOrder(20), EditorDisplay(\"Probe\")")
+    API_FIELD(Attributes = "EditorOrder(25), EditorDisplay(\"Probe\")")
     int32 SortOrder = 0;
 
+    /// <summary>
+    /// The probe update mode.
+    /// </summary>
+    API_FIELD(Attributes="EditorOrder(30), EditorDisplay(\"Probe\")")
+    ProbeUpdateMode UpdateMode = ProbeUpdateMode::Manual;
+
     /// <summary>
     /// The probe capture camera near plane distance.
     /// </summary>
-    API_FIELD(Attributes="EditorOrder(25), Limit(0, float.MaxValue, 0.01f), EditorDisplay(\"Probe\")")
+    API_FIELD(Attributes="EditorOrder(30), Limit(0, float.MaxValue, 0.01f), EditorDisplay(\"Probe\")")
     float CaptureNearPlane = 10.0f;
 
 public:
     /// <summary>
     /// Gets the probe radius.
     /// </summary>
-    API_PROPERTY(Attributes="EditorOrder(15), DefaultValue(3000.0f), Limit(0), EditorDisplay(\"Probe\")")
+    API_PROPERTY(Attributes="EditorOrder(20), DefaultValue(3000.0f), Limit(0), EditorDisplay(\"Probe\")")
     float GetRadius() const;
 
     /// <summary>

Source/Engine/Level/Actors/Spline.cpp

@@ -518,7 +518,7 @@ namespace
                 Vector3 nextPos = transform.LocalToWorld(next->Value.Translation);
                 DEBUG_DRAW_WIRE_SPHERE(BoundingSphere(nextPos, NodeSizeByDistance(nextPos, scaleByDistance)), color, 0.0f, depthTest);
                 const float d = (next->Time - prev->Time) / 3.0f;
-                DEBUG_DRAW_BEZIER(prevPos, transform.LocalToWorld(prev->Value.Translation + prev->TangentOut.Translation * d), transform.LocalToWorld(next->Value.Translation + next->TangentIn.Translation * d), nextPos, color, 0.0f, depthTest);
+                DEBUG_DRAW_BEZIER(prevPos, prevPos + prev->TangentOut.Translation * d, nextPos + next->TangentIn.Translation * d, nextPos, color, 0.0f, depthTest);
                 prev = next;
                 prevPos = nextPos;
             }

Source/Engine/Main/MainUtil.h

@@ -16,7 +16,7 @@ const Char* GetCommandLine(int argc, char* argv[])
     const Char* cmdLine;
     if (length != 0)
     {
-        Char* str = (Char*)malloc((length + 1) * sizeof(Char));
+        Char* str = (Char*)malloc(length * sizeof(Char));
         cmdLine = str;
         for (int i = 1; i < argc; i++)
         {

Source/Engine/Networking/NetworkInternal.h

@@ -8,7 +8,7 @@
 #endif
 
 // Internal version number of networking implementation. Updated once engine changes serialization or connection rules.
-#define NETWORK_PROTOCOL_VERSION 5
+#define NETWORK_PROTOCOL_VERSION 4
 
 // Enables encoding object ids and typenames via uint32 keys rather than full data send.
 #define USE_NETWORK_KEYS 1
@@ -29,7 +29,6 @@ enum class NetworkMessageIDs : uint8
     ObjectDespawn,
     ObjectRole,
     ObjectRpc,
-    ObjectRpcPart,
 
     MAX,
 };
@@ -49,7 +48,6 @@ public:
     static void OnNetworkMessageObjectDespawn(NetworkEvent& event, NetworkClient* client, NetworkPeer* peer);
     static void OnNetworkMessageObjectRole(NetworkEvent& event, NetworkClient* client, NetworkPeer* peer);
     static void OnNetworkMessageObjectRpc(NetworkEvent& event, NetworkClient* client, NetworkPeer* peer);
-    static void OnNetworkMessageObjectRpcPart(NetworkEvent& event, NetworkClient* client, NetworkPeer* peer);
 
 #if COMPILE_WITH_PROFILER
 

Source/Engine/Networking/NetworkManager.cpp

@@ -391,7 +391,6 @@ namespace
         NetworkInternal::OnNetworkMessageObjectDespawn,
         NetworkInternal::OnNetworkMessageObjectRole,
         NetworkInternal::OnNetworkMessageObjectRpc,
-        NetworkInternal::OnNetworkMessageObjectRpcPart,
     };
 }
 

Source/Engine/Networking/NetworkReplicationHierarchy.h

@@ -100,35 +100,6 @@ API_STRUCT(NoDefault, Namespace="FlaxEngine.Networking") struct FLAXENGINE_API N
         return Word0 + Word1 != 0;
     }
 
-    NetworkClientsMask operator&(const NetworkClientsMask& other) const
-    {
-        return { Word0 & other.Word0, Word1 & other.Word1 };
-    }
-
-    NetworkClientsMask operator|(const NetworkClientsMask& other) const
-    {
-        return { Word0 | other.Word0, Word1 | other.Word1 };
-    }
-
-    NetworkClientsMask operator~() const
-    {
-        return { ~Word0, ~Word1 };
-    }
-
-    NetworkClientsMask& operator|=(const NetworkClientsMask& other)
-    {
-        Word0 |= other.Word0;
-        Word1 |= other.Word1;
-        return *this;
-    }
-
-    NetworkClientsMask& operator&=(const NetworkClientsMask& other)
-    {
-        Word0 &= other.Word0;
-        Word1 &= other.Word1;
-        return *this;
-    }
-
     bool operator==(const NetworkClientsMask& other) const
     {
         return Word0 == other.Word0 && Word1 == other.Word1;

Source/Engine/Networking/NetworkReplicator.cpp

@@ -55,14 +55,14 @@ PACK_STRUCT(struct NetworkMessageObjectReplicate
     uint32 OwnerFrame;
     });
 
-PACK_STRUCT(struct NetworkMessageObjectPartPayload
+PACK_STRUCT(struct NetworkMessageObjectReplicatePayload
     {
     uint16 DataSize;
     uint16 PartsCount;
     uint16 PartSize;
     });
 
-PACK_STRUCT(struct NetworkMessageObjectPart
+PACK_STRUCT(struct NetworkMessageObjectReplicatePart
     {
     NetworkMessageIDs ID = NetworkMessageIDs::ObjectReplicatePart;
     uint32 OwnerFrame;
@@ -111,11 +111,22 @@ PACK_STRUCT(struct NetworkMessageObjectRole
 PACK_STRUCT(struct NetworkMessageObjectRpc
     {
     NetworkMessageIDs ID = NetworkMessageIDs::ObjectRpc;
-    uint32 OwnerFrame;
+    uint16 ArgsSize;
     });
 
 struct NetworkReplicatedObject
 {
+    ScriptingObjectReference<ScriptingObject> Object;
+    Guid ObjectId;
+    Guid ParentId;
+    uint32 OwnerClientId;
+    uint32 LastOwnerFrame = 0;
+    NetworkObjectRole Role;
+    uint8 Spawned : 1;
+    uint8 Synced : 1;
+    DataContainer<uint32> TargetClientIds;
+    INetworkObject* AsNetworkObject;
+
     struct
     {
         NetworkClientsMask Mask;
@@ -128,17 +139,6 @@ struct NetworkReplicatedObject
         }
     } RepCache;
 
-    ScriptingObjectReference<ScriptingObject> Object;
-    Guid ObjectId;
-    Guid ParentId;
-    DataContainer<uint32> TargetClientIds;
-    INetworkObject* AsNetworkObject;
-    uint32 OwnerClientId;
-    uint32 LastOwnerFrame = 0;
-    NetworkObjectRole Role;
-    uint8 Spawned : 1;
-    uint8 Synced : 1;
-
     NetworkReplicatedObject()
     {
         Spawned = 0;
@@ -152,12 +152,12 @@ struct NetworkReplicatedObject
 
     bool operator==(const NetworkReplicatedObject& other) const
     {
-        return ObjectId == other.ObjectId;
+        return Object == other.Object;
     }
 
     bool operator==(const ScriptingObject* other) const
     {
-        return other && ObjectId == other->GetID();
+        return Object == other;
     }
 
     bool operator==(const Guid& other) const
@@ -176,25 +176,19 @@ inline uint32 GetHash(const NetworkReplicatedObject& key)
     return GetHash(key.ObjectId);
 }
 
-inline uint32 GetHash(const ScriptingObject* key)
-{
-    return key ? GetHash(key->GetID()) : 0;
-}
-
 struct Serializer
 {
     NetworkReplicator::SerializeFunc Methods[2];
     void* Tags[2];
 };
 
-struct PartsItem
+struct ReplicateItem
 {
     ScriptingObjectReference<ScriptingObject> Object;
     Guid ObjectId;
     uint16 PartsLeft;
     uint32 OwnerFrame;
     uint32 OwnerClientId;
-    const void* Tag;
     Array<byte> Data;
 };
 
@@ -226,7 +220,7 @@ struct DespawnItem
     DataContainer<uint32> Targets;
 };
 
-struct RpcSendItem
+struct RpcItem
 {
     ScriptingObjectReference<ScriptingObject> Object;
     NetworkRpcName Name;
@@ -239,12 +233,11 @@ namespace
 {
     CriticalSection ObjectsLock;
     HashSet<NetworkReplicatedObject> Objects;
-    Array<PartsItem> ReplicationParts;
-    Array<PartsItem> RpcParts;
+    Array<ReplicateItem> ReplicationParts;
     Array<SpawnItemParts> SpawnParts;
     Array<SpawnItem> SpawnQueue;
     Array<DespawnItem> DespawnQueue;
-    Array<RpcSendItem> RpcQueue;
+    Array<RpcItem> RpcQueue;
     Dictionary<Guid, Guid> IdsRemappingTable;
     NetworkStream* CachedWriteStream = nullptr;
     NetworkStream* CachedReadStream = nullptr;
@@ -258,7 +251,6 @@ namespace
 #endif
     Array<Guid> DespawnedObjects;
     uint32 SpawnId = 0;
-    uint32 RpcId = 0;
 
 #if USE_EDITOR
     void OnScriptsReloading()
@@ -513,76 +505,6 @@ void SetupObjectSpawnMessageItem(SpawnItem* e, NetworkMessage& msg)
     msg.WriteStructure(msgDataItem);
 }
 
-void SendInParts(NetworkPeer* peer, NetworkChannelType channel, const byte* data, const uint16 dataSize, NetworkMessage& msg, const NetworkRpcName& name, bool toServer, const Guid& objectId, uint32 ownerFrame, NetworkMessageIDs partId)
-{
-    NetworkMessageObjectPartPayload msgDataPayload;
-    msgDataPayload.DataSize = dataSize;
-    const uint32 networkKeyIdWorstCaseSize = sizeof(uint32) + sizeof(Guid);
-    const uint32 msgMaxData = peer->Config.MessageSize - msg.Position - sizeof(NetworkMessageObjectPartPayload);
-    const uint32 partMaxData = peer->Config.MessageSize - sizeof(NetworkMessageObjectPart) - networkKeyIdWorstCaseSize;
-    uint32 partsCount = 1;
-    uint32 dataStart = 0;
-    uint32 msgDataSize = dataSize;
-    if (dataSize > msgMaxData)
-    {
-        // Send msgMaxData within first message
-        msgDataSize = msgMaxData;
-        dataStart += msgMaxData;
-
-        // Send rest of the data in separate parts
-        partsCount += Math::DivideAndRoundUp(dataSize - dataStart, partMaxData);
-
-        // TODO: promote channel to Ordered when using parts?
-    }
-    else
-        dataStart += dataSize;
-    ASSERT(partsCount <= MAX_uint8);
-    msgDataPayload.PartsCount = partsCount;
-    msgDataPayload.PartSize = msgDataSize;
-    msg.WriteStructure(msgDataPayload);
-    msg.WriteBytes(data, msgDataSize);
-    uint32 messageSize = msg.Length;
-    if (toServer)
-        peer->EndSendMessage(channel, msg);
-    else
-        peer->EndSendMessage(channel, msg, CachedTargets);
-
-    // Send all other parts
-    for (uint32 partIndex = 1; partIndex < partsCount; partIndex++)
-    {
-        NetworkMessageObjectPart msgDataPart;
-        msgDataPart.ID = partId;
-        msgDataPart.OwnerFrame = ownerFrame;
-        msgDataPart.DataSize = msgDataPayload.DataSize;
-        msgDataPart.PartsCount = msgDataPayload.PartsCount;
-        msgDataPart.PartStart = dataStart;
-        msgDataPart.PartSize = Math::Min(dataSize - dataStart, partMaxData);
-        msg = peer->BeginSendMessage();
-        msg.WriteStructure(msgDataPart);
-        msg.WriteNetworkId(objectId);
-        msg.WriteBytes(data + msgDataPart.PartStart, msgDataPart.PartSize);
-        messageSize += msg.Length;
-        dataStart += msgDataPart.PartSize;
-        if (toServer)
-            peer->EndSendMessage(channel, msg);
-        else
-            peer->EndSendMessage(channel, msg, CachedTargets);
-    }
-    ASSERT_LOW_LAYER(dataStart == dataSize);
-
-#if COMPILE_WITH_PROFILER
-    // Network stats recording
-    if (NetworkInternal::EnableProfiling)
-    {
-        auto& profileEvent = NetworkInternal::ProfilerEvents[name];
-        profileEvent.Count++;
-        profileEvent.DataSize += dataSize;
-        profileEvent.MessageSize += messageSize;
-        profileEvent.Receivers += toServer ? 1 : CachedTargets.Count();
-    }
-#endif
-}
-
 void SendObjectSpawnMessage(const SpawnGroup& group, const Array<NetworkClient*>& clients)
 {
     PROFILE_CPU();
@@ -667,7 +589,7 @@ void SendObjectRoleMessage(const NetworkReplicatedObject& item, const NetworkCli
     msg.WriteNetworkId(objectId);
     if (NetworkManager::IsClient())
     {
-        peer->EndSendMessage(NetworkChannelType::ReliableOrdered, msg);
+        NetworkManager::Peer->EndSendMessage(NetworkChannelType::ReliableOrdered, msg);
     }
     else
     {
@@ -676,169 +598,6 @@ void SendObjectRoleMessage(const NetworkReplicatedObject& item, const NetworkCli
     }
 }
 
-void SendDespawn(DespawnItem& e)
-{
-    NETWORK_REPLICATOR_LOG(Info, "[NetworkReplicator] Despawn object ID={}", e.Id.ToString());
-    NetworkMessageObjectDespawn msgData;
-    Guid objectId = e.Id;
-    {
-        // Remap local client object ids into server ids
-        IdsRemappingTable.KeyOf(objectId, &objectId);
-    }
-    auto peer = NetworkManager::Peer;
-    NetworkMessage msg = peer->BeginSendMessage();
-    msg.WriteStructure(msgData);
-    msg.WriteNetworkId(objectId);
-    BuildCachedTargets(NetworkManager::Clients, e.Targets);
-    if (NetworkManager::IsClient())
-        peer->EndSendMessage(NetworkChannelType::ReliableOrdered, msg);
-    else
-        peer->EndSendMessage(NetworkChannelType::ReliableOrdered, msg, CachedTargets);
-}
-
-void SendReplication(ScriptingObject* obj, NetworkClientsMask targetClients)
-{
-    auto it = Objects.Find(obj->GetID());
-    if (it.IsEnd())
-        return;
-    auto& item = it->Item;
-    const bool isClient = NetworkManager::IsClient();
-    const NetworkClientsMask fullTargetClients = targetClients;
-
-    // If server has no recipients, skip early.
-    if (!isClient && !targetClients)
-        return;
-
-    if (item.AsNetworkObject)
-        item.AsNetworkObject->OnNetworkSerialize();
-
-    // Serialize object
-    NetworkStream* stream = CachedWriteStream;
-    stream->Initialize();
-    const bool failed = NetworkReplicator::InvokeSerializer(obj->GetTypeHandle(), obj, stream, true);
-    if (failed)
-    {
-        //NETWORK_REPLICATOR_LOG(Error, "[NetworkReplicator] Cannot serialize object {} of type {} (missing serialization logic)", item.ToString(), obj->GetType().ToString());
-        return;
-    }
-    const uint32 size = stream->GetPosition();
-    if (size > MAX_uint16)
-    {
-        LOG(Error, "Too much data for object {} replication ({} bytes provided while limit is {}).", item.ToString(), size, MAX_uint16);
-        return;
-    }
-
-#if USE_NETWORK_REPLICATOR_CACHE
-    // Process replication cache to skip sending object data if it didn't change
-    if (item.RepCache.Data.Length() == size && Platform::MemoryCompare(item.RepCache.Data.Get(), stream->GetBuffer(), size) == 0)
-    {
-        // Check if only newly joined clients are missing this data to avoid resending it to everyone
-        NetworkClientsMask missingClients = targetClients & ~item.RepCache.Mask;
-
-        // If data is the same and only the client set changed, replicate to missing clients only
-        if (!missingClients)
-            return;
-        targetClients = missingClients;
-    }
-    item.RepCache.Mask = fullTargetClients;
-    item.RepCache.Data.Copy(stream->GetBuffer(), size);
-#endif
-    // TODO: use Unreliable for dynamic objects that are replicated every frame? (eg. player state)
-    constexpr NetworkChannelType repChannel = NetworkChannelType::Reliable;
-
-    // Skip serialization of objects that none will receive
-    if (!isClient)
-    {
-        BuildCachedTargets(item, targetClients);
-        if (CachedTargets.Count() == 0)
-            return;
-    }
-
-    // Send object to clients
-    NetworkMessageObjectReplicate msgData;
-    msgData.OwnerFrame = NetworkManager::Frame;
-    Guid objectId = item.ObjectId, parentId = item.ParentId;
-    {
-        // Remap local client object ids into server ids
-        IdsRemappingTable.KeyOf(objectId, &objectId);
-        IdsRemappingTable.KeyOf(parentId, &parentId);
-    }
-    NetworkPeer* peer = NetworkManager::Peer;
-    NetworkMessage msg = peer->BeginSendMessage();
-    msg.WriteStructure(msgData);
-    msg.WriteNetworkId(objectId);
-    msg.WriteNetworkId(parentId);
-    msg.WriteNetworkName(obj->GetType().Fullname);
-    const NetworkRpcName name(obj->GetTypeHandle(), StringAnsiView::Empty);
-    SendInParts(peer, repChannel, stream->GetBuffer(), size, msg, name, isClient, objectId, msgData.OwnerFrame, NetworkMessageIDs::ObjectReplicatePart);
-}
-
-void SendRpc(RpcSendItem& e)
-{
-    ScriptingObject* obj = e.Object.Get();
-    if (!obj)
-        return;
-    auto it = Objects.Find(obj->GetID());
-    if (it == Objects.End())
-    {
-#if !BUILD_RELEASE
-        if (!DespawnedObjects.Contains(obj->GetID()))
-            LOG(Error, "Cannot invoke RPC method '{0}.{1}' on object '{2}' that is not registered in networking (use 'NetworkReplicator.AddObject').", e.Name.First.ToString(), e.Name.Second.ToString(), obj->GetID());
-#endif
-        return;
-    }
-    auto& item = it->Item;
-    if (e.ArgsData.Length() > MAX_uint16)
-    {
-        LOG(Error, "Too much data for object RPC method '{}.{}' on object '{}' ({} bytes provided while limit is {}).", e.Name.First.ToString(), e.Name.Second.ToString(), obj->GetID(), e.ArgsData.Length(), MAX_uint16);
-        return;
-    }
-    const NetworkManagerMode mode = NetworkManager::Mode;
-    NetworkPeer* peer = NetworkManager::Peer;
-
-    bool toServer;
-    if (e.Info.Server && mode == NetworkManagerMode::Client)
-    {
-        // Client -> Server
-#if USE_NETWORK_REPLICATOR_LOG
-        if (e.Targets.Length() != 0)
-            NETWORK_REPLICATOR_LOG(Error, "[NetworkReplicator] Server RPC '{}.{}' called with non-empty list of targets is not supported (only server will receive it)", e.Name.First.ToString(), e.Name.Second.ToString());
-#endif
-        toServer = true;
-    }
-    else if (e.Info.Client && (mode == NetworkManagerMode::Server || mode == NetworkManagerMode::Host))
-    {
-        // Server -> Client(s)
-        BuildCachedTargets(NetworkManager::Clients, item.TargetClientIds, e.Targets, NetworkManager::LocalClientId);
-        if (CachedTargets.IsEmpty())
-            return;
-        toServer = false;
-    }
-    else
-        return;
-
-    // Send RPC message
-    //NETWORK_REPLICATOR_LOG(Info, "[NetworkReplicator] Rpc {}.{} object ID={}", e.Name.First.ToString(), e.Name.Second.ToString(), item.ToString());
-    NetworkMessageObjectRpc msgData;
-    msgData.OwnerFrame = ++RpcId;
-    Guid objectId = item.ObjectId;
-    Guid parentId = item.ParentId;
-    {
-        // Remap local client object ids into server ids
-        IdsRemappingTable.KeyOf(objectId, &objectId);
-        IdsRemappingTable.KeyOf(parentId, &parentId);
-    }
-    NetworkMessage msg = peer->BeginSendMessage();
-    msg.WriteStructure(msgData);
-    msg.WriteNetworkId(objectId);
-    msg.WriteNetworkId(parentId);
-    msg.WriteNetworkName(obj->GetType().Fullname);
-    msg.WriteNetworkName(e.Name.First.GetType().Fullname);
-    msg.WriteNetworkName(e.Name.Second);
-    NetworkChannelType channel = (NetworkChannelType)e.Info.Channel;
-    SendInParts(peer, channel, e.ArgsData.Get(), e.ArgsData.Length(), msg, e.Name, toServer, objectId, msgData.OwnerFrame, NetworkMessageIDs::ObjectRpcPart);
-}
-
 void DeleteNetworkObject(ScriptingObject* obj)
 {
     // Remove from the mapping table
@@ -949,43 +708,38 @@ FORCE_INLINE void DirtyObjectImpl(NetworkReplicatedObject& item, ScriptingObject
         Hierarchy->DirtyObject(obj);
 }
 
-PartsItem* AddPartsItem(Array<PartsItem>& items, NetworkEvent& event, uint32 ownerFrame, uint16 partsCount, uint16 dataSize, const Guid& objectId, uint16 partStart, uint16 partSize, uint32 senderClientId)
+ReplicateItem* AddObjectReplicateItem(NetworkEvent& event, uint32 ownerFrame, uint16 partsCount, uint16 dataSize, const Guid& objectId, uint16 partStart, uint16 partSize, uint32 senderClientId)
 {
     // Reuse or add part item
-    PartsItem* item = nullptr;
-    for (auto& e : items)
+    ReplicateItem* replicateItem = nullptr;
+    for (auto& e : ReplicationParts)
     {
         if (e.OwnerFrame == ownerFrame && e.Data.Count() == dataSize && e.ObjectId == objectId)
         {
             // Reuse
-            item = &e;
+            replicateItem = &e;
             break;
         }
     }
-    if (!item)
+    if (!replicateItem)
     {
         // Add
-        item = &items.AddOne();
-        item->ObjectId = objectId;
-        item->PartsLeft = partsCount;
-        item->OwnerFrame = ownerFrame;
-        item->OwnerClientId = senderClientId;
-        item->Data.Resize(dataSize);
+        replicateItem = &ReplicationParts.AddOne();
+        replicateItem->ObjectId = objectId;
+        replicateItem->PartsLeft = partsCount;
+        replicateItem->OwnerFrame = ownerFrame;
+        replicateItem->OwnerClientId = senderClientId;
+        replicateItem->Data.Resize(dataSize);
     }
 
     // Copy part data
-    ASSERT(item->PartsLeft > 0);
-    item->PartsLeft--;
-    ASSERT(partStart + partSize <= item->Data.Count());
+    ASSERT(replicateItem->PartsLeft > 0);
+    replicateItem->PartsLeft--;
+    ASSERT(partStart + partSize <= replicateItem->Data.Count());
     const void* partData = event.Message.SkipBytes(partSize);
-    Platform::MemoryCopy(item->Data.Get() + partStart, partData, partSize);
+    Platform::MemoryCopy(replicateItem->Data.Get() + partStart, partData, partSize);
 
-    return item;
-}
-
-FORCE_INLINE PartsItem* AddObjectReplicateItem(NetworkEvent& event, uint32 ownerFrame, uint16 partsCount, uint16 dataSize, const Guid& objectId, uint16 partStart, uint16 partSize, uint32 senderClientId)
-{
-    return AddPartsItem(ReplicationParts, event, ownerFrame, partsCount, dataSize, objectId, partStart, partSize, senderClientId);
+    return replicateItem;
 }
 
 void InvokeObjectReplication(NetworkReplicatedObject& item, uint32 ownerFrame, byte* data, uint32 dataSize, uint32 senderClientId)
@@ -1033,24 +787,6 @@ void InvokeObjectReplication(NetworkReplicatedObject& item, uint32 ownerFrame, b
         DirtyObjectImpl(item, obj);
 }
 
-FORCE_INLINE PartsItem* AddObjectRpcItem(NetworkEvent& event, uint32 ownerFrame, uint16 partsCount, uint16 dataSize, const Guid& objectId, uint16 partStart, uint16 partSize, uint32 senderClientId)
-{
-    return AddPartsItem(RpcParts, event, ownerFrame, partsCount, dataSize, objectId, partStart, partSize, senderClientId);
-}
-
-void InvokeObjectRpc(const NetworkRpcInfo* info, byte* data, uint32 dataSize, uint32 senderClientId, ScriptingObject* obj)
-{
-    // Setup message reading stream
-    if (CachedReadStream == nullptr)
-        CachedReadStream = New<NetworkStream>();
-    NetworkStream* stream = CachedReadStream;
-    stream->SenderId = senderClientId;
-    stream->Initialize(data, dataSize);
-
-    // Execute RPC
-    info->Execute(obj, stream, info->Tag);
-}
-
 void InvokeObjectSpawn(const NetworkMessageObjectSpawn& msgData, const Guid& prefabId, const NetworkMessageObjectSpawnItem* msgDataItems)
 {
     ScopeLock lock(ObjectsLock);
@@ -1544,21 +1280,7 @@ void NetworkReplicator::DespawnObject(ScriptingObject* obj)
     // Register for despawning (batched during update)
     auto& despawn = DespawnQueue.AddOne();
     despawn.Id = obj->GetID();
-    if (item.TargetClientIds.IsValid())
-    {
-        despawn.Targets = item.TargetClientIds;
-    }
-    else
-    {
-        // Snapshot current recipients to avoid sending despawn to clients that connect later (and never got the spawn)
-        Array<uint32, InlinedAllocation<8>> clientIds;
-        for (const NetworkClient* client : NetworkManager::Clients)
-        {
-            if (client->State == NetworkConnectionState::Connected && client->ClientId != item.OwnerClientId)
-                clientIds.Add(client->ClientId);
-        }
-        despawn.Targets.Copy(clientIds);
-    }
+    despawn.Targets = item.TargetClientIds;
 
     // Prevent spawning
     for (int32 i = 0; i < SpawnQueue.Count(); i++)
@@ -1851,31 +1573,6 @@ void NetworkInternal::NetworkReplicatorClientConnected(NetworkClient* client)
 {
     ScopeLock lock(ObjectsLock);
     NewClients.Add(client);
-
-    // Ensure cached replication acknowledges the new client without resending to others.
-    // Clear the new client's bit in RepCache and schedule a near-term replication.
-    const int32 clientIndex = NetworkManager::Clients.Find(client);
-    if (clientIndex != -1)
-    {
-        const uint64 bitMask = 1ull << (uint64)(clientIndex % 64);
-        const int32 wordIndex = clientIndex / 64;
-        for (auto it = Objects.Begin(); it.IsNotEnd(); ++it)
-        {
-            auto& item = it->Item;
-            ScriptingObject* obj = item.Object.Get();
-            if (!obj || !item.Spawned || item.Role != NetworkObjectRole::OwnedAuthoritative)
-                continue;
-
-            // Mark this client as missing cached data
-            uint64* word = wordIndex == 0 ? &item.RepCache.Mask.Word0 : &item.RepCache.Mask.Word1;
-            *word &= ~bitMask;
-
-            // Force next replication tick for this object so the new client gets data promptly
-            if (Hierarchy)
-                Hierarchy->DirtyObject(obj);
-        }
-    }
-
     ASSERT(sizeof(NetworkClientsMask) * 8 >= (uint32)NetworkManager::Clients.Count()); // Ensure that clients mask can hold all of clients
 }
 
@@ -1955,6 +1652,9 @@ void NetworkInternal::NetworkReplicatorUpdate()
     if (Objects.Count() == 0)
         return;
     const bool isClient = NetworkManager::IsClient();
+    const bool isServer = NetworkManager::IsServer();
+    const bool isHost = NetworkManager::IsHost();
+    NetworkPeer* peer = NetworkManager::Peer;
 
     if (!isClient && NewClients.Count() != 0)
     {
@@ -1994,7 +1694,22 @@ void NetworkInternal::NetworkReplicatorUpdate()
         PROFILE_CPU_NAMED("DespawnQueue");
         for (DespawnItem& e : DespawnQueue)
         {
-            SendDespawn(e);
+            // Send despawn message
+            NETWORK_REPLICATOR_LOG(Info, "[NetworkReplicator] Despawn object ID={}", e.Id.ToString());
+            NetworkMessageObjectDespawn msgData;
+            Guid objectId = e.Id;
+            {
+                // Remap local client object ids into server ids
+                IdsRemappingTable.KeyOf(objectId, &objectId);
+            }
+            NetworkMessage msg = peer->BeginSendMessage();
+            msg.WriteStructure(msgData);
+            msg.WriteNetworkId(objectId);
+            BuildCachedTargets(NetworkManager::Clients, e.Targets);
+            if (isClient)
+                peer->EndSendMessage(NetworkChannelType::ReliableOrdered, msg);
+            else
+                peer->EndSendMessage(NetworkChannelType::ReliableOrdered, msg, CachedTargets);
         }
         DespawnQueue.Clear();
     }
@@ -2115,7 +1830,6 @@ void NetworkInternal::NetworkReplicatorUpdate()
         }
     }
 
-    // TODO: remove items from RpcParts after some TTL to reduce memory usage
     // TODO: remove items from SpawnParts after some TTL to reduce memory usage
 
     // Replicate all owned networked objects with other clients or server
@@ -2157,11 +1871,136 @@ void NetworkInternal::NetworkReplicatorUpdate()
         PROFILE_CPU_NAMED("Replication");
         if (CachedWriteStream == nullptr)
             CachedWriteStream = New<NetworkStream>();
-        CachedWriteStream->SenderId = NetworkManager::LocalClientId;
+        NetworkStream* stream = CachedWriteStream;
+        stream->SenderId = NetworkManager::LocalClientId;
         // TODO: use Job System when replicated objects count is large
         for (auto& e : CachedReplicationResult->_entries)
         {
-            SendReplication(e.Object, e.TargetClients);
+            ScriptingObject* obj = e.Object;
+            auto it = Objects.Find(obj->GetID());
+            if (it.IsEnd())
+                continue;
+            auto& item = it->Item;
+
+            // Skip serialization of objects that none will receive
+            if (!isClient)
+            {
+                BuildCachedTargets(item, e.TargetClients);
+                if (CachedTargets.Count() == 0)
+                    continue;
+            }
+
+            if (item.AsNetworkObject)
+                item.AsNetworkObject->OnNetworkSerialize();
+
+            // Serialize object
+            stream->Initialize();
+            const bool failed = NetworkReplicator::InvokeSerializer(obj->GetTypeHandle(), obj, stream, true);
+            if (failed)
+            {
+                //NETWORK_REPLICATOR_LOG(Error, "[NetworkReplicator] Cannot serialize object {} of type {} (missing serialization logic)", item.ToString(), obj->GetType().ToString());
+                continue;
+            }
+            const uint32 size = stream->GetPosition();
+            if (size > MAX_uint16)
+            {
+                LOG(Error, "Too much data for object {} replication ({} bytes provided while limit is {}).", item.ToString(), size, MAX_uint16);
+                continue;
+            }
+
+#if USE_NETWORK_REPLICATOR_CACHE
+            // Process replication cache to skip sending object data if it didn't change
+            if (item.RepCache.Data.Length() == size &&
+                item.RepCache.Mask == e.TargetClients &&
+                Platform::MemoryCompare(item.RepCache.Data.Get(), stream->GetBuffer(), size) == 0)
+            {
+                continue;
+            }
+            item.RepCache.Mask = e.TargetClients;
+            item.RepCache.Data.Copy(stream->GetBuffer(), size);
+#endif
+            // TODO: use Unreliable for dynamic objects that are replicated every frame? (eg. player state)
+            constexpr NetworkChannelType repChannel = NetworkChannelType::Reliable;
+
+            // Send object to clients
+            NetworkMessageObjectReplicate msgData;
+            msgData.OwnerFrame = NetworkManager::Frame;
+            Guid objectId = item.ObjectId, parentId = item.ParentId;
+            {
+                // Remap local client object ids into server ids
+                IdsRemappingTable.KeyOf(objectId, &objectId);
+                IdsRemappingTable.KeyOf(parentId, &parentId);
+            }
+            NetworkMessage msg = peer->BeginSendMessage();
+            msg.WriteStructure(msgData);
+            msg.WriteNetworkId(objectId);
+            msg.WriteNetworkId(parentId);
+            msg.WriteNetworkName(obj->GetType().Fullname);
+            NetworkMessageObjectReplicatePayload msgDataPayload;
+            msgDataPayload.DataSize = size;
+            const uint32 networkKeyIdWorstCaseSize = sizeof(uint32) + sizeof(Guid);
+            const uint32 msgMaxData = peer->Config.MessageSize - msg.Position - sizeof(NetworkMessageObjectReplicatePayload);
+            const uint32 partMaxData = peer->Config.MessageSize - sizeof(NetworkMessageObjectReplicatePart) - networkKeyIdWorstCaseSize;
+            uint32 partsCount = 1;
+            uint32 dataStart = 0;
+            uint32 msgDataSize = size;
+            if (size > msgMaxData)
+            {
+                // Send msgMaxData within first message
+                msgDataSize = msgMaxData;
+                dataStart += msgMaxData;
+
+                // Send rest of the data in separate parts
+                partsCount += Math::DivideAndRoundUp(size - dataStart, partMaxData);
+            }
+            else
+                dataStart += size;
+            ASSERT(partsCount <= MAX_uint8);
+            msgDataPayload.PartsCount = partsCount;
+            msgDataPayload.PartSize = msgDataSize;
+            msg.WriteStructure(msgDataPayload);
+            msg.WriteBytes(stream->GetBuffer(), msgDataSize);
+            uint32 dataSize = msgDataSize, messageSize = msg.Length;
+            if (isClient)
+                peer->EndSendMessage(repChannel, msg);
+            else
+                peer->EndSendMessage(repChannel, msg, CachedTargets);
+
+            // Send all other parts
+            for (uint32 partIndex = 1; partIndex < partsCount; partIndex++)
+            {
+                NetworkMessageObjectReplicatePart msgDataPart;
+                msgDataPart.OwnerFrame = msgData.OwnerFrame;
+                msgDataPart.DataSize = msgDataPayload.DataSize;
+                msgDataPart.PartsCount = msgDataPayload.PartsCount;
+                msgDataPart.PartStart = dataStart;
+                msgDataPart.PartSize = Math::Min(size - dataStart, partMaxData);
+                msg = peer->BeginSendMessage();
+                msg.WriteStructure(msgDataPart);
+                msg.WriteNetworkId(objectId);
+                msg.WriteBytes(stream->GetBuffer() + msgDataPart.PartStart, msgDataPart.PartSize);
+                messageSize += msg.Length;
+                dataSize += msgDataPart.PartSize;
+                dataStart += msgDataPart.PartSize;
+                if (isClient)
+                    peer->EndSendMessage(repChannel, msg);
+                else
+                    peer->EndSendMessage(repChannel, msg, CachedTargets);
+            }
+            ASSERT_LOW_LAYER(dataStart == size);
+
+#if COMPILE_WITH_PROFILER
+            // Network stats recording
+            if (EnableProfiling)
+            {
+                const Pair<ScriptingTypeHandle, StringAnsiView> name(obj->GetTypeHandle(), StringAnsiView::Empty);
+                auto& profileEvent = ProfilerEvents[name];
+                profileEvent.Count++;
+                profileEvent.DataSize += dataSize;
+                profileEvent.MessageSize += messageSize;
+                profileEvent.Receivers += isClient ? 1 : CachedTargets.Count();
+            }
+#endif
         }
     }
 
@@ -2170,7 +2009,70 @@ void NetworkInternal::NetworkReplicatorUpdate()
         PROFILE_CPU_NAMED("Rpc");
         for (auto& e : RpcQueue)
         {
-            SendRpc(e);
+            ScriptingObject* obj = e.Object.Get();
+            if (!obj)
+                continue;
+            auto it = Objects.Find(obj->GetID());
+            if (it == Objects.End())
+            {
+#if USE_EDITOR || !BUILD_RELEASE
+                if (!DespawnedObjects.Contains(obj->GetID()))
+                    LOG(Error, "Cannot invoke RPC method '{0}.{1}' on object '{2}' that is not registered in networking (use 'NetworkReplicator.AddObject').", e.Name.First.ToString(), String(e.Name.Second), obj->GetID());
+#endif
+                continue;
+            }
+            auto& item = it->Item;
+
+            // Send RPC message
+            //NETWORK_REPLICATOR_LOG(Info, "[NetworkReplicator] Rpc {}::{} object ID={}", e.Name.First.ToString(), String(e.Name.Second), item.ToString());
+            NetworkMessageObjectRpc msgData;
+            Guid msgObjectId = item.ObjectId;
+            Guid msgParentId = item.ParentId;
+            {
+                // Remap local client object ids into server ids
+                IdsRemappingTable.KeyOf(msgObjectId, &msgObjectId);
+                IdsRemappingTable.KeyOf(msgParentId, &msgParentId);
+            }
+            msgData.ArgsSize = (uint16)e.ArgsData.Length();
+            NetworkMessage msg = peer->BeginSendMessage();
+            msg.WriteStructure(msgData);
+            msg.WriteNetworkId(msgObjectId);
+            msg.WriteNetworkId(msgParentId);
+            msg.WriteNetworkName(obj->GetType().Fullname);
+            msg.WriteNetworkName(e.Name.First.GetType().Fullname);
+            msg.WriteNetworkName(e.Name.Second);
+            msg.WriteBytes(e.ArgsData.Get(), e.ArgsData.Length());
+            uint32 dataSize = e.ArgsData.Length(), messageSize = msg.Length, receivers = 0;
+            NetworkChannelType channel = (NetworkChannelType)e.Info.Channel;
+            if (e.Info.Server && isClient)
+            {
+                // Client -> Server
+#if USE_NETWORK_REPLICATOR_LOG
+                if (e.Targets.Length() != 0)
+                    NETWORK_REPLICATOR_LOG(Error, "[NetworkReplicator] Server RPC '{}::{}' called with non-empty list of targets is not supported (only server will receive it)", e.Name.First.ToString(), e.Name.Second.ToString());
+#endif
+                peer->EndSendMessage(channel, msg);
+                receivers = 1;
+            }
+            else if (e.Info.Client && (isServer || isHost))
+            {
+                // Server -> Client(s)
+                BuildCachedTargets(NetworkManager::Clients, item.TargetClientIds, e.Targets, NetworkManager::LocalClientId);
+                peer->EndSendMessage(channel, msg, CachedTargets);
+                receivers = CachedTargets.Count();
+            }
+
+#if COMPILE_WITH_PROFILER
+            // Network stats recording
+            if (EnableProfiling && receivers)
+            {
+                auto& profileEvent = ProfilerEvents[e.Name];
+                profileEvent.Count++;
+                profileEvent.DataSize += dataSize;
+                profileEvent.MessageSize += messageSize;
+                profileEvent.Receivers += receivers;
+            }
+#endif
         }
         RpcQueue.Clear();
     }
@@ -2183,7 +2085,7 @@ void NetworkInternal::OnNetworkMessageObjectReplicate(NetworkEvent& event, Netwo
 {
     PROFILE_CPU();
     NetworkMessageObjectReplicate msgData;
-    NetworkMessageObjectPartPayload msgDataPayload;
+    NetworkMessageObjectReplicatePayload msgDataPayload;
     Guid objectId, parentId;
     StringAnsiView objectTypeName;
     event.Message.ReadStructure(msgData);
@@ -2193,7 +2095,7 @@ void NetworkInternal::OnNetworkMessageObjectReplicate(NetworkEvent& event, Netwo
     event.Message.ReadStructure(msgDataPayload);
     ScopeLock lock(ObjectsLock);
     if (DespawnedObjects.Contains(objectId))
-        return; // Skip replicating non-existing objects
+        return; // Skip replicating not-existing objects
     NetworkReplicatedObject* e = ResolveObject(objectId, parentId, objectTypeName);
     if (!e)
         return;
@@ -2212,7 +2114,7 @@ void NetworkInternal::OnNetworkMessageObjectReplicate(NetworkEvent& event, Netwo
     else
     {
         // Add to replication from multiple parts
-        PartsItem* replicateItem = AddObjectReplicateItem(event, msgData.OwnerFrame, msgDataPayload.PartsCount, msgDataPayload.DataSize, objectId, 0, msgDataPayload.PartSize, senderClientId);
+        ReplicateItem* replicateItem = AddObjectReplicateItem(event, msgData.OwnerFrame, msgDataPayload.PartsCount, msgDataPayload.DataSize, objectId, 0, msgDataPayload.PartSize, senderClientId);
         replicateItem->Object = e->Object;
     }
 }
@@ -2220,13 +2122,13 @@ void NetworkInternal::OnNetworkMessageObjectReplicate(NetworkEvent& event, Netwo
 void NetworkInternal::OnNetworkMessageObjectReplicatePart(NetworkEvent& event, NetworkClient* client, NetworkPeer* peer)
 {
     PROFILE_CPU();
-    NetworkMessageObjectPart msgData;
+    NetworkMessageObjectReplicatePart msgData;
     Guid objectId;
     event.Message.ReadStructure(msgData);
     event.Message.ReadNetworkId(objectId);
     ScopeLock lock(ObjectsLock);
     if (DespawnedObjects.Contains(objectId))
-        return; // Skip replicating non-existing objects
+        return; // Skip replicating not-existing objects
 
     const uint32 senderClientId = client ? client->ClientId : NetworkManager::ServerClientId;
     AddObjectReplicateItem(event, msgData.OwnerFrame, msgData.PartsCount, msgData.DataSize, objectId, msgData.PartStart, msgData.PartSize, senderClientId);
@@ -2328,9 +2230,7 @@ void NetworkInternal::OnNetworkMessageObjectDespawn(NetworkEvent& event, Network
     }
     else
     {
-        // If this client never had the object (eg. it was targeted to other clients only), drop the message quietly
-        DespawnedObjects.Add(objectId);
-        NETWORK_REPLICATOR_LOG(Warning, "[NetworkReplicator] Failed to despawn object {}", objectId);
+        NETWORK_REPLICATOR_LOG(Error, "[NetworkReplicator] Failed to despawn object {}", objectId);
     }
 }
 
@@ -2388,16 +2288,14 @@ void NetworkInternal::OnNetworkMessageObjectRpc(NetworkEvent& event, NetworkClie
 {
     PROFILE_CPU();
     NetworkMessageObjectRpc msgData;
-    NetworkMessageObjectPartPayload msgDataPayload;
-    Guid objectId, parentId;
+    Guid msgObjectId, msgParentId;
     StringAnsiView objectTypeName, rpcTypeName, rpcName;
     event.Message.ReadStructure(msgData);
-    event.Message.ReadNetworkId(objectId);
-    event.Message.ReadNetworkId(parentId);
+    event.Message.ReadNetworkId(msgObjectId);
+    event.Message.ReadNetworkId(msgParentId);
     event.Message.ReadNetworkName(objectTypeName);
     event.Message.ReadNetworkName(rpcTypeName);
     event.Message.ReadNetworkName(rpcName);
-    event.Message.ReadStructure(msgDataPayload);
     ScopeLock lock(ObjectsLock);
 
     // Find RPC info
@@ -2407,11 +2305,11 @@ void NetworkInternal::OnNetworkMessageObjectRpc(NetworkEvent& event, NetworkClie
     const NetworkRpcInfo* info = NetworkRpcInfo::RPCsTable.TryGet(name);
     if (!info)
     {
-        NETWORK_REPLICATOR_LOG(Error, "[NetworkReplicator] Unknown RPC {}::{} for object {}", String(rpcTypeName), String(rpcName), objectId);
+        NETWORK_REPLICATOR_LOG(Error, "[NetworkReplicator] Unknown RPC {}::{} for object {}", String(rpcTypeName), String(rpcName), msgObjectId);
         return;
     }
 
-    NetworkReplicatedObject* e = ResolveObject(objectId, parentId, objectTypeName);
+    NetworkReplicatedObject* e = ResolveObject(msgObjectId, msgParentId, objectTypeName);
     if (e)
     {
         auto& item = *e;
@@ -2431,50 +2329,18 @@ void NetworkInternal::OnNetworkMessageObjectRpc(NetworkEvent& event, NetworkClie
             return;
         }
 
-        const uint32 senderClientId = client ? client->ClientId : NetworkManager::ServerClientId;
-        if (msgDataPayload.PartsCount == 1)
-        {
-            // Call RPC
-            InvokeObjectRpc(info, event.Message.Buffer + event.Message.Position, msgDataPayload.DataSize, senderClientId, obj);
-        }
-        else
-        {
-            // Add to RPC from multiple parts
-            PartsItem* rpcItem = AddObjectRpcItem(event, msgData.OwnerFrame, msgDataPayload.PartsCount, msgDataPayload.DataSize, objectId, 0, msgDataPayload.PartSize, senderClientId);
-            rpcItem->Object = e->Object;
-            rpcItem->Tag = info;
-        }
+        // Setup message reading stream
+        if (CachedReadStream == nullptr)
+            CachedReadStream = New<NetworkStream>();
+        NetworkStream* stream = CachedReadStream;
+        stream->SenderId = client ? client->ClientId : NetworkManager::ServerClientId;
+        stream->Initialize(event.Message.Buffer + event.Message.Position, msgData.ArgsSize);
+
+        // Execute RPC
+        info->Execute(obj, stream, info->Tag);
     }
     else if (info->Channel != static_cast<uint8>(NetworkChannelType::Unreliable) && info->Channel != static_cast<uint8>(NetworkChannelType::UnreliableOrdered))
     {
-        NETWORK_REPLICATOR_LOG(Error, "[NetworkReplicator] Unknown object {} RPC {}::{}", objectId, String(rpcTypeName), String(rpcName));
-    }
-}
-
-void NetworkInternal::OnNetworkMessageObjectRpcPart(NetworkEvent& event, NetworkClient* client, NetworkPeer* peer)
-{
-    PROFILE_CPU();
-    NetworkMessageObjectPart msgData;
-    Guid objectId;
-    event.Message.ReadStructure(msgData);
-    event.Message.ReadNetworkId(objectId);
-    ScopeLock lock(ObjectsLock);
-    if (DespawnedObjects.Contains(objectId))
-        return; // Skip replicating non-existing objects
-
-    const uint32 senderClientId = client ? client->ClientId : NetworkManager::ServerClientId;
-    PartsItem* rpcItem = AddObjectRpcItem(event, msgData.OwnerFrame, msgData.PartsCount, msgData.DataSize, objectId, msgData.PartStart, msgData.PartSize, senderClientId);
-    if (rpcItem && rpcItem->PartsLeft == 0)
-    {
-        // Got all parts so invoke RPC
-        ScriptingObject* obj = rpcItem->Object.Get();
-        if (obj)
-        {
-            InvokeObjectRpc((const NetworkRpcInfo*)rpcItem->Tag, rpcItem->Data.Get(), rpcItem->Data.Count(), rpcItem->OwnerClientId, obj);
-        }
-
-        // Remove item
-        int32 partIndex = (int32)((RpcParts.Get() - rpcItem) / sizeof(rpcItem));
-        RpcParts.RemoveAt(partIndex);
+        NETWORK_REPLICATOR_LOG(Error, "[NetworkReplicator] Unknown object {} RPC {}::{}", msgObjectId, String(rpcTypeName), String(rpcName));
     }
 }

Source/Engine/Particles/Graph/CPU/ParticleEmitterGraph.CPU.Particles.cpp

@@ -482,15 +482,9 @@ void ParticleEmitterGraphCPUExecutor::ProcessGroupFunction(Box* box, Node* node,
     // Function Input
     case 1:
     {
-        // Skip when graph is too small (eg. preview) and fallback with default value from the function graph
-        if (context.GraphStack.Count() < 2)
-        {
-            value = tryGetValue(node->TryGetBox(1), Value::Zero);
-            break;
-        }
-
         // Find the function call
         Node* functionCallNode = nullptr;
+        ASSERT(context.GraphStack.Count() >= 2);
         ParticleEmitterGraphCPU* graph;
         for (int32 i = context.CallStackSize - 1; i >= 0; i--)
         {

Source/Engine/Particles/Graph/GPU/ParticleEmitterGraph.GPU.Particles.cpp

@@ -425,8 +425,8 @@ void ParticleEmitterGPUGenerator::ProcessGroupParticles(Box* box, Node* node, Va
     case 300:
     {
         // Load function asset
-        const auto function = Assets.Load<ParticleEmitterFunction>((Guid)node->Values[0]);
-        if (!function)
+        const auto function = Assets.LoadAsync<ParticleEmitterFunction>((Guid)node->Values[0]);
+        if (!function || function->WaitForLoaded())
         {
             OnError(node, box, TEXT("Missing or invalid function."));
             value = Value::Zero;
@@ -439,7 +439,7 @@ void ParticleEmitterGPUGenerator::ProcessGroupParticles(Box* box, Node* node, Va
         {
             if (_callStack[i]->Type == GRAPH_NODE_MAKE_TYPE(14, 300))
             {
-                const auto callFunc = Assets.Load<ParticleEmitterFunction>((Guid)_callStack[i]->Values[0]);
+                const auto callFunc = Assets.LoadAsync<ParticleEmitterFunction>((Guid)_callStack[i]->Values[0]);
                 if (callFunc == function)
                 {
                     OnError(node, box, String::Format(TEXT("Recursive call to function '{0}'!"), function->ToString()));
@@ -514,7 +514,7 @@ void ParticleEmitterGPUGenerator::ProcessGroupFunction(Box* box, Node* node, Val
             value = Value::Zero;
             break;
         }
-        const auto function = Assets.Load<ParticleEmitterFunction>((Guid)functionCallNode->Values[0]);
+        const auto function = Assets.LoadAsync<ParticleEmitterFunction>((Guid)functionCallNode->Values[0]);
         if (!_functions.TryGet(functionCallNode, graph) || !function)
         {
             OnError(node, box, TEXT("Missing calling function graph."));

Source/Engine/Particles/ParticlesSimulation.cpp

@@ -156,7 +156,7 @@ void ParticleSystemInstance::Sync(ParticleSystem* system)
         if (GPUParticlesCountReadback)
             GPUParticlesCountReadback->ReleaseGPU();
     }
-    CHECK(Emitters.Count() == system->Emitters.Count());
+    ASSERT(Emitters.Count() == system->Emitters.Count());
 }
 
 bool ParticleSystemInstance::ContainsEmitter(ParticleEmitter* emitter) const