diff --git a/include/Nazara/VulkanRenderer/Wrapper/Framebuffer.hpp b/include/Nazara/VulkanRenderer/Wrapper/Framebuffer.hpp index b874f3405..fcd464e98 100644 --- a/include/Nazara/VulkanRenderer/Wrapper/Framebuffer.hpp +++ b/include/Nazara/VulkanRenderer/Wrapper/Framebuffer.hpp @@ -21,11 +21,11 @@ namespace Nz public: Framebuffer() = default; Framebuffer(const Framebuffer&) = delete; - Framebuffer(Framebuffer&&) = default; + Framebuffer(Framebuffer&&) noexcept = default; ~Framebuffer() = default; Framebuffer& operator=(const Framebuffer&) = delete; - Framebuffer& operator=(Framebuffer&&) = delete; + Framebuffer& operator=(Framebuffer&&) noexcept = default; private: static inline VkResult CreateHelper(Device& device, const VkFramebufferCreateInfo* createInfo, const VkAllocationCallbacks* allocator, VkFramebuffer* handle); diff --git a/include/Nazara/Widgets/ScrollbarWidget.hpp b/include/Nazara/Widgets/ScrollbarWidget.hpp index d9ab68fbf..5925fa0d2 100644 --- a/include/Nazara/Widgets/ScrollbarWidget.hpp +++ b/include/Nazara/Widgets/ScrollbarWidget.hpp @@ -47,7 +47,6 @@ namespace Nz ImageButtonWidget* m_scrollNextButton; ScrollbarButtonWidget* m_scrollCenterButton; ScrollbarOrientation m_orientation; - bool m_isGrabbed; float m_maximumValue; float m_minimumValue; float m_step; diff --git a/plugins/Assimp/Plugin.cpp b/plugins/Assimp/Plugin.cpp index 44a8a7062..b2d705006 100644 --- a/plugins/Assimp/Plugin.cpp +++ b/plugins/Assimp/Plugin.cpp @@ -363,7 +363,7 @@ Nz::Result, Nz::ResourceLoadingError> LoadAnimati } else { - sequenceJoints[jointIndex].position = Nz::TransformPositionTRS({}, Nz::Quaternionf::Identity(), parameters.jointScale, interpolatedPosition); + sequenceJoints[jointIndex].position = parameters.jointScale * interpolatedPosition; sequenceJoints[jointIndex].rotation = interpolatedRotation; sequenceJoints[jointIndex].scale = interpolatedScale; } diff --git a/src/Nazara/Core/Error.cpp b/src/Nazara/Core/Error.cpp index d5f386214..82dab07cd 100644 --- a/src/Nazara/Core/Error.cpp +++ b/src/Nazara/Core/Error.cpp @@ -32,9 +32,9 @@ namespace Nz thread_local ErrorModeFlags s_flags; thread_local std::string s_lastError = "no error"; - thread_local std::string_view s_lastErrorFunction; - thread_local std::string_view s_lastErrorFile; - thread_local unsigned int s_lastErrorLine = 0; + thread_local std::string_view s_lastErrorFunction = {}; + thread_local std::string_view s_lastErrorFile = {}; + thread_local constinit unsigned int s_lastErrorLine = 0; } /*! diff --git a/src/Nazara/Core/Posix/ThreadImpl.cpp b/src/Nazara/Core/Posix/ThreadImpl.cpp index f7b2bf90d..0f2b89358 100644 --- a/src/Nazara/Core/Posix/ThreadImpl.cpp +++ b/src/Nazara/Core/Posix/ThreadImpl.cpp @@ -29,6 +29,7 @@ namespace Nz::PlatformImpl return std::string(&name[0]); #else + NazaraUnused(threadHandle) return ""; #endif } @@ -40,6 +41,7 @@ namespace Nz::PlatformImpl #elif defined(__APPLE__) ::pthread_setname_np(threadName); #else + NazaraUnused(threadName) NazaraWarning("setting current thread name is not supported on this platform"); #endif } @@ -49,8 +51,12 @@ namespace Nz::PlatformImpl #if defined(__linux__) || defined(__FreeBSD__) ::pthread_setname_np(threadHandle, threadName); #elif defined(__APPLE__) + NazaraUnused(threadHandle) + NazaraUnused(threadName) NazaraWarning("only current thread name can be set on MacOS X"); #else + NazaraUnused(threadHandle) + NazaraUnused(threadName) NazaraWarning("setting a thread name is not supported on this platform"); #endif } diff --git a/src/Nazara/Core/Win32/ThreadImpl.cpp b/src/Nazara/Core/Win32/ThreadImpl.cpp index 5b91fff1a..cdb5cfa93 100644 --- a/src/Nazara/Core/Win32/ThreadImpl.cpp +++ b/src/Nazara/Core/Win32/ThreadImpl.cpp @@ -101,6 +101,8 @@ NAZARA_WARNING_MSVC_DISABLE(6320 6322) NAZARA_WARNING_POP() #else + NazaraUnused(threadId) + NazaraUnused(threadName) NazaraWarning("ThreadName exception is only supported with MSVC"); #endif } diff --git a/src/Nazara/OpenGLRenderer/Wrapper/Context.cpp b/src/Nazara/OpenGLRenderer/Wrapper/Context.cpp index 6ce31a885..6b8eedc07 100644 --- a/src/Nazara/OpenGLRenderer/Wrapper/Context.cpp +++ b/src/Nazara/OpenGLRenderer/Wrapper/Context.cpp @@ -18,7 +18,7 @@ namespace Nz::GL { - thread_local const Context* s_currentGLContext = nullptr; + thread_local constinit const Context* s_currentGLContext = nullptr; namespace { diff --git a/src/Nazara/Widgets/ScrollbarWidget.cpp b/src/Nazara/Widgets/ScrollbarWidget.cpp index a272c0f58..1b065a4cf 100644 --- a/src/Nazara/Widgets/ScrollbarWidget.cpp +++ b/src/Nazara/Widgets/ScrollbarWidget.cpp @@ -12,7 +12,6 @@ namespace Nz ScrollbarWidget::ScrollbarWidget(BaseWidget* parent, ScrollbarOrientation orientation) : BaseWidget(parent), m_orientation(orientation), - m_isGrabbed(false), m_maximumValue(1.f), m_minimumValue(0.f), m_step(0.5f), diff --git a/xmake.lua b/xmake.lua index ea861cfde..1b623b024 100644 --- a/xmake.lua +++ b/xmake.lua @@ -282,6 +282,7 @@ add_requires( -- Don't link with system-installed libs on CI if os.getenv("CI") then add_requireconfs("*", { system = false }) + add_requireconfs("freetype.*", { system = false }) end -- Module dependencies