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

Fix compilation without SDL

Browse Source
This commit is contained in:
Ari Vuollet
2025-06-24 22:57:49 +03:00
parent 951edd95db
commit edeaf6af09
6 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Engine/Platform/Base/PlatformBase.h
View File

@@ -372,7 +372,7 @@ public:
/// <summary> /// <summary>
/// Returns the display server name on Linux. /// Returns the display server name on Linux.
/// </summary> /// </summary>
API_PROPERTY() static String GetDisplayServer() = delete; API_PROPERTY() static String GetDisplayServer();
/// <summary> /// <summary>
/// Returns true if is running 64 bit application (otherwise 32 bit). It's compile-time constant. /// Returns true if is running 64 bit application (otherwise 32 bit). It's compile-time constant.

9
Source/Engine/Platform/Linux/LinuxScreenUtilities.cpp
View File

@@ -12,11 +12,14 @@
#include "Engine/Platform/Linux/LinuxPlatform.h" #include "Engine/Platform/Linux/LinuxPlatform.h"
#include "Engine/Platform/Linux/IncludeX11.h" #include "Engine/Platform/Linux/IncludeX11.h"
#if PLATFORM_SDL
#include <libportal/portal-enums.h> #include <libportal/portal-enums.h>
#include <libportal/screenshot.h> #include <libportal/screenshot.h>
#endif
Delegate<Color32> ScreenUtilitiesBase::PickColorDone; Delegate<Color32> ScreenUtilitiesBase::PickColorDone;
#if PLATFORM_SDL
namespace PortalImpl namespace PortalImpl
{ {
XdpPortal* Portal = nullptr; XdpPortal* Portal = nullptr;
@@ -25,6 +28,7 @@ namespace PortalImpl
gpointer GLibMainLoop(gpointer data); gpointer GLibMainLoop(gpointer data);
void PickColorCallback(GObject* source, GAsyncResult* result, gpointer data); void PickColorCallback(GObject* source, GAsyncResult* result, gpointer data);
} }
#endif
Color32 LinuxScreenUtilities::GetColorAt(const Float2& pos) Color32 LinuxScreenUtilities::GetColorAt(const Float2& pos)
{ {
@@ -93,7 +97,7 @@ void LinuxScreenUtilities::PickColor()
LinuxPlatform::xEventReceived.Bind(OnScreenUtilsXEventCallback); LinuxPlatform::xEventReceived.Bind(OnScreenUtilsXEventCallback);
return; return;
} }
#if PLATFORM_SDL
if (PortalImpl::MainLoopReady == 0) if (PortalImpl::MainLoopReady == 0)
{ {
// Initialize portal // Initialize portal
@@ -117,8 +121,10 @@ void LinuxScreenUtilities::PickColor()
// Enter color picking mode, the callback receives the final color // Enter color picking mode, the callback receives the final color
xdp_portal_pick_color(PortalImpl::Portal, nullptr, nullptr, PortalImpl::PickColorCallback, nullptr); xdp_portal_pick_color(PortalImpl::Portal, nullptr, nullptr, PortalImpl::PickColorCallback, nullptr);
} }
#endif
} }
#if PLATFORM_SDL
gpointer PortalImpl::GLibMainLoop(gpointer data) gpointer PortalImpl::GLibMainLoop(gpointer data)
{ {
GMainContext* mainContext = g_main_context_get_thread_default(); GMainContext* mainContext = g_main_context_get_thread_default();
@@ -154,5 +160,6 @@ void PortalImpl::PickColorCallback(GObject* source, GAsyncResult* result, gpoint
ScreenUtilities::PickColorDone(color); ScreenUtilities::PickColorDone(color);
} }
#endif
#endif #endif

1
Source/Engine/Platform/Linux/LinuxWindow.h
View File

@@ -89,6 +89,7 @@ public:
void Focus() override; void Focus() override;
void SetTitle(const StringView& title) override; void SetTitle(const StringView& title) override;
DragDropEffect DoDragDrop(const StringView& data) override; DragDropEffect DoDragDrop(const StringView& data) override;
using WindowBase::DoDragDrop;
void StartTrackingMouse(bool useMouseScreenOffset) override; void StartTrackingMouse(bool useMouseScreenOffset) override;
void EndTrackingMouse() override; void EndTrackingMouse() override;
void SetCursor(CursorType type) override; void SetCursor(CursorType type) override;

1
Source/Engine/Platform/Mac/MacWindow.h
View File

@@ -55,6 +55,7 @@ public:
void Focus() override; void Focus() override;
void SetTitle(const StringView& title) override; void SetTitle(const StringView& title) override;
DragDropEffect DoDragDrop(const StringView& data) override; DragDropEffect DoDragDrop(const StringView& data) override;
using WindowBase::DoDragDrop;
void StartTrackingMouse(bool useMouseScreenOffset) override; void StartTrackingMouse(bool useMouseScreenOffset) override;
void EndTrackingMouse() override; void EndTrackingMouse() override;
void SetCursor(CursorType type) override; void SetCursor(CursorType type) override;

1
Source/Engine/Platform/UWP/UWPWindow.h
View File

@@ -183,6 +183,7 @@ public:
void Focus() override; void Focus() override;
void SetTitle(const StringView& title) override; void SetTitle(const StringView& title) override;
DragDropEffect DoDragDrop(const StringView& data) override; DragDropEffect DoDragDrop(const StringView& data) override;
using WindowBase::DoDragDrop;
void StartTrackingMouse(bool useMouseScreenOffset) override; void StartTrackingMouse(bool useMouseScreenOffset) override;
void EndTrackingMouse() override; void EndTrackingMouse() override;
void SetCursor(CursorType type) override; void SetCursor(CursorType type) override;

1
Source/Engine/Platform/Windows/WindowsWindow.h
View File

@@ -123,6 +123,7 @@ public:
void Focus() override; void Focus() override;
void SetTitle(const StringView& title) override; void SetTitle(const StringView& title) override;
DragDropEffect DoDragDrop(const StringView& data) override; DragDropEffect DoDragDrop(const StringView& data) override;
using WindowBase::DoDragDrop;
void StartTrackingMouse(bool useMouseScreenOffset) override; void StartTrackingMouse(bool useMouseScreenOffset) override;
void EndTrackingMouse() override; void EndTrackingMouse() override;
void StartClippingCursor(const Rectangle& bounds) override; void StartClippingCursor(const Rectangle& bounds) override;