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

updating code to reflect changes in engine

This commit is contained in:
SweetId 2023-11-21 11:26:13 +05:30
parent 251c9f23ec
commit e72f1278c6
5 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/Demo/main.cpp
View File

@ -109,7 +109,7 @@ int WinMain(int argc, char* argv[])
ImGui::InputFloat4("value from 2nd window", mywindow.values, "%.3f", ImGuiInputTextFlags_ReadOnly); ImGui::InputFloat4("value from 2nd window", mywindow.values, "%.3f", ImGuiInputTextFlags_ReadOnly);
ImGui::End(); ImGui::End();
Nz::Imgui::Instance()->Render(&windowSwapchain, frame); Nz::Imgui::Instance()->Render(windowSwapchain.GetSwapchain(), frame);
frame.Present(); frame.Present();

2
examples/Ecs/main.cpp
View File

@ -63,7 +63,7 @@ int WinMain(int argc, char* argv[])
auto passList = Nz::PipelinePassList::LoadFromFile("example.passlist"); auto passList = Nz::PipelinePassList::LoadFromFile("example.passlist");
camera.emplace<Nz::NodeComponent>(); camera.emplace<Nz::NodeComponent>();
auto& cameraComponent = camera.emplace<Nz::CameraComponent>(&swapchain, passList, Nz::ProjectionType::Perspective); auto& cameraComponent = camera.emplace<Nz::CameraComponent>(std::make_shared<Nz::RenderWindow>(swapchain), passList, Nz::ProjectionType::Perspective);
cameraComponent.UpdateFOV(70.f); cameraComponent.UpdateFOV(70.f);
cameraComponent.UpdateClearColor(Nz::Color(0.46f, 0.48f, 0.84f, 1.f)); cameraComponent.UpdateClearColor(Nz::Color(0.46f, 0.48f, 0.84f, 1.f));

4
include/NazaraImgui/NazaraImgui.hpp
View File

@ -12,7 +12,9 @@
namespace Nz namespace Nz
{ {
class Cursor; class Cursor;
class RenderTarget;
class RenderWindow; class RenderWindow;
class Swapchain;
class Texture; class Texture;
class Window; class Window;
class WindowEventHandler; class WindowEventHandler;
@ -37,7 +39,7 @@ namespace Nz
bool Init(Nz::Window& window, bool bLoadDefaultFont = true); bool Init(Nz::Window& window, bool bLoadDefaultFont = true);
void Update(float dt); void Update(float dt);
void Render(); void Render();
void Render(Nz::RenderTarget* renderTarget, Nz::RenderFrame& frame); void Render(Nz::Swapchain* renderTarget, Nz::RenderFrame& frame);
inline ImguiDrawer& GetImguiDrawer() { return m_imguiDrawer; } inline ImguiDrawer& GetImguiDrawer() { return m_imguiDrawer; }
inline const ImguiDrawer& GetImguiDrawer() const { return m_imguiDrawer; } inline const ImguiDrawer& GetImguiDrawer() const { return m_imguiDrawer; }

5
src/NazaraImgui/NazaraImgui.cpp
View File

@ -4,13 +4,12 @@
#include <Nazara/Core/DynLib.hpp> #include <Nazara/Core/DynLib.hpp>
#include <Nazara/Core/Log.hpp> #include <Nazara/Core/Log.hpp>
#include <Nazara/Graphics/RenderTarget.hpp>
#include <Nazara/Platform/Cursor.hpp> #include <Nazara/Platform/Cursor.hpp>
#include <Nazara/Platform/Clipboard.hpp> #include <Nazara/Platform/Clipboard.hpp>
#include <Nazara/Platform/Window.hpp> #include <Nazara/Platform/Window.hpp>
#include <Nazara/Renderer/CommandBufferBuilder.hpp> #include <Nazara/Renderer/CommandBufferBuilder.hpp>
#include <Nazara/Renderer/Renderer.hpp> #include <Nazara/Renderer/Renderer.hpp>
#include <Nazara/Renderer/RenderTarget.hpp>
#include <Nazara/Renderer/RenderTarget.hpp>
#include <Nazara/Renderer/Texture.hpp> #include <Nazara/Renderer/Texture.hpp>
#include <NZSL/Parser.hpp> #include <NZSL/Parser.hpp>
@ -276,7 +275,7 @@ namespace Nz
ImGui::NewFrame(); ImGui::NewFrame();
} }
void Imgui::Render(Nz::RenderTarget* renderTarget, Nz::RenderFrame& frame) void Imgui::Render(Nz::Swapchain* renderTarget, Nz::RenderFrame& frame)
{ {
Render(); Render();
m_imguiDrawer.Prepare(frame); m_imguiDrawer.Prepare(frame);

2
xmake.lua
View File

@ -11,7 +11,7 @@ add_requires("nazaraengine", { alias = "nazara", debug = is_mode("debug") })
add_requires("imgui v1.87-docking", { alias = "imgui" }) add_requires("imgui v1.87-docking", { alias = "imgui" })
add_includedirs("include", "src") add_includedirs("include", "src")
set_languages("c89", "c++17") set_languages("c89", "c++20")
set_rundir("./bin/$(plat)_$(arch)_$(mode)") set_rundir("./bin/$(plat)_$(arch)_$(mode)")
set_targetdir("./bin/$(plat)_$(arch)_$(mode)") set_targetdir("./bin/$(plat)_$(arch)_$(mode)")