From 86e26008b3d69ac040757531b1c7574d86050ae5 Mon Sep 17 00:00:00 2001
From: SirLynix <lynix680@gmail.com>
Date: Sun, 12 Nov 2023 12:51:56 +0100
Subject: [PATCH] Minor fixes

---
 include/Nazara/Core/PluginInterface.hpp                       | 2 +-
 include/Nazara/Core/StringExt.hpp                             | 1 -
 include/Nazara/Graphics/ElementRendererRegistry.inl           | 2 +-
 include/Nazara/Graphics/FramePipelinePassRegistry.hpp         | 1 -
 include/Nazara/Graphics/MaterialPassRegistry.hpp              | 1 -
 include/Nazara/Graphics/MaterialSettings.inl                  | 2 +-
 include/Nazara/Platform/AppWindowingComponent.inl             | 2 +-
 src/Nazara/Core/StringExt.cpp                                 | 1 +
 .../Resources/Shaders/Modules/Engine/LightShadow.nzsl         | 4 +---
 src/Nazara/OpenGLRenderer/OpenGLCommandBuffer.cpp             | 2 +-
 10 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/include/Nazara/Core/PluginInterface.hpp b/include/Nazara/Core/PluginInterface.hpp
index 31fbba924..1539ff490 100644
--- a/include/Nazara/Core/PluginInterface.hpp
+++ b/include/Nazara/Core/PluginInterface.hpp
@@ -9,7 +9,7 @@
 
 #include <NazaraUtils/Prerequisites.hpp>
 #include <Nazara/Core/Config.hpp>
-#include <NazaraUtils/Algorithm.hpp>
+#include <NazaraUtils/TypeTraits.hpp>
 #include <string>
 
 #ifdef NAZARA_COMPILER_MSVC
diff --git a/include/Nazara/Core/StringExt.hpp b/include/Nazara/Core/StringExt.hpp
index bf5e5beaf..1a2ab064e 100644
--- a/include/Nazara/Core/StringExt.hpp
+++ b/include/Nazara/Core/StringExt.hpp
@@ -9,7 +9,6 @@
 
 #include <NazaraUtils/Prerequisites.hpp>
 #include <Nazara/Core/Unicode.hpp>
-#include <NazaraUtils/Algorithm.hpp>
 #include <NazaraUtils/FunctionRef.hpp>
 #include <string>
 
diff --git a/include/Nazara/Graphics/ElementRendererRegistry.inl b/include/Nazara/Graphics/ElementRendererRegistry.inl
index b4da20e46..da0e6ff12 100644
--- a/include/Nazara/Graphics/ElementRendererRegistry.inl
+++ b/include/Nazara/Graphics/ElementRendererRegistry.inl
@@ -7,7 +7,7 @@
 
 namespace Nz
 {
-	template<typename T, typename ...Args>
+	template<typename T, typename... Args>
 	RenderElementOwner ElementRendererRegistry::AllocateElement(Args&&... args)
 	{
 		ElementRenderer& elementRenderer = GetElementRenderer(SafeCast<std::size_t>(T::ElementType));
diff --git a/include/Nazara/Graphics/FramePipelinePassRegistry.hpp b/include/Nazara/Graphics/FramePipelinePassRegistry.hpp
index 4ab00ce25..177a67646 100644
--- a/include/Nazara/Graphics/FramePipelinePassRegistry.hpp
+++ b/include/Nazara/Graphics/FramePipelinePassRegistry.hpp
@@ -9,7 +9,6 @@
 
 #include <NazaraUtils/Prerequisites.hpp>
 #include <Nazara/Graphics/FramePipelinePass.hpp>
-#include <NazaraUtils/Algorithm.hpp>
 #include <functional>
 #include <list>
 #include <string>
diff --git a/include/Nazara/Graphics/MaterialPassRegistry.hpp b/include/Nazara/Graphics/MaterialPassRegistry.hpp
index 467cc759f..8e5548360 100644
--- a/include/Nazara/Graphics/MaterialPassRegistry.hpp
+++ b/include/Nazara/Graphics/MaterialPassRegistry.hpp
@@ -8,7 +8,6 @@
 #define NAZARA_GRAPHICS_MATERIALPASSREGISTRY_HPP
 
 #include <NazaraUtils/Prerequisites.hpp>
-#include <NazaraUtils/Algorithm.hpp>
 #include <list>
 #include <string>
 #include <unordered_map>
diff --git a/include/Nazara/Graphics/MaterialSettings.inl b/include/Nazara/Graphics/MaterialSettings.inl
index bf80be663..2ea191342 100644
--- a/include/Nazara/Graphics/MaterialSettings.inl
+++ b/include/Nazara/Graphics/MaterialSettings.inl
@@ -2,7 +2,7 @@
 // This file is part of the "Nazara Engine - Graphics module"
 // For conditions of distribution and use, see copyright notice in Config.hpp
 
-#include <NazaraUtils/Algorithm.hpp>
+#include <NazaraUtils/TypeTraits.hpp>
 #include <stdexcept>
 #include <Nazara/Graphics/Debug.hpp>
 
diff --git a/include/Nazara/Platform/AppWindowingComponent.inl b/include/Nazara/Platform/AppWindowingComponent.inl
index f5e82e0f7..7bc9c9e63 100644
--- a/include/Nazara/Platform/AppWindowingComponent.inl
+++ b/include/Nazara/Platform/AppWindowingComponent.inl
@@ -6,7 +6,7 @@
 
 namespace Nz
 {
-	template<typename ...Args>
+	template<typename... Args>
 	Window& AppWindowingComponent::CreateWindow(Args&&... args)
 	{
 		return *m_windows.emplace_back(std::make_unique<Window>(std::forward<Args>(args)...));
diff --git a/src/Nazara/Core/StringExt.cpp b/src/Nazara/Core/StringExt.cpp
index 75b4fcebd..cc79ef7b4 100644
--- a/src/Nazara/Core/StringExt.cpp
+++ b/src/Nazara/Core/StringExt.cpp
@@ -5,6 +5,7 @@
 #include <Nazara/Core/StringExt.hpp>
 #include <Nazara/Core/Algorithm.hpp>
 #include <Nazara/Core/Error.hpp>
+#include <NazaraUtils/FunctionTraits.hpp>
 #include <Utfcpp/utf8.h>
 #include <cinttypes>
 #include <Nazara/Core/Debug.hpp>
diff --git a/src/Nazara/Graphics/Resources/Shaders/Modules/Engine/LightShadow.nzsl b/src/Nazara/Graphics/Resources/Shaders/Modules/Engine/LightShadow.nzsl
index df3ca02e1..d8cdc4ce0 100644
--- a/src/Nazara/Graphics/Resources/Shaders/Modules/Engine/LightShadow.nzsl
+++ b/src/Nazara/Graphics/Resources/Shaders/Modules/Engine/LightShadow.nzsl
@@ -26,9 +26,7 @@ fn ComputeDirectionalLightShadow(light: DirectionalLight, shadowmap: depth_sampl
 					break;
 				}
 			}
-
-			if (cascadeIndex >= light.cascadeCount)
-				cascadeIndex = light.cascadeCount - u32(1);
+			cascadeIndex = min(cascadeIndex, light.cascadeCount - u32(1));
 
 			let lightProjPos = light.viewProjMatrices[cascadeIndex] * vec4[f32](worldPos, 1.0);
 			let shadowCoords = lightProjPos.xyz / lightProjPos.w;
diff --git a/src/Nazara/OpenGLRenderer/OpenGLCommandBuffer.cpp b/src/Nazara/OpenGLRenderer/OpenGLCommandBuffer.cpp
index 9874c5971..0a9667c4a 100644
--- a/src/Nazara/OpenGLRenderer/OpenGLCommandBuffer.cpp
+++ b/src/Nazara/OpenGLRenderer/OpenGLCommandBuffer.cpp
@@ -212,7 +212,7 @@ namespace Nz
 	inline void OpenGLCommandBuffer::Execute(const GL::Context* context, const InsertDebugLabelCommand& command)
 	{
 		if (context->glDebugMessageInsert)
-			context->glDebugMessageInsert(GL_DEBUG_SOURCE_APPLICATION, GL_DEBUG_TYPE_MARKER, 0, GL_DEBUG_SEVERITY_NOTIFICATION, command.label.size(), command.label.data());
+			context->glDebugMessageInsert(GL_DEBUG_SOURCE_APPLICATION, GL_DEBUG_TYPE_MARKER, 0, GL_DEBUG_SEVERITY_NOTIFICATION, SafeCast<GLsizei>(command.label.size()), command.label.data());
 	}
 
 	inline void OpenGLCommandBuffer::Execute(const GL::Context* context, const MemoryBarrier& command)