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

Merge remote-tracking branch 'origin/gi' into large-worlds

Browse Source 
# Conflicts:
#	Source/Engine/Core/Math/Vector3.h
This commit is contained in:
Wojtek Figat
2022-05-21 19:45:13 +02:00
parent f53a5ff536 1a64df9116
commit 785f8915b7
280 changed files with 7660 additions and 2355 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -176,8 +176,12 @@ void GetWindowsVersion(String& windowsName, int32& versionMajor, int32& versionM
VersionMajor = 6;
VersionMinor = 2;
}
if (VersionMajor == 0 && VersionMinor == 0)
else if (VersionMajor >= 10 && VersionBuild >= 22000)
{
// Windows 11
windowsName.Replace(TEXT("10"), TEXT("11"));
}
else if (VersionMajor == 0 && VersionMinor == 0)
{
String windowsVersion;
GetStringRegKey(hKey, TEXT("CurrentVersion"), windowsVersion, TEXT(""));

13
Source/Engine/Platform/Windows/WindowsWindow.DragDrop.cpp
View File

@@ -6,7 +6,6 @@
#if USE_EDITOR
#include "Engine/Core/Log.h"
#include "Engine/Core/Collections/Array.h"
#include "Engine/Engine/Engine.h"
#include "Engine/Platform/IGuiData.h"
@@ -575,27 +574,15 @@ public:
int64 ExitFlag = 0;
public:
// [ThreadPoolTask]
bool Run() override
{
const uint64 beginFrame = Engine::FrameCount;
Scripting::GetScriptsDomain()->Dispatch();
while (Platform::AtomicRead(&ExitFlag) == 0)
{
// Render single frame
Engine::OnDraw();
// Wait for a while
Platform::Sleep(20);
}
const uint64 endFrame = Engine::FrameCount;
LOG(Info, "Rendered {0} frames during DoDragDrop stall.", endFrame - beginFrame);
return false;
}
};