Bump up version

Fixes #176

.github/workflows/build_linux.todo

@@ -0,0 +1,19 @@
+name: Build Linux
+on: [push, pull_request]
+
+jobs:
+
+  # Game
+  game-linux:
+    name: Game (Linux, Release x64)
+    runs-on: "ubuntu-20.04"
+    steps:
+    - name: Checkout repo
+      uses: actions/checkout@v2
+    - name: Checkout LFS
+      run: |
+        git lfs version
+        git lfs pull
+    - name: Build
+      run: |
+        ./Development/Scripts/Linux/CallBuildTool.sh -build -log -arch=x64 -platform=Linux -configuration=Release -buildtargets=FlaxGame

.github/workflows/build_windows.yml

@@ -0,0 +1,34 @@
+name: Build Windows
+on: [push, pull_request]
+
+jobs:
+
+  # Editor
+  editor-windows:
+    name: Editor (Windows, Development x64)
+    runs-on: "windows-latest"
+    steps:
+    - name: Checkout repo
+      uses: actions/checkout@v2
+    - name: Checkout LFS
+      run: |
+        git lfs version
+        git lfs pull
+    - name: Build
+      run: |
+        .\Development\Scripts\Windows\CallBuildTool.bat -build -log -arch=x64 -platform=Windows -configuration=Development -buildtargets=FlaxEditor
+
+  # Game
+  game-windows:
+    name: Game (Windows, Release x64)
+    runs-on: "windows-latest"
+    steps:
+    - name: Checkout repo
+      uses: actions/checkout@v2
+    - name: Checkout LFS
+      run: |
+        git lfs version
+        git lfs pull
+    - name: Build
+      run: |
+        .\Development\Scripts\Windows\CallBuildTool.bat -build -log -arch=x64 -platform=Windows -configuration=Release -buildtargets=FlaxGame

.lfsconfig

@@ -1,3 +1,4 @@
 # Redirect to our own Git LFS server
 [lfs]
 url="https://gitlab.flaxengine.com/flax/flaxengine.git/info/lfs"
+locksverify = false

CONTRIBUTING.md

@@ -0,0 +1,34 @@
+# How to contribute to the FlaxEngine
+
+For any questions, suggestions or help join our discord!
+
+<a href="https://flaxengine.com/discord"><img src="https://discordapp.com/api/guilds/437989205315158016/widget.png"/></a>
+
+Want to see whats planned for Flax?
+
+Go check out our [Trello](https://trello.com/b/NQjLXRCP/flax-roadmap).
+
+## **Found a bug?**
+
+* Avoid opening any new issues without having checked if your problem has already been reported. If there are no currently open issues that fit your problem's description, feel free to [add it](https://github.com/FlaxEngine/FlaxEngine/issues/new).
+
+* When writing an issue make sure to include a clear title and description as well as having filled out all the necessary information, depending on the severity of the issue also include the necessary log files and minidump.
+
+* Try to following the given template when writing a new issue if possible.
+
+## **Want to contribute?**
+  
+* Fork the FlaxEngine, create a new branch and push your changes there. Then, create a pull request.
+  
+* When creating a PR for fixing an issue/bug make sure to describe as to what led to the fix for better understanding, for small and obvious fixes this is not really needed. 
+  However make sure to mention the relevant issue where it was first reported if possible.
+  
+* For feature PR's the first thing you should evaluate is the value of your contribution, as in, what would it bring to this engine? Is it really required?
+  If its a small change you could preferably suggest it to us on our discord, else feel free to open up a PR for it.
+  
+* Ensure when creating a PR that your contribution is well explained with a adequate description and title.
+
+* Generally, good code quality is expected, make sure your contribution works as intended and is appropriately commented where necessary.
+
+
+Thank you for taking interest in contributing to Flax!

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
-// This allows shader error line numbers after this point to be the same regardless of which material is being compiled
+// Fix line for errors/warnings for shader code from template
 #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
-// This allows shader error line numbers after this point to be the same regardless of which material is being compiled
+// Fix line for errors/warnings for shader code from template
 #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
-// This allows shader error line numbers after this point to be the same regardless of which material is being compiled
+// Fix line for errors/warnings for shader code from template
 #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
-// This allows shader error line numbers after this point to be the same regardless of which material is being compiled
+// Fix line for errors/warnings for shader code from template
 #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
-// This allows shader error line numbers after this point to be the same regardless of which material is being compiled
+// Fix line for errors/warnings for shader code from template
 #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
-// This allows shader error line numbers after this point to be the same regardless of which material is being compiled
+// Fix line for errors/warnings for shader code from template
 #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
-// This allows shader error line numbers after this point to be the same regardless of which material is being compiled
+// Fix line for errors/warnings for shader code from template
 #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;

Development/Scripts/Linux/CallBuildTool.sh

@@ -3,6 +3,12 @@
 
 set -e
 
+testfilesize=$(wc -c < 'Source/Logo.png')
+if [ $testfilesize -le 1000 ]; then
+    echo "CallBuildTool ERROR: Repository was not cloned using Git LFS" 1>&2
+	exit 1
+fi
+
 # Compile the build tool.
 xbuild /nologo /verbosity:quiet "Source/Tools/Flax.Build/Flax.Build.csproj" /property:Configuration=Release /property:Platform=AnyCPU /target:Build
 

Development/Scripts/Windows/CallBuildTool.bat

@@ -2,93 +2,55 @@
 
 rem Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
 
-rem Make sure the batch file exists in the root folder.
-if not exist "Development\Scripts\Windows\GetMSBuildPath.bat" goto Error_BatchFileInWrongLocation
+if not exist "Development\Scripts\Windows\GetMSBuildPath.bat" goto Error_InvalidLocation
+
+for %%I in (Source\Logo.png) do if %%~zI LSS 2000 (
+	goto Error_MissingLFS
+)
 
-rem Get the path to MSBuild executable.
 call "Development\Scripts\Windows\GetMSBuildPath.bat"
 if errorlevel 1 goto Error_NoVisualStudioEnvironment
 
-rem If using VS2017, check that NuGet package manager is installed.
-if not exist "%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe" goto NoVsWhere
-
-set MSBUILD_15_EXE=
+if not exist "%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe" goto Compile
 for /f "delims=" %%i in ('"%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere" -latest -products * -requires Microsoft.Component.MSBuild -property installationPath') do (
 	for %%j in (15.0, Current) do (
 		if exist "%%i\MSBuild\%%j\Bin\MSBuild.exe" (
-			set MSBUILD_15_EXE="%%i\MSBuild\%%j\Bin\MSBuild.exe"
-			goto FoundMsBuild15
+			set MSBUILD_PATH="%%i\MSBuild\%%j\Bin\MSBuild.exe"
+			goto Compile
 		)
 	)
 )
-:FoundMsBuild15
 
-set MSBUILD_15_EXE_WITH_NUGET=
-for /f "delims=" %%i in ('"%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere" -latest -products * -requires Microsoft.Component.MSBuild -requires Microsoft.VisualStudio.Component.NuGet -property installationPath') do (
-	if exist "%%i\MSBuild\15.0\Bin\MSBuild.exe" (
-		set MSBUILD_15_EXE_WITH_NUGET="%%i\MSBuild\15.0\Bin\MSBuild.exe"
-		goto FoundMsBuild15WithNuget
-	)
-)
-:FoundMsBuild15WithNuget
-
-if not [%MSBUILD_15_EXE%] == [] (
-	set MSBUILD_EXE=%MSBUILD_15_EXE%
-	goto NoVsWhere
-)
-
-if not [%MSBUILD_EXE%] == [%MSBUILD_15_EXE_WITH_NUGET%] goto Error_RequireNugetPackageManager
-
-:NoVsWhere
-
-rem Check to see if the build tool source files have changed. Some can be included conditionally based on NDA access.
+:Compile
 md Cache\Intermediate >nul 2>nul
 dir /s /b Source\Tools\Flax.Build\*.cs >Cache\Intermediate\Flax.Build.Files.txt
 fc /b Cache\Intermediate\Build\Flax.Build.Files.txt Cache\Intermediate\Build\Flax.Build.PrevFiles.txt >nul 2>nul
 if not errorlevel 1 goto SkipClean
-copy /y Cache\Intermediate\Build\Flax.Build.Files.txt Cache\Intermediate\Build\Flax.Build.PrevFiles.txt >nul
-%MSBUILD_EXE% /nologo /verbosity:quiet Source\Tools\Flax.Build\Flax.Build.csproj /property:Configuration=Release /property:Platform=AnyCPU /target:Clean
-:SkipClean
-%MSBUILD_EXE% /nologo /verbosity:quiet Source\Tools\Flax.Build\Flax.Build.csproj /property:Configuration=Release /property:Platform=AnyCPU /target:Build
-if errorlevel 1 goto Error_CompileFailed
 
-rem Run the build tool using the provided arguments.
+copy /y Cache\Intermediate\Build\Flax.Build.Files.txt Cache\Intermediate\Build\Flax.Build.PrevFiles.txt >nul
+%MSBUILD_PATH% /nologo /verbosity:quiet Source\Tools\Flax.Build\Flax.Build.csproj /property:Configuration=Release /property:Platform=AnyCPU /target:Clean
+:SkipClean
+%MSBUILD_PATH% /nologo /verbosity:quiet Source\Tools\Flax.Build\Flax.Build.csproj /property:Configuration=Release /property:Platform=AnyCPU /target:Build
+if errorlevel 1 goto Error_CompilationFailed
+
 Binaries\Tools\Flax.Build.exe %*
 if errorlevel 1 goto Error_FlaxBuildFailed
-
-rem Done.
 exit /B 0
 
-:Error_BatchFileInWrongLocation
-echo.
-echo CallBuildTool ERROR: The batch file does not appear to be located in the root directory. This script must be run from within that directory.
-echo.
+:Error_MissingLFS
+echo CallBuildTool ERROR: Repository was not cloned using Git LFS
+goto Exit
+:Error_InvalidLocation
+echo CallBuildTool ERROR: The script is in invalid directory.
 goto Exit
-
 :Error_NoVisualStudioEnvironment
-echo.
-echo CallBuildTool ERROR: We couldn't find a valid installation of Visual Studio. This program requires Visual Studio 2015. Please check that you have Visual Studio installed, then verify that the HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\VisualStudio\14.0\InstallDir (or HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\VisualStudio\14.0\InstallDir on 32-bit machines) registry value is set.  Visual Studio configures this value when it is installed, and this program expects it to be set to the '\Common7\IDE\' sub-folder under a valid Visual Studio installation directory.
-echo.
+echo CallBuildTool ERROR: Missing Visual Studio 2015 or newer.
 goto Exit
-
-:Error_RequireNugetPackageManager
-echo.
-echo CallBuildTool ERROR: NuGet Package Manager is requried to be installed to use %MSBUILD_EXE%. Please run the Visual Studio Installer and add it from the individual components list (in the 'Code Tools' category).
-echo.
-goto Exit
-
-:Error_CompileFailed
-echo.
+:Error_CompilationFailed
 echo CallBuildTool ERROR: Failed to compile Flax.Build project.
-echo.
 goto Exit
-
 :Error_FlaxBuildFailed
-echo.
 echo CallBuildTool ERROR: Flax.Build tool failed.
-echo.
 goto Exit
-
 :Exit
-rem Exit with error.
 exit /B 1

Development/Scripts/Windows/GetMSBuildPath.bat

@@ -2,72 +2,57 @@
 
 rem Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
 
-set MSBUILD_EXE=
+set MSBUILD_PATH=
 
-rem Try to get the MSBuild 15 path using vswhere (see https://github.com/Microsoft/vswhere).
-if not exist "%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe" goto no_vswhere
+if not exist "%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe" goto VsWhereNotFound
 for /f "delims=" %%i in ('"%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere" -latest -products * -requires Microsoft.Component.MSBuild -property installationPath') do (
 	if exist "%%i\MSBuild\15.0\Bin\MSBuild.exe" (
-		set MSBUILD_EXE="%%i\MSBuild\15.0\Bin\MSBuild.exe"
-		goto Succeeded
+		set MSBUILD_PATH="%%i\MSBuild\15.0\Bin\MSBuild.exe"
+		goto End
 	)
 )
-:no_vswhere
+:VsWhereNotFound
 
-rem Check for MSBuild 15. This is installed alongside Visual Studio 2017, so we get the path relative to that.
-call :ReadInstallPath Microsoft\VisualStudio\SxS\VS7 15.0 MSBuild\15.0\bin\MSBuild.exe
-if not errorlevel 1 goto Succeeded
-
-rem Try to get the MSBuild 14.0 path directly (see https://msdn.microsoft.com/en-us/library/hh162058(v=vs.120).aspx).
 if exist "%ProgramFiles(x86)%\MSBuild\14.0\bin\MSBuild.exe" (
-	set MSBUILD_EXE="%ProgramFiles(x86)%\MSBuild\14.0\bin\MSBuild.exe"
-	goto Succeeded
+	set MSBUILD_PATH="%ProgramFiles(x86)%\MSBuild\14.0\bin\MSBuild.exe"
+	goto End
 )
 
-rem Try to get the MSBuild 14.0 path from the registry.
-call :ReadInstallPath Microsoft\MSBuild\ToolsVersions\14.0 MSBuildToolsPath MSBuild.exe
-if not errorlevel 1 goto Succeeded
+call :GetInstallPath Microsoft\VisualStudio\SxS\VS7 15.0 MSBuild\15.0\bin\MSBuild.exe
+if not errorlevel 1 goto End
+call :GetInstallPath Microsoft\MSBuild\ToolsVersions\14.0 MSBuildToolsPath MSBuild.exe
+if not errorlevel 1 goto End
+call :GetInstallPath Microsoft\MSBuild\ToolsVersions\12.0 MSBuildToolsPath MSBuild.exe
+if not errorlevel 1 goto End
+call :GetInstallPath Microsoft\MSBuild\ToolsVersions\4.0 MSBuildToolsPath MSBuild.exe
+if not errorlevel 1 goto End
 
-rem Check for older versions of MSBuild. These are registered as separate versions in the registry.
-call :ReadInstallPath Microsoft\MSBuild\ToolsVersions\12.0 MSBuildToolsPath MSBuild.exe
-if not errorlevel 1 goto Succeeded
-call :ReadInstallPath Microsoft\MSBuild\ToolsVersions\4.0 MSBuildToolsPath MSBuild.exe
-if not errorlevel 1 goto Succeeded
-
-rem Searching failed.
 exit /B 1
-
-rem Searching done!
-:Succeeded
+:End
 exit /B 0
 
-rem Subroutine to query the registry under HKCU/HKLM Win32/Wow64 software registry keys for a certain install directory.
-rem Arguments: 
-rem      %1 = Registry path under the 'SOFTWARE' registry key
-rem      %2 = Value name
-rem      %3 = Relative path under this directory to look for an installed executable.
-:ReadInstallPath
+:GetInstallPath
 for /f "tokens=2,*" %%A in ('REG.exe query HKCU\SOFTWARE\%1 /v %2 2^>Nul') do (
 	if exist "%%B%%3" (
-		set MSBUILD_EXE="%%B%3"
+		set MSBUILD_PATH="%%B%3"
 		exit /B 0
 	)
 )
 for /f "tokens=2,*" %%A in ('REG.exe query HKLM\SOFTWARE\%1 /v %2 2^>Nul') do (
 	if exist "%%B%3" (
-		set MSBUILD_EXE="%%B%3"
+		set MSBUILD_PATH="%%B%3"
 		exit /B 0
 	)
 )
 for /f "tokens=2,*" %%A in ('REG.exe query HKCU\SOFTWARE\Wow6432Node\%1 /v %2 2^>Nul') do (
 	if exist "%%B%%3" (
-		set MSBUILD_EXE="%%B%3"
+		set MSBUILD_PATH="%%B%3"
 		exit /B 0
 	)
 )
 for /f "tokens=2,*" %%A in ('REG.exe query HKLM\SOFTWARE\Wow6432Node\%1 /v %2 2^>Nul') do (
 	if exist "%%B%3" (
-		set MSBUILD_EXE="%%B%3"
+		set MSBUILD_PATH="%%B%3"
 		exit /B 0
 	)
 )

Flax.flaxproj

@@ -3,10 +3,10 @@
   "Version": {
     "Major": 1,
     "Minor": 0,
-    "Build": 6214
+    "Build": 6216
   },
   "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,19 @@ 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
-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.
+:BuildToolFailed
 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
-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.
+:BuildToolFailed
 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.
-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)
+rem Run the build tool.
 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
-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.
+:BuildToolFailed
 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.
-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)
+rem Run the build tool.
 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
-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.
+:BuildToolFailed
 echo Flax.Build tool failed.
-echo.
 goto Exit
 
 :Exit
-rem Restore original directory before exit.
 popd
 exit /B 1

README.md

@@ -16,10 +16,6 @@ This repository contains full source code of the Flax (excluding NDA-protected p
 * [Forum](https://forum.flaxengine.com)
 * [Roadmap](https://trello.com/b/NQjLXRCP/flax-roadmap)
 
-# Flax plugin for Visual Studio
-
-Flax Visual Studio extension provides better programming workflow, C# scripts debugging functionality and allows to attach to running engine instance to debug C# source. This extension is available to download [here](https://marketplace.visualstudio.com/items?itemName=Flax.FlaxVS).
-
 # Screenshots
 
 ![rendering](Development/Images/flax-pic-1.jpg "Rendering")
@@ -30,6 +26,10 @@ Flax Visual Studio extension provides better programming workflow, C# scripts de
 
 Follow the instructions below to compile and run the engine from source.
 
+## Flax plugin for Visual Studio
+
+Flax Visual Studio extension provides better programming workflow, C# scripts debugging functionality and allows to attach to running engine instance to debug C# source. This extension is available to download [here](https://marketplace.visualstudio.com/items?itemName=Flax.FlaxVS).
+
 ## Windows
 
 * Install Visual Studio 2015 or newer
@@ -38,7 +38,8 @@ Follow the instructions below to compile and run the engine from source.
 * Clone repo (with LFS)
 * Run **GenerateProjectFiles.bat**
 * Open `Flax.sln` and set solution configuration to **Editor.Development** and solution platform to **Win64**
-* Compile Flax project (hit F7 key)
+* Set Flax or FlaxEngine as startup project
+* Compile Flax project (hit F7 or CTRL+Shift+B)
 * Run Flax (hit F5 key)
 
 ## Linux

RegisterEngineLocation.bat

@@ -3,7 +3,7 @@
 rem Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
 
 setlocal
-pushd
+pushd %~dp0
 echo Registering Flax Engine project files...
 
 rem Check the current versions config
@@ -14,13 +14,13 @@ 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
-echo Location '%EngineLocation%' is not registered. Adding it to the lsit of engine versions.
+: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;
@@ -262,9 +262,9 @@ namespace FlaxEditor.Content.Import
         public int BaseLOD { get; set; } = 0;
 
         /// <summary>
-        /// The amount of LODs to include in the model (all reaming ones starting from Base LOD will be generated).
+        /// The amount of LODs to include in the model (all remaining ones starting from Base LOD will be generated).
         /// </summary>
-        [EditorOrder(1120), DefaultValue(4), Limit(1, Model.MaxLODs), EditorDisplay("Level Of Detail", "LOD Count"), Tooltip("The amount of LODs to include in the model (all reaming ones starting from Base LOD will be generated).")]
+        [EditorOrder(1120), DefaultValue(4), Limit(1, Model.MaxLODs), EditorDisplay("Level Of Detail", "LOD Count"), Tooltip("The amount of LODs to include in the model (all remaining ones starting from Base LOD will be generated).")]
         public int LODCount { get; set; } = 4;
 
         /// <summary>

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;