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

examples/DeferredShading/main.cpp

@@ -3,7 +3,6 @@
 #include <Nazara/Math/Angle.hpp>
 #include <Nazara/Graphics.hpp>
 #include <Nazara/Renderer.hpp>
-#include <Nazara/Utility.hpp>
 #include <NZSL/Math/FieldOffsets.hpp>
 #include <NZSL/Parser.hpp>
 #include <array>

examples/FirstScene/main.cpp

@@ -16,7 +16,7 @@
 #include <Nazara/Graphics.hpp> // Module graphique
 #include <Nazara/Renderer.hpp> // Module de rendu
 #include <Nazara/Network.hpp> // Module utilitaire
-#include <Nazara/Utility.hpp> // Module utilitaire
+#include <Nazara/Core.hpp> // Module utilitaire
 #include <NazaraSDK/Application.hpp>
 #include <NazaraSDK/Components.hpp>
 #include <NazaraSDK/Console.hpp>

examples/HardwareInfo/build.lua

@@ -13,6 +13,5 @@ EXAMPLE.Files = {
 EXAMPLE.Libraries = {
 	"NazaraCore",
 	"NazaraPlatform",
-	"NazaraRenderer",
-	"NazaraUtility"
+	"NazaraRenderer"
 }

examples/MeshInfos/build.lua

@@ -8,8 +8,7 @@ EXAMPLE.Files = {
 
 EXAMPLE.Libraries = {
 	"NazaraCore",
-	"NazaraPlatform",
-	"NazaraUtility"
+	"NazaraPlatform"
 }
 
 if Config.PlatformSDL2 then

examples/MeshInfos/main.cpp

@@ -1,13 +1,13 @@
 #include <Nazara/Core/File.hpp>
 #include <Nazara/Core/Modules.hpp>
 #include <Nazara/Math/Box.hpp>
-#include <Nazara/Utility/Animation.hpp>
-#include <Nazara/Utility/Joint.hpp>
-#include <Nazara/Utility/MaterialData.hpp>
-#include <Nazara/Utility/Mesh.hpp>
-#include <Nazara/Utility/Sequence.hpp>
-#include <Nazara/Utility/Skeleton.hpp>
-#include <Nazara/Utility/Utility.hpp>
+#include <Nazara/Core/Animation.hpp>
+#include <Nazara/Core/Joint.hpp>
+#include <Nazara/Core/MaterialData.hpp>
+#include <Nazara/Core/Mesh.hpp>
+#include <Nazara/Core/Sequence.hpp>
+#include <Nazara/Core/Skeleton.hpp>
+#include <Nazara/Core/Core.hpp>
 #include <cctype>
 #include <iostream>
 #include <limits>
@@ -15,14 +15,7 @@
 int main()
 {
 	// Pour charger des ressources, il est impératif d'initialiser le module utilitaire
-	Nz::Modules<Nz::Utility> nazara;
-	/*if (!utility)
-	{
-		// Ça n'a pas fonctionné, le pourquoi se trouve dans le fichier NazaraLog.log
-		std::cout << "Failed to initialize Nazara, see NazaraLog.log for further informations" << std::endl;
-		std::getchar(); // On laise le temps de voir l'erreur
-		return EXIT_FAILURE;
-	}*/
+	Nz::Modules<Nz::Core> nazara;
 
 	for (;;)
 	{

examples/Particles/Common.cpp

@@ -1,6 +1,6 @@
 #include "Common.hpp"
 #include <Nazara/Core/Error.hpp>
-#include <Nazara/Utility/SimpleTextDrawer.hpp>
+#include <Nazara/TextRenderer/SimpleTextDrawer.hpp>
 #include <NazaraSDK/Components/ParticleGroupComponent.hpp>
 #include <NazaraSDK/Systems/RenderSystem.hpp>
 

examples/Particles/LogoDemo.cpp

@@ -1,7 +1,7 @@
 #include "LogoDemo.hpp"
 #include <Nazara/Core/OffsetOf.hpp>
 #include <Nazara/Graphics.hpp>
-#include <Nazara/Utility.hpp>
+#include <Nazara/Core.hpp>
 #include <NazaraSDK/Components.hpp>
 #include <NazaraSDK/Systems.hpp>
 #include <iostream>

examples/Particles/SpacebattleDemo.cpp

@@ -3,7 +3,7 @@
 #include <Nazara/Core/OffsetOf.hpp>
 #include <Nazara/Graphics.hpp>
 #include <Nazara/Platform.hpp>
-#include <Nazara/Utility.hpp>
+#include <Nazara/Core.hpp>
 #include <NazaraSDK/Components.hpp>
 #include <NazaraSDK/Systems.hpp>
 

examples/Particles/main.cpp

@@ -3,7 +3,6 @@
 #include <Nazara/Graphics.hpp>
 #include <Nazara/Network.hpp>
 #include <Nazara/Renderer.hpp>
-#include <Nazara/Utility.hpp>
 #include <NazaraSDK/Application.hpp>
 #include <NazaraSDK/Components.hpp>
 #include <NazaraSDK/Systems.hpp>

examples/PhysicallyBasedRendering/main.cpp

@@ -2,7 +2,6 @@
 #include <Nazara/Platform.hpp>
 #include <Nazara/Graphics.hpp>
 #include <Nazara/Renderer.hpp>
-#include <Nazara/Utility.hpp>
 #include <chrono>
 #include <iostream>
 #include <thread>

examples/Physics2DDemo/main.cpp

@@ -4,7 +4,6 @@
 #include <Nazara/Math/PidController.hpp>
 #include <Nazara/Physics2D.hpp>
 #include <Nazara/Renderer.hpp>
-#include <Nazara/Utility.hpp>
 #include <Nazara/Widgets.hpp>
 #include <entt/entt.hpp>
 #include <array>

examples/PhysicsDemo/main.cpp

@@ -4,7 +4,7 @@
 #include <Nazara/Math/PidController.hpp>
 #include <Nazara/Physics3D.hpp>
 #include <Nazara/Renderer.hpp>
-#include <Nazara/Utility.hpp>
+#include <Nazara/TextRenderer/SimpleTextDrawer.hpp>
 #include <entt/entt.hpp>
 #include <array>
 #include <chrono>

examples/PhysicsPlayground/main.cpp

@@ -3,7 +3,6 @@
 #include <Nazara/Platform/WindowingAppComponent.hpp>
 #include <Nazara/Physics3D.hpp>
 #include <Nazara/Renderer.hpp>
-#include <Nazara/Utility.hpp>
 #include <iostream>
 #include <random>
 

examples/Showcase/main.cpp

@@ -1,11 +1,11 @@
 #include <Nazara/Core.hpp>
+#include <Nazara/Core/Plugins/AssimpPlugin.hpp>
 #include <Nazara/Platform.hpp>
 #include <Nazara/Graphics.hpp>
 #include <Nazara/Math/PidController.hpp>
 #include <Nazara/Physics3D.hpp>
 #include <Nazara/Renderer.hpp>
-#include <Nazara/Utility.hpp>
-#include <Nazara/Utility/Plugins/AssimpPlugin.hpp>
+#include <Nazara/TextRenderer/SimpleTextDrawer.hpp>
 #include <NazaraUtils/CallOnExit.hpp>
 #include <NZSL/Math/FieldOffsets.hpp>
 #include <entt/entt.hpp>

examples/Tut00/main.cpp

@@ -5,14 +5,15 @@
 #include <Nazara/Physics3D.hpp>
 #include <Nazara/Physics2D.hpp>
 #include <Nazara/Renderer.hpp>
-#include <Nazara/Utility.hpp>
+#include <Nazara/TextRenderer.hpp>
+#include <Nazara/Widgets.hpp>
 #include <iostream>
 
 int main(int argc, char* argv[])
 {
 	// This "example" has only one purpose: Giving an empty project for you to test whatever you want
 	// If you wish to have multiple test projects, you only have to copy/paste this directory and change the name in the xmake.lua
-	Nz::Application<Nz::Audio, Nz::Core, Nz::Graphics, Nz::Network, Nz::Physics2D, Nz::Physics3D, Nz::Renderer, Nz::Utility> app(argc, argv);
+	Nz::Application<Nz::Audio, Nz::Core, Nz::Graphics, Nz::Network, Nz::Physics2D, Nz::Physics3D, Nz::Renderer, Nz::TextRenderer, Nz::Widgets> app(argc, argv);
 
 	return EXIT_SUCCESS;
 }

examples/Tut00/xmake.lua

@@ -1,3 +1,5 @@
 target("Tut00_EmptyProject")
-	add_deps("NazaraAudio", "NazaraGraphics", "NazaraNetwork", "NazaraPhysics2D", "NazaraPhysics3D", "NazaraRenderer", "NazaraUtility")
+	add_packages("entt")
+	add_defines("NAZARA_ENTT")
+	add_deps("NazaraAudio", "NazaraGraphics", "NazaraNetwork", "NazaraPhysics2D", "NazaraPhysics3D", "NazaraRenderer", "NazaraTextRenderer", "NazaraWidgets")
 	add_files("main.cpp")

examples/Tut01/main.cpp

@@ -4,7 +4,7 @@
 #include <Nazara/Graphics.hpp>
 #include <Nazara/Platform/WindowingAppComponent.hpp>
 #include <Nazara/Renderer.hpp>
-#include <Nazara/Utility.hpp>
+#include <Nazara/TextRenderer/SimpleTextDrawer.hpp>
 #include <iostream>
 
 int main(int argc, char* argv[])

examples/Tut02/main.cpp

@@ -4,7 +4,7 @@
 #include <Nazara/Graphics.hpp>
 #include <Nazara/Platform/WindowingAppComponent.hpp>
 #include <Nazara/Renderer.hpp>
-#include <Nazara/Utility.hpp>
+#include <Nazara/TextRenderer/SimpleTextDrawer.hpp>
 #include <iostream>
 
 int main(int argc, char* argv[])

examples/WidgetDemo/main.cpp

@@ -3,7 +3,7 @@
 #include <Nazara/Graphics.hpp>
 #include <Nazara/Math/PidController.hpp>
 #include <Nazara/Renderer.hpp>
-#include <Nazara/Utility.hpp>
+#include <Nazara/TextRenderer.hpp>
 #include <Nazara/Widgets.hpp>
 #include <entt/entt.hpp>
 #include <array>