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

Remove assets from repository and download them using xmake

Browse Source
This commit is contained in:
SirLynix
2022-05-27 08:34:36 +02:00
parent 03e2801dbe
commit 5507b98f2f
51 changed files with 189 additions and 313 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/Engine/Utility/FontLoading.cpp
View File

@@ -5,7 +5,7 @@
#include <array>
#include <filesystem>
std::filesystem::path GetResourceDir();
std::filesystem::path GetAssetDir();
SCENARIO("Fonts", "[Utility][Font]")
{

6
tests/Engine/Utility/ImageLoading.cpp
View File

@@ -2,7 +2,7 @@
#include <catch2/catch.hpp>
#include <filesystem>
std::filesystem::path GetResourceDir();
std::filesystem::path GetAssetDir();
SCENARIO("Images", "[Utility][Image]")
{
@@ -10,7 +10,7 @@ SCENARIO("Images", "[Utility][Image]")
{
GIVEN("Logo.png")
{
std::shared_ptr<Nz::Image> logo = Nz::Image::LoadFromFile(GetResourceDir() / "Logo.png");
std::shared_ptr<Nz::Image> logo = Nz::Image::LoadFromFile(GetAssetDir() / "Logo.png");
REQUIRE(logo);
CHECK(logo->GetWidth() == 765);
@@ -26,7 +26,7 @@ SCENARIO("Images", "[Utility][Image]")
{
GIVEN("stars-background.jpg")
{
std::shared_ptr<Nz::Image> background = Nz::Image::LoadFromFile(GetResourceDir() / "stars-background.jpg");
std::shared_ptr<Nz::Image> background = Nz::Image::LoadFromFile(GetAssetDir() / "Utility/stars-background.jpg");
REQUIRE(background);
CHECK(background->GetWidth() == 1920);

28
tests/Engine/Utility/ImageStreamLoading.cpp
View File

@@ -4,7 +4,7 @@
#include <catch2/catch.hpp>
#include <filesystem>
std::filesystem::path GetResourceDir();
std::filesystem::path GetAssetDir();
void CompareFrames(const Nz::ImageStream& gif, std::vector<Nz::UInt8>& frameData, const Nz::Image& referenceImage)
{
@@ -26,7 +26,7 @@ SCENARIO("Streamed images", "[Utility][ImageStream]")
Nz::UInt64 time;
};
std::filesystem::path resourcePath = GetResourceDir();
std::filesystem::path resourcePath = GetAssetDir();
WHEN("Loading GIF files")
{
@@ -34,28 +34,28 @@ SCENARIO("Streamed images", "[Utility][ImageStream]")
{
std::array expectedFrames = {
ExpectedFrame{
Nz::Image::LoadFromFile(resourcePath / "Tests/GIF/canvas_bgnd/0.png"),
Nz::Image::LoadFromFile(resourcePath / "Utility/GIF/canvas_bgnd/0.png"),
0
},
ExpectedFrame{
Nz::Image::LoadFromFile(resourcePath / "Tests/GIF/canvas_bgnd/1.png"),
Nz::Image::LoadFromFile(resourcePath / "Utility/GIF/canvas_bgnd/1.png"),
1000
},
ExpectedFrame{
Nz::Image::LoadFromFile(resourcePath / "Tests/GIF/canvas_bgnd/2.png"),
Nz::Image::LoadFromFile(resourcePath / "Utility/GIF/canvas_bgnd/2.png"),
2000
},
ExpectedFrame{
Nz::Image::LoadFromFile(resourcePath / "Tests/GIF/canvas_bgnd/3.png"),
Nz::Image::LoadFromFile(resourcePath / "Utility/GIF/canvas_bgnd/3.png"),
3000
},
ExpectedFrame{
Nz::Image::LoadFromFile(resourcePath / "Tests/GIF/canvas_bgnd/4.png"),
Nz::Image::LoadFromFile(resourcePath / "Utility/GIF/canvas_bgnd/4.png"),
4000
}
};
std::shared_ptr<Nz::ImageStream> gif = Nz::ImageStream::OpenFromFile(resourcePath / "Tests/GIF/canvas_bgnd.gif");
std::shared_ptr<Nz::ImageStream> gif = Nz::ImageStream::OpenFromFile(resourcePath / "Utility/GIF/canvas_bgnd.gif");
REQUIRE(gif);
Nz::Vector2ui size = gif->GetSize();
@@ -100,28 +100,28 @@ SCENARIO("Streamed images", "[Utility][ImageStream]")
{
std::array expectedFrames = {
ExpectedFrame{
Nz::Image::LoadFromFile(resourcePath / "Tests/GIF/canvas_prev/0.png"),
Nz::Image::LoadFromFile(resourcePath / "Utility/GIF/canvas_prev/0.png"),
0
},
ExpectedFrame{
Nz::Image::LoadFromFile(resourcePath / "Tests/GIF/canvas_prev/1.png"),
Nz::Image::LoadFromFile(resourcePath / "Utility/GIF/canvas_prev/1.png"),
100
},
ExpectedFrame{
Nz::Image::LoadFromFile(resourcePath / "Tests/GIF/canvas_prev/2.png"),
Nz::Image::LoadFromFile(resourcePath / "Utility/GIF/canvas_prev/2.png"),
1100
},
ExpectedFrame{
Nz::Image::LoadFromFile(resourcePath / "Tests/GIF/canvas_prev/3.png"),
Nz::Image::LoadFromFile(resourcePath / "Utility/GIF/canvas_prev/3.png"),
2100
},
ExpectedFrame{
Nz::Image::LoadFromFile(resourcePath / "Tests/GIF/canvas_prev/4.png"),
Nz::Image::LoadFromFile(resourcePath / "Utility/GIF/canvas_prev/4.png"),
3100
}
};
std::shared_ptr<Nz::ImageStream> gif = Nz::ImageStream::OpenFromFile(resourcePath / "Tests/GIF/canvas_prev.gif");
std::shared_ptr<Nz::ImageStream> gif = Nz::ImageStream::OpenFromFile(resourcePath / "Utility/GIF/canvas_prev.gif");
REQUIRE(gif);
Nz::Vector2ui size = gif->GetSize();

8
tests/Engine/Utility/MeshLoading.cpp
View File

@@ -2,7 +2,7 @@
#include <catch2/catch.hpp>
#include <filesystem>
std::filesystem::path GetResourceDir();
std::filesystem::path GetAssetDir();
SCENARIO("Meshes", "[Utility][Mesh]")
{
@@ -10,7 +10,7 @@ SCENARIO("Meshes", "[Utility][Mesh]")
{
GIVEN("Spaceship/spaceship.obj")
{
std::shared_ptr<Nz::Mesh> spaceship = Nz::Mesh::LoadFromFile(GetResourceDir() / "Spaceship/spaceship.obj");
std::shared_ptr<Nz::Mesh> spaceship = Nz::Mesh::LoadFromFile(GetAssetDir() / "Utility/Spaceship/spaceship.obj");
REQUIRE(spaceship);
CHECK(!spaceship->IsAnimable());
@@ -22,7 +22,7 @@ SCENARIO("Meshes", "[Utility][Mesh]")
GIVEN("SpaceStation/space_station.obj")
{
std::shared_ptr<Nz::Mesh> spacestation = Nz::Mesh::LoadFromFile(GetResourceDir() / "SpaceStation/space_station.obj");
std::shared_ptr<Nz::Mesh> spacestation = Nz::Mesh::LoadFromFile(GetAssetDir() / "Utility/SpaceStation/space_station.obj");
REQUIRE(spacestation);
CHECK(!spacestation->IsAnimable());
@@ -37,7 +37,7 @@ SCENARIO("Meshes", "[Utility][Mesh]")
{
GIVEN("drfreak.md2")
{
std::shared_ptr<Nz::Mesh> drfreak = Nz::Mesh::LoadFromFile(GetResourceDir() / "drfreak.md2");
std::shared_ptr<Nz::Mesh> drfreak = Nz::Mesh::LoadFromFile(GetAssetDir() / "Utility/drfreak/drfreak.md2");
CHECK(drfreak);
CHECK(!drfreak->IsAnimable()); //< non-skeletal animations are not supported