From e72f1278c62d801d3c6cf02d1d288a120417cf8f Mon Sep 17 00:00:00 2001
From: SweetId <2630750+SweetId@users.noreply.github.com>
Date: Tue, 21 Nov 2023 11:26:13 +0530
Subject: [PATCH] updating code to reflect changes in engine

---
 examples/Demo/main.cpp              | 2 +-
 examples/Ecs/main.cpp               | 2 +-
 include/NazaraImgui/NazaraImgui.hpp | 4 +++-
 src/NazaraImgui/NazaraImgui.cpp     | 5 ++---
 xmake.lua                           | 2 +-
 5 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/examples/Demo/main.cpp b/examples/Demo/main.cpp
index 28e819d..5114d97 100644
--- a/examples/Demo/main.cpp
+++ b/examples/Demo/main.cpp
@@ -109,7 +109,7 @@ int WinMain(int argc, char* argv[])
 		ImGui::InputFloat4("value from 2nd window", mywindow.values, "%.3f", ImGuiInputTextFlags_ReadOnly);
 		ImGui::End();
 
-		Nz::Imgui::Instance()->Render(&windowSwapchain, frame);
+		Nz::Imgui::Instance()->Render(windowSwapchain.GetSwapchain(), frame);
 
 		frame.Present();
 
diff --git a/examples/Ecs/main.cpp b/examples/Ecs/main.cpp
index 099f011..641dc01 100644
--- a/examples/Ecs/main.cpp
+++ b/examples/Ecs/main.cpp
@@ -63,7 +63,7 @@ int WinMain(int argc, char* argv[])
 	auto passList = Nz::PipelinePassList::LoadFromFile("example.passlist");
 	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.UpdateClearColor(Nz::Color(0.46f, 0.48f, 0.84f, 1.f));
 
diff --git a/include/NazaraImgui/NazaraImgui.hpp b/include/NazaraImgui/NazaraImgui.hpp
index bc01598..a27dab5 100644
--- a/include/NazaraImgui/NazaraImgui.hpp
+++ b/include/NazaraImgui/NazaraImgui.hpp
@@ -12,7 +12,9 @@
 namespace Nz
 {
     class Cursor;
+    class RenderTarget;
     class RenderWindow;
+    class Swapchain;
     class Texture;
     class Window;
     class WindowEventHandler;
@@ -37,7 +39,7 @@ namespace Nz
         bool Init(Nz::Window& window, bool bLoadDefaultFont = true);
         void Update(float dt);
         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 const ImguiDrawer& GetImguiDrawer() const { return m_imguiDrawer; }
diff --git a/src/NazaraImgui/NazaraImgui.cpp b/src/NazaraImgui/NazaraImgui.cpp
index d7bdb12..b62451a 100644
--- a/src/NazaraImgui/NazaraImgui.cpp
+++ b/src/NazaraImgui/NazaraImgui.cpp
@@ -4,13 +4,12 @@
 
 #include <Nazara/Core/DynLib.hpp>
 #include <Nazara/Core/Log.hpp>
+#include <Nazara/Graphics/RenderTarget.hpp>
 #include <Nazara/Platform/Cursor.hpp>
 #include <Nazara/Platform/Clipboard.hpp>
 #include <Nazara/Platform/Window.hpp>
 #include <Nazara/Renderer/CommandBufferBuilder.hpp>
 #include <Nazara/Renderer/Renderer.hpp>
-#include <Nazara/Renderer/RenderTarget.hpp>
-#include <Nazara/Renderer/RenderTarget.hpp>
 #include <Nazara/Renderer/Texture.hpp>
 #include <NZSL/Parser.hpp>
 
@@ -276,7 +275,7 @@ namespace Nz
         ImGui::NewFrame();
     }
 
-    void Imgui::Render(Nz::RenderTarget* renderTarget, Nz::RenderFrame& frame)
+    void Imgui::Render(Nz::Swapchain* renderTarget, Nz::RenderFrame& frame)
     {
         Render();
         m_imguiDrawer.Prepare(frame);
diff --git a/xmake.lua b/xmake.lua
index 850b914..3a2f0f6 100644
--- a/xmake.lua
+++ b/xmake.lua
@@ -11,7 +11,7 @@ add_requires("nazaraengine", { alias = "nazara", debug = is_mode("debug") })
 add_requires("imgui v1.87-docking", { alias = "imgui" })
 
 add_includedirs("include", "src")
-set_languages("c89", "c++17")
+set_languages("c89", "c++20")
 set_rundir("./bin/$(plat)_$(arch)_$(mode)")
 set_targetdir("./bin/$(plat)_$(arch)_$(mode)")