From f54eb0402f8d22af2f733b19966b9941a9a095ee Mon Sep 17 00:00:00 2001 From: Lynix Date: Mon, 28 Sep 2015 12:41:41 +0200 Subject: [PATCH] Examples: Fix MeshInfos Former-commit-id: b6c5ea953f60d2b22eaa6aae06d1618efdb09bc1 --- examples/MeshInfos/main.cpp | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/examples/MeshInfos/main.cpp b/examples/MeshInfos/main.cpp index 839c20f31..ba55d2686 100644 --- a/examples/MeshInfos/main.cpp +++ b/examples/MeshInfos/main.cpp @@ -11,7 +11,7 @@ int main() { // Pour charger des ressources, il est impératif d'initialiser le module utilitaire - Initializer utility; + Nz::Initializer utility; if (!utility) { // Ça n'a pas fonctionné, le pourquoi se trouve dans le fichier NazaraLog.log @@ -22,7 +22,7 @@ int main() for (;;) { - Directory resourceDirectory("resources/"); + Nz::Directory resourceDirectory("resources/"); if (!resourceDirectory.Open()) { std::cerr << "Failed to open resource directory" << std::endl; @@ -30,12 +30,12 @@ int main() return EXIT_FAILURE; } - std::vector models; + std::vector models; while (resourceDirectory.NextResult()) { - String path = resourceDirectory.GetResultName(); - String ext = path.SubStringFrom('.', -1, true); // Tout ce qui vient après le dernier '.' de la chaîne - if (MeshLoader::IsExtensionSupported(ext)) // L'extension est-elle supportée par le MeshLoader ? + Nz::String path = resourceDirectory.GetResultName(); + Nz::String ext = path.SubStringFrom('.', -1, true); // Tout ce qui vient après le dernier '.' de la chaîne + if (Nz::MeshLoader::IsExtensionSupported(ext)) // L'extension est-elle supportée par le MeshLoader ? models.push_back(path); } @@ -67,7 +67,7 @@ int main() if (iChoice == 0) break; - Mesh mesh; + Nz::Mesh mesh; if (!mesh.LoadFromFile("resources/" + models[iChoice-1])) { std::cout << "Failed to load mesh" << std::endl; @@ -77,11 +77,11 @@ int main() switch (mesh.GetAnimationType()) { - case AnimationType_Skeletal: + case Nz::AnimationType_Skeletal: std::cout << "This is a skeletal-animated mesh" << std::endl; break; - case AnimationType_Static: + case Nz::AnimationType_Static: std::cout << "This is a static mesh" << std::endl; break; @@ -92,9 +92,9 @@ int main() if (mesh.IsAnimable()) { - if (mesh.GetAnimationType() == AnimationType_Skeletal) + if (mesh.GetAnimationType() == Nz::AnimationType_Skeletal) { - const Skeleton* skeleton = mesh.GetSkeleton(); + const Nz::Skeleton* skeleton = mesh.GetSkeleton(); unsigned int jointCount = skeleton->GetJointCount(); std::cout << "It has a skeleton made of " << skeleton->GetJointCount() << " joint(s)." << std::endl; std::cout << "Print joints ? (Y/N) "; @@ -107,10 +107,10 @@ int main() { for (unsigned int i = 0; i < jointCount; ++i) { - const Joint* joint = skeleton->GetJoint(i); + const Nz::Joint* joint = skeleton->GetJoint(i); std::cout << "\t" << (i+1) << ": " << joint->GetName(); - const Joint* parent = static_cast(joint->GetParent()); + const Nz::Joint* parent = static_cast(joint->GetParent()); if (parent) std::cout << " (Parent: " << parent->GetName() << ')'; @@ -119,10 +119,10 @@ int main() } } - String animationPath = mesh.GetAnimation(); + Nz::String animationPath = mesh.GetAnimation(); if (!animationPath.IsEmpty()) { - Animation animation; + Nz::Animation animation; if (animation.LoadFromFile(animationPath)) { unsigned int sequenceCount = animation.GetSequenceCount(); @@ -137,7 +137,7 @@ int main() { for (unsigned int i = 0; i < sequenceCount; ++i) { - const Sequence* sequence = animation.GetSequence(i); + const Nz::Sequence* sequence = animation.GetSequence(i); std::cout << "\t" << (i+1) << ": " << sequence->name << std::endl; std::cout << "\t\tStart frame: " << sequence->firstFrame << std::endl; std::cout << "\t\tFrame count: " << sequence->frameCount << std::endl; @@ -153,7 +153,7 @@ int main() std::cout << "It's animable but has no animation information" << std::endl; } - Boxf cube = mesh.GetAABB(); + Nz::Boxf cube = mesh.GetAABB(); std::cout << "Mesh is " << cube.width << " units wide, " << cube.height << " units height and " << cube.depth << " units depth" << std::endl; unsigned int materialCount = mesh.GetMaterialCount();