diff --git a/Engine-Core/Build-Core.lua b/Engine-Core/Build-Core.lua index a9da846..a4b5258 100644 --- a/Engine-Core/Build-Core.lua +++ b/Engine-Core/Build-Core.lua @@ -103,10 +103,10 @@ project "Engine-Core" links { - "sfml-graphics-s", - "sfml-window-s", - "sfml-audio-s", - "sfml-system-s", + "sfml-graphics", + "sfml-window", + "sfml-audio", + "sfml-system", "OpenGL", } diff --git a/Engine-Core/vendor/SFML/include/SFML/Audio.hpp b/Engine-Core/vendor/SFML/include/SFML/Audio.hpp index f0d262e..50668fd 100644 --- a/Engine-Core/vendor/SFML/include/SFML/Audio.hpp +++ b/Engine-Core/vendor/SFML/include/SFML/Audio.hpp @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////// // // SFML - Simple and Fast Multimedia Library -// Copyright (C) 2007-2024 Laurent Gomila (laurent@sfml-dev.org) +// Copyright (C) 2007-2025 Laurent Gomila (laurent@sfml-dev.org) // // This software is provided 'as-is', without any express or implied warranty. // In no event will the authors be held liable for any damages arising from the use of this software. diff --git a/Engine-Core/vendor/SFML/include/SFML/Audio/AudioResource.hpp b/Engine-Core/vendor/SFML/include/SFML/Audio/AudioResource.hpp index 3230637..b75840c 100644 --- a/Engine-Core/vendor/SFML/include/SFML/Audio/AudioResource.hpp +++ b/Engine-Core/vendor/SFML/include/SFML/Audio/AudioResource.hpp @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////// // // SFML - Simple and Fast Multimedia Library -// Copyright (C) 2007-2024 Laurent Gomila (laurent@sfml-dev.org) +// Copyright (C) 2007-2025 Laurent Gomila (laurent@sfml-dev.org) // // This software is provided 'as-is', without any express or implied warranty. // In no event will the authors be held liable for any damages arising from the use of this software. diff --git a/Engine-Core/vendor/SFML/include/SFML/Audio/Export.hpp b/Engine-Core/vendor/SFML/include/SFML/Audio/Export.hpp index c50efc0..4cf99c1 100644 --- a/Engine-Core/vendor/SFML/include/SFML/Audio/Export.hpp +++ b/Engine-Core/vendor/SFML/include/SFML/Audio/Export.hpp @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////// // // SFML - Simple and Fast Multimedia Library -// Copyright (C) 2007-2024 Laurent Gomila (laurent@sfml-dev.org) +// Copyright (C) 2007-2025 Laurent Gomila (laurent@sfml-dev.org) // // This software is provided 'as-is', without any express or implied warranty. // In no event will the authors be held liable for any damages arising from the use of this software. diff --git a/Engine-Core/vendor/SFML/include/SFML/Audio/InputSoundFile.hpp b/Engine-Core/vendor/SFML/include/SFML/Audio/InputSoundFile.hpp index 523b8e5..253ed63 100644 --- a/Engine-Core/vendor/SFML/include/SFML/Audio/InputSoundFile.hpp +++ b/Engine-Core/vendor/SFML/include/SFML/Audio/InputSoundFile.hpp @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////// // // SFML - Simple and Fast Multimedia Library -// Copyright (C) 2007-2024 Laurent Gomila (laurent@sfml-dev.org) +// Copyright (C) 2007-2025 Laurent Gomila (laurent@sfml-dev.org) // // This software is provided 'as-is', without any express or implied warranty. // In no event will the authors be held liable for any damages arising from the use of this software. diff --git a/Engine-Core/vendor/SFML/include/SFML/Audio/Listener.hpp b/Engine-Core/vendor/SFML/include/SFML/Audio/Listener.hpp index 81c1794..475b366 100644 --- a/Engine-Core/vendor/SFML/include/SFML/Audio/Listener.hpp +++ b/Engine-Core/vendor/SFML/include/SFML/Audio/Listener.hpp @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////// // // SFML - Simple and Fast Multimedia Library -// Copyright (C) 2007-2024 Laurent Gomila (laurent@sfml-dev.org) +// Copyright (C) 2007-2025 Laurent Gomila (laurent@sfml-dev.org) // // This software is provided 'as-is', without any express or implied warranty. // In no event will the authors be held liable for any damages arising from the use of this software. diff --git a/Engine-Core/vendor/SFML/include/SFML/Audio/Music.hpp b/Engine-Core/vendor/SFML/include/SFML/Audio/Music.hpp index 91a2787..c60acda 100644 --- a/Engine-Core/vendor/SFML/include/SFML/Audio/Music.hpp +++ b/Engine-Core/vendor/SFML/include/SFML/Audio/Music.hpp @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////// // // SFML - Simple and Fast Multimedia Library -// Copyright (C) 2007-2024 Laurent Gomila (laurent@sfml-dev.org) +// Copyright (C) 2007-2025 Laurent Gomila (laurent@sfml-dev.org) // // This software is provided 'as-is', without any express or implied warranty. // In no event will the authors be held liable for any damages arising from the use of this software. diff --git a/Engine-Core/vendor/SFML/include/SFML/Audio/OutputSoundFile.hpp b/Engine-Core/vendor/SFML/include/SFML/Audio/OutputSoundFile.hpp index 422fa5e..16c83e3 100644 --- a/Engine-Core/vendor/SFML/include/SFML/Audio/OutputSoundFile.hpp +++ b/Engine-Core/vendor/SFML/include/SFML/Audio/OutputSoundFile.hpp @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////// // // SFML - Simple and Fast Multimedia Library -// Copyright (C) 2007-2024 Laurent Gomila (laurent@sfml-dev.org) +// Copyright (C) 2007-2025 Laurent Gomila (laurent@sfml-dev.org) // // This software is provided 'as-is', without any express or implied warranty. // In no event will the authors be held liable for any damages arising from the use of this software. diff --git a/Engine-Core/vendor/SFML/include/SFML/Audio/PlaybackDevice.hpp b/Engine-Core/vendor/SFML/include/SFML/Audio/PlaybackDevice.hpp index c59d91e..ab6ab64 100644 --- a/Engine-Core/vendor/SFML/include/SFML/Audio/PlaybackDevice.hpp +++ b/Engine-Core/vendor/SFML/include/SFML/Audio/PlaybackDevice.hpp @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////// // // SFML - Simple and Fast Multimedia Library -// Copyright (C) 2007-2024 Laurent Gomila (laurent@sfml-dev.org) +// Copyright (C) 2007-2025 Laurent Gomila (laurent@sfml-dev.org) // // This software is provided 'as-is', without any express or implied warranty. // In no event will the authors be held liable for any damages arising from the use of this software. diff --git a/Engine-Core/vendor/SFML/include/SFML/Audio/Sound.hpp b/Engine-Core/vendor/SFML/include/SFML/Audio/Sound.hpp index 6bf7297..4bacab2 100644 --- a/Engine-Core/vendor/SFML/include/SFML/Audio/Sound.hpp +++ b/Engine-Core/vendor/SFML/include/SFML/Audio/Sound.hpp @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////// // // SFML - Simple and Fast Multimedia Library -// Copyright (C) 2007-2024 Laurent Gomila (laurent@sfml-dev.org) +// Copyright (C) 2007-2025 Laurent Gomila (laurent@sfml-dev.org) // // This software is provided 'as-is', without any express or implied warranty. // In no event will the authors be held liable for any damages arising from the use of this software. diff --git a/Engine-Core/vendor/SFML/include/SFML/Audio/SoundBuffer.hpp b/Engine-Core/vendor/SFML/include/SFML/Audio/SoundBuffer.hpp index db2f48e..3fa2484 100644 --- a/Engine-Core/vendor/SFML/include/SFML/Audio/SoundBuffer.hpp +++ b/Engine-Core/vendor/SFML/include/SFML/Audio/SoundBuffer.hpp @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////// // // SFML - Simple and Fast Multimedia Library -// Copyright (C) 2007-2024 Laurent Gomila (laurent@sfml-dev.org) +// Copyright (C) 2007-2025 Laurent Gomila (laurent@sfml-dev.org) // // This software is provided 'as-is', without any express or implied warranty. // In no event will the authors be held liable for any damages arising from the use of this software. diff --git a/Engine-Core/vendor/SFML/include/SFML/Audio/SoundBufferRecorder.hpp b/Engine-Core/vendor/SFML/include/SFML/Audio/SoundBufferRecorder.hpp index 116ea80..b740f08 100644 --- a/Engine-Core/vendor/SFML/include/SFML/Audio/SoundBufferRecorder.hpp +++ b/Engine-Core/vendor/SFML/include/SFML/Audio/SoundBufferRecorder.hpp @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////// // // SFML - Simple and Fast Multimedia Library -// Copyright (C) 2007-2024 Laurent Gomila (laurent@sfml-dev.org) +// Copyright (C) 2007-2025 Laurent Gomila (laurent@sfml-dev.org) // // This software is provided 'as-is', without any express or implied warranty. // In no event will the authors be held liable for any damages arising from the use of this software. diff --git a/Engine-Core/vendor/SFML/include/SFML/Audio/SoundChannel.hpp b/Engine-Core/vendor/SFML/include/SFML/Audio/SoundChannel.hpp index 4418d00..05a4537 100644 --- a/Engine-Core/vendor/SFML/include/SFML/Audio/SoundChannel.hpp +++ b/Engine-Core/vendor/SFML/include/SFML/Audio/SoundChannel.hpp @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////// // // SFML - Simple and Fast Multimedia Library -// Copyright (C) 2007-2024 Laurent Gomila (laurent@sfml-dev.org) +// Copyright (C) 2007-2025 Laurent Gomila (laurent@sfml-dev.org) // // This software is provided 'as-is', without any express or implied warranty. // In no event will the authors be held liable for any damages arising from the use of this software. diff --git a/Engine-Core/vendor/SFML/include/SFML/Audio/SoundFileFactory.hpp b/Engine-Core/vendor/SFML/include/SFML/Audio/SoundFileFactory.hpp index 227b315..8e1952c 100644 --- a/Engine-Core/vendor/SFML/include/SFML/Audio/SoundFileFactory.hpp +++ b/Engine-Core/vendor/SFML/include/SFML/Audio/SoundFileFactory.hpp @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////// // // SFML - Simple and Fast Multimedia Library -// Copyright (C) 2007-2024 Laurent Gomila (laurent@sfml-dev.org) +// Copyright (C) 2007-2025 Laurent Gomila (laurent@sfml-dev.org) // // This software is provided 'as-is', without any express or implied warranty. // In no event will the authors be held liable for any damages arising from the use of this software. diff --git a/Engine-Core/vendor/SFML/include/SFML/Audio/SoundFileFactory.inl b/Engine-Core/vendor/SFML/include/SFML/Audio/SoundFileFactory.inl index 47a3d6c..f74ee1d 100644 --- a/Engine-Core/vendor/SFML/include/SFML/Audio/SoundFileFactory.inl +++ b/Engine-Core/vendor/SFML/include/SFML/Audio/SoundFileFactory.inl @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////// // // SFML - Simple and Fast Multimedia Library -// Copyright (C) 2007-2024 Laurent Gomila (laurent@sfml-dev.org) +// Copyright (C) 2007-2025 Laurent Gomila (laurent@sfml-dev.org) // // This software is provided 'as-is', without any express or implied warranty. // In no event will the authors be held liable for any damages arising from the use of this software. diff --git a/Engine-Core/vendor/SFML/include/SFML/Audio/SoundFileReader.hpp b/Engine-Core/vendor/SFML/include/SFML/Audio/SoundFileReader.hpp index 5ce6ec8..9cdf080 100644 --- a/Engine-Core/vendor/SFML/include/SFML/Audio/SoundFileReader.hpp +++ b/Engine-Core/vendor/SFML/include/SFML/Audio/SoundFileReader.hpp @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////// // // SFML - Simple and Fast Multimedia Library -// Copyright (C) 2007-2024 Laurent Gomila (laurent@sfml-dev.org) +// Copyright (C) 2007-2025 Laurent Gomila (laurent@sfml-dev.org) // // This software is provided 'as-is', without any express or implied warranty. // In no event will the authors be held liable for any damages arising from the use of this software. diff --git a/Engine-Core/vendor/SFML/include/SFML/Audio/SoundFileWriter.hpp b/Engine-Core/vendor/SFML/include/SFML/Audio/SoundFileWriter.hpp index 1a3629c..de095c6 100644 --- a/Engine-Core/vendor/SFML/include/SFML/Audio/SoundFileWriter.hpp +++ b/Engine-Core/vendor/SFML/include/SFML/Audio/SoundFileWriter.hpp @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////// // // SFML - Simple and Fast Multimedia Library -// Copyright (C) 2007-2024 Laurent Gomila (laurent@sfml-dev.org) +// Copyright (C) 2007-2025 Laurent Gomila (laurent@sfml-dev.org) // // This software is provided 'as-is', without any express or implied warranty. // In no event will the authors be held liable for any damages arising from the use of this software. diff --git a/Engine-Core/vendor/SFML/include/SFML/Audio/SoundRecorder.hpp b/Engine-Core/vendor/SFML/include/SFML/Audio/SoundRecorder.hpp index 8e8197c..8693861 100644 --- a/Engine-Core/vendor/SFML/include/SFML/Audio/SoundRecorder.hpp +++ b/Engine-Core/vendor/SFML/include/SFML/Audio/SoundRecorder.hpp @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////// // // SFML - Simple and Fast Multimedia Library -// Copyright (C) 2007-2024 Laurent Gomila (laurent@sfml-dev.org) +// Copyright (C) 2007-2025 Laurent Gomila (laurent@sfml-dev.org) // // This software is provided 'as-is', without any express or implied warranty. // In no event will the authors be held liable for any damages arising from the use of this software. diff --git a/Engine-Core/vendor/SFML/include/SFML/Audio/SoundSource.hpp b/Engine-Core/vendor/SFML/include/SFML/Audio/SoundSource.hpp index 24129e8..3cdff0a 100644 --- a/Engine-Core/vendor/SFML/include/SFML/Audio/SoundSource.hpp +++ b/Engine-Core/vendor/SFML/include/SFML/Audio/SoundSource.hpp @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////// // // SFML - Simple and Fast Multimedia Library -// Copyright (C) 2007-2024 Laurent Gomila (laurent@sfml-dev.org) +// Copyright (C) 2007-2025 Laurent Gomila (laurent@sfml-dev.org) // // This software is provided 'as-is', without any express or implied warranty. // In no event will the authors be held liable for any damages arising from the use of this software. diff --git a/Engine-Core/vendor/SFML/include/SFML/Audio/SoundStream.hpp b/Engine-Core/vendor/SFML/include/SFML/Audio/SoundStream.hpp index 12ee9c7..475e73a 100644 --- a/Engine-Core/vendor/SFML/include/SFML/Audio/SoundStream.hpp +++ b/Engine-Core/vendor/SFML/include/SFML/Audio/SoundStream.hpp @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////// // // SFML - Simple and Fast Multimedia Library -// Copyright (C) 2007-2024 Laurent Gomila (laurent@sfml-dev.org) +// Copyright (C) 2007-2025 Laurent Gomila (laurent@sfml-dev.org) // // This software is provided 'as-is', without any express or implied warranty. // In no event will the authors be held liable for any damages arising from the use of this software. diff --git a/Engine-Core/vendor/SFML/include/SFML/Config.hpp b/Engine-Core/vendor/SFML/include/SFML/Config.hpp index 8162827..760b887 100644 --- a/Engine-Core/vendor/SFML/include/SFML/Config.hpp +++ b/Engine-Core/vendor/SFML/include/SFML/Config.hpp @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////// // // SFML - Simple and Fast Multimedia Library -// Copyright (C) 2007-2024 Laurent Gomila (laurent@sfml-dev.org) +// Copyright (C) 2007-2025 Laurent Gomila (laurent@sfml-dev.org) // // This software is provided 'as-is', without any express or implied warranty. // In no event will the authors be held liable for any damages arising from the use of this software. @@ -30,7 +30,7 @@ //////////////////////////////////////////////////////////// #define SFML_VERSION_MAJOR 3 #define SFML_VERSION_MINOR 0 -#define SFML_VERSION_PATCH 0 +#define SFML_VERSION_PATCH 1 #define SFML_VERSION_IS_RELEASE true @@ -111,6 +111,14 @@ #endif +//////////////////////////////////////////////////////////// +// Ensure minimum C++ language standard version is met +//////////////////////////////////////////////////////////// +#if (defined(_MSVC_LANG) && _MSVC_LANG < 201703L) || (!defined(_MSVC_LANG) && __cplusplus < 201703L) +#error "Enable C++17 or newer for your compiler (e.g. -std=c++17 for GCC/Clang or /std:c++17 for MSVC)" +#endif + + //////////////////////////////////////////////////////////// // Portable debug macro //////////////////////////////////////////////////////////// @@ -132,7 +140,7 @@ #define SFML_API_EXPORT __declspec(dllexport) #define SFML_API_IMPORT __declspec(dllimport) -// For Visual C++ compilers, we also need to turn off this annoying C4251 warning +// For Visual C++ compilers, we also need to turn off this annoying C4251 & C4275 warning #ifdef _MSC_VER #pragma warning(disable : 4251) // Using standard library types in our own exported types is okay diff --git a/Engine-Core/vendor/SFML/include/SFML/GpuPreference.hpp b/Engine-Core/vendor/SFML/include/SFML/GpuPreference.hpp index fdb51ae..87a53ce 100644 --- a/Engine-Core/vendor/SFML/include/SFML/GpuPreference.hpp +++ b/Engine-Core/vendor/SFML/include/SFML/GpuPreference.hpp @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////// // // SFML - Simple and Fast Multimedia Library -// Copyright (C) 2007-2024 Laurent Gomila (laurent@sfml-dev.org) +// Copyright (C) 2007-2025 Laurent Gomila (laurent@sfml-dev.org) // // This software is provided 'as-is', without any express or implied warranty. // In no event will the authors be held liable for any damages arising from the use of this software. diff --git a/Engine-Core/vendor/SFML/include/SFML/Graphics.hpp b/Engine-Core/vendor/SFML/include/SFML/Graphics.hpp index 1440728..2f5823e 100644 --- a/Engine-Core/vendor/SFML/include/SFML/Graphics.hpp +++ b/Engine-Core/vendor/SFML/include/SFML/Graphics.hpp @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////// // // SFML - Simple and Fast Multimedia Library -// Copyright (C) 2007-2024 Laurent Gomila (laurent@sfml-dev.org) +// Copyright (C) 2007-2025 Laurent Gomila (laurent@sfml-dev.org) // // This software is provided 'as-is', without any express or implied warranty. // In no event will the authors be held liable for any damages arising from the use of this software. diff --git a/Engine-Core/vendor/SFML/include/SFML/Graphics/BlendMode.hpp b/Engine-Core/vendor/SFML/include/SFML/Graphics/BlendMode.hpp index 731d6b7..0acdcad 100644 --- a/Engine-Core/vendor/SFML/include/SFML/Graphics/BlendMode.hpp +++ b/Engine-Core/vendor/SFML/include/SFML/Graphics/BlendMode.hpp @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////// // // SFML - Simple and Fast Multimedia Library -// Copyright (C) 2007-2024 Laurent Gomila (laurent@sfml-dev.org) +// Copyright (C) 2007-2025 Laurent Gomila (laurent@sfml-dev.org) // // This software is provided 'as-is', without any express or implied warranty. // In no event will the authors be held liable for any damages arising from the use of this software. diff --git a/Engine-Core/vendor/SFML/include/SFML/Graphics/CircleShape.hpp b/Engine-Core/vendor/SFML/include/SFML/Graphics/CircleShape.hpp index c2d57d7..987237e 100644 --- a/Engine-Core/vendor/SFML/include/SFML/Graphics/CircleShape.hpp +++ b/Engine-Core/vendor/SFML/include/SFML/Graphics/CircleShape.hpp @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////// // // SFML - Simple and Fast Multimedia Library -// Copyright (C) 2007-2024 Laurent Gomila (laurent@sfml-dev.org) +// Copyright (C) 2007-2025 Laurent Gomila (laurent@sfml-dev.org) // // This software is provided 'as-is', without any express or implied warranty. // In no event will the authors be held liable for any damages arising from the use of this software. diff --git a/Engine-Core/vendor/SFML/include/SFML/Graphics/Color.hpp b/Engine-Core/vendor/SFML/include/SFML/Graphics/Color.hpp index 1a2c8a4..eba7466 100644 --- a/Engine-Core/vendor/SFML/include/SFML/Graphics/Color.hpp +++ b/Engine-Core/vendor/SFML/include/SFML/Graphics/Color.hpp @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////// // // SFML - Simple and Fast Multimedia Library -// Copyright (C) 2007-2024 Laurent Gomila (laurent@sfml-dev.org) +// Copyright (C) 2007-2025 Laurent Gomila (laurent@sfml-dev.org) // // This software is provided 'as-is', without any express or implied warranty. // In no event will the authors be held liable for any damages arising from the use of this software. diff --git a/Engine-Core/vendor/SFML/include/SFML/Graphics/Color.inl b/Engine-Core/vendor/SFML/include/SFML/Graphics/Color.inl index fd486d6..1b5f3a1 100644 --- a/Engine-Core/vendor/SFML/include/SFML/Graphics/Color.inl +++ b/Engine-Core/vendor/SFML/include/SFML/Graphics/Color.inl @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////// // // SFML - Simple and Fast Multimedia Library -// Copyright (C) 2007-2024 Laurent Gomila (laurent@sfml-dev.org) +// Copyright (C) 2007-2025 Laurent Gomila (laurent@sfml-dev.org) // // This software is provided 'as-is', without any express or implied warranty. // In no event will the authors be held liable for any damages arising from the use of this software. diff --git a/Engine-Core/vendor/SFML/include/SFML/Graphics/ConvexShape.hpp b/Engine-Core/vendor/SFML/include/SFML/Graphics/ConvexShape.hpp index a4aa37c..35183c3 100644 --- a/Engine-Core/vendor/SFML/include/SFML/Graphics/ConvexShape.hpp +++ b/Engine-Core/vendor/SFML/include/SFML/Graphics/ConvexShape.hpp @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////// // // SFML - Simple and Fast Multimedia Library -// Copyright (C) 2007-2024 Laurent Gomila (laurent@sfml-dev.org) +// Copyright (C) 2007-2025 Laurent Gomila (laurent@sfml-dev.org) // // This software is provided 'as-is', without any express or implied warranty. // In no event will the authors be held liable for any damages arising from the use of this software. diff --git a/Engine-Core/vendor/SFML/include/SFML/Graphics/CoordinateType.hpp b/Engine-Core/vendor/SFML/include/SFML/Graphics/CoordinateType.hpp index 5c26f03..26bf5ca 100644 --- a/Engine-Core/vendor/SFML/include/SFML/Graphics/CoordinateType.hpp +++ b/Engine-Core/vendor/SFML/include/SFML/Graphics/CoordinateType.hpp @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////// // // SFML - Simple and Fast Multimedia Library -// Copyright (C) 2007-2024 Laurent Gomila (laurent@sfml-dev.org) +// Copyright (C) 2007-2025 Laurent Gomila (laurent@sfml-dev.org) // // This software is provided 'as-is', without any express or implied warranty. // In no event will the authors be held liable for any damages arising from the use of this software. diff --git a/Engine-Core/vendor/SFML/include/SFML/Graphics/Drawable.hpp b/Engine-Core/vendor/SFML/include/SFML/Graphics/Drawable.hpp index 3a5c89d..3fd120f 100644 --- a/Engine-Core/vendor/SFML/include/SFML/Graphics/Drawable.hpp +++ b/Engine-Core/vendor/SFML/include/SFML/Graphics/Drawable.hpp @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////// // // SFML - Simple and Fast Multimedia Library -// Copyright (C) 2007-2024 Laurent Gomila (laurent@sfml-dev.org) +// Copyright (C) 2007-2025 Laurent Gomila (laurent@sfml-dev.org) // // This software is provided 'as-is', without any express or implied warranty. // In no event will the authors be held liable for any damages arising from the use of this software. diff --git a/Engine-Core/vendor/SFML/include/SFML/Graphics/Export.hpp b/Engine-Core/vendor/SFML/include/SFML/Graphics/Export.hpp index 79b0554..1908ce9 100644 --- a/Engine-Core/vendor/SFML/include/SFML/Graphics/Export.hpp +++ b/Engine-Core/vendor/SFML/include/SFML/Graphics/Export.hpp @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////// // // SFML - Simple and Fast Multimedia Library -// Copyright (C) 2007-2024 Laurent Gomila (laurent@sfml-dev.org) +// Copyright (C) 2007-2025 Laurent Gomila (laurent@sfml-dev.org) // // This software is provided 'as-is', without any express or implied warranty. // In no event will the authors be held liable for any damages arising from the use of this software. diff --git a/Engine-Core/vendor/SFML/include/SFML/Graphics/Font.hpp b/Engine-Core/vendor/SFML/include/SFML/Graphics/Font.hpp index aed7052..d1a0140 100644 --- a/Engine-Core/vendor/SFML/include/SFML/Graphics/Font.hpp +++ b/Engine-Core/vendor/SFML/include/SFML/Graphics/Font.hpp @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////// // // SFML - Simple and Fast Multimedia Library -// Copyright (C) 2007-2024 Laurent Gomila (laurent@sfml-dev.org) +// Copyright (C) 2007-2025 Laurent Gomila (laurent@sfml-dev.org) // // This software is provided 'as-is', without any express or implied warranty. // In no event will the authors be held liable for any damages arising from the use of this software. @@ -38,6 +38,7 @@ #include #include #include +#include #include #include @@ -45,13 +46,6 @@ #include -#ifdef SFML_SYSTEM_ANDROID -namespace sf::priv -{ -class ResourceStream; -} -#endif - namespace sf { class InputStream; @@ -399,6 +393,12 @@ private: //////////////////////////////////////////////////////////// void cleanup(); + //////////////////////////////////////////////////////////// + /// \brief Open from stream and print errors with custom message + /// + //////////////////////////////////////////////////////////// + [[nodiscard]] bool openFromStreamImpl(InputStream& stream, std::string_view type); + //////////////////////////////////////////////////////////// /// \brief Find or create the glyphs page corresponding to the given character size /// @@ -457,9 +457,7 @@ private: Info m_info; //!< Information about the font mutable PageTable m_pages; //!< Table containing the glyphs pages by character size mutable std::vector m_pixelBuffer; //!< Pixel buffer holding a glyph's pixels before being written to the texture -#ifdef SFML_SYSTEM_ANDROID - std::shared_ptr m_stream; //!< Asset file streamer (if loaded from file) -#endif + std::shared_ptr m_stream; //!< Stream for openFromFile and openFromMemory }; } // namespace sf diff --git a/Engine-Core/vendor/SFML/include/SFML/Graphics/Glsl.hpp b/Engine-Core/vendor/SFML/include/SFML/Graphics/Glsl.hpp index 617f422..6d2fc00 100644 --- a/Engine-Core/vendor/SFML/include/SFML/Graphics/Glsl.hpp +++ b/Engine-Core/vendor/SFML/include/SFML/Graphics/Glsl.hpp @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////// // // SFML - Simple and Fast Multimedia Library -// Copyright (C) 2007-2024 Laurent Gomila (laurent@sfml-dev.org) +// Copyright (C) 2007-2025 Laurent Gomila (laurent@sfml-dev.org) // // This software is provided 'as-is', without any express or implied warranty. // In no event will the authors be held liable for any damages arising from the use of this software. diff --git a/Engine-Core/vendor/SFML/include/SFML/Graphics/Glsl.inl b/Engine-Core/vendor/SFML/include/SFML/Graphics/Glsl.inl index a45482a..a10edc8 100644 --- a/Engine-Core/vendor/SFML/include/SFML/Graphics/Glsl.inl +++ b/Engine-Core/vendor/SFML/include/SFML/Graphics/Glsl.inl @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////// // // SFML - Simple and Fast Multimedia Library -// Copyright (C) 2007-2024 Laurent Gomila (laurent@sfml-dev.org) +// Copyright (C) 2007-2025 Laurent Gomila (laurent@sfml-dev.org) // // This software is provided 'as-is', without any express or implied warranty. // In no event will the authors be held liable for any damages arising from the use of this software. diff --git a/Engine-Core/vendor/SFML/include/SFML/Graphics/Glyph.hpp b/Engine-Core/vendor/SFML/include/SFML/Graphics/Glyph.hpp index 46b83d7..b576fc1 100644 --- a/Engine-Core/vendor/SFML/include/SFML/Graphics/Glyph.hpp +++ b/Engine-Core/vendor/SFML/include/SFML/Graphics/Glyph.hpp @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////// // // SFML - Simple and Fast Multimedia Library -// Copyright (C) 2007-2024 Laurent Gomila (laurent@sfml-dev.org) +// Copyright (C) 2007-2025 Laurent Gomila (laurent@sfml-dev.org) // // This software is provided 'as-is', without any express or implied warranty. // In no event will the authors be held liable for any damages arising from the use of this software. diff --git a/Engine-Core/vendor/SFML/include/SFML/Graphics/Image.hpp b/Engine-Core/vendor/SFML/include/SFML/Graphics/Image.hpp index cba6ccb..cc31fce 100644 --- a/Engine-Core/vendor/SFML/include/SFML/Graphics/Image.hpp +++ b/Engine-Core/vendor/SFML/include/SFML/Graphics/Image.hpp @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////// // // SFML - Simple and Fast Multimedia Library -// Copyright (C) 2007-2024 Laurent Gomila (laurent@sfml-dev.org) +// Copyright (C) 2007-2025 Laurent Gomila (laurent@sfml-dev.org) // // This software is provided 'as-is', without any express or implied warranty. // In no event will the authors be held liable for any damages arising from the use of this software. diff --git a/Engine-Core/vendor/SFML/include/SFML/Graphics/PrimitiveType.hpp b/Engine-Core/vendor/SFML/include/SFML/Graphics/PrimitiveType.hpp index 52682fb..c9c4082 100644 --- a/Engine-Core/vendor/SFML/include/SFML/Graphics/PrimitiveType.hpp +++ b/Engine-Core/vendor/SFML/include/SFML/Graphics/PrimitiveType.hpp @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////// // // SFML - Simple and Fast Multimedia Library -// Copyright (C) 2007-2024 Laurent Gomila (laurent@sfml-dev.org) +// Copyright (C) 2007-2025 Laurent Gomila (laurent@sfml-dev.org) // // This software is provided 'as-is', without any express or implied warranty. // In no event will the authors be held liable for any damages arising from the use of this software. diff --git a/Engine-Core/vendor/SFML/include/SFML/Graphics/Rect.hpp b/Engine-Core/vendor/SFML/include/SFML/Graphics/Rect.hpp index d703328..053bc07 100644 --- a/Engine-Core/vendor/SFML/include/SFML/Graphics/Rect.hpp +++ b/Engine-Core/vendor/SFML/include/SFML/Graphics/Rect.hpp @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////// // // SFML - Simple and Fast Multimedia Library -// Copyright (C) 2007-2024 Laurent Gomila (laurent@sfml-dev.org) +// Copyright (C) 2007-2025 Laurent Gomila (laurent@sfml-dev.org) // // This software is provided 'as-is', without any express or implied warranty. // In no event will the authors be held liable for any damages arising from the use of this software. diff --git a/Engine-Core/vendor/SFML/include/SFML/Graphics/Rect.inl b/Engine-Core/vendor/SFML/include/SFML/Graphics/Rect.inl index e1dc35f..7c82428 100644 --- a/Engine-Core/vendor/SFML/include/SFML/Graphics/Rect.inl +++ b/Engine-Core/vendor/SFML/include/SFML/Graphics/Rect.inl @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////// // // SFML - Simple and Fast Multimedia Library -// Copyright (C) 2007-2024 Laurent Gomila (laurent@sfml-dev.org) +// Copyright (C) 2007-2025 Laurent Gomila (laurent@sfml-dev.org) // // This software is provided 'as-is', without any express or implied warranty. // In no event will the authors be held liable for any damages arising from the use of this software. diff --git a/Engine-Core/vendor/SFML/include/SFML/Graphics/RectangleShape.hpp b/Engine-Core/vendor/SFML/include/SFML/Graphics/RectangleShape.hpp index 2cac809..378411c 100644 --- a/Engine-Core/vendor/SFML/include/SFML/Graphics/RectangleShape.hpp +++ b/Engine-Core/vendor/SFML/include/SFML/Graphics/RectangleShape.hpp @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////// // // SFML - Simple and Fast Multimedia Library -// Copyright (C) 2007-2024 Laurent Gomila (laurent@sfml-dev.org) +// Copyright (C) 2007-2025 Laurent Gomila (laurent@sfml-dev.org) // // This software is provided 'as-is', without any express or implied warranty. // In no event will the authors be held liable for any damages arising from the use of this software. diff --git a/Engine-Core/vendor/SFML/include/SFML/Graphics/RenderStates.hpp b/Engine-Core/vendor/SFML/include/SFML/Graphics/RenderStates.hpp index 52f5b59..b8dc337 100644 --- a/Engine-Core/vendor/SFML/include/SFML/Graphics/RenderStates.hpp +++ b/Engine-Core/vendor/SFML/include/SFML/Graphics/RenderStates.hpp @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////// // // SFML - Simple and Fast Multimedia Library -// Copyright (C) 2007-2024 Laurent Gomila (laurent@sfml-dev.org) +// Copyright (C) 2007-2025 Laurent Gomila (laurent@sfml-dev.org) // // This software is provided 'as-is', without any express or implied warranty. // In no event will the authors be held liable for any damages arising from the use of this software. diff --git a/Engine-Core/vendor/SFML/include/SFML/Graphics/RenderTarget.hpp b/Engine-Core/vendor/SFML/include/SFML/Graphics/RenderTarget.hpp index a3d21f6..8c4cf80 100644 --- a/Engine-Core/vendor/SFML/include/SFML/Graphics/RenderTarget.hpp +++ b/Engine-Core/vendor/SFML/include/SFML/Graphics/RenderTarget.hpp @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////// // // SFML - Simple and Fast Multimedia Library -// Copyright (C) 2007-2024 Laurent Gomila (laurent@sfml-dev.org) +// Copyright (C) 2007-2025 Laurent Gomila (laurent@sfml-dev.org) // // This software is provided 'as-is', without any express or implied warranty. // In no event will the authors be held liable for any damages arising from the use of this software. diff --git a/Engine-Core/vendor/SFML/include/SFML/Graphics/RenderTexture.hpp b/Engine-Core/vendor/SFML/include/SFML/Graphics/RenderTexture.hpp index b5fc3de..a2b8b20 100644 --- a/Engine-Core/vendor/SFML/include/SFML/Graphics/RenderTexture.hpp +++ b/Engine-Core/vendor/SFML/include/SFML/Graphics/RenderTexture.hpp @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////// // // SFML - Simple and Fast Multimedia Library -// Copyright (C) 2007-2024 Laurent Gomila (laurent@sfml-dev.org) +// Copyright (C) 2007-2025 Laurent Gomila (laurent@sfml-dev.org) // // This software is provided 'as-is', without any express or implied warranty. // In no event will the authors be held liable for any damages arising from the use of this software. diff --git a/Engine-Core/vendor/SFML/include/SFML/Graphics/RenderWindow.hpp b/Engine-Core/vendor/SFML/include/SFML/Graphics/RenderWindow.hpp index 5365c93..9a9bca0 100644 --- a/Engine-Core/vendor/SFML/include/SFML/Graphics/RenderWindow.hpp +++ b/Engine-Core/vendor/SFML/include/SFML/Graphics/RenderWindow.hpp @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////// // // SFML - Simple and Fast Multimedia Library -// Copyright (C) 2007-2024 Laurent Gomila (laurent@sfml-dev.org) +// Copyright (C) 2007-2025 Laurent Gomila (laurent@sfml-dev.org) // // This software is provided 'as-is', without any express or implied warranty. // In no event will the authors be held liable for any damages arising from the use of this software. diff --git a/Engine-Core/vendor/SFML/include/SFML/Graphics/Shader.hpp b/Engine-Core/vendor/SFML/include/SFML/Graphics/Shader.hpp index 9ec0584..6d480f5 100644 --- a/Engine-Core/vendor/SFML/include/SFML/Graphics/Shader.hpp +++ b/Engine-Core/vendor/SFML/include/SFML/Graphics/Shader.hpp @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////// // // SFML - Simple and Fast Multimedia Library -// Copyright (C) 2007-2024 Laurent Gomila (laurent@sfml-dev.org) +// Copyright (C) 2007-2025 Laurent Gomila (laurent@sfml-dev.org) // // This software is provided 'as-is', without any express or implied warranty. // In no event will the authors be held liable for any damages arising from the use of this software. diff --git a/Engine-Core/vendor/SFML/include/SFML/Graphics/Shape.hpp b/Engine-Core/vendor/SFML/include/SFML/Graphics/Shape.hpp index 6cffac5..db3ee75 100644 --- a/Engine-Core/vendor/SFML/include/SFML/Graphics/Shape.hpp +++ b/Engine-Core/vendor/SFML/include/SFML/Graphics/Shape.hpp @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////// // // SFML - Simple and Fast Multimedia Library -// Copyright (C) 2007-2024 Laurent Gomila (laurent@sfml-dev.org) +// Copyright (C) 2007-2025 Laurent Gomila (laurent@sfml-dev.org) // // This software is provided 'as-is', without any express or implied warranty. // In no event will the authors be held liable for any damages arising from the use of this software. diff --git a/Engine-Core/vendor/SFML/include/SFML/Graphics/Sprite.hpp b/Engine-Core/vendor/SFML/include/SFML/Graphics/Sprite.hpp index 4a780b8..0715926 100644 --- a/Engine-Core/vendor/SFML/include/SFML/Graphics/Sprite.hpp +++ b/Engine-Core/vendor/SFML/include/SFML/Graphics/Sprite.hpp @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////// // // SFML - Simple and Fast Multimedia Library -// Copyright (C) 2007-2024 Laurent Gomila (laurent@sfml-dev.org) +// Copyright (C) 2007-2025 Laurent Gomila (laurent@sfml-dev.org) // // This software is provided 'as-is', without any express or implied warranty. // In no event will the authors be held liable for any damages arising from the use of this software. diff --git a/Engine-Core/vendor/SFML/include/SFML/Graphics/StencilMode.hpp b/Engine-Core/vendor/SFML/include/SFML/Graphics/StencilMode.hpp index 871c545..55656b2 100644 --- a/Engine-Core/vendor/SFML/include/SFML/Graphics/StencilMode.hpp +++ b/Engine-Core/vendor/SFML/include/SFML/Graphics/StencilMode.hpp @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////// // // SFML - Simple and Fast Multimedia Library -// Copyright (C) 2007-2023 Laurent Gomila (laurent@sfml-dev.org) +// Copyright (C) 2007-2025 Laurent Gomila (laurent@sfml-dev.org) // // This software is provided 'as-is', without any express or implied warranty. // In no event will the authors be held liable for any damages arising from the use of this software. diff --git a/Engine-Core/vendor/SFML/include/SFML/Graphics/Text.hpp b/Engine-Core/vendor/SFML/include/SFML/Graphics/Text.hpp index e495a64..620a0cf 100644 --- a/Engine-Core/vendor/SFML/include/SFML/Graphics/Text.hpp +++ b/Engine-Core/vendor/SFML/include/SFML/Graphics/Text.hpp @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////// // // SFML - Simple and Fast Multimedia Library -// Copyright (C) 2007-2024 Laurent Gomila (laurent@sfml-dev.org) +// Copyright (C) 2007-2025 Laurent Gomila (laurent@sfml-dev.org) // // This software is provided 'as-is', without any express or implied warranty. // In no event will the authors be held liable for any damages arising from the use of this software. diff --git a/Engine-Core/vendor/SFML/include/SFML/Graphics/Texture.hpp b/Engine-Core/vendor/SFML/include/SFML/Graphics/Texture.hpp index 0fe61c9..6dccd05 100644 --- a/Engine-Core/vendor/SFML/include/SFML/Graphics/Texture.hpp +++ b/Engine-Core/vendor/SFML/include/SFML/Graphics/Texture.hpp @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////// // // SFML - Simple and Fast Multimedia Library -// Copyright (C) 2007-2024 Laurent Gomila (laurent@sfml-dev.org) +// Copyright (C) 2007-2025 Laurent Gomila (laurent@sfml-dev.org) // // This software is provided 'as-is', without any express or implied warranty. // In no event will the authors be held liable for any damages arising from the use of this software. diff --git a/Engine-Core/vendor/SFML/include/SFML/Graphics/Transform.hpp b/Engine-Core/vendor/SFML/include/SFML/Graphics/Transform.hpp index 1847a6c..7edbf3f 100644 --- a/Engine-Core/vendor/SFML/include/SFML/Graphics/Transform.hpp +++ b/Engine-Core/vendor/SFML/include/SFML/Graphics/Transform.hpp @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////// // // SFML - Simple and Fast Multimedia Library -// Copyright (C) 2007-2024 Laurent Gomila (laurent@sfml-dev.org) +// Copyright (C) 2007-2025 Laurent Gomila (laurent@sfml-dev.org) // // This software is provided 'as-is', without any express or implied warranty. // In no event will the authors be held liable for any damages arising from the use of this software. diff --git a/Engine-Core/vendor/SFML/include/SFML/Graphics/Transform.inl b/Engine-Core/vendor/SFML/include/SFML/Graphics/Transform.inl index 81a5c2b..6d05aac 100644 --- a/Engine-Core/vendor/SFML/include/SFML/Graphics/Transform.inl +++ b/Engine-Core/vendor/SFML/include/SFML/Graphics/Transform.inl @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////// // // SFML - Simple and Fast Multimedia Library -// Copyright (C) 2007-2024 Laurent Gomila (laurent@sfml-dev.org) +// Copyright (C) 2007-2025 Laurent Gomila (laurent@sfml-dev.org) // // This software is provided 'as-is', without any express or implied warranty. // In no event will the authors be held liable for any damages arising from the use of this software. diff --git a/Engine-Core/vendor/SFML/include/SFML/Graphics/Transformable.hpp b/Engine-Core/vendor/SFML/include/SFML/Graphics/Transformable.hpp index a6d7be6..1819288 100644 --- a/Engine-Core/vendor/SFML/include/SFML/Graphics/Transformable.hpp +++ b/Engine-Core/vendor/SFML/include/SFML/Graphics/Transformable.hpp @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////// // // SFML - Simple and Fast Multimedia Library -// Copyright (C) 2007-2024 Laurent Gomila (laurent@sfml-dev.org) +// Copyright (C) 2007-2025 Laurent Gomila (laurent@sfml-dev.org) // // This software is provided 'as-is', without any express or implied warranty. // In no event will the authors be held liable for any damages arising from the use of this software. @@ -271,7 +271,7 @@ private: /// provides an "origin" component, which represents the local origin /// of the three other components. Let's take an example with a 10x10 /// pixels sprite. By default, the sprite is positioned/rotated/scaled -/// relatively to its top-left corner, because it is the local point +/// relative to its top-left corner, because it is the local point /// (0, 0). But if we change the origin to be (5, 5), the sprite will /// be positioned/rotated/scaled around its center instead. And if /// we set the origin to (10, 10), it will be transformed around its @@ -279,7 +279,7 @@ private: /// /// To keep the `sf::Transformable` class simple, there's only one /// origin for all the components. You cannot position the sprite -/// relatively to its top-left corner while rotating it around its +/// relative to its top-left corner while rotating it around its /// center, for example. To do such things, use `sf::Transform` directly. /// /// `sf::Transformable` can be used as a base class. It is often diff --git a/Engine-Core/vendor/SFML/include/SFML/Graphics/Vertex.hpp b/Engine-Core/vendor/SFML/include/SFML/Graphics/Vertex.hpp index 7fbdf9b..d8ee49a 100644 --- a/Engine-Core/vendor/SFML/include/SFML/Graphics/Vertex.hpp +++ b/Engine-Core/vendor/SFML/include/SFML/Graphics/Vertex.hpp @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////// // // SFML - Simple and Fast Multimedia Library -// Copyright (C) 2007-2024 Laurent Gomila (laurent@sfml-dev.org) +// Copyright (C) 2007-2025 Laurent Gomila (laurent@sfml-dev.org) // // This software is provided 'as-is', without any express or implied warranty. // In no event will the authors be held liable for any damages arising from the use of this software. diff --git a/Engine-Core/vendor/SFML/include/SFML/Graphics/VertexArray.hpp b/Engine-Core/vendor/SFML/include/SFML/Graphics/VertexArray.hpp index 9b60fe2..5106ce5 100644 --- a/Engine-Core/vendor/SFML/include/SFML/Graphics/VertexArray.hpp +++ b/Engine-Core/vendor/SFML/include/SFML/Graphics/VertexArray.hpp @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////// // // SFML - Simple and Fast Multimedia Library -// Copyright (C) 2007-2024 Laurent Gomila (laurent@sfml-dev.org) +// Copyright (C) 2007-2025 Laurent Gomila (laurent@sfml-dev.org) // // This software is provided 'as-is', without any express or implied warranty. // In no event will the authors be held liable for any damages arising from the use of this software. @@ -175,8 +175,6 @@ public: //////////////////////////////////////////////////////////// [[nodiscard]] FloatRect getBounds() const; - //////////////////////////////////////////////////////////// - private: //////////////////////////////////////////////////////////// /// \brief Draw the vertex array to a render target diff --git a/Engine-Core/vendor/SFML/include/SFML/Graphics/VertexBuffer.hpp b/Engine-Core/vendor/SFML/include/SFML/Graphics/VertexBuffer.hpp index bb1f1b9..4bc45ac 100644 --- a/Engine-Core/vendor/SFML/include/SFML/Graphics/VertexBuffer.hpp +++ b/Engine-Core/vendor/SFML/include/SFML/Graphics/VertexBuffer.hpp @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////// // // SFML - Simple and Fast Multimedia Library -// Copyright (C) 2007-2024 Laurent Gomila (laurent@sfml-dev.org) +// Copyright (C) 2007-2025 Laurent Gomila (laurent@sfml-dev.org) // // This software is provided 'as-is', without any express or implied warranty. // In no event will the authors be held liable for any damages arising from the use of this software. diff --git a/Engine-Core/vendor/SFML/include/SFML/Graphics/View.hpp b/Engine-Core/vendor/SFML/include/SFML/Graphics/View.hpp index 450973f..e58d82a 100644 --- a/Engine-Core/vendor/SFML/include/SFML/Graphics/View.hpp +++ b/Engine-Core/vendor/SFML/include/SFML/Graphics/View.hpp @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////// // // SFML - Simple and Fast Multimedia Library -// Copyright (C) 2007-2024 Laurent Gomila (laurent@sfml-dev.org) +// Copyright (C) 2007-2025 Laurent Gomila (laurent@sfml-dev.org) // // This software is provided 'as-is', without any express or implied warranty. // In no event will the authors be held liable for any damages arising from the use of this software. @@ -194,7 +194,7 @@ public: [[nodiscard]] const FloatRect& getScissor() const; //////////////////////////////////////////////////////////// - /// \brief Move the view relatively to its current position + /// \brief Move the view relative to its current position /// /// \param offset Move offset /// @@ -204,7 +204,7 @@ public: void move(Vector2f offset); //////////////////////////////////////////////////////////// - /// \brief Rotate the view relatively to its current orientation + /// \brief Rotate the view relative to its current orientation /// /// \param angle Angle to rotate /// @@ -214,7 +214,7 @@ public: void rotate(Angle angle); //////////////////////////////////////////////////////////// - /// \brief Resize the view rectangle relatively to its current size + /// \brief Resize the view rectangle relative to its current size /// /// Resizing the view simulates a zoom, as the zone displayed on /// screen grows or shrinks. diff --git a/Engine-Core/vendor/SFML/include/SFML/Main.hpp b/Engine-Core/vendor/SFML/include/SFML/Main.hpp index 15ce131..ce043c4 100644 --- a/Engine-Core/vendor/SFML/include/SFML/Main.hpp +++ b/Engine-Core/vendor/SFML/include/SFML/Main.hpp @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////// // // SFML - Simple and Fast Multimedia Library -// Copyright (C) 2007-2024 Laurent Gomila (laurent@sfml-dev.org) +// Copyright (C) 2007-2025 Laurent Gomila (laurent@sfml-dev.org) // // This software is provided 'as-is', without any express or implied warranty. // In no event will the authors be held liable for any damages arising from the use of this software. diff --git a/Engine-Core/vendor/SFML/include/SFML/Network.hpp b/Engine-Core/vendor/SFML/include/SFML/Network.hpp index 4ff2492..ff4990f 100644 --- a/Engine-Core/vendor/SFML/include/SFML/Network.hpp +++ b/Engine-Core/vendor/SFML/include/SFML/Network.hpp @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////// // // SFML - Simple and Fast Multimedia Library -// Copyright (C) 2007-2024 Laurent Gomila (laurent@sfml-dev.org) +// Copyright (C) 2007-2025 Laurent Gomila (laurent@sfml-dev.org) // // This software is provided 'as-is', without any express or implied warranty. // In no event will the authors be held liable for any damages arising from the use of this software. diff --git a/Engine-Core/vendor/SFML/include/SFML/Network/Export.hpp b/Engine-Core/vendor/SFML/include/SFML/Network/Export.hpp index b5ba14a..edcc6e5 100644 --- a/Engine-Core/vendor/SFML/include/SFML/Network/Export.hpp +++ b/Engine-Core/vendor/SFML/include/SFML/Network/Export.hpp @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////// // // SFML - Simple and Fast Multimedia Library -// Copyright (C) 2007-2024 Laurent Gomila (laurent@sfml-dev.org) +// Copyright (C) 2007-2025 Laurent Gomila (laurent@sfml-dev.org) // // This software is provided 'as-is', without any express or implied warranty. // In no event will the authors be held liable for any damages arising from the use of this software. diff --git a/Engine-Core/vendor/SFML/include/SFML/Network/Ftp.hpp b/Engine-Core/vendor/SFML/include/SFML/Network/Ftp.hpp index bb49729..12e3bce 100644 --- a/Engine-Core/vendor/SFML/include/SFML/Network/Ftp.hpp +++ b/Engine-Core/vendor/SFML/include/SFML/Network/Ftp.hpp @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////// // // SFML - Simple and Fast Multimedia Library -// Copyright (C) 2007-2024 Laurent Gomila (laurent@sfml-dev.org) +// Copyright (C) 2007-2025 Laurent Gomila (laurent@sfml-dev.org) // // This software is provided 'as-is', without any express or implied warranty. // In no event will the authors be held liable for any damages arising from the use of this software. diff --git a/Engine-Core/vendor/SFML/include/SFML/Network/Http.hpp b/Engine-Core/vendor/SFML/include/SFML/Network/Http.hpp index 6092bb6..46d2d98 100644 --- a/Engine-Core/vendor/SFML/include/SFML/Network/Http.hpp +++ b/Engine-Core/vendor/SFML/include/SFML/Network/Http.hpp @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////// // // SFML - Simple and Fast Multimedia Library -// Copyright (C) 2007-2024 Laurent Gomila (laurent@sfml-dev.org) +// Copyright (C) 2007-2025 Laurent Gomila (laurent@sfml-dev.org) // // This software is provided 'as-is', without any express or implied warranty. // In no event will the authors be held liable for any damages arising from the use of this software. diff --git a/Engine-Core/vendor/SFML/include/SFML/Network/IpAddress.hpp b/Engine-Core/vendor/SFML/include/SFML/Network/IpAddress.hpp index 0634339..a43fd0f 100644 --- a/Engine-Core/vendor/SFML/include/SFML/Network/IpAddress.hpp +++ b/Engine-Core/vendor/SFML/include/SFML/Network/IpAddress.hpp @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////// // // SFML - Simple and Fast Multimedia Library -// Copyright (C) 2007-2024 Laurent Gomila (laurent@sfml-dev.org) +// Copyright (C) 2007-2025 Laurent Gomila (laurent@sfml-dev.org) // // This software is provided 'as-is', without any express or implied warranty. // In no event will the authors be held liable for any damages arising from the use of this software. diff --git a/Engine-Core/vendor/SFML/include/SFML/Network/Packet.hpp b/Engine-Core/vendor/SFML/include/SFML/Network/Packet.hpp index c246a89..2ba56db 100644 --- a/Engine-Core/vendor/SFML/include/SFML/Network/Packet.hpp +++ b/Engine-Core/vendor/SFML/include/SFML/Network/Packet.hpp @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////// // // SFML - Simple and Fast Multimedia Library -// Copyright (C) 2007-2024 Laurent Gomila (laurent@sfml-dev.org) +// Copyright (C) 2007-2025 Laurent Gomila (laurent@sfml-dev.org) // // This software is provided 'as-is', without any express or implied warranty. // In no event will the authors be held liable for any damages arising from the use of this software. diff --git a/Engine-Core/vendor/SFML/include/SFML/Network/Socket.hpp b/Engine-Core/vendor/SFML/include/SFML/Network/Socket.hpp index f96bd93..2b7b79f 100644 --- a/Engine-Core/vendor/SFML/include/SFML/Network/Socket.hpp +++ b/Engine-Core/vendor/SFML/include/SFML/Network/Socket.hpp @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////// // // SFML - Simple and Fast Multimedia Library -// Copyright (C) 2007-2024 Laurent Gomila (laurent@sfml-dev.org) +// Copyright (C) 2007-2025 Laurent Gomila (laurent@sfml-dev.org) // // This software is provided 'as-is', without any express or implied warranty. // In no event will the authors be held liable for any damages arising from the use of this software. diff --git a/Engine-Core/vendor/SFML/include/SFML/Network/SocketHandle.hpp b/Engine-Core/vendor/SFML/include/SFML/Network/SocketHandle.hpp index f7963fa..7025069 100644 --- a/Engine-Core/vendor/SFML/include/SFML/Network/SocketHandle.hpp +++ b/Engine-Core/vendor/SFML/include/SFML/Network/SocketHandle.hpp @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////// // // SFML - Simple and Fast Multimedia Library -// Copyright (C) 2007-2024 Laurent Gomila (laurent@sfml-dev.org) +// Copyright (C) 2007-2025 Laurent Gomila (laurent@sfml-dev.org) // // This software is provided 'as-is', without any express or implied warranty. // In no event will the authors be held liable for any damages arising from the use of this software. diff --git a/Engine-Core/vendor/SFML/include/SFML/Network/SocketSelector.hpp b/Engine-Core/vendor/SFML/include/SFML/Network/SocketSelector.hpp index 8b8f939..ac80a87 100644 --- a/Engine-Core/vendor/SFML/include/SFML/Network/SocketSelector.hpp +++ b/Engine-Core/vendor/SFML/include/SFML/Network/SocketSelector.hpp @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////// // // SFML - Simple and Fast Multimedia Library -// Copyright (C) 2007-2024 Laurent Gomila (laurent@sfml-dev.org) +// Copyright (C) 2007-2025 Laurent Gomila (laurent@sfml-dev.org) // // This software is provided 'as-is', without any express or implied warranty. // In no event will the authors be held liable for any damages arising from the use of this software. diff --git a/Engine-Core/vendor/SFML/include/SFML/Network/TcpListener.hpp b/Engine-Core/vendor/SFML/include/SFML/Network/TcpListener.hpp index 76623e6..54cd6e6 100644 --- a/Engine-Core/vendor/SFML/include/SFML/Network/TcpListener.hpp +++ b/Engine-Core/vendor/SFML/include/SFML/Network/TcpListener.hpp @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////// // // SFML - Simple and Fast Multimedia Library -// Copyright (C) 2007-2024 Laurent Gomila (laurent@sfml-dev.org) +// Copyright (C) 2007-2025 Laurent Gomila (laurent@sfml-dev.org) // // This software is provided 'as-is', without any express or implied warranty. // In no event will the authors be held liable for any damages arising from the use of this software. diff --git a/Engine-Core/vendor/SFML/include/SFML/Network/TcpSocket.hpp b/Engine-Core/vendor/SFML/include/SFML/Network/TcpSocket.hpp index fd2ca2a..05df0d6 100644 --- a/Engine-Core/vendor/SFML/include/SFML/Network/TcpSocket.hpp +++ b/Engine-Core/vendor/SFML/include/SFML/Network/TcpSocket.hpp @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////// // // SFML - Simple and Fast Multimedia Library -// Copyright (C) 2007-2024 Laurent Gomila (laurent@sfml-dev.org) +// Copyright (C) 2007-2025 Laurent Gomila (laurent@sfml-dev.org) // // This software is provided 'as-is', without any express or implied warranty. // In no event will the authors be held liable for any damages arising from the use of this software. diff --git a/Engine-Core/vendor/SFML/include/SFML/Network/UdpSocket.hpp b/Engine-Core/vendor/SFML/include/SFML/Network/UdpSocket.hpp index 58fe497..0950561 100644 --- a/Engine-Core/vendor/SFML/include/SFML/Network/UdpSocket.hpp +++ b/Engine-Core/vendor/SFML/include/SFML/Network/UdpSocket.hpp @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////// // // SFML - Simple and Fast Multimedia Library -// Copyright (C) 2007-2024 Laurent Gomila (laurent@sfml-dev.org) +// Copyright (C) 2007-2025 Laurent Gomila (laurent@sfml-dev.org) // // This software is provided 'as-is', without any express or implied warranty. // In no event will the authors be held liable for any damages arising from the use of this software. diff --git a/Engine-Core/vendor/SFML/include/SFML/OpenGL.hpp b/Engine-Core/vendor/SFML/include/SFML/OpenGL.hpp index 6e8b445..cd9a960 100644 --- a/Engine-Core/vendor/SFML/include/SFML/OpenGL.hpp +++ b/Engine-Core/vendor/SFML/include/SFML/OpenGL.hpp @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////// // // SFML - Simple and Fast Multimedia Library -// Copyright (C) 2007-2024 Laurent Gomila (laurent@sfml-dev.org) +// Copyright (C) 2007-2025 Laurent Gomila (laurent@sfml-dev.org) // // This software is provided 'as-is', without any express or implied warranty. // In no event will the authors be held liable for any damages arising from the use of this software. diff --git a/Engine-Core/vendor/SFML/include/SFML/System.hpp b/Engine-Core/vendor/SFML/include/SFML/System.hpp index 4d14475..36599db 100644 --- a/Engine-Core/vendor/SFML/include/SFML/System.hpp +++ b/Engine-Core/vendor/SFML/include/SFML/System.hpp @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////// // // SFML - Simple and Fast Multimedia Library -// Copyright (C) 2007-2024 Laurent Gomila (laurent@sfml-dev.org) +// Copyright (C) 2007-2025 Laurent Gomila (laurent@sfml-dev.org) // // This software is provided 'as-is', without any express or implied warranty. // In no event will the authors be held liable for any damages arising from the use of this software. diff --git a/Engine-Core/vendor/SFML/include/SFML/System/Angle.hpp b/Engine-Core/vendor/SFML/include/SFML/System/Angle.hpp index 3240d86..e6355d6 100644 --- a/Engine-Core/vendor/SFML/include/SFML/System/Angle.hpp +++ b/Engine-Core/vendor/SFML/include/SFML/System/Angle.hpp @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////// // // SFML - Simple and Fast Multimedia Library -// Copyright (C) 2007-2024 Laurent Gomila (laurent@sfml-dev.org) +// Copyright (C) 2007-2025 Laurent Gomila (laurent@sfml-dev.org) // // This software is provided 'as-is', without any express or implied warranty. // In no event will the authors be held liable for any damages arising from the use of this software. diff --git a/Engine-Core/vendor/SFML/include/SFML/System/Angle.inl b/Engine-Core/vendor/SFML/include/SFML/System/Angle.inl index 867cf22..a894c8e 100644 --- a/Engine-Core/vendor/SFML/include/SFML/System/Angle.inl +++ b/Engine-Core/vendor/SFML/include/SFML/System/Angle.inl @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////// // // SFML - Simple and Fast Multimedia Library -// Copyright (C) 2007-2024 Laurent Gomila (laurent@sfml-dev.org) +// Copyright (C) 2007-2025 Laurent Gomila (laurent@sfml-dev.org) // // This software is provided 'as-is', without any express or implied warranty. // In no event will the authors be held liable for any damages arising from the use of this software. @@ -34,8 +34,8 @@ namespace sf { namespace priv { -constexpr float pi = 3.141592654f; -constexpr float tau = pi * 2.f; +inline constexpr float pi = 3.141592654f; +inline constexpr float tau = pi * 2.f; constexpr float positiveRemainder(float a, float b) { diff --git a/Engine-Core/vendor/SFML/include/SFML/System/Clock.hpp b/Engine-Core/vendor/SFML/include/SFML/System/Clock.hpp index 3eca84c..92615f5 100644 --- a/Engine-Core/vendor/SFML/include/SFML/System/Clock.hpp +++ b/Engine-Core/vendor/SFML/include/SFML/System/Clock.hpp @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////// // // SFML - Simple and Fast Multimedia Library -// Copyright (C) 2007-2024 Laurent Gomila (laurent@sfml-dev.org) +// Copyright (C) 2007-2025 Laurent Gomila (laurent@sfml-dev.org) // // This software is provided 'as-is', without any express or implied warranty. // In no event will the authors be held liable for any damages arising from the use of this software. diff --git a/Engine-Core/vendor/SFML/include/SFML/System/Err.hpp b/Engine-Core/vendor/SFML/include/SFML/System/Err.hpp index 6baecec..ea59da4 100644 --- a/Engine-Core/vendor/SFML/include/SFML/System/Err.hpp +++ b/Engine-Core/vendor/SFML/include/SFML/System/Err.hpp @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////// // // SFML - Simple and Fast Multimedia Library -// Copyright (C) 2007-2024 Laurent Gomila (laurent@sfml-dev.org) +// Copyright (C) 2007-2025 Laurent Gomila (laurent@sfml-dev.org) // // This software is provided 'as-is', without any express or implied warranty. // In no event will the authors be held liable for any damages arising from the use of this software. diff --git a/Engine-Core/vendor/SFML/include/SFML/System/Exception.hpp b/Engine-Core/vendor/SFML/include/SFML/System/Exception.hpp index a72e7e7..bee07e4 100644 --- a/Engine-Core/vendor/SFML/include/SFML/System/Exception.hpp +++ b/Engine-Core/vendor/SFML/include/SFML/System/Exception.hpp @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////// // // SFML - Simple and Fast Multimedia Library -// Copyright (C) 2007-2024 Laurent Gomila (laurent@sfml-dev.org) +// Copyright (C) 2007-2025 Laurent Gomila (laurent@sfml-dev.org) // // This software is provided 'as-is', without any express or implied warranty. // In no event will the authors be held liable for any damages arising from the use of this software. diff --git a/Engine-Core/vendor/SFML/include/SFML/System/Export.hpp b/Engine-Core/vendor/SFML/include/SFML/System/Export.hpp index 3dcb383..2362d3a 100644 --- a/Engine-Core/vendor/SFML/include/SFML/System/Export.hpp +++ b/Engine-Core/vendor/SFML/include/SFML/System/Export.hpp @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////// // // SFML - Simple and Fast Multimedia Library -// Copyright (C) 2007-2024 Laurent Gomila (laurent@sfml-dev.org) +// Copyright (C) 2007-2025 Laurent Gomila (laurent@sfml-dev.org) // // This software is provided 'as-is', without any express or implied warranty. // In no event will the authors be held liable for any damages arising from the use of this software. diff --git a/Engine-Core/vendor/SFML/include/SFML/System/FileInputStream.hpp b/Engine-Core/vendor/SFML/include/SFML/System/FileInputStream.hpp index b9a8014..3a036e4 100644 --- a/Engine-Core/vendor/SFML/include/SFML/System/FileInputStream.hpp +++ b/Engine-Core/vendor/SFML/include/SFML/System/FileInputStream.hpp @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////// // // SFML - Simple and Fast Multimedia Library -// Copyright (C) 2007-2024 Laurent Gomila (laurent@sfml-dev.org) +// Copyright (C) 2007-2025 Laurent Gomila (laurent@sfml-dev.org) // // This software is provided 'as-is', without any express or implied warranty. // In no event will the authors be held liable for any damages arising from the use of this software. diff --git a/Engine-Core/vendor/SFML/include/SFML/System/InputStream.hpp b/Engine-Core/vendor/SFML/include/SFML/System/InputStream.hpp index a9770cb..6eda58d 100644 --- a/Engine-Core/vendor/SFML/include/SFML/System/InputStream.hpp +++ b/Engine-Core/vendor/SFML/include/SFML/System/InputStream.hpp @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////// // // SFML - Simple and Fast Multimedia Library -// Copyright (C) 2007-2024 Laurent Gomila (laurent@sfml-dev.org) +// Copyright (C) 2007-2025 Laurent Gomila (laurent@sfml-dev.org) // // This software is provided 'as-is', without any express or implied warranty. // In no event will the authors be held liable for any damages arising from the use of this software. diff --git a/Engine-Core/vendor/SFML/include/SFML/System/MemoryInputStream.hpp b/Engine-Core/vendor/SFML/include/SFML/System/MemoryInputStream.hpp index cd8ad54..e5eaf50 100644 --- a/Engine-Core/vendor/SFML/include/SFML/System/MemoryInputStream.hpp +++ b/Engine-Core/vendor/SFML/include/SFML/System/MemoryInputStream.hpp @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////// // // SFML - Simple and Fast Multimedia Library -// Copyright (C) 2007-2024 Laurent Gomila (laurent@sfml-dev.org) +// Copyright (C) 2007-2025 Laurent Gomila (laurent@sfml-dev.org) // // This software is provided 'as-is', without any express or implied warranty. // In no event will the authors be held liable for any damages arising from the use of this software. diff --git a/Engine-Core/vendor/SFML/include/SFML/System/NativeActivity.hpp b/Engine-Core/vendor/SFML/include/SFML/System/NativeActivity.hpp index cff04a5..207f468 100644 --- a/Engine-Core/vendor/SFML/include/SFML/System/NativeActivity.hpp +++ b/Engine-Core/vendor/SFML/include/SFML/System/NativeActivity.hpp @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////// // // SFML - Simple and Fast Multimedia Library -// Copyright (C) 2007-2024 Laurent Gomila (laurent@sfml-dev.org) +// Copyright (C) 2007-2025 Laurent Gomila (laurent@sfml-dev.org) // // This software is provided 'as-is', without any express or implied warranty. // In no event will the authors be held liable for any damages arising from the use of this software. diff --git a/Engine-Core/vendor/SFML/include/SFML/System/Sleep.hpp b/Engine-Core/vendor/SFML/include/SFML/System/Sleep.hpp index c5d1962..7aaa0ab 100644 --- a/Engine-Core/vendor/SFML/include/SFML/System/Sleep.hpp +++ b/Engine-Core/vendor/SFML/include/SFML/System/Sleep.hpp @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////// // // SFML - Simple and Fast Multimedia Library -// Copyright (C) 2007-2024 Laurent Gomila (laurent@sfml-dev.org) +// Copyright (C) 2007-2025 Laurent Gomila (laurent@sfml-dev.org) // // This software is provided 'as-is', without any express or implied warranty. // In no event will the authors be held liable for any damages arising from the use of this software. diff --git a/Engine-Core/vendor/SFML/include/SFML/System/String.hpp b/Engine-Core/vendor/SFML/include/SFML/System/String.hpp index 76b1101..7cea505 100644 --- a/Engine-Core/vendor/SFML/include/SFML/System/String.hpp +++ b/Engine-Core/vendor/SFML/include/SFML/System/String.hpp @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////// // // SFML - Simple and Fast Multimedia Library -// Copyright (C) 2007-2024 Laurent Gomila (laurent@sfml-dev.org) +// Copyright (C) 2007-2025 Laurent Gomila (laurent@sfml-dev.org) // // This software is provided 'as-is', without any express or implied warranty. // In no event will the authors be held liable for any damages arising from the use of this software. diff --git a/Engine-Core/vendor/SFML/include/SFML/System/String.inl b/Engine-Core/vendor/SFML/include/SFML/System/String.inl index 11c350a..eb22d98 100644 --- a/Engine-Core/vendor/SFML/include/SFML/System/String.inl +++ b/Engine-Core/vendor/SFML/include/SFML/System/String.inl @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////// // // SFML - Simple and Fast Multimedia Library -// Copyright (C) 2007-2024 Laurent Gomila (laurent@sfml-dev.org) +// Copyright (C) 2007-2025 Laurent Gomila (laurent@sfml-dev.org) // // This software is provided 'as-is', without any express or implied warranty. // In no event will the authors be held liable for any damages arising from the use of this software. diff --git a/Engine-Core/vendor/SFML/include/SFML/System/SuspendAwareClock.hpp b/Engine-Core/vendor/SFML/include/SFML/System/SuspendAwareClock.hpp index dd5a019..4a1cfd2 100644 --- a/Engine-Core/vendor/SFML/include/SFML/System/SuspendAwareClock.hpp +++ b/Engine-Core/vendor/SFML/include/SFML/System/SuspendAwareClock.hpp @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////// // // SFML - Simple and Fast Multimedia Library -// Copyright (C) 2007-2024 Laurent Gomila (laurent@sfml-dev.org) +// Copyright (C) 2007-2025 Laurent Gomila (laurent@sfml-dev.org) // // This software is provided 'as-is', without any express or implied warranty. // In no event will the authors be held liable for any damages arising from the use of this software. diff --git a/Engine-Core/vendor/SFML/include/SFML/System/Time.hpp b/Engine-Core/vendor/SFML/include/SFML/System/Time.hpp index 0b5c192..ce1df1f 100644 --- a/Engine-Core/vendor/SFML/include/SFML/System/Time.hpp +++ b/Engine-Core/vendor/SFML/include/SFML/System/Time.hpp @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////// // // SFML - Simple and Fast Multimedia Library -// Copyright (C) 2007-2024 Laurent Gomila (laurent@sfml-dev.org) +// Copyright (C) 2007-2025 Laurent Gomila (laurent@sfml-dev.org) // // This software is provided 'as-is', without any express or implied warranty. // In no event will the authors be held liable for any damages arising from the use of this software. diff --git a/Engine-Core/vendor/SFML/include/SFML/System/Time.inl b/Engine-Core/vendor/SFML/include/SFML/System/Time.inl index f4c4b1a..ffdaff1 100644 --- a/Engine-Core/vendor/SFML/include/SFML/System/Time.inl +++ b/Engine-Core/vendor/SFML/include/SFML/System/Time.inl @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////// // // SFML - Simple and Fast Multimedia Library -// Copyright (C) 2007-2024 Laurent Gomila (laurent@sfml-dev.org) +// Copyright (C) 2007-2025 Laurent Gomila (laurent@sfml-dev.org) // // This software is provided 'as-is', without any express or implied warranty. // In no event will the authors be held liable for any damages arising from the use of this software. diff --git a/Engine-Core/vendor/SFML/include/SFML/System/Utf.hpp b/Engine-Core/vendor/SFML/include/SFML/System/Utf.hpp index 36d7ae7..297211e 100644 --- a/Engine-Core/vendor/SFML/include/SFML/System/Utf.hpp +++ b/Engine-Core/vendor/SFML/include/SFML/System/Utf.hpp @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////// // // SFML - Simple and Fast Multimedia Library -// Copyright (C) 2007-2024 Laurent Gomila (laurent@sfml-dev.org) +// Copyright (C) 2007-2025 Laurent Gomila (laurent@sfml-dev.org) // // This software is provided 'as-is', without any express or implied warranty. // In no event will the authors be held liable for any damages arising from the use of this software. diff --git a/Engine-Core/vendor/SFML/include/SFML/System/Utf.inl b/Engine-Core/vendor/SFML/include/SFML/System/Utf.inl index 7c9d2b6..20763c7 100644 --- a/Engine-Core/vendor/SFML/include/SFML/System/Utf.inl +++ b/Engine-Core/vendor/SFML/include/SFML/System/Utf.inl @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////// // // SFML - Simple and Fast Multimedia Library -// Copyright (C) 2007-2024 Laurent Gomila (laurent@sfml-dev.org) +// Copyright (C) 2007-2025 Laurent Gomila (laurent@sfml-dev.org) // // This software is provided 'as-is', without any express or implied warranty. // In no event will the authors be held liable for any damages arising from the use of this software. diff --git a/Engine-Core/vendor/SFML/include/SFML/System/Vector2.hpp b/Engine-Core/vendor/SFML/include/SFML/System/Vector2.hpp index bc6cd73..f71d41b 100644 --- a/Engine-Core/vendor/SFML/include/SFML/System/Vector2.hpp +++ b/Engine-Core/vendor/SFML/include/SFML/System/Vector2.hpp @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////// // // SFML - Simple and Fast Multimedia Library -// Copyright (C) 2007-2024 Laurent Gomila (laurent@sfml-dev.org) +// Copyright (C) 2007-2025 Laurent Gomila (laurent@sfml-dev.org) // // This software is provided 'as-is', without any express or implied warranty. // In no event will the authors be held liable for any damages arising from the use of this software. diff --git a/Engine-Core/vendor/SFML/include/SFML/System/Vector2.inl b/Engine-Core/vendor/SFML/include/SFML/System/Vector2.inl index 6f3c8af..6a0ce69 100644 --- a/Engine-Core/vendor/SFML/include/SFML/System/Vector2.inl +++ b/Engine-Core/vendor/SFML/include/SFML/System/Vector2.inl @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////// // // SFML - Simple and Fast Multimedia Library -// Copyright (C) 2007-2024 Laurent Gomila (laurent@sfml-dev.org) +// Copyright (C) 2007-2025 Laurent Gomila (laurent@sfml-dev.org) // // This software is provided 'as-is', without any express or implied warranty. // In no event will the authors be held liable for any damages arising from the use of this software. diff --git a/Engine-Core/vendor/SFML/include/SFML/System/Vector3.hpp b/Engine-Core/vendor/SFML/include/SFML/System/Vector3.hpp index b7f9cb6..8fa5308 100644 --- a/Engine-Core/vendor/SFML/include/SFML/System/Vector3.hpp +++ b/Engine-Core/vendor/SFML/include/SFML/System/Vector3.hpp @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////// // // SFML - Simple and Fast Multimedia Library -// Copyright (C) 2007-2024 Laurent Gomila (laurent@sfml-dev.org) +// Copyright (C) 2007-2025 Laurent Gomila (laurent@sfml-dev.org) // // This software is provided 'as-is', without any express or implied warranty. // In no event will the authors be held liable for any damages arising from the use of this software. diff --git a/Engine-Core/vendor/SFML/include/SFML/System/Vector3.inl b/Engine-Core/vendor/SFML/include/SFML/System/Vector3.inl index fa9f444..e24b9a8 100644 --- a/Engine-Core/vendor/SFML/include/SFML/System/Vector3.inl +++ b/Engine-Core/vendor/SFML/include/SFML/System/Vector3.inl @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////// // // SFML - Simple and Fast Multimedia Library -// Copyright (C) 2007-2024 Laurent Gomila (laurent@sfml-dev.org) +// Copyright (C) 2007-2025 Laurent Gomila (laurent@sfml-dev.org) // // This software is provided 'as-is', without any express or implied warranty. // In no event will the authors be held liable for any damages arising from the use of this software. diff --git a/Engine-Core/vendor/SFML/include/SFML/Window.hpp b/Engine-Core/vendor/SFML/include/SFML/Window.hpp index bb76e76..07225b7 100644 --- a/Engine-Core/vendor/SFML/include/SFML/Window.hpp +++ b/Engine-Core/vendor/SFML/include/SFML/Window.hpp @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////// // // SFML - Simple and Fast Multimedia Library -// Copyright (C) 2007-2024 Laurent Gomila (laurent@sfml-dev.org) +// Copyright (C) 2007-2025 Laurent Gomila (laurent@sfml-dev.org) // // This software is provided 'as-is', without any express or implied warranty. // In no event will the authors be held liable for any damages arising from the use of this software. diff --git a/Engine-Core/vendor/SFML/include/SFML/Window/Clipboard.hpp b/Engine-Core/vendor/SFML/include/SFML/Window/Clipboard.hpp index 9186149..8d6457e 100644 --- a/Engine-Core/vendor/SFML/include/SFML/Window/Clipboard.hpp +++ b/Engine-Core/vendor/SFML/include/SFML/Window/Clipboard.hpp @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////// // // SFML - Simple and Fast Multimedia Library -// Copyright (C) 2007-2024 Laurent Gomila (laurent@sfml-dev.org) +// Copyright (C) 2007-2025 Laurent Gomila (laurent@sfml-dev.org) // // This software is provided 'as-is', without any express or implied warranty. // In no event will the authors be held liable for any damages arising from the use of this software. diff --git a/Engine-Core/vendor/SFML/include/SFML/Window/Context.hpp b/Engine-Core/vendor/SFML/include/SFML/Window/Context.hpp index a4e9ae3..6623a35 100644 --- a/Engine-Core/vendor/SFML/include/SFML/Window/Context.hpp +++ b/Engine-Core/vendor/SFML/include/SFML/Window/Context.hpp @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////// // // SFML - Simple and Fast Multimedia Library -// Copyright (C) 2007-2024 Laurent Gomila (laurent@sfml-dev.org) +// Copyright (C) 2007-2025 Laurent Gomila (laurent@sfml-dev.org) // // This software is provided 'as-is', without any express or implied warranty. // In no event will the authors be held liable for any damages arising from the use of this software. diff --git a/Engine-Core/vendor/SFML/include/SFML/Window/ContextSettings.hpp b/Engine-Core/vendor/SFML/include/SFML/Window/ContextSettings.hpp index f23378b..b95d6c7 100644 --- a/Engine-Core/vendor/SFML/include/SFML/Window/ContextSettings.hpp +++ b/Engine-Core/vendor/SFML/include/SFML/Window/ContextSettings.hpp @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////// // // SFML - Simple and Fast Multimedia Library -// Copyright (C) 2007-2024 Laurent Gomila (laurent@sfml-dev.org) +// Copyright (C) 2007-2025 Laurent Gomila (laurent@sfml-dev.org) // // This software is provided 'as-is', without any express or implied warranty. // In no event will the authors be held liable for any damages arising from the use of this software. diff --git a/Engine-Core/vendor/SFML/include/SFML/Window/Cursor.hpp b/Engine-Core/vendor/SFML/include/SFML/Window/Cursor.hpp index f889702..fa8066e 100644 --- a/Engine-Core/vendor/SFML/include/SFML/Window/Cursor.hpp +++ b/Engine-Core/vendor/SFML/include/SFML/Window/Cursor.hpp @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////// // // SFML - Simple and Fast Multimedia Library -// Copyright (C) 2007-2024 Laurent Gomila (laurent@sfml-dev.org) +// Copyright (C) 2007-2025 Laurent Gomila (laurent@sfml-dev.org) // // This software is provided 'as-is', without any express or implied warranty. // In no event will the authors be held liable for any damages arising from the use of this software. diff --git a/Engine-Core/vendor/SFML/include/SFML/Window/Event.hpp b/Engine-Core/vendor/SFML/include/SFML/Window/Event.hpp index 98f66e3..db13ad7 100644 --- a/Engine-Core/vendor/SFML/include/SFML/Window/Event.hpp +++ b/Engine-Core/vendor/SFML/include/SFML/Window/Event.hpp @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////// // // SFML - Simple and Fast Multimedia Library -// Copyright (C) 2007-2024 Laurent Gomila (laurent@sfml-dev.org) +// Copyright (C) 2007-2025 Laurent Gomila (laurent@sfml-dev.org) // // This software is provided 'as-is', without any express or implied warranty. // In no event will the authors be held liable for any damages arising from the use of this software. @@ -34,6 +34,7 @@ #include +#include #include @@ -335,8 +336,8 @@ public: /// \return The result of applying the visitor to the event /// //////////////////////////////////////////////////////////// - template - decltype(auto) visit(T&& visitor) const; + template + decltype(auto) visit(Visitor&& visitor) const; private: //////////////////////////////////////////////////////////// @@ -373,11 +374,22 @@ private: template [[nodiscard]] static constexpr bool isInParameterPack(const std::variant*) { - return (std::is_same_v || ...); + return std::disjunction_v...>; } template static constexpr bool isEventSubtype = isInParameterPack(decltype (&m_data)(nullptr)); + + friend class WindowBase; + + template + [[nodiscard]] static constexpr bool isInvocableWithEventSubtype(const std::variant*) + { + return std::disjunction_v...>; + } + + template + static constexpr bool isEventHandler = isInvocableWithEventSubtype(decltype (&m_data)(nullptr)); }; } // namespace sf diff --git a/Engine-Core/vendor/SFML/include/SFML/Window/Event.inl b/Engine-Core/vendor/SFML/include/SFML/Window/Event.inl index 70cb639..b60dd4e 100644 --- a/Engine-Core/vendor/SFML/include/SFML/Window/Event.inl +++ b/Engine-Core/vendor/SFML/include/SFML/Window/Event.inl @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////// // // SFML - Simple and Fast Multimedia Library -// Copyright (C) 2007-2024 Laurent Gomila (laurent@sfml-dev.org) +// Copyright (C) 2007-2025 Laurent Gomila (laurent@sfml-dev.org) // // This software is provided 'as-is', without any express or implied warranty. // In no event will the authors be held liable for any damages arising from the use of this software. @@ -69,10 +69,10 @@ const TEventSubtype* Event::getIf() const //////////////////////////////////////////////////////////// -template -decltype(auto) Event::visit(T&& visitor) const +template +decltype(auto) Event::visit(Visitor&& visitor) const { - return std::visit(std::forward(visitor), m_data); + return std::visit(std::forward(visitor), m_data); } } // namespace sf diff --git a/Engine-Core/vendor/SFML/include/SFML/Window/Export.hpp b/Engine-Core/vendor/SFML/include/SFML/Window/Export.hpp index 5eaaefc..704fc82 100644 --- a/Engine-Core/vendor/SFML/include/SFML/Window/Export.hpp +++ b/Engine-Core/vendor/SFML/include/SFML/Window/Export.hpp @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////// // // SFML - Simple and Fast Multimedia Library -// Copyright (C) 2007-2024 Laurent Gomila (laurent@sfml-dev.org) +// Copyright (C) 2007-2025 Laurent Gomila (laurent@sfml-dev.org) // // This software is provided 'as-is', without any express or implied warranty. // In no event will the authors be held liable for any damages arising from the use of this software. diff --git a/Engine-Core/vendor/SFML/include/SFML/Window/GlResource.hpp b/Engine-Core/vendor/SFML/include/SFML/Window/GlResource.hpp index 557e3ee..3300909 100644 --- a/Engine-Core/vendor/SFML/include/SFML/Window/GlResource.hpp +++ b/Engine-Core/vendor/SFML/include/SFML/Window/GlResource.hpp @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////// // // SFML - Simple and Fast Multimedia Library -// Copyright (C) 2007-2024 Laurent Gomila (laurent@sfml-dev.org) +// Copyright (C) 2007-2025 Laurent Gomila (laurent@sfml-dev.org) // // This software is provided 'as-is', without any express or implied warranty. // In no event will the authors be held liable for any damages arising from the use of this software. diff --git a/Engine-Core/vendor/SFML/include/SFML/Window/Joystick.hpp b/Engine-Core/vendor/SFML/include/SFML/Window/Joystick.hpp index dd5005b..9bc3346 100644 --- a/Engine-Core/vendor/SFML/include/SFML/Window/Joystick.hpp +++ b/Engine-Core/vendor/SFML/include/SFML/Window/Joystick.hpp @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////// // // SFML - Simple and Fast Multimedia Library -// Copyright (C) 2007-2024 Laurent Gomila (laurent@sfml-dev.org) +// Copyright (C) 2007-2025 Laurent Gomila (laurent@sfml-dev.org) // // This software is provided 'as-is', without any express or implied warranty. // In no event will the authors be held liable for any damages arising from the use of this software. diff --git a/Engine-Core/vendor/SFML/include/SFML/Window/Keyboard.hpp b/Engine-Core/vendor/SFML/include/SFML/Window/Keyboard.hpp index 9077ce1..7cc53c2 100644 --- a/Engine-Core/vendor/SFML/include/SFML/Window/Keyboard.hpp +++ b/Engine-Core/vendor/SFML/include/SFML/Window/Keyboard.hpp @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////// // // SFML - Simple and Fast Multimedia Library -// Copyright (C) 2007-2024 Laurent Gomila (laurent@sfml-dev.org) +// Copyright (C) 2007-2025 Laurent Gomila (laurent@sfml-dev.org) // // This software is provided 'as-is', without any express or implied warranty. // In no event will the authors be held liable for any damages arising from the use of this software. diff --git a/Engine-Core/vendor/SFML/include/SFML/Window/Mouse.hpp b/Engine-Core/vendor/SFML/include/SFML/Window/Mouse.hpp index 528c420..97459e0 100644 --- a/Engine-Core/vendor/SFML/include/SFML/Window/Mouse.hpp +++ b/Engine-Core/vendor/SFML/include/SFML/Window/Mouse.hpp @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////// // // SFML - Simple and Fast Multimedia Library -// Copyright (C) 2007-2024 Laurent Gomila (laurent@sfml-dev.org) +// Copyright (C) 2007-2025 Laurent Gomila (laurent@sfml-dev.org) // // This software is provided 'as-is', without any express or implied warranty. // In no event will the authors be held liable for any damages arising from the use of this software. diff --git a/Engine-Core/vendor/SFML/include/SFML/Window/Sensor.hpp b/Engine-Core/vendor/SFML/include/SFML/Window/Sensor.hpp index 1496131..c6dd482 100644 --- a/Engine-Core/vendor/SFML/include/SFML/Window/Sensor.hpp +++ b/Engine-Core/vendor/SFML/include/SFML/Window/Sensor.hpp @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////// // // SFML - Simple and Fast Multimedia Library -// Copyright (C) 2007-2024 Laurent Gomila (laurent@sfml-dev.org) +// Copyright (C) 2007-2025 Laurent Gomila (laurent@sfml-dev.org) // // This software is provided 'as-is', without any express or implied warranty. // In no event will the authors be held liable for any damages arising from the use of this software. diff --git a/Engine-Core/vendor/SFML/include/SFML/Window/Touch.hpp b/Engine-Core/vendor/SFML/include/SFML/Window/Touch.hpp index f361a8d..43c4053 100644 --- a/Engine-Core/vendor/SFML/include/SFML/Window/Touch.hpp +++ b/Engine-Core/vendor/SFML/include/SFML/Window/Touch.hpp @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////// // // SFML - Simple and Fast Multimedia Library -// Copyright (C) 2007-2024 Laurent Gomila (laurent@sfml-dev.org) +// Copyright (C) 2007-2025 Laurent Gomila (laurent@sfml-dev.org) // // This software is provided 'as-is', without any express or implied warranty. // In no event will the authors be held liable for any damages arising from the use of this software. diff --git a/Engine-Core/vendor/SFML/include/SFML/Window/VideoMode.hpp b/Engine-Core/vendor/SFML/include/SFML/Window/VideoMode.hpp index 510f0a3..d16cb55 100644 --- a/Engine-Core/vendor/SFML/include/SFML/Window/VideoMode.hpp +++ b/Engine-Core/vendor/SFML/include/SFML/Window/VideoMode.hpp @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////// // // SFML - Simple and Fast Multimedia Library -// Copyright (C) 2007-2024 Laurent Gomila (laurent@sfml-dev.org) +// Copyright (C) 2007-2025 Laurent Gomila (laurent@sfml-dev.org) // // This software is provided 'as-is', without any express or implied warranty. // In no event will the authors be held liable for any damages arising from the use of this software. diff --git a/Engine-Core/vendor/SFML/include/SFML/Window/Vulkan.hpp b/Engine-Core/vendor/SFML/include/SFML/Window/Vulkan.hpp index 534914d..885fbf5 100644 --- a/Engine-Core/vendor/SFML/include/SFML/Window/Vulkan.hpp +++ b/Engine-Core/vendor/SFML/include/SFML/Window/Vulkan.hpp @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////// // // SFML - Simple and Fast Multimedia Library -// Copyright (C) 2007-2024 Laurent Gomila (laurent@sfml-dev.org) +// Copyright (C) 2007-2025 Laurent Gomila (laurent@sfml-dev.org) // // This software is provided 'as-is', without any express or implied warranty. // In no event will the authors be held liable for any damages arising from the use of this software. diff --git a/Engine-Core/vendor/SFML/include/SFML/Window/Window.hpp b/Engine-Core/vendor/SFML/include/SFML/Window/Window.hpp index f01d098..f9744bd 100644 --- a/Engine-Core/vendor/SFML/include/SFML/Window/Window.hpp +++ b/Engine-Core/vendor/SFML/include/SFML/Window/Window.hpp @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////// // // SFML - Simple and Fast Multimedia Library -// Copyright (C) 2007-2024 Laurent Gomila (laurent@sfml-dev.org) +// Copyright (C) 2007-2025 Laurent Gomila (laurent@sfml-dev.org) // // This software is provided 'as-is', without any express or implied warranty. // In no event will the authors be held liable for any damages arising from the use of this software. diff --git a/Engine-Core/vendor/SFML/include/SFML/Window/WindowBase.hpp b/Engine-Core/vendor/SFML/include/SFML/Window/WindowBase.hpp index 54e4ce2..6baf0e3 100644 --- a/Engine-Core/vendor/SFML/include/SFML/Window/WindowBase.hpp +++ b/Engine-Core/vendor/SFML/include/SFML/Window/WindowBase.hpp @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////// // // SFML - Simple and Fast Multimedia Library -// Copyright (C) 2007-2024 Laurent Gomila (laurent@sfml-dev.org) +// Copyright (C) 2007-2025 Laurent Gomila (laurent@sfml-dev.org) // // This software is provided 'as-is', without any express or implied warranty. // In no event will the authors be held liable for any damages arising from the use of this software. @@ -326,8 +326,8 @@ public: /// \see `waitEvent`, `pollEvent` /// //////////////////////////////////////////////////////////// - template - void handleEvents(Ts&&... handlers); + template + void handleEvents(Handlers&&... handlers); //////////////////////////////////////////////////////////// /// \brief Get the position of the window diff --git a/Engine-Core/vendor/SFML/include/SFML/Window/WindowBase.inl b/Engine-Core/vendor/SFML/include/SFML/Window/WindowBase.inl index e1af3c7..cc6bc91 100644 --- a/Engine-Core/vendor/SFML/include/SFML/Window/WindowBase.inl +++ b/Engine-Core/vendor/SFML/include/SFML/Window/WindowBase.inl @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////// // // SFML - Simple and Fast Multimedia Library -// Copyright (C) 2007-2024 Laurent Gomila (laurent@sfml-dev.org) +// Copyright (C) 2007-2025 Laurent Gomila (laurent@sfml-dev.org) // // This software is provided 'as-is', without any express or implied warranty. // In no event will the authors be held liable for any damages arising from the use of this software. @@ -28,6 +28,7 @@ #include #include // NOLINT(misc-header-include-cycle) +#include #include @@ -53,20 +54,56 @@ struct DelayOverloadResolution { } }; + +// Wrapper providing a callable type suitable as OverloadSet base type for different kinds of handlers. +// By default, we derive from the handler type and inherit its call operators. +template +struct Caller : Handler +{ + using Handler::operator(); +}; + +// Inheritance is not possible with reference types. +// In this case, we capture the reference and forward arguments to it. +template +struct Caller +{ + // Use SFINAE so that the call operator exists only for arguments the captured handler accepts + template , int> = 0> + decltype(auto) operator()(Argument&& argument) + { + return handler(std::forward(argument)); + } + Handler& handler; +}; + +// Inheritance is not possible with function pointers either. +// In this case, we capture the function pointer to call it. +template +struct Caller +{ + Return operator()(Argument&& argument) + { + return function(std::forward(argument)); + } + Return (*function)(Argument); +}; } // namespace priv //////////////////////////////////////////////////////////// -template -void WindowBase::handleEvents(Ts&&... handlers) // NOLINT(cppcoreguidelines-missing-std-forward) +template +void WindowBase::handleEvents(Handlers&&... handlers) { - static_assert(sizeof...(Ts) > 0, "Must provide at least one handler"); + static_assert(sizeof...(Handlers) > 0, "Must provide at least one handler"); + static_assert((Event::isEventHandler && ...), "Handlers must accept at least one subtype of sf::Event"); // Disable misc-const-correctness for this line since clang-tidy - // complains about it even though the code would become uncompilable + // complains about it even though the code would become incorrect // NOLINTNEXTLINE(misc-const-correctness) - priv::OverloadSet overloadSet{std::forward(handlers)..., [](const priv::DelayOverloadResolution&) { /* ignore */ }}; + priv::OverloadSet overloadSet{priv::Caller{std::forward(handlers)}..., + [](const priv::DelayOverloadResolution&) { /* ignore */ }}; while (const std::optional event = pollEvent()) event->visit(overloadSet); diff --git a/Engine-Core/vendor/SFML/include/SFML/Window/WindowEnums.hpp b/Engine-Core/vendor/SFML/include/SFML/Window/WindowEnums.hpp index 9e0ebce..cd9a8fb 100644 --- a/Engine-Core/vendor/SFML/include/SFML/Window/WindowEnums.hpp +++ b/Engine-Core/vendor/SFML/include/SFML/Window/WindowEnums.hpp @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////// // // SFML - Simple and Fast Multimedia Library -// Copyright (C) 2007-2024 Laurent Gomila (laurent@sfml-dev.org) +// Copyright (C) 2007-2025 Laurent Gomila (laurent@sfml-dev.org) // // This software is provided 'as-is', without any express or implied warranty. // In no event will the authors be held liable for any damages arising from the use of this software. diff --git a/Engine-Core/vendor/SFML/include/SFML/Window/WindowHandle.hpp b/Engine-Core/vendor/SFML/include/SFML/Window/WindowHandle.hpp index 7456ae3..c15ce07 100644 --- a/Engine-Core/vendor/SFML/include/SFML/Window/WindowHandle.hpp +++ b/Engine-Core/vendor/SFML/include/SFML/Window/WindowHandle.hpp @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////// // // SFML - Simple and Fast Multimedia Library -// Copyright (C) 2007-2024 Laurent Gomila (laurent@sfml-dev.org) +// Copyright (C) 2007-2025 Laurent Gomila (laurent@sfml-dev.org) // // This software is provided 'as-is', without any express or implied warranty. // In no event will the authors be held liable for any damages arising from the use of this software.