GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into 1.8

Browse Source 
# Conflicts:
#	Flax.flaxproj
This commit is contained in:
Wojtek Figat
2024-02-26 19:49:39 +01:00
parent 10180de9c6 7f935ab57a
commit 14902dc29e
2740 changed files with 5217 additions and 3615 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Editor/Cooker/CookingData.h
View File

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

14
Source/Editor/Cooker/GameCooker.cpp
View File

@@ -1,4 +1,4 @@
// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
#include "GameCooker.h"
#include "PlatformTools.h"
@@ -456,18 +456,18 @@ PlatformTools* GameCooker::GetTools(BuildPlatform platform)
return result;
}
void GameCooker::Build(BuildPlatform platform, BuildConfiguration configuration, const StringView& outputPath, BuildOptions options, const Array<String>& customDefines, const StringView& preset, const StringView& presetTarget)
bool GameCooker::Build(BuildPlatform platform, BuildConfiguration configuration, const StringView& outputPath, BuildOptions options, const Array<String>& customDefines, const StringView& preset, const StringView& presetTarget)
{
if (IsRunning())
{
LOG(Warning, "Cannot start a build. Already running.");
return;
return true;
}
PlatformTools* tools = GetTools(platform);
if (tools == nullptr)
{
LOG(Error, "Build platform {0} is not supported.", ::ToString(platform));
return;
return true;
}
// Setup
@@ -493,7 +493,7 @@ void GameCooker::Build(BuildPlatform platform, BuildConfiguration configuration,
if (FileSystem::CreateDirectory(data.CacheDirectory))
{
LOG(Error, "Cannot setup game building cache directory.");
return;
return true;
}
}
@@ -510,13 +510,15 @@ void GameCooker::Build(BuildPlatform platform, BuildConfiguration configuration,
{
GameCookerImpl::IsRunning = false;
LOG(Error, "Failed to start a build thread.");
return;
return true;
}
}
else
{
ThreadCond.NotifyOne();
}
return false;
}
void GameCooker::Cancel(bool waitForEnd)

2
Source/Editor/Cooker/GameCooker.cs
View File

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

5
Source/Editor/Cooker/GameCooker.h
View File

@@ -1,4 +1,4 @@
// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
#pragma once
@@ -82,7 +82,8 @@ public:
/// <param name="customDefines">The list of custom defines passed to the build tool when compiling project scripts. Can be used in build scripts for configuration (Configuration.CustomDefines).</param>
/// <param name="preset">The name of build preset used for cooking (can be used by editor and game plugins).</param>
/// <param name="presetTarget">The name of build preset target used for cooking (can be used by editor and game plugins).</param>
API_FUNCTION() static void Build(BuildPlatform platform, BuildConfiguration configuration, const StringView& outputPath, BuildOptions options, const Array<String>& customDefines, const StringView& preset = StringView::Empty, const StringView& presetTarget = StringView::Empty);
/// <returns>True if failed to start the build, otherwise false.</returns>
API_FUNCTION() static bool Build(BuildPlatform platform, BuildConfiguration configuration, const StringView& outputPath, BuildOptions options, const Array<String>& customDefines, const StringView& preset = StringView::Empty, const StringView& presetTarget = StringView::Empty);
/// <summary>
/// Sends a cancel event to the game building service.

2
Source/Editor/Cooker/Platform/Android/AndroidPlatformTools.h
View File

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

2
Source/Editor/Cooker/Platform/GDK/GDKPlatformTools.cpp
View File

@@ -1,4 +1,4 @@
// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
#if PLATFORM_TOOLS_GDK

2
Source/Editor/Cooker/Platform/GDK/GDKPlatformTools.h
View File

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

2
Source/Editor/Cooker/Platform/Linux/LinuxPlatformTools.cpp
View File

@@ -1,4 +1,4 @@
// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
#if PLATFORM_TOOLS_LINUX

2
Source/Editor/Cooker/Platform/Linux/LinuxPlatformTools.h
View File

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

2
Source/Editor/Cooker/Platform/Mac/MacPlatformTools.cpp
View File

@@ -1,4 +1,4 @@
// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
#if PLATFORM_TOOLS_MAC

2
Source/Editor/Cooker/Platform/Mac/MacPlatformTools.h
View File

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

2
Source/Editor/Cooker/Platform/UWP/UWPPlatformTools.cpp
View File

@@ -1,4 +1,4 @@
// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
#if PLATFORM_TOOLS_UWP

2
Source/Editor/Cooker/Platform/UWP/UWPPlatformTools.h
View File

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

2
Source/Editor/Cooker/Platform/Windows/WindowsPlatformTools.cpp
View File

@@ -1,4 +1,4 @@
// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
#if PLATFORM_TOOLS_WINDOWS

2
Source/Editor/Cooker/Platform/Windows/WindowsPlatformTools.h
View File

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

2
Source/Editor/Cooker/Platform/iOS/iOSPlatformTools.cpp
View File

@@ -1,4 +1,4 @@
// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
#if PLATFORM_TOOLS_IOS

2
Source/Editor/Cooker/Platform/iOS/iOSPlatformTools.h
View File

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

2
Source/Editor/Cooker/PlatformTools.h
View File

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

2
Source/Editor/Cooker/Steps/CollectAssetsStep.cpp
View File

@@ -1,4 +1,4 @@
// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
#include "CollectAssetsStep.h"
#include "Engine/Content/Content.h"

2
Source/Editor/Cooker/Steps/CollectAssetsStep.h
View File

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

2
Source/Editor/Cooker/Steps/CompileScriptsStep.cpp
View File

@@ -1,4 +1,4 @@
// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
#include "CompileScriptsStep.h"
#include "Editor/Scripting/ScriptsBuilder.h"

2
Source/Editor/Cooker/Steps/CompileScriptsStep.h
View File

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

2
Source/Editor/Cooker/Steps/CookAssetsStep.cpp
View File

@@ -1,4 +1,4 @@
// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
#include "CookAssetsStep.h"
#include "Editor/Cooker/PlatformTools.h"

2
Source/Editor/Cooker/Steps/CookAssetsStep.h
View File

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

2
Source/Editor/Cooker/Steps/DeployDataStep.cpp
View File

@@ -1,4 +1,4 @@
// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
#include "DeployDataStep.h"
#include "Engine/Platform/File.h"

2
Source/Editor/Cooker/Steps/DeployDataStep.h
View File

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

2
Source/Editor/Cooker/Steps/PostProcessStep.cpp
View File

@@ -1,4 +1,4 @@
// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
#include "PostProcessStep.h"
#include "Editor/Cooker/PlatformTools.h"

2
Source/Editor/Cooker/Steps/PostProcessStep.h
View File

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

2
Source/Editor/Cooker/Steps/PrecompileAssembliesStep.cpp
View File

@@ -1,4 +1,4 @@
// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
#include "PrecompileAssembliesStep.h"
#include "Engine/Platform/FileSystem.h"

2
Source/Editor/Cooker/Steps/PrecompileAssembliesStep.h
View File

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

2
Source/Editor/Cooker/Steps/ValidateStep.cpp
View File

@@ -1,4 +1,4 @@
// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
#include "ValidateStep.h"
#include "Engine/Core/Config/GameSettings.h"

2
Source/Editor/Cooker/Steps/ValidateStep.h
View File

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