Split engine to packages NazaraUtils and NZSL (#375)

* Move code to NazaraUtils and NZSL packages * Reorder includes * Tests: Remove glslang and spirv-tools deps * Tests: Remove glslang init * Remove NazaraUtils tests and fix Vector4Test * Fix Linux compilation * Update msys2-build.yml * Fix assimp package * Update xmake.lua * Update xmake.lua * Fix shader compilation on MinGW * Final fixes * The final fix 2: the fix strikes back! * Disable cache on CI * The return of the fix™️
2022-05-25 19:36:10 +02:00
parent 3f8f1c4653
commit 03e2801dbe
483 changed files with 1139 additions and 59112 deletions
--- a/include/Nazara/Utility/AbstractAtlas.hpp
+++ b/include/Nazara/Utility/AbstractAtlas.hpp
@@ -8,11 +8,12 @@
 #define NAZARA_UTILITY_ABSTRACTATLAS_HPP

 #include <Nazara/Prerequisites.hpp>
-#include <Nazara/Core/Signal.hpp>
-#include <Nazara/Core/SparsePtr.hpp>
+#include <Nazara/Core/Error.hpp>
 #include <Nazara/Math/Rect.hpp>
 #include <Nazara/Utility/Config.hpp>
 #include <Nazara/Utility/Enums.hpp>
+#include <Nazara/Utils/Signal.hpp>
+#include <Nazara/Utils/SparsePtr.hpp>

 namespace Nz
 {
--- a/include/Nazara/Utility/Algorithm.hpp
+++ b/include/Nazara/Utility/Algorithm.hpp
@@ -9,7 +9,6 @@

 #include <Nazara/Prerequisites.hpp>
 #include <Nazara/Core/Color.hpp>
-#include <Nazara/Core/SparsePtr.hpp>
 #include <Nazara/Math/Box.hpp>
 #include <Nazara/Math/Matrix4.hpp>
 #include <Nazara/Math/Quaternion.hpp>
@@ -17,6 +16,7 @@
 #include <Nazara/Math/Vector3.hpp>
 #include <Nazara/Math/Vector4.hpp>
 #include <Nazara/Utility/IndexIterator.hpp>
+#include <Nazara/Utils/SparsePtr.hpp>

 namespace Nz
 {
--- a/include/Nazara/Utility/Animation.hpp
+++ b/include/Nazara/Utility/Animation.hpp
@@ -8,15 +8,15 @@
 #define NAZARA_UTILITY_ANIMATION_HPP

 #include <Nazara/Prerequisites.hpp>
-#include <Nazara/Core/MovablePtr.hpp>
 #include <Nazara/Core/ObjectLibrary.hpp>
 #include <Nazara/Core/Resource.hpp>
 #include <Nazara/Core/ResourceLoader.hpp>
 #include <Nazara/Core/ResourceManager.hpp>
 #include <Nazara/Core/ResourceParameters.hpp>
-#include <Nazara/Core/Signal.hpp>
 #include <Nazara/Utility/Config.hpp>
 #include <Nazara/Utility/Enums.hpp>
+#include <Nazara/Utils/MovablePtr.hpp>
+#include <Nazara/Utils/Signal.hpp>
 #include <string>

 namespace Nz
--- a/include/Nazara/Utility/Enums.hpp
+++ b/include/Nazara/Utility/Enums.hpp
@@ -7,7 +7,7 @@
 #ifndef NAZARA_UTILITY_ENUMS_HPP
 #define NAZARA_UTILITY_ENUMS_HPP

-#include <Nazara/Core/Flags.hpp>
+#include <Nazara/Utils/Flags.hpp>

 namespace Nz
 {
--- a/include/Nazara/Utility/Image.hpp
+++ b/include/Nazara/Utility/Image.hpp
@@ -9,16 +9,16 @@

 #include <Nazara/Prerequisites.hpp>
 #include <Nazara/Core/Color.hpp>
-#include <Nazara/Core/MovablePtr.hpp>
 #include <Nazara/Core/ObjectLibrary.hpp>
 #include <Nazara/Core/Resource.hpp>
 #include <Nazara/Core/ResourceLoader.hpp>
 #include <Nazara/Core/ResourceManager.hpp>
 #include <Nazara/Core/ResourceParameters.hpp>
 #include <Nazara/Core/ResourceSaver.hpp>
-#include <Nazara/Core/Signal.hpp>
 #include <Nazara/Utility/AbstractImage.hpp>
 #include <Nazara/Utility/CubemapParams.hpp>
+#include <Nazara/Utils/MovablePtr.hpp>
+#include <Nazara/Utils/Signal.hpp>
 #include <atomic>

 ///TODO: Filtres
--- a/include/Nazara/Utility/Node.hpp
+++ b/include/Nazara/Utility/Node.hpp
@@ -8,12 +8,13 @@
 #define NAZARA_UTILITY_NODE_HPP

 #include <Nazara/Prerequisites.hpp>
-#include <Nazara/Core/Signal.hpp>
+#include <Nazara/Core/Error.hpp>
 #include <Nazara/Math/Matrix4.hpp>
 #include <Nazara/Math/Quaternion.hpp>
 #include <Nazara/Math/Vector3.hpp>
 #include <Nazara/Utility/Config.hpp>
 #include <Nazara/Utility/Enums.hpp>
+#include <Nazara/Utils/Signal.hpp>
 #include <vector>

 namespace Nz
--- a/include/Nazara/Utility/PixelFormat.hpp
+++ b/include/Nazara/Utility/PixelFormat.hpp
@@ -8,9 +8,10 @@
 #define NAZARA_UTILITY_PIXELFORMAT_HPP

 #include <Nazara/Prerequisites.hpp>
-#include <Nazara/Core/Bitset.hpp>
+#include <Nazara/Core/Error.hpp>
 #include <Nazara/Utility/Config.hpp>
 #include <Nazara/Utility/Enums.hpp>
+#include <Nazara/Utils/Bitset.hpp>
 #include <array>
 #include <functional>

--- a/include/Nazara/Utility/Skeleton.hpp
+++ b/include/Nazara/Utility/Skeleton.hpp
@@ -9,9 +9,9 @@

 #include <Nazara/Prerequisites.hpp>
 #include <Nazara/Core/ObjectLibrary.hpp>
-#include <Nazara/Core/Signal.hpp>
 #include <Nazara/Math/Box.hpp>
 #include <Nazara/Utility/Config.hpp>
+#include <Nazara/Utils/Signal.hpp>
 #include <string>

 namespace Nz
--- a/include/Nazara/Utility/SubMesh.hpp
+++ b/include/Nazara/Utility/SubMesh.hpp
@@ -8,11 +8,12 @@
 #define NAZARA_UTILITY_SUBMESH_HPP

 #include <Nazara/Prerequisites.hpp>
-#include <Nazara/Core/Signal.hpp>
+#include <Nazara/Core/Error.hpp>
 #include <Nazara/Math/Box.hpp>
 #include <Nazara/Utility/Enums.hpp>
 #include <Nazara/Utility/IndexBuffer.hpp>
 #include <Nazara/Utility/VertexBuffer.hpp>
+#include <Nazara/Utils/Signal.hpp>

 namespace Nz
 {
--- a/include/Nazara/Utility/VertexDeclaration.hpp
+++ b/include/Nazara/Utility/VertexDeclaration.hpp
@@ -9,9 +9,9 @@

 #include <Nazara/Prerequisites.hpp>
 #include <Nazara/Core/ObjectLibrary.hpp>
-#include <Nazara/Core/SparsePtr.hpp>
 #include <Nazara/Utility/Config.hpp>
 #include <Nazara/Utility/Enums.hpp>
+#include <Nazara/Utils/SparsePtr.hpp>
 #include <array>
 #include <vector>

--- a/include/Nazara/Utility/VertexMapper.hpp
+++ b/include/Nazara/Utility/VertexMapper.hpp
@@ -8,10 +8,10 @@
 #define NAZARA_UTILITY_VERTEXMAPPER_HPP

 #include <Nazara/Prerequisites.hpp>
-#include <Nazara/Core/SparsePtr.hpp>
 #include <Nazara/Utility/BufferMapper.hpp>
 #include <Nazara/Utility/Enums.hpp>
 #include <Nazara/Utility/VertexBuffer.hpp>
+#include <Nazara/Utils/SparsePtr.hpp>

 namespace Nz
 {