sid/NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
SirLynix
2024-02-10 22:46:53 +01:00
committed by Jérôme Leclercq
parent 965a00182c
commit e64c2b036e
364 changed files with 2336 additions and 2516 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
tests/UnitTests/Engine/Core/ByteStreamTest.cpp
View File

@@ -1,3 +1,4 @@
#include <Nazara/Core/ByteArray.hpp>
#include <Nazara/Core/ByteStream.hpp>
#include <catch2/catch_approx.hpp>
#include <catch2/catch_test_macros.hpp>

4
tests/UnitTests/Engine/Utility/ImageLoading.cpp → tests/UnitTests/Engine/Core/ImageLoading.cpp
View File

@@ -1,11 +1,11 @@
#include <Nazara/Utility/Image.hpp>
#include <Nazara/Core/Image.hpp>
#include <catch2/catch_approx.hpp>
#include <catch2/catch_test_macros.hpp>
#include <filesystem>
std::filesystem::path GetAssetDir();
SCENARIO("Images", "[Utility][Image]")
SCENARIO("Images", "[Core][Image]")
{
WHEN("Loading PNG files")
{

8
tests/UnitTests/Engine/Utility/ImageStreamLoading.cpp → tests/UnitTests/Engine/Core/ImageStreamLoading.cpp
View File

@@ -1,6 +1,6 @@
#include <Nazara/Utility/Image.hpp>
#include <Nazara/Utility/ImageStream.hpp>
#include <Nazara/Utility/PixelFormat.hpp>
#include <Nazara/Core/Image.hpp>
#include <Nazara/Core/ImageStream.hpp>
#include <Nazara/Core/PixelFormat.hpp>
#include <catch2/catch_approx.hpp>
#include <catch2/catch_test_macros.hpp>
#include <filesystem>
@@ -17,7 +17,7 @@ void CompareFrames(const Nz::ImageStream& gif, std::vector<Nz::UInt8>& frameData
REQUIRE(std::memcmp(frameData.data(), referenceImage.GetConstPixels(), frameData.size()) == 0);
}
SCENARIO("Streamed images", "[Utility][ImageStream]")
SCENARIO("Streamed images", "[Core][ImageStream]")
{
using namespace Nz::Literals;

4
tests/UnitTests/Engine/Utility/MeshLoading.cpp → tests/UnitTests/Engine/Core/MeshLoading.cpp
View File

@@ -1,11 +1,11 @@
#include <Nazara/Utility/Mesh.hpp>
#include <Nazara/Core/Mesh.hpp>
#include <catch2/catch_approx.hpp>
#include <catch2/catch_test_macros.hpp>
#include <filesystem>
std::filesystem::path GetAssetDir();
SCENARIO("Meshes", "[Utility][Mesh]")
SCENARIO("Meshes", "[Core][Mesh]")
{
WHEN("Loading OJB files")
{

2
tests/UnitTests/Engine/Core/SerializationTest.cpp
View File

@@ -1,4 +1,4 @@
#include <Nazara/Core/SerializationContext.hpp>
#include <Nazara/Core/Serialization.hpp>
#include <Nazara/Core/Color.hpp>
#include <Nazara/Core/MemoryView.hpp>

3
tests/UnitTests/Engine/Core/VirtualDirectoryTest.cpp
View File

@@ -1,4 +1,3 @@
#include <Nazara/Core/Algorithm.hpp>
#include <Nazara/Core/File.hpp>
#include <Nazara/Core/StringExt.hpp>
#include <Nazara/Core/VirtualDirectory.hpp>
@@ -260,7 +259,7 @@ TEST_CASE("VirtualDirectory", "[Core][VirtualDirectory]")
CHECK(resourceDir->GetEntry("./..", CheckOurselves));
CHECK(resourceDir->GetEntry("./..", CheckOurselves));
CHECK(resourceDir->GetEntry("Audio/../..", CheckOurselves));
CHECK(resourceDir->GetEntry("Core/../Audio/../../..", CheckOurselves));
CHECK(resourceDir->GetEntry("Utility/../Audio/../../..", CheckOurselves));
}
AND_THEN("Overriding the physical file with another one")
{

1
tests/UnitTests/Engine/Modules.hpp
View File

@@ -4,4 +4,3 @@
#include <Nazara/Network.hpp>
#include <Nazara/Physics2D.hpp>
#include <Nazara/Physics3D.hpp>
#include <Nazara/Utility.hpp>

8
tests/UnitTests/Engine/Utility/FontLoading.cpp → tests/UnitTests/Engine/TextRenderer/FontLoading.cpp
View File

@@ -1,6 +1,6 @@
#include <Nazara/Utility/AbstractImage.hpp>
#include <Nazara/Utility/Font.hpp>
#include <Nazara/Utility/GuillotineImageAtlas.hpp>
#include <Nazara/Core/AbstractImage.hpp>
#include <Nazara/TextRenderer/Font.hpp>
#include <Nazara/Core/GuillotineImageAtlas.hpp>
#include <catch2/catch_approx.hpp>
#include <catch2/catch_test_macros.hpp>
#include <array>
@@ -8,7 +8,7 @@
std::filesystem::path GetAssetDir();
SCENARIO("Fonts", "[Utility][Font]")
SCENARIO("Fonts", "[TextRenderer][Font]")
{
WHEN("Loading default font")
{

5
tests/UnitTests/main.cpp
View File

@@ -2,14 +2,15 @@
#include <catch2/catch_session.hpp>
#include <Nazara/Audio/Audio.hpp>
#include <Nazara/Core/Core.hpp>
#include <Nazara/Core/Modules.hpp>
#include <Nazara/Network/Network.hpp>
#include <Nazara/Physics2D/Physics2D.hpp>
#include <Nazara/Utility/Utility.hpp>
#include <Nazara/TextRenderer/TextRenderer.hpp>
int main(int argc, char* argv[])
{
Nz::Modules<Nz::Audio, Nz::Network, Nz::Physics2D, Nz::Utility> nazaza;
Nz::Modules<Nz::Audio, Nz::Network, Nz::Physics2D, Nz::TextRenderer> nazaza;
return Catch::Session().run(argc, argv);
}

2
tests/UnitTests/xmake.lua
View File

@@ -18,7 +18,7 @@ target("UnitTests", function ()
add_defines("CATCH_CONFIG_NO_POSIX_SIGNALS")
end
add_deps("NazaraAudio", "NazaraCore", "NazaraNetwork", "NazaraPhysics2D")
add_deps("NazaraAudio", "NazaraCore", "NazaraNetwork", "NazaraPhysics2D", "NazaraTextRenderer")
add_deps("UnitTests_sub1", "UnitTests_sub2", { links = {} })
add_packages("catch2", "entt", "frozen")
add_headerfiles("Engine/**.hpp", { prefixdir = "private", install = false })