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

Merge remote-tracking branch 'origin/1.10' into sdl_platform

Browse Source 
# Conflicts:
#	Source/Editor/GUI/ContextMenu/ContextMenuBase.cs
#	Source/Engine/Platform/Linux/LinuxPlatform.cpp
This commit is contained in:
Ari Vuollet
2025-03-09 13:16:25 +02:00
parent 83d6f9fcf3 bc4f3668fe
commit 45c388c92d
594 changed files with 19183 additions and 15772 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
Source/Engine/Platform/Windows/WindowsPlatform.cpp
View File

@@ -13,8 +13,8 @@
#include "Engine/Platform/MemoryStats.h"
#include "Engine/Platform/BatteryInfo.h"
#include "Engine/Platform/Base/PlatformUtils.h"
#include "Engine/Engine/Globals.h"
#include "Engine/Core/Log.h"
#include "Engine/Core/Types/Version.h"
#include "Engine/Core/Collections/Dictionary.h"
#include "Engine/Core/Collections/Array.h"
#include "Engine/Platform/MessageBox.h"
@@ -287,7 +287,7 @@ long __stdcall WindowsPlatform::SehExceptionHandler(EXCEPTION_POINTERS* ep)
}
// Skip if engine already crashed
if (Globals::FatalErrorOccurred)
if (Engine::FatalError != FatalErrorType::None)
return EXCEPTION_CONTINUE_SEARCH;
// Get exception info
@@ -331,7 +331,7 @@ long __stdcall WindowsPlatform::SehExceptionHandler(EXCEPTION_POINTERS* ep)
}
// Crash engine
Platform::Fatal(errorMsg.Get(), ep);
Platform::Fatal(errorMsg.Get(), ep, FatalErrorType::Exception);
return EXCEPTION_CONTINUE_SEARCH;
}
@@ -624,7 +624,7 @@ bool WindowsPlatform::Init()
return true;
// Init console output (engine is linked with /SUBSYSTEM:WINDOWS so it lacks of proper console output on Windows)
if (CommandLine::Options.Std)
if (CommandLine::Options.Std.IsTrue())
{
// Attaches output of application to parent console, returns true if running in console-mode
// [Reference: https://www.tillett.info/2013/05/13/how-to-create-a-windows-program-that-works-as-both-as-a-gui-and-console-application]
@@ -645,12 +645,32 @@ bool WindowsPlatform::Init()
}
}
// Check if can run Engine on current platform (requires Windows Vista SP1 or above)
if (!IsWindowsVistaSP1OrGreater() && !IsWindowsServer())
// Check if can run Engine on current platform
#if WINVER >= 0x0A00
if (!IsWindows10OrGreater() && !IsWindowsServer())
{
Platform::Fatal(TEXT("Flax Engine requires Windows Vista SP1 or higher."));
Platform::Fatal(TEXT("Flax Engine requires Windows 10 or higher."));
return true;
}
#elif WINVER >= 0x0603
if (!IsWindows8Point1OrGreater() && !IsWindowsServer())
{
Platform::Fatal(TEXT("Flax Engine requires Windows 8.1 or higher."));
return true;
}
#elif WINVER >= 0x0602
if (!IsWindows8OrGreater() && !IsWindowsServer())
{
Platform::Fatal(TEXT("Flax Engine requires Windows 8 or higher."));
return true;
}
#else
if (!IsWindows7OrGreater() && !IsWindowsServer())
{
Platform::Fatal(TEXT("Flax Engine requires Windows 7 or higher."));
return true;
}
#endif
// Set the lowest possible timer resolution
const HMODULE ntdll = LoadLibraryW(L"ntdll.dll");
@@ -702,6 +722,24 @@ void WindowsPlatform::LogInfo()
{
Win32Platform::LogInfo();
#if PLATFORM_ARCH_X86 || PLATFORM_ARCH_X64
// Log CPU brand
{
char brandBuffer[0x40] = {};
int32 cpuInfo[4] = { -1 };
__cpuid(cpuInfo, 0x80000000);
if (cpuInfo[0] >= 0x80000004)
{
for (uint32 i = 0; i < 3; i++)
{
__cpuid(cpuInfo, 0x80000002 + i);
memcpy(brandBuffer + i * sizeof(cpuInfo), cpuInfo, sizeof(cpuInfo));
}
}
LOG(Info, "CPU: {0}", String(brandBuffer));
}
#endif
LOG(Info, "Microsoft {0} {1}-bit ({2}.{3}.{4})", WindowsName, Platform::Is64BitPlatform() ? TEXT("64") : TEXT("32"), VersionMajor, VersionMinor, VersionBuild);
// Check minimum amount of RAM
@@ -809,6 +847,16 @@ void WindowsPlatform::SetHighDpiAwarenessEnabled(bool enable)
::FreeLibrary(shCoreDll);
}
String WindowsPlatform::GetSystemName()
{
return WindowsName;
}
Version WindowsPlatform::GetSystemVersion()
{
return Version(VersionMajor, VersionMinor, VersionBuild);
}
BatteryInfo WindowsPlatform::GetBatteryInfo()
{
BatteryInfo info;