sid
/
NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update RenderTest demo

This commit is contained in:
Jérôme Leclercq 2020-09-20 14:53:44 +02:00
parent 95c9ad0fd8
commit 84a25df0bf
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
examples/RenderTest/main.cpp
View File

@ -1,14 +1,23 @@
#include <Nazara/Utility.hpp> #include <Nazara/Core.hpp>
#include <Nazara/Platform.hpp>
#include <Nazara/Renderer.hpp> #include <Nazara/Renderer.hpp>
#include <Nazara/Shader.hpp> #include <Nazara/Shader.hpp>
#include <Nazara/Shader/SpirvConstantCache.hpp> #include <Nazara/Shader/SpirvConstantCache.hpp>
#include <Nazara/Shader/SpirvPrinter.hpp> #include <Nazara/Shader/SpirvPrinter.hpp>
#include <Nazara/Utility.hpp>
#include <array> #include <array>
#include <iostream> #include <iostream>
int main() int main()
{ {
Nz::Modules<Nz::Renderer> 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<Nz::Renderer> nazara(rendererConfig);
Nz::RenderWindow window; 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.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); 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)) if (!window.Create(Nz::VideoMode(800, 600, 32), windowTitle))
{ {
std::cout << "Failed to create Window" << std::endl; 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); Nz::MeshRef drfreak = Nz::Mesh::LoadFromFile("resources/Spaceship/spaceship.obj", meshParams);
if (!drfreak) if (!drfreak)
{ {
NazaraError("Failed to load model"); NazaraError("Failed to load model");
@ -218,7 +226,7 @@ int main()
unsigned int fps = 0; unsigned int fps = 0;
bool uboUpdate = true; bool uboUpdate = true;
//Nz::Mouse::SetRelativeMouseMode(true); Nz::Mouse::SetRelativeMouseMode(true);
while (window.IsOpen()) while (window.IsOpen())
{ {
@ -231,7 +239,7 @@ int main()
window.Close(); window.Close();
break; 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) // Gestion de la caméra free-fly (Rotation)
float sensitivity = 0.3f; // Sensibilité de la souris float sensitivity = 0.3f; // Sensibilité de la souris
@ -246,7 +254,7 @@ int main()
uboUpdate = true; uboUpdate = true;
break; break;
}*/ }
case Nz::WindowEventType_Resized: case Nz::WindowEventType_Resized:
{ {