Remove Utility module and move its content to Core and TextRenderer modules

include/Nazara/Renderer/CommandBufferBuilder.hpp

@@ -9,13 +9,13 @@
 
 #include <NazaraUtils/Prerequisites.hpp>
 #include <Nazara/Core/Color.hpp>
+#include <Nazara/Core/Enums.hpp>
 #include <Nazara/Math/Box.hpp>
 #include <Nazara/Math/Rect.hpp>
 #include <Nazara/Renderer/Config.hpp>
 #include <Nazara/Renderer/Enums.hpp>
 #include <Nazara/Renderer/RenderBufferView.hpp>
 #include <Nazara/Renderer/UploadPool.hpp>
-#include <Nazara/Utility/Enums.hpp>
 #include <string_view>
 
 namespace Nz

include/Nazara/Renderer/ComputePipeline.hpp

@@ -7,9 +7,9 @@
 #ifndef NAZARA_RENDERER_COMPUTEPIPELINE_HPP
 #define NAZARA_RENDERER_COMPUTEPIPELINE_HPP
 
+#include <Nazara/Core/Enums.hpp>
 #include <Nazara/Renderer/RenderPipelineLayout.hpp>
 #include <Nazara/Renderer/ShaderModule.hpp>
-#include <Nazara/Utility/Enums.hpp>
 
 namespace Nz
 {

include/Nazara/Renderer/DebugDrawer.hpp

@@ -9,13 +9,13 @@
 
 #include <NazaraUtils/Prerequisites.hpp>
 #include <Nazara/Core/Color.hpp>
+#include <Nazara/Core/VertexStruct.hpp>
 #include <Nazara/Math/Box.hpp>
 #include <Nazara/Math/Frustum.hpp>
 #include <Nazara/Math/Matrix4.hpp>
 #include <Nazara/Math/Vector3.hpp>
 #include <Nazara/Renderer/Config.hpp>
 #include <Nazara/Renderer/UploadPool.hpp>
-#include <Nazara/Utility/VertexStruct.hpp>
 #include <memory>
 #include <vector>
 

include/Nazara/Renderer/RenderBuffer.hpp

@@ -8,8 +8,8 @@
 #define NAZARA_RENDERER_RENDERBUFFER_HPP
 
 #include <NazaraUtils/Prerequisites.hpp>
+#include <Nazara/Core/Buffer.hpp>
 #include <Nazara/Renderer/Config.hpp>
-#include <Nazara/Utility/Buffer.hpp>
 #include <memory>
 #include <string_view>
 

include/Nazara/Renderer/RenderDevice.hpp

@@ -8,6 +8,7 @@
 #define NAZARA_RENDERER_RENDERDEVICE_HPP
 
 #include <NazaraUtils/Prerequisites.hpp>
+#include <Nazara/Core/PixelFormat.hpp>
 #include <Nazara/Renderer/ComputePipeline.hpp>
 #include <Nazara/Renderer/Config.hpp>
 #include <Nazara/Renderer/Enums.hpp>
@@ -21,7 +22,6 @@
 #include <Nazara/Renderer/SwapchainParameters.hpp>
 #include <Nazara/Renderer/Texture.hpp>
 #include <Nazara/Renderer/TextureSampler.hpp>
-#include <Nazara/Utility/PixelFormat.hpp>
 #include <NazaraUtils/FunctionRef.hpp>
 #include <NZSL/ShaderWriter.hpp>
 #include <NZSL/Ast/Module.hpp>

include/Nazara/Renderer/RenderPass.hpp

@@ -8,9 +8,9 @@
 #define NAZARA_RENDERER_RENDERPASS_HPP
 
 #include <NazaraUtils/Prerequisites.hpp>
+#include <Nazara/Core/PixelFormat.hpp>
 #include <Nazara/Renderer/Config.hpp>
 #include <Nazara/Renderer/Enums.hpp>
-#include <Nazara/Utility/PixelFormat.hpp>
 #include <limits>
 #include <optional>
 #include <vector>

include/Nazara/Renderer/RenderPipeline.hpp

@@ -7,9 +7,9 @@
 #ifndef NAZARA_RENDERER_RENDERPIPELINE_HPP
 #define NAZARA_RENDERER_RENDERPIPELINE_HPP
 
+#include <Nazara/Core/Enums.hpp>
 #include <Nazara/Renderer/RenderPipelineLayout.hpp>
 #include <Nazara/Renderer/RenderStates.hpp>
-#include <Nazara/Utility/Enums.hpp>
 
 namespace Nz
 {

include/Nazara/Renderer/RenderStates.hpp

@@ -8,9 +8,9 @@
 #define NAZARA_RENDERER_RENDERSTATES_HPP
 
 #include <NazaraUtils/Prerequisites.hpp>
+#include <Nazara/Core/Enums.hpp>
+#include <Nazara/Core/VertexDeclaration.hpp>
 #include <Nazara/Renderer/Enums.hpp>
-#include <Nazara/Utility/Enums.hpp>
-#include <Nazara/Utility/VertexDeclaration.hpp>
 #include <memory>
 #include <vector>
 

include/Nazara/Renderer/RenderStates.inl

@@ -2,7 +2,7 @@
 // This file is part of the "Nazara Engine - Renderer module"
 // For conditions of distribution and use, see copyright notice in Config.hpp
 
-#include <Nazara/Core/Algorithm.hpp>
+#include <NazaraUtils/MathUtils.hpp>
 #include <functional>
 #include <Nazara/Renderer/Debug.hpp>
 

include/Nazara/Renderer/RendererImpl.hpp

@@ -8,12 +8,12 @@
 #define NAZARA_RENDERER_RENDERERIMPL_HPP
 
 #include <NazaraUtils/Prerequisites.hpp>
+#include <Nazara/Core/Enums.hpp>
 #include <Nazara/Core/ParameterList.hpp>
 #include <Nazara/Renderer/Config.hpp>
 #include <Nazara/Renderer/Enums.hpp>
 #include <Nazara/Renderer/RenderDeviceInfo.hpp>
 #include <Nazara/Renderer/Renderer.hpp>
-#include <Nazara/Utility/Enums.hpp>
 #include <string>
 #include <vector>
 

include/Nazara/Renderer/SwapchainParameters.hpp

@@ -8,8 +8,8 @@
 #define NAZARA_RENDERER_SWAPCHAINPARAMETERS_HPP
 
 #include <NazaraUtils/Prerequisites.hpp>
+#include <Nazara/Core/PixelFormat.hpp>
 #include <Nazara/Renderer/Enums.hpp>
-#include <Nazara/Utility/PixelFormat.hpp>
 #include <vector>
 
 namespace Nz

include/Nazara/Renderer/Texture.hpp

@@ -8,6 +8,7 @@
 #define NAZARA_RENDERER_TEXTURE_HPP
 
 #include <NazaraUtils/Prerequisites.hpp>
+#include <Nazara/Core/Image.hpp>
 #include <Nazara/Core/ObjectLibrary.hpp>
 #include <Nazara/Core/Resource.hpp>
 #include <Nazara/Core/ResourceLoader.hpp>
@@ -15,7 +16,6 @@
 #include <Nazara/Math/Vector3.hpp>
 #include <Nazara/Renderer/Config.hpp>
 #include <Nazara/Renderer/Enums.hpp>
-#include <Nazara/Utility/Image.hpp>
 
 namespace Nz
 {

include/Nazara/Renderer/TextureSampler.hpp

@@ -8,8 +8,8 @@
 #define NAZARA_RENDERER_TEXTURESAMPLER_HPP
 
 #include <NazaraUtils/Prerequisites.hpp>
+#include <Nazara/Core/Enums.hpp>
 #include <Nazara/Renderer/Config.hpp>
-#include <Nazara/Utility/Enums.hpp>
 #include <functional>
 #include <string_view>
 

include/Nazara/Renderer/WindowSwapchain.hpp

@@ -11,6 +11,7 @@
 #include <Nazara/Platform/WindowEventHandler.hpp>
 #include <Nazara/Renderer/Swapchain.hpp>
 #include <Nazara/Renderer/SwapchainParameters.hpp>
+#include <NazaraUtils/MovablePtr.hpp>
 #include <memory>
 
 namespace Nz