Merge branch 'master' into 1.5

# Conflicts: # Content/Shaders/GI/DDGI.flax # Content/Shaders/GI/GlobalSurfaceAtlas.flax # Content/Shaders/TAA.flax # Content/Shaders/VolumetricFog.flax # Source/Editor/CustomEditors/Editors/ActorTagEditor.cs # Source/Engine/Core/Config/GraphicsSettings.cpp # Source/Engine/Engine/PostProcessEffect.cs # Source/Engine/Graphics/GPUResourcesCollection.cpp # Source/Engine/Graphics/GPUResourcesCollection.h # Source/Engine/Graphics/PostProcessBase.h # Source/FlaxEngine.Gen.cs
2023-01-10 15:37:55 +01:00
parent e7f40a4c0e 9626e9bbb6
commit a7e428a21c
2624 changed files with 2659 additions and 2659 deletions
--- a/Source/Engine/Tools/AudioTool/AudioDecoder.h
+++ b/Source/Engine/Tools/AudioTool/AudioDecoder.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2022 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.

 #pragma once

--- a/Source/Engine/Tools/AudioTool/AudioEncoder.h
+++ b/Source/Engine/Tools/AudioTool/AudioEncoder.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2022 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.

 #pragma once

--- a/Source/Engine/Tools/AudioTool/AudioTool.Build.cs
+++ b/Source/Engine/Tools/AudioTool/AudioTool.Build.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2022 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.

 using System.Collections.Generic;
 using Flax.Build;
--- a/Source/Engine/Tools/AudioTool/AudioTool.cpp
+++ b/Source/Engine/Tools/AudioTool/AudioTool.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2022 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.

 #include "AudioTool.h"
 #include "Engine/Core/Core.h"
--- a/Source/Engine/Tools/AudioTool/AudioTool.h
+++ b/Source/Engine/Tools/AudioTool/AudioTool.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2022 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.

 #pragma once

--- a/Source/Engine/Tools/AudioTool/MP3Decoder.cpp
+++ b/Source/Engine/Tools/AudioTool/MP3Decoder.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2022 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.

 #include "MP3Decoder.h"
 #include "Engine/Core/Log.h"
--- a/Source/Engine/Tools/AudioTool/MP3Decoder.h
+++ b/Source/Engine/Tools/AudioTool/MP3Decoder.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2022 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.

 #pragma once

--- a/Source/Engine/Tools/AudioTool/OggVorbisDecoder.cpp
+++ b/Source/Engine/Tools/AudioTool/OggVorbisDecoder.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2022 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.

 #if COMPILE_WITH_OGG_VORBIS

--- a/Source/Engine/Tools/AudioTool/OggVorbisDecoder.h
+++ b/Source/Engine/Tools/AudioTool/OggVorbisDecoder.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2022 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.

 #pragma once

--- a/Source/Engine/Tools/AudioTool/OggVorbisEncoder.cpp
+++ b/Source/Engine/Tools/AudioTool/OggVorbisEncoder.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2022 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.

 #if COMPILE_WITH_OGG_VORBIS

--- a/Source/Engine/Tools/AudioTool/OggVorbisEncoder.h
+++ b/Source/Engine/Tools/AudioTool/OggVorbisEncoder.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2022 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.

 #pragma once

--- a/Source/Engine/Tools/AudioTool/WaveDecoder.cpp
+++ b/Source/Engine/Tools/AudioTool/WaveDecoder.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2022 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.

 #include "WaveDecoder.h"
 #include "Engine/Core/Log.h"
--- a/Source/Engine/Tools/AudioTool/WaveDecoder.h
+++ b/Source/Engine/Tools/AudioTool/WaveDecoder.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2022 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.

 #pragma once

--- a/Source/Engine/Tools/MaterialGenerator/MaterialGenerator.Build.cs
+++ b/Source/Engine/Tools/MaterialGenerator/MaterialGenerator.Build.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2022 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.

 using System.Collections.Generic;
 using Flax.Build;
--- a/Source/Engine/Tools/MaterialGenerator/MaterialGenerator.Layer.cpp
+++ b/Source/Engine/Tools/MaterialGenerator/MaterialGenerator.Layer.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2022 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.

 #if COMPILE_WITH_MATERIAL_GRAPH

--- a/Source/Engine/Tools/MaterialGenerator/MaterialGenerator.Layers.cpp
+++ b/Source/Engine/Tools/MaterialGenerator/MaterialGenerator.Layers.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2022 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.

 #if COMPILE_WITH_MATERIAL_GRAPH

--- a/Source/Engine/Tools/MaterialGenerator/MaterialGenerator.Material.cpp
+++ b/Source/Engine/Tools/MaterialGenerator/MaterialGenerator.Material.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2022 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.

 #if COMPILE_WITH_MATERIAL_GRAPH

--- a/Source/Engine/Tools/MaterialGenerator/MaterialGenerator.Parameters.cpp
+++ b/Source/Engine/Tools/MaterialGenerator/MaterialGenerator.Parameters.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2022 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.

 #if COMPILE_WITH_MATERIAL_GRAPH

--- a/Source/Engine/Tools/MaterialGenerator/MaterialGenerator.Particles.cpp
+++ b/Source/Engine/Tools/MaterialGenerator/MaterialGenerator.Particles.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2022 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.

 #if COMPILE_WITH_MATERIAL_GRAPH

--- a/Source/Engine/Tools/MaterialGenerator/MaterialGenerator.Textures.cpp
+++ b/Source/Engine/Tools/MaterialGenerator/MaterialGenerator.Textures.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2022 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.

 #if COMPILE_WITH_MATERIAL_GRAPH

--- a/Source/Engine/Tools/MaterialGenerator/MaterialGenerator.Tools.cpp
+++ b/Source/Engine/Tools/MaterialGenerator/MaterialGenerator.Tools.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2022 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.

 #if COMPILE_WITH_MATERIAL_GRAPH

--- a/Source/Engine/Tools/MaterialGenerator/MaterialGenerator.cpp
+++ b/Source/Engine/Tools/MaterialGenerator/MaterialGenerator.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2022 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.

 #if COMPILE_WITH_MATERIAL_GRAPH

--- a/Source/Engine/Tools/MaterialGenerator/MaterialGenerator.h
+++ b/Source/Engine/Tools/MaterialGenerator/MaterialGenerator.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2022 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.

 #pragma once

--- a/Source/Engine/Tools/MaterialGenerator/MaterialLayer.cpp
+++ b/Source/Engine/Tools/MaterialGenerator/MaterialLayer.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2022 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.

 #if COMPILE_WITH_MATERIAL_GRAPH

--- a/Source/Engine/Tools/MaterialGenerator/MaterialLayer.h
+++ b/Source/Engine/Tools/MaterialGenerator/MaterialLayer.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2022 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.

 #pragma once

--- a/Source/Engine/Tools/MaterialGenerator/Types.h
+++ b/Source/Engine/Tools/MaterialGenerator/Types.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2022 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.

 #pragma once

--- a/Source/Engine/Tools/ModelTool/MeshAccelerationStructure.cpp
+++ b/Source/Engine/Tools/ModelTool/MeshAccelerationStructure.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2022 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.

 #if COMPILE_WITH_MODEL_TOOL

--- a/Source/Engine/Tools/ModelTool/MeshAccelerationStructure.h
+++ b/Source/Engine/Tools/ModelTool/MeshAccelerationStructure.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2022 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.

 #pragma once

--- a/Source/Engine/Tools/ModelTool/ModelTool.Assimp.cpp
+++ b/Source/Engine/Tools/ModelTool/ModelTool.Assimp.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2022 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.

 #if COMPILE_WITH_MODEL_TOOL && USE_ASSIMP

--- a/Source/Engine/Tools/ModelTool/ModelTool.AutodeskFbxSdk.cpp
+++ b/Source/Engine/Tools/ModelTool/ModelTool.AutodeskFbxSdk.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2022 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.

 #if COMPILE_WITH_MODEL_TOOL && USE_AUTODESK_FBX_SDK

--- a/Source/Engine/Tools/ModelTool/ModelTool.Build.cs
+++ b/Source/Engine/Tools/ModelTool/ModelTool.Build.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2022 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.

 using System.Collections.Generic;
 using System.IO;
--- a/Source/Engine/Tools/ModelTool/ModelTool.OpenFBX.cpp
+++ b/Source/Engine/Tools/ModelTool/ModelTool.OpenFBX.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2022 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.

 #if COMPILE_WITH_MODEL_TOOL && USE_OPEN_FBX

--- a/Source/Engine/Tools/ModelTool/ModelTool.Options.cpp
+++ b/Source/Engine/Tools/ModelTool/ModelTool.Options.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2022 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.

 #if COMPILE_WITH_MODEL_TOOL && USE_EDITOR

--- a/Source/Engine/Tools/ModelTool/ModelTool.cpp
+++ b/Source/Engine/Tools/ModelTool/ModelTool.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2022 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.

 #if COMPILE_WITH_MODEL_TOOL

--- a/Source/Engine/Tools/ModelTool/ModelTool.h
+++ b/Source/Engine/Tools/ModelTool/ModelTool.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2022 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.

 #pragma once

--- a/Source/Engine/Tools/ModelTool/VertexTriangleAdjacency.cpp
+++ b/Source/Engine/Tools/ModelTool/VertexTriangleAdjacency.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2022 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.

 #if COMPILE_WITH_MODEL_TOOL && USE_EDITOR

--- a/Source/Engine/Tools/ModelTool/VertexTriangleAdjacency.h
+++ b/Source/Engine/Tools/ModelTool/VertexTriangleAdjacency.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2022 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.

 #pragma once

--- a/Source/Engine/Tools/TextureTool/TextureTool.Build.cs
+++ b/Source/Engine/Tools/TextureTool/TextureTool.Build.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2022 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.

 using System.Collections.Generic;
 using System.IO;
--- a/Source/Engine/Tools/TextureTool/TextureTool.DirectXTex.cpp
+++ b/Source/Engine/Tools/TextureTool/TextureTool.DirectXTex.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2022 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.

 #if COMPILE_WITH_TEXTURE_TOOL && COMPILE_WITH_DIRECTXTEX

--- a/Source/Engine/Tools/TextureTool/TextureTool.cpp
+++ b/Source/Engine/Tools/TextureTool/TextureTool.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2022 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.

 #if COMPILE_WITH_TEXTURE_TOOL

--- a/Source/Engine/Tools/TextureTool/TextureTool.h
+++ b/Source/Engine/Tools/TextureTool/TextureTool.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2022 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.

 #pragma once

--- a/Source/Engine/Tools/TextureTool/TextureTool.stb.cpp
+++ b/Source/Engine/Tools/TextureTool/TextureTool.stb.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2022 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.

 #if COMPILE_WITH_TEXTURE_TOOL && COMPILE_WITH_STB