From 2a4f020dd7f40089d77f87f90ec9f73388e2d549 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Leclercq?= Date: Wed, 5 May 2021 14:01:12 +0200 Subject: [PATCH] Move resources to bin directory --- examples/DopplerEffect/main.cpp | 6 +++++- examples/GraphicsTest/main.cpp | 12 ++++++++---- examples/RenderTest/main.cpp | 8 ++++++-- examples/{bin => }/resources/Spaceship/readme.txt | 0 .../{bin => }/resources/shaders/spirv-triangle.bat | 0 examples/{bin => }/resources/shaders/triangle.frag | 0 .../{bin => }/resources/shaders/triangle.frag.spv | Bin examples/{bin => }/resources/shaders/triangle.vert | 0 .../{bin => }/resources/shaders/triangle.vert.spv | Bin 9 files changed, 19 insertions(+), 7 deletions(-) rename examples/{bin => }/resources/Spaceship/readme.txt (100%) rename examples/{bin => }/resources/shaders/spirv-triangle.bat (100%) rename examples/{bin => }/resources/shaders/triangle.frag (100%) rename examples/{bin => }/resources/shaders/triangle.frag.spv (100%) rename examples/{bin => }/resources/shaders/triangle.vert (100%) rename examples/{bin => }/resources/shaders/triangle.vert.spv (100%) diff --git a/examples/DopplerEffect/main.cpp b/examples/DopplerEffect/main.cpp index dcb760bb6..d57c0e082 100644 --- a/examples/DopplerEffect/main.cpp +++ b/examples/DopplerEffect/main.cpp @@ -20,6 +20,10 @@ int main() { + std::filesystem::path resourceDir = "resources"; + if (!std::filesystem::is_directory(resourceDir) && std::filesystem::is_directory(".." / resourceDir)) + resourceDir = ".." / resourceDir; + // NzKeyboard nécessite l'initialisation du module Utilitaire Nz::Modules audio; /*if (!audio) @@ -30,7 +34,7 @@ int main() }*/ Nz::Sound sound; - if (!sound.LoadFromFile("resources/siren.wav")) + if (!sound.LoadFromFile(resourceDir / "siren.wav")) { std::cout << "Failed to load sound" << std::endl; std::getchar(); diff --git a/examples/GraphicsTest/main.cpp b/examples/GraphicsTest/main.cpp index b5578fd88..29f7ed023 100644 --- a/examples/GraphicsTest/main.cpp +++ b/examples/GraphicsTest/main.cpp @@ -11,6 +11,10 @@ int main() { + std::filesystem::path resourceDir = "resources"; + if (!std::filesystem::is_directory(resourceDir) && std::filesystem::is_directory(".." / resourceDir)) + resourceDir = ".." / resourceDir; + Nz::Renderer::Config rendererConfig; std::cout << "Run using Vulkan? (y/n)" << std::endl; if (std::getchar() == 'y') @@ -36,7 +40,7 @@ int main() std::shared_ptr device = window.GetRenderDevice(); - Nz::MeshRef drfreak = Nz::Mesh::LoadFromFile("resources/Spaceship/spaceship.obj", meshParams); + Nz::MeshRef drfreak = Nz::Mesh::LoadFromFile(resourceDir / "Spaceship/spaceship.obj", meshParams); if (!drfreak) { NazaraError("Failed to load model"); @@ -46,8 +50,8 @@ int main() std::shared_ptr gfxMesh = std::make_shared(drfreak); // Texture - Nz::ImageRef drfreakImage = Nz::Image::LoadFromFile("resources/Spaceship/Texture/diffuse.png"); - if (!drfreakImage || !drfreakImage->Convert(Nz::PixelFormat_RGBA8)) + Nz::ImageRef drfreakImage = Nz::Image::LoadFromFile(resourceDir / "Spaceship/Texture/diffuse.png"); + if (!drfreakImage || !drfreakImage->Convert(Nz::PixelFormat_RGBA8_SRGB)) { NazaraError("Failed to load image"); return __LINE__; @@ -68,7 +72,7 @@ int main() } // Texture (alpha-map) - Nz::ImageRef alphaImage = Nz::Image::LoadFromFile("alphatile.png"); + Nz::ImageRef alphaImage = Nz::Image::LoadFromFile(resourceDir / "alphatile.png"); if (!alphaImage || !alphaImage->Convert(Nz::PixelFormat_RGBA8)) { NazaraError("Failed to load image"); diff --git a/examples/RenderTest/main.cpp b/examples/RenderTest/main.cpp index c076d8c3f..4e8fff1cc 100644 --- a/examples/RenderTest/main.cpp +++ b/examples/RenderTest/main.cpp @@ -71,6 +71,10 @@ fn main(vertIn: VertIn) -> VertOut int main() { + std::filesystem::path resourceDir = "resources"; + if (!std::filesystem::is_directory(resourceDir) && std::filesystem::is_directory(".." / resourceDir)) + resourceDir = ".." / resourceDir; + Nz::Renderer::Config rendererConfig; std::cout << "Run using Vulkan? (y/n)" << std::endl; if (std::getchar() == 'y') @@ -105,7 +109,7 @@ int main() return __LINE__; } - Nz::MeshRef drfreak = Nz::Mesh::LoadFromFile("resources/Spaceship/spaceship.obj", meshParams); + Nz::MeshRef drfreak = Nz::Mesh::LoadFromFile(resourceDir / "Spaceship/spaceship.obj", meshParams); if (!drfreak) { NazaraError("Failed to load model"); @@ -124,7 +128,7 @@ int main() std::cout << "Vertex count: " << drfreakVB->GetVertexCount() << std::endl; // Texture - Nz::ImageRef drfreakImage = Nz::Image::LoadFromFile("resources/Spaceship/Texture/diffuse.png"); + Nz::ImageRef drfreakImage = Nz::Image::LoadFromFile(resourceDir / "Spaceship/Texture/diffuse.png"); if (!drfreakImage || !drfreakImage->Convert(Nz::PixelFormat_RGBA8)) { NazaraError("Failed to load image"); diff --git a/examples/bin/resources/Spaceship/readme.txt b/examples/resources/Spaceship/readme.txt similarity index 100% rename from examples/bin/resources/Spaceship/readme.txt rename to examples/resources/Spaceship/readme.txt diff --git a/examples/bin/resources/shaders/spirv-triangle.bat b/examples/resources/shaders/spirv-triangle.bat similarity index 100% rename from examples/bin/resources/shaders/spirv-triangle.bat rename to examples/resources/shaders/spirv-triangle.bat diff --git a/examples/bin/resources/shaders/triangle.frag b/examples/resources/shaders/triangle.frag similarity index 100% rename from examples/bin/resources/shaders/triangle.frag rename to examples/resources/shaders/triangle.frag diff --git a/examples/bin/resources/shaders/triangle.frag.spv b/examples/resources/shaders/triangle.frag.spv similarity index 100% rename from examples/bin/resources/shaders/triangle.frag.spv rename to examples/resources/shaders/triangle.frag.spv diff --git a/examples/bin/resources/shaders/triangle.vert b/examples/resources/shaders/triangle.vert similarity index 100% rename from examples/bin/resources/shaders/triangle.vert rename to examples/resources/shaders/triangle.vert diff --git a/examples/bin/resources/shaders/triangle.vert.spv b/examples/resources/shaders/triangle.vert.spv similarity index 100% rename from examples/bin/resources/shaders/triangle.vert.spv rename to examples/resources/shaders/triangle.vert.spv