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

Last changes

Browse Source
This commit is contained in:
SirLynix
2023-02-02 20:33:53 +01:00
committed by Jérôme Leclercq
parent cee75dcc11
commit 5a57aca66a
26 changed files with 310 additions and 183 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tests/ComputeTest/xmake.lua
View File

@@ -1,3 +1,7 @@
if is_plat("wasm") then
return -- Compute shaders are not supported with WebGL (but are with WebGPU)
end
target("ComputeTest")
add_deps("NazaraRenderer")
add_files("main.cpp")

27
tests/GraphicsTest/main.cpp
View File

@@ -17,14 +17,16 @@ int main()
resourceDir = "../.." / resourceDir;
Nz::Renderer::Config rendererConfig;
rendererConfig.preferredAPI = Nz::RenderAPI::OpenGL;
/*std::cout << "Run using Vulkan? (y/n)" << std::endl;
#ifndef NAZARA_PLATFORM_WEB
std::cout << "Run using Vulkan? (y/n)" << std::endl;
if (std::getchar() == 'y')
rendererConfig.preferredAPI = Nz::RenderAPI::Vulkan;
else
rendererConfig.preferredAPI = Nz::RenderAPI::OpenGL;*/
rendererConfig.preferredAPI = Nz::RenderAPI::OpenGL;
#endif
Nz::Modules<Nz::Graphics> nazara(rendererConfig);
Nz::Application<Nz::Graphics> app(rendererConfig);
auto& windowingApp = app.AddComponent<Nz::AppWindowingComponent>();
Nz::MeshParams meshParams;
meshParams.center = true;
@@ -35,12 +37,7 @@ int main()
std::shared_ptr<Nz::RenderDevice> device = Nz::Graphics::Instance()->GetRenderDevice();
std::string windowTitle = "Graphics Test";
Nz::Window window;
if (!window.Create(Nz::VideoMode(1280, 720), windowTitle))
{
std::cout << "Failed to create Window" << std::endl;
std::abort();
}
Nz::Window& window = windowingApp.CreateWindow(Nz::VideoMode(1280, 720), windowTitle);
Nz::WindowSwapchain windowSwapchain(device, window);
std::shared_ptr<Nz::Mesh> spaceshipMesh = Nz::Mesh::LoadFromFile(resourceDir / "Spaceship/spaceship.obj", meshParams);
@@ -177,10 +174,8 @@ int main()
}
});
while (window.IsOpen())
app.AddUpdater([&](Nz::Time /*elapsedTime*/)
{
Nz::Window::ProcessEvents();
if (std::optional<Nz::Time> deltaTime = updateClock.RestartIfOver(Nz::Time::TickDuration(60)))
{
float cameraSpeed = 2.f * deltaTime->AsSeconds();
@@ -215,7 +210,7 @@ int main()
if (!frame)
{
std::this_thread::sleep_for(std::chrono::milliseconds(1));
continue;
return;
}
framePipeline.GetDebugDrawer().DrawLine(Nz::Vector3f::Zero(), Nz::Vector3f::Forward(), Nz::Color::Blue());
@@ -243,7 +238,7 @@ int main()
window.SetTitle(windowTitle + " - " + Nz::NumberToString(fps) + " FPS");
fps = 0;
}
}
});
return EXIT_SUCCESS;
return app.Run();
}

21
tests/RenderTest/main.cpp
View File

@@ -88,25 +88,22 @@ int main()
resourceDir = "../.." / resourceDir;
Nz::Renderer::Config rendererConfig;
#ifndef NAZARA_PLATFORM_WEB
std::cout << "Run using Vulkan? (y/n)" << std::endl;
if (std::getchar() == 'y')
rendererConfig.preferredAPI = Nz::RenderAPI::Vulkan;
else
rendererConfig.preferredAPI = Nz::RenderAPI::OpenGL;
#endif
Nz::Modules<Nz::Renderer> nazara(rendererConfig);
Nz::Application<Nz::Renderer> app(rendererConfig);
auto& windowingApp = app.AddComponent<Nz::AppWindowingComponent>();
std::shared_ptr<Nz::RenderDevice> device = Nz::Renderer::Instance()->InstanciateRenderDevice(0);
Nz::Window window;
Nz::WindowSwapchain windowSwapchain(device, window);
std::string windowTitle = "Render Test";
if (!window.Create(Nz::VideoMode(1280, 720), windowTitle))
{
std::cout << "Failed to create Window" << std::endl;
return __LINE__;
}
Nz::Window& window = windowingApp.CreateWindow(Nz::VideoMode(1280, 720), windowTitle);
Nz::WindowSwapchain windowSwapchain(device, window);
nzsl::Ast::ModulePtr shaderModule = nzsl::Parse(std::string_view(shaderSource, sizeof(shaderSource)));
if (!shaderModule)
@@ -287,10 +284,8 @@ int main()
uboUpdate = true;
});
Nz::BasicMainloop(window, [&]
app.AddUpdater([&](Nz::Time /*elapsedTime*/)
{
Nz::Window::ProcessEvents();
if (std::optional<Nz::Time> deltaTime = updateClock.RestartIfOver(Nz::Time::TickDuration(60)))
{
float cameraSpeed = 2.f * deltaTime->AsSeconds();
@@ -416,5 +411,5 @@ int main()
}
});
return EXIT_SUCCESS;
return app.Run();
}