diff --git a/examples/MeshInfos/main.cpp b/examples/MeshInfos/main.cpp index ba55d2686..73864abaa 100644 --- a/examples/MeshInfos/main.cpp +++ b/examples/MeshInfos/main.cpp @@ -2,6 +2,7 @@ #include #include #include +#include #include #include #include @@ -22,7 +23,7 @@ int main() for (;;) { - Nz::Directory resourceDirectory("resources/"); + Nz::Directory resourceDirectory("resources"); if (!resourceDirectory.Open()) { std::cerr << "Failed to open resource directory" << std::endl; @@ -68,7 +69,7 @@ int main() break; Nz::Mesh mesh; - if (!mesh.LoadFromFile("resources/" + models[iChoice-1])) + if (!mesh.LoadFromFile(resourceDirectory.GetPath() + '/' + models[iChoice-1])) { std::cout << "Failed to load mesh" << std::endl; std::getchar(); @@ -168,8 +169,18 @@ int main() { for (unsigned int i = 0; i < materialCount; ++i) { - std::cout << "\t" << (i+1) << ": " << mesh.GetMaterial(i) << std::endl; - std::cin.ignore(std::numeric_limits::max(), '\n'); + const Nz::ParameterList& matData = mesh.GetMaterialData(i); + + Nz::String data; + if (!matData.GetStringParameter(Nz::MaterialData::FilePath, &data)) + { + if (matData.HasParameter(Nz::MaterialData::CustomDefined)) + data = ""; + else + data = ""; + } + + std::cout << "\t" << (i+1) << ": " << data << std::endl; } }