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

update NazaraImgui to reflect latest changes in Nazara

Browse Source
This commit is contained in:
SweetId
2023-09-19 19:52:12 -04:00
parent 0a50ad12ad
commit 14c36368de
4 changed files with 59 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
examples/Demo/main.cpp
View File

@@ -1,10 +1,16 @@
#include <Nazara/Core/Modules.hpp>
#include <Nazara/Core/Application.hpp>
#include <Nazara/Core/Clock.hpp>
#include <Nazara/Graphics/Graphics.hpp>
#include <Nazara/Renderer/RenderWindow.hpp>
#include <Nazara/Platform/AppWindowingComponent.hpp>
#include <Nazara/Platform/Platform.hpp>
#include <Nazara/Renderer/GpuSwitch.hpp>
#include <Nazara/Renderer/WindowSwapchain.hpp>
#include <NazaraImgui/NazaraImgui.hpp>
NAZARA_REQUEST_DEDICATED_GPU()
struct MyImguiWindow
: private Nz::ImguiHandler
{
@@ -28,12 +34,22 @@ struct MyImguiWindow
float values[4] = { 0 };
};
#if 1
int main(int argc, char* argv[])
#else
int WinMain(int argc, char* argv[])
#endif
{
NazaraUnused(argc);
NazaraUnused(argv);
Nz::Modules<Nz::Graphics, Nz::Imgui> nazara;
Nz::Application<Nz::Graphics, Nz::Imgui> nazara;
auto& windowing = nazara.AddComponent<Nz::AppWindowingComponent>();
std::shared_ptr<Nz::RenderDevice> device = Nz::Graphics::Instance()->GetRenderDevice();
std::string windowTitle = "Nazara Imgui Demo";
Nz::Window& window = windowing.CreateWindow(Nz::VideoMode(1280, 720, 32), windowTitle);
Nz::WindowSwapchain windowSwapchain(device, window);
// Load test texture
Nz::TextureParams texParams;
@@ -41,11 +57,6 @@ int WinMain(int argc, char* argv[])
texParams.loadFormat = Nz::PixelFormat::RGBA8;
auto logo = Nz::Texture::LoadFromFile("LogoMini.png", texParams);
std::string windowTitle = "Nazara Imgui Demo";
Nz::RenderWindow window;
if (!window.Create(Nz::Graphics::Instance()->GetRenderDevice(), Nz::VideoMode(1280, 720, 32), windowTitle))
return false;
// connect basic handler
window.GetEventHandler().OnQuit.Connect([&window](const auto* handler) {
NazaraUnused(handler);
@@ -58,20 +69,20 @@ int WinMain(int argc, char* argv[])
float val = 0.f;
float color[4] = { 1,0,0,1 };
Nz::Clock updateClock;
Nz::MillisecondClock updateClock;
while (window.IsOpen())
{
window.ProcessEvents();
Nz::RenderFrame frame = window.AcquireFrame();
Nz::RenderFrame frame = windowSwapchain.AcquireFrame();
if (!frame)
{
std::this_thread::sleep_for(std::chrono::milliseconds(1));
continue;
}
float deltaTime = updateClock.GetSeconds();
float deltaTime = updateClock.GetElapsedTime().AsSeconds();
Nz::Imgui::Instance()->Update(window, deltaTime);
ImGui::Begin("Loop Window");
@@ -83,7 +94,7 @@ int WinMain(int argc, char* argv[])
ImGui::InputFloat4("value from 2nd window", mywindow.values, "%.3f", ImGuiInputTextFlags_ReadOnly);
ImGui::End();
Nz::Imgui::Instance()->Render(window, frame);
Nz::Imgui::Instance()->Render(&windowSwapchain, frame);
frame.Present();