Merge remote-tracking branch 'origin/master' into navigation-features

# Conflicts:
#	Source/Editor/Content/Settings/NavigationSettings.cs
#	Source/Engine/Engine/PhysicalMaterial.cs
#	Source/Tools/Flax.Build/Bindings/BindingsGenerator.Api.cs

Content/Editor/MaterialTemplates/Decal.shader

@@ -114,8 +114,7 @@ Material GetMaterialPS(MaterialInput input)
 @4
 }
 
-// Programmatically set the line number after all the material inputs which have a variable number of line endings
+// Fix line for errors/warnings for shader code from template
-// This allows shader error line numbers after this point to be the same regardless of which material is being compiled
 #line 1000
 
 // Input macro specified by the material: DECAL_BLEND_MODE
@@ -160,12 +159,9 @@ void PS_Decal(
 	float3 positionWS = positionHS.xyz / positionHS.w;
 	float3 positionOS = mul(float4(positionWS, 1), InvWorld).xyz;
 
-	// Clip content outside the decal
 	clip(0.5 - abs(positionOS.xyz));
-
-	// By default, map textures using the vectors perpendicular to the projection direction
 	float2 decalUVs = positionOS.xz + 0.5f;
-	
+
 	// Setup material input
 	MaterialInput materialInput = (MaterialInput)0;
 	materialInput.WorldPosition = positionWS;

Content/Editor/MaterialTemplates/GUI.shader

@@ -197,8 +197,7 @@ Material GetMaterialPS(MaterialInput input)
 @4
 }
 
-// Programmatically set the line number after all the material inputs which have a variable number of line endings
+// Fix line for errors/warnings for shader code from template
-// This allows shader error line numbers after this point to be the same regardless of which material is being compiled
 #line 1000
 
 // Vertex Shader function for GUI materials rendering

Content/Editor/MaterialTemplates/Particle.shader

@@ -330,8 +330,7 @@ Material GetMaterialPS(MaterialInput input)
 @4
 }
 
-// Programmatically set the line number after all the material inputs which have a variable number of line endings
+// Fix line for errors/warnings for shader code from template
-// This allows shader error line numbers after this point to be the same regardless of which material is being compiled
 #line 1000
 
 // Calculates the transform matrix from mesh tangent space to local space
@@ -834,7 +833,7 @@ float4 PS_Distortion(PixelInput input) : SV_Target0
 	// Scale up for better precision in low/subtle refractions at the expense of artefacts at higher refraction
 	distortion *= 4.0f;
 
-	// Store positive and negative offsets separately
+	// Use separate storage for positive and negative offsets
 	float2 addOffset = max(distortion, 0);
 	float2 subOffset = abs(min(distortion, 0));
 	return float4(addOffset.x, addOffset.y, subOffset.x, subOffset.y);

Content/Editor/MaterialTemplates/PostProcess.shader

@@ -134,8 +134,7 @@ Material GetMaterialPS(MaterialInput input)
 @4
 }
 
-// Programmatically set the line number after all the material inputs which have a variable number of line endings
+// Fix line for errors/warnings for shader code from template
-// This allows shader error line numbers after this point to be the same regardless of which material is being compiled
 #line 1000
 
 // Pixel Shader function for PostFx materials rendering

Content/Editor/MaterialTemplates/SurfaceDeferred.shader

@@ -340,8 +340,7 @@ Material GetMaterialPS(MaterialInput input)
 @4
 }
 
-// Programmatically set the line number after all the material inputs which have a variable number of line endings
+// Fix line for errors/warnings for shader code from template
-// This allows shader error line numbers after this point to be the same regardless of which material is being compiled
 #line 1000
 
 // Calculates the transform matrix from mesh tangent space to local space
@@ -500,7 +499,7 @@ float3x4 GetBoneMatrix(int index)
 }
 
 // Calculates the transposed transform matrix for the given vertex (uses blending)
-float3x4 CalcBoneMatrix(ModelInput_Skinned input)
+float3x4 GetBoneMatrix(ModelInput_Skinned input)
 {
 	float3x4 boneMatrix = input.BlendWeights.x * GetBoneMatrix(input.BlendIndices.x);
 	boneMatrix += input.BlendWeights.y * GetBoneMatrix(input.BlendIndices.y);
@@ -549,7 +548,7 @@ VertexOutput VS_Skinned(ModelInput_Skinned input)
 	
 	// Perform skinning
 	SkinningData data;
-	data.BlendMatrix = CalcBoneMatrix(input);
+	data.BlendMatrix = GetBoneMatrix(input);
 	float3 position = SkinPosition(input, data);
 	float3x3 tangentToLocal = SkinTangents(input, data);
 	
@@ -808,7 +807,6 @@ TessalationDSToPS DS(TessalationPatch constantData, float3 barycentricCoords : S
 #define COPY(thing) output.thing = input[0].thing
 	INTERPOLATE(Position);
 #if MATERIAL_TESSELLATION == MATERIAL_TESSELLATION_PN
-	// Precompute squares and squares * 3 
 	float UU = U * U;
 	float VV = V * V;
 	float WW = W * W;

Content/Editor/MaterialTemplates/SurfaceForward.shader

@@ -337,8 +337,7 @@ Material GetMaterialPS(MaterialInput input)
 @4
 }
 
-// Programmatically set the line number after all the material inputs which have a variable number of line endings
+// Fix line for errors/warnings for shader code from template
-// This allows shader error line numbers after this point to be the same regardless of which material is being compiled
 #line 1000
 
 // Calculates the transform matrix from mesh tangent space to local space
@@ -474,7 +473,7 @@ float3x4 GetBoneMatrix(int index)
 }
 
 // Calculates the transposed transform matrix for the given vertex (uses blending)
-float3x4 CalcBoneMatrix(ModelInput_Skinned input)
+float3x4 GetBoneMatrix(ModelInput_Skinned input)
 {
 	float3x4 boneMatrix = input.BlendWeights.x * GetBoneMatrix(input.BlendIndices.x);
 	boneMatrix += input.BlendWeights.y * GetBoneMatrix(input.BlendIndices.y);
@@ -521,7 +520,7 @@ VertexOutput VS_Skinned(ModelInput_Skinned input)
 
 	// Perform skinning
 	SkinningData data;
-	data.BlendMatrix = CalcBoneMatrix(input);
+	data.BlendMatrix = GetBoneMatrix(input);
 	float3 position = SkinPosition(input, data);
 	half3x3 tangentToLocal = SkinTangents(input, data);
 
@@ -755,7 +754,6 @@ TessalationDSToPS DS(TessalationPatch constantData, float3 barycentricCoords : S
 #define COPY(thing) output.thing = input[0].thing
 	INTERPOLATE(Position);
 #if MATERIAL_TESSELLATION == MATERIAL_TESSELLATION_PN
-	// Precompute squares and squares * 3 
 	float UU = U * U;
 	float VV = V * V;
 	float WW = W * W;
@@ -977,8 +975,8 @@ float4 PS_Distortion(PixelInput input) : SV_Target0
 
 	// Scale up for better precision in low/subtle refractions at the expense of artefacts at higher refraction
 	distortion *= 4.0f;
-
+	
-	// Store positive and negative offsets separately
+	// Use separate storage for positive and negative offsets
 	float2 addOffset = max(distortion, 0);
 	float2 subOffset = abs(min(distortion, 0));
 	return float4(addOffset.x, addOffset.y, subOffset.x, subOffset.y);

Content/Editor/MaterialTemplates/Terrain.shader

@@ -234,8 +234,7 @@ Material GetMaterialPS(MaterialInput input)
 @4
 }
 
-// Programmatically set the line number after all the material inputs which have a variable number of line endings
+// Fix line for errors/warnings for shader code from template
-// This allows shader error line numbers after this point to be the same regardless of which material is being compiled
 #line 1000
 
 // Calculates LOD value (with fractional part for blending)
@@ -595,7 +594,6 @@ TessalationDSToPS DS(TessalationPatch constantData, float3 barycentricCoords : S
 #define COPY(thing) output.thing = input[0].thing
 	INTERPOLATE(Position);
 #if MATERIAL_TESSELLATION == MATERIAL_TESSELLATION_PN
-	// Precompute squares and squares * 3 
 	float UU = U * U;
 	float VV = V * V;
 	float WW = W * W;

Flax.flaxproj

@@ -6,7 +6,7 @@
     "Build": 6214
   },
   "Company": "Flax",
-  "Copyright": "Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.",
+  "Copyright": "Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.",
   "GameTarget": "FlaxGame",
   "EditorTarget": "FlaxEditor"
 }

GenerateProjectFiles.bat

@@ -6,34 +6,18 @@ setlocal
 pushd
 echo Generating Flax Engine project files...
 
-rem Make sure the batch file exists in the root folder.
-if not exist "%~dp0\Source" goto Error_BatchFileInWrongLocation
-if not exist "Development\Scripts\Windows\CallBuildTool.bat" goto Error_BatchFileInWrongLocation
-
 rem Run Flax.Build to generate Visual Studio solution and project files (also pass the arguments)
 call "Development\Scripts\Windows\CallBuildTool.bat" -genproject %*
-if errorlevel 1 goto Error_BuildToolFailed
+if errorlevel 1 goto BuildToolFailed
 
-rem Done.
 popd
 echo Done!
 exit /B 0
 
-:Error_BatchFileInWrongLocation
+:BuildToolFailed
-echo.
-echo The batch file does not appear to be located in the root directory. This script must be run from within that directory.
-echo.
-pause
-goto Exit
-
-:Error_BuildToolFailed
-echo.
 echo Flax.Build tool failed.
-echo.
-pause
 goto Exit
 
 :Exit
-rem Restore original directory before exit.
 popd
 exit /B 1

PackageAll.bat

@@ -6,32 +6,18 @@ setlocal
 pushd
 echo Performing the full package...
 
-rem Make sure the batch file exists in the root folder.
-if not exist "%~dp0\Source" goto Error_BatchFileInWrongLocation
-if not exist "Development\Scripts\Windows\CallBuildTool.bat" goto Error_BatchFileInWrongLocation
-
 rem Run the build tool.
 call "Development\Scripts\Windows\CallBuildTool.bat" -deploy -deployEditor -deployPlatforms -verbose -log -logFile="Cache\Intermediate\PackageLog.txt" %*
-if errorlevel 1 goto Error_BuildToolFailed
+if errorlevel 1 goto BuildToolFailed
 
-rem Done.
 popd
 echo Done!
 exit /B 0
 
-:Error_BatchFileInWrongLocation
+:BuildToolFailed
-echo.
-echo The batch file does not appear to be located in the root directory. This script must be run from within that directory.
-echo.
-goto Exit
-
-:Error_BuildToolFailed
-echo.
 echo Flax.Build tool failed.
-echo.
 goto Exit
 
 :Exit
-rem Restore original directory before exit.
 popd
 exit /B 1

PackageEditor.bat

@@ -6,32 +6,18 @@ setlocal
 pushd
 echo Building and packaging Flax Editor...
 
-rem Make sure the batch file exists in the root folder.
+rem Run the build tool.
-if not exist "%~dp0\Source" goto Error_BatchFileInWrongLocation
-if not exist "Development\Scripts\Windows\CallBuildTool.bat" goto Error_BatchFileInWrongLocation
-
-rem Run Flax.Build to generate Visual Studio solution and project files (also pass the arguments)
 call "Development\Scripts\Windows\CallBuildTool.bat" -deploy -deployEditor -verbose -log -logFile="Cache\Intermediate\PackageLog.txt" %*
-if errorlevel 1 goto Error_BuildToolFailed
+if errorlevel 1 goto BuildToolFailed
 
-rem Done.
 popd
 echo Done!
 exit /B 0
 
-:Error_BatchFileInWrongLocation
+:BuildToolFailed
-echo.
-echo The batch file does not appear to be located in the root directory. This script must be run from within that directory.
-echo.
-goto Exit
-
-:Error_BuildToolFailed
-echo.
 echo Flax.Build tool failed.
-echo.
 goto Exit
 
 :Exit
-rem Restore original directory before exit.
 popd
 exit /B 1

PackagePlatforms.bat

@@ -6,32 +6,18 @@ setlocal
 pushd
 echo Building and packaging platforms data...
 
-rem Make sure the batch file exists in the root folder.
+rem Run the build tool.
-if not exist "%~dp0\Source" goto Error_BatchFileInWrongLocation
-if not exist "Development\Scripts\Windows\CallBuildTool.bat" goto Error_BatchFileInWrongLocation
-
-rem Run Flax.Build to generate Visual Studio solution and project files (also pass the arguments)
 call "Development\Scripts\Windows\CallBuildTool.bat" -deploy -deployPlatforms -verbose -log -logFile="Cache\Intermediate\PackageLog.txt" %*
-if errorlevel 1 goto Error_BuildToolFailed
+if errorlevel 1 goto BuildToolFailed
 
-rem Done.
 popd
 echo Done!
 exit /B 0
 
-:Error_BatchFileInWrongLocation
+:BuildToolFailed
-echo.
-echo The batch file does not appear to be located in the root directory. This script must be run from within that directory.
-echo.
-goto Exit
-
-:Error_BuildToolFailed
-echo.
 echo Flax.Build tool failed.
-echo.
 goto Exit
 
 :Exit
-rem Restore original directory before exit.
 popd
 exit /B 1

RegisterEngineLocation.bat

@@ -14,12 +14,12 @@ if not exist "%appdata%\Flax\Versions.txt" (
 )
 set EngineLocation=%cd%
 find /c "%EngineLocation%" "%appdata%\Flax\Versions.txt"
-if %errorlevel% equ 1 goto notfound
+if %errorlevel% equ 1 goto NotFound
 echo Already registered.
 goto Done
 
 rem Register the location (append to the end)
-:notfound
+:NotFound
 echo Location '%EngineLocation%' is not registered. Adding it to the list of engine versions.
 echo %EngineLocation%>>"%appdata%\Flax\Versions.txt"
 goto Done
@@ -31,6 +31,5 @@ echo Done!
 exit /B 0
 
 :Exit
-rem Restore original directory before exit.
 popd
 exit /B 1

Source/Editor/Analytics/EditorAnalytics.cpp

@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.
 
 #include "EditorAnalytics.h"
 #include "EditorAnalyticsController.h"

Source/Editor/Analytics/EditorAnalytics.h

@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.
 
 #pragma once
 

Source/Editor/Analytics/EditorAnalyticsController.cpp

@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.
 
 #include "EditorAnalyticsController.h"
 #include "Editor/Cooker/GameCooker.h"

Source/Editor/Analytics/EditorAnalyticsController.h

@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.
 
 #pragma once
 

Source/Editor/Content/AssetItemConverter.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.
 
 using System;
 using Newtonsoft.Json;

Source/Editor/Content/Create/CreateFileEntry.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.
 
 namespace FlaxEditor.Content.Create
 {

Source/Editor/Content/Create/CreateFilesDialog.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.
 
 using System;
 using System.Collections.Generic;

Source/Editor/Content/Create/ParticleEmitterCreateEntry.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.
 
 using System;
 using System.IO;

Source/Editor/Content/Create/SettingsCreateEntry.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.
 
 using System;
 using FlaxEditor.Content.Settings;

Source/Editor/Content/Create/VisualScriptCreateEntry.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.
 
 using System;
 using FlaxEngine;

Source/Editor/Content/GUI/ContentNavigationButton.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.
 
 using FlaxEditor.GUI;
 using FlaxEditor.GUI.Drag;

Source/Editor/Content/GUI/ContentView.DragDrop.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.
 
 using FlaxEditor.GUI.Drag;
 using FlaxEditor.SceneGraph;

Source/Editor/Content/GUI/ContentView.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.
 
 using System;
 using System.Collections.Generic;

Source/Editor/Content/IFileEntryAction.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.
 
 namespace FlaxEditor.Content
 {

Source/Editor/Content/Import/AssetImportEntry.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.
 
 namespace FlaxEditor.Content.Import
 {

Source/Editor/Content/Import/AudioImportSettings.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.
 
 using System.ComponentModel;
 using System.Reflection;

Source/Editor/Content/Import/FolderImportEntry.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.
 
 using System.IO;
 

Source/Editor/Content/Import/ImportFileEntry.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.
 
 using System.Collections.Generic;
 using System.IO;

Source/Editor/Content/Import/ImportFilesDialog.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.
 
 using System;
 using System.Collections.Generic;

Source/Editor/Content/Import/ModelImportEntry.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.
 
 using System.ComponentModel;
 using System.Runtime.CompilerServices;

Source/Editor/Content/Import/Request.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.
 
 using FlaxEngine;
 

Source/Editor/Content/Import/TextureImportEntry.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.
 
 using System.Collections.Generic;
 using System.ComponentModel;

Source/Editor/Content/Items/AssetItem.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.
 
 using System;
 using System.IO;
@@ -58,7 +58,7 @@ namespace FlaxEditor.Content
 
             public override bool OnMouseDoubleClick(Vector2 location, MouseButton button)
             {
-                return Item.OnMouseDoubleClick(Item.ScreenToClient(ClientToScreen(location)), button);
+                return Item.OnMouseDoubleClick(Item.PointFromScreen(PointToScreen(location)), button);
             }
         }
 

Source/Editor/Content/Items/BinaryAssetItem.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.
 
 using System;
 using System.Text;

Source/Editor/Content/Items/CSharpScriptItem.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.
 
 using FlaxEngine;
 

Source/Editor/Content/Items/ContentFolder.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.
 
 using System;
 using System.Collections.Generic;

Source/Editor/Content/Items/ContentItem.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.
 
 using System;
 using System.Collections.Generic;

Source/Editor/Content/Items/CppScriptItem.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.
 
 using FlaxEngine;
 

Source/Editor/Content/Items/FileItem.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.
 
 using FlaxEngine;
 

Source/Editor/Content/Items/JsonAssetItem.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.
 
 using System;
 using FlaxEngine;

Source/Editor/Content/Items/NewItem.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.
 
 using FlaxEngine;
 

Source/Editor/Content/Items/PrefabItem.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.
 
 using System;
 using FlaxEngine;

Source/Editor/Content/Items/SceneItem.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.
 
 using System;
 using FlaxEngine;

Source/Editor/Content/Items/ScriptItem.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.
 
 using System.Text;
 

Source/Editor/Content/Items/ShaderSourceItem.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.
 
 using FlaxEngine;
 

Source/Editor/Content/Items/VisualScriptItem.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.
 
 using System;
 using System.Collections.Generic;

Source/Editor/Content/PreviewsCache.cpp

@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.
 
 #include "PreviewsCache.h"
 #include "Engine/Core/Log.h"

Source/Editor/Content/PreviewsCache.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.
 
 using FlaxEngine;
 

Source/Editor/Content/PreviewsCache.h

@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.
 
 #pragma once
 

Source/Editor/Content/Proxy/AnimationGraphFunctionProxy.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.
 
 using System;
 using FlaxEditor.Windows;

Source/Editor/Content/Proxy/AnimationGraphProxy.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.
 
 using System;
 using FlaxEditor.Windows;

Source/Editor/Content/Proxy/AnimationProxy.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.
 
 using System;
 using System.IO;

Source/Editor/Content/Proxy/AssetProxy.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.
 
 using System;
 using FlaxEditor.Content.Thumbnails;

Source/Editor/Content/Proxy/AudioClipProxy.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.
 
 using System;
 using System.Collections.Generic;

Source/Editor/Content/Proxy/BinaryAssetProxy.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.
 
 using System;
 using FlaxEngine;

Source/Editor/Content/Proxy/CSharpScriptProxy.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.
 
 using System;
 using System.IO;

Source/Editor/Content/Proxy/CollisionDataProxy.cs

@@ -1,6 +1,7 @@
-// Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.
 
 using System;
+using System.Threading.Tasks;
 using FlaxEditor.Windows;
 using FlaxEditor.Windows.Assets;
 using FlaxEngine;
@@ -40,5 +41,29 @@ namespace FlaxEditor.Content
             if (Editor.CreateAsset(Editor.NewAssetType.CollisionData, outputPath))
                 throw new Exception("Failed to create new asset.");
         }
+
+        /// <summary>
+        /// Create collision data from model.
+        /// </summary>
+        /// <param name="model">The associated model.</param>
+        public void CreateCollisionDataFromModel(Model model)
+        {
+            Action<ContentItem> created = contentItem =>
+            {
+                var ai = (AssetItem)contentItem;
+                var cd = FlaxEngine.Content.LoadAsync<CollisionData>(ai.ID);
+                if (cd == null || cd.WaitForLoaded())
+                {
+                    Editor.LogError("Failed to load created collision data.");
+                    return;
+                }
+
+                Task.Run(() =>
+                {
+                    Editor.CookMeshCollision(ai.Path, CollisionDataType.TriangleMesh, model);
+                }); 
+            };
+            Editor.Instance.Windows.ContentWin.NewItem(this, null, created);
+        }
     }
 }