diff --git a/examples/RenderTest/main.cpp b/examples/RenderTest/main.cpp index cef3ecf51..6af94fa9f 100644 --- a/examples/RenderTest/main.cpp +++ b/examples/RenderTest/main.cpp @@ -1,14 +1,23 @@ -#include +#include +#include #include #include #include #include +#include #include #include int main() { - Nz::Modules nazara; + Nz::Renderer::Config rendererConfig; + std::cout << "Run using Vulkan? (y/n)" << std::endl; + if (std::getchar() == 'y') + rendererConfig.preferredAPI = Nz::RenderAPI::Vulkan; + else + rendererConfig.preferredAPI = Nz::RenderAPI::OpenGL; + + Nz::Modules nazara(rendererConfig); Nz::RenderWindow window; @@ -16,7 +25,7 @@ int main() meshParams.matrix = Nz::Matrix4f::Rotate(Nz::EulerAnglesf(0.f, 90.f, 180.f)) * Nz::Matrix4f::Scale(Nz::Vector3f(0.002f)); meshParams.vertexDeclaration = Nz::VertexDeclaration::Get(Nz::VertexLayout_XYZ_Normal_UV); - Nz::String windowTitle = "Vulkan Test"; + Nz::String windowTitle = "Render Test"; if (!window.Create(Nz::VideoMode(800, 600, 32), windowTitle)) { std::cout << "Failed to create Window" << std::endl; @@ -40,7 +49,6 @@ int main() } Nz::MeshRef drfreak = Nz::Mesh::LoadFromFile("resources/Spaceship/spaceship.obj", meshParams); - if (!drfreak) { NazaraError("Failed to load model"); @@ -218,7 +226,7 @@ int main() unsigned int fps = 0; bool uboUpdate = true; - //Nz::Mouse::SetRelativeMouseMode(true); + Nz::Mouse::SetRelativeMouseMode(true); while (window.IsOpen()) { @@ -231,7 +239,7 @@ int main() window.Close(); break; - /*case Nz::WindowEventType_MouseMoved: // La souris a bougé + case Nz::WindowEventType_MouseMoved: // La souris a bougé { // Gestion de la caméra free-fly (Rotation) float sensitivity = 0.3f; // Sensibilité de la souris @@ -246,7 +254,7 @@ int main() uboUpdate = true; break; - }*/ + } case Nz::WindowEventType_Resized: {