Move resources to bin directory
This commit is contained in:
@@ -20,6 +20,10 @@
|
|||||||
|
|
||||||
int main()
|
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
|
// NzKeyboard nécessite l'initialisation du module Utilitaire
|
||||||
Nz::Modules<Nz::Audio, Nz::Platform> audio;
|
Nz::Modules<Nz::Audio, Nz::Platform> audio;
|
||||||
/*if (!audio)
|
/*if (!audio)
|
||||||
@@ -30,7 +34,7 @@ int main()
|
|||||||
}*/
|
}*/
|
||||||
|
|
||||||
Nz::Sound sound;
|
Nz::Sound sound;
|
||||||
if (!sound.LoadFromFile("resources/siren.wav"))
|
if (!sound.LoadFromFile(resourceDir / "siren.wav"))
|
||||||
{
|
{
|
||||||
std::cout << "Failed to load sound" << std::endl;
|
std::cout << "Failed to load sound" << std::endl;
|
||||||
std::getchar();
|
std::getchar();
|
||||||
|
|||||||
@@ -11,6 +11,10 @@
|
|||||||
|
|
||||||
int main()
|
int main()
|
||||||
{
|
{
|
||||||
|
std::filesystem::path resourceDir = "resources";
|
||||||
|
if (!std::filesystem::is_directory(resourceDir) && std::filesystem::is_directory(".." / resourceDir))
|
||||||
|
resourceDir = ".." / resourceDir;
|
||||||
|
|
||||||
Nz::Renderer::Config rendererConfig;
|
Nz::Renderer::Config rendererConfig;
|
||||||
std::cout << "Run using Vulkan? (y/n)" << std::endl;
|
std::cout << "Run using Vulkan? (y/n)" << std::endl;
|
||||||
if (std::getchar() == 'y')
|
if (std::getchar() == 'y')
|
||||||
@@ -36,7 +40,7 @@ int main()
|
|||||||
|
|
||||||
std::shared_ptr<Nz::RenderDevice> device = window.GetRenderDevice();
|
std::shared_ptr<Nz::RenderDevice> 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)
|
if (!drfreak)
|
||||||
{
|
{
|
||||||
NazaraError("Failed to load model");
|
NazaraError("Failed to load model");
|
||||||
@@ -46,8 +50,8 @@ int main()
|
|||||||
std::shared_ptr<Nz::GraphicalMesh> gfxMesh = std::make_shared<Nz::GraphicalMesh>(drfreak);
|
std::shared_ptr<Nz::GraphicalMesh> gfxMesh = std::make_shared<Nz::GraphicalMesh>(drfreak);
|
||||||
|
|
||||||
// Texture
|
// 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))
|
if (!drfreakImage || !drfreakImage->Convert(Nz::PixelFormat_RGBA8_SRGB))
|
||||||
{
|
{
|
||||||
NazaraError("Failed to load image");
|
NazaraError("Failed to load image");
|
||||||
return __LINE__;
|
return __LINE__;
|
||||||
@@ -68,7 +72,7 @@ int main()
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Texture (alpha-map)
|
// 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))
|
if (!alphaImage || !alphaImage->Convert(Nz::PixelFormat_RGBA8))
|
||||||
{
|
{
|
||||||
NazaraError("Failed to load image");
|
NazaraError("Failed to load image");
|
||||||
|
|||||||
@@ -71,6 +71,10 @@ fn main(vertIn: VertIn) -> VertOut
|
|||||||
|
|
||||||
int main()
|
int main()
|
||||||
{
|
{
|
||||||
|
std::filesystem::path resourceDir = "resources";
|
||||||
|
if (!std::filesystem::is_directory(resourceDir) && std::filesystem::is_directory(".." / resourceDir))
|
||||||
|
resourceDir = ".." / resourceDir;
|
||||||
|
|
||||||
Nz::Renderer::Config rendererConfig;
|
Nz::Renderer::Config rendererConfig;
|
||||||
std::cout << "Run using Vulkan? (y/n)" << std::endl;
|
std::cout << "Run using Vulkan? (y/n)" << std::endl;
|
||||||
if (std::getchar() == 'y')
|
if (std::getchar() == 'y')
|
||||||
@@ -105,7 +109,7 @@ int main()
|
|||||||
return __LINE__;
|
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)
|
if (!drfreak)
|
||||||
{
|
{
|
||||||
NazaraError("Failed to load model");
|
NazaraError("Failed to load model");
|
||||||
@@ -124,7 +128,7 @@ int main()
|
|||||||
std::cout << "Vertex count: " << drfreakVB->GetVertexCount() << std::endl;
|
std::cout << "Vertex count: " << drfreakVB->GetVertexCount() << std::endl;
|
||||||
|
|
||||||
// Texture
|
// 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))
|
if (!drfreakImage || !drfreakImage->Convert(Nz::PixelFormat_RGBA8))
|
||||||
{
|
{
|
||||||
NazaraError("Failed to load image");
|
NazaraError("Failed to load image");
|
||||||
|
|||||||
Reference in New Issue
Block a user