Fix examples compilation

Renderer fixes

.gitignore

@@ -193,3 +193,6 @@ DocProject/Help/*.hhk
 DocProject/Help/*.hhp
 DocProject/Help/Html2
 DocProject/Help/html
+
+# Ignore Imgui files
+imgui.ini

examples/Demo/main.cpp

@@ -2,11 +2,13 @@
 #include <Nazara/Core/Application.hpp>
 #include <Nazara/Core/Clock.hpp>
 #include <Nazara/Graphics/Graphics.hpp>
-#include <Nazara/Platform/AppWindowingComponent.hpp>
 #include <Nazara/Platform/Platform.hpp>
+#include <Nazara/Platform/WindowingAppComponent.hpp>
 #include <Nazara/Renderer/GpuSwitch.hpp>
 #include <Nazara/Renderer/WindowSwapchain.hpp>
 
+#include <NazaraImgui/ImguiHandler.hpp>
+#include <NazaraImgui/ImguiWidgets.hpp>
 #include <NazaraImgui/NazaraImgui.hpp>
 
 NAZARA_REQUEST_DEDICATED_GPU()
@@ -40,11 +42,8 @@ int main(int argc, char* argv[])
 int WinMain(int argc, char* argv[])
 #endif
 {
-	NazaraUnused(argc);
+	Nz::Application<Nz::Graphics, Nz::Imgui> nazara(argc, argv);
-	NazaraUnused(argv);
+	auto& windowing = nazara.AddComponent<Nz::WindowingAppComponent>();
-
-	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";

examples/Ecs/main.cpp

@@ -3,8 +3,9 @@
 #include <Nazara/Graphics.hpp>
 #include <Nazara/Platform.hpp>
 #include <Nazara/Renderer.hpp>
-#include <Nazara/Utility.hpp>
 
+#include <NazaraImgui/ImguiHandler.hpp>
+#include <NazaraImgui/ImguiWidgets.hpp>
 #include <NazaraImgui/NazaraImgui.hpp>
 
 NAZARA_REQUEST_DEDICATED_GPU()
@@ -38,14 +39,11 @@ int main(int argc, char* argv[])
 int WinMain(int argc, char* argv[])
 #endif
 {
-	NazaraUnused(argc);
+	Nz::Application<Nz::Graphics, Nz::Imgui> nazara(argc, argv);
-	NazaraUnused(argv);
+	auto& windowing = nazara.AddComponent<Nz::WindowingAppComponent>();
-
-	Nz::Application<Nz::Graphics, Nz::Imgui> nazara;
-	auto& windowing = nazara.AddComponent<Nz::AppWindowingComponent>();
 	std::shared_ptr<Nz::RenderDevice> device = Nz::Graphics::Instance()->GetRenderDevice();
 
-	auto& ecs = nazara.AddComponent<Nz::AppEntitySystemComponent>();
+	auto& ecs = nazara.AddComponent<Nz::EntitySystemAppComponent>();
 	auto& world = ecs.AddWorld<Nz::EnttWorld>();
 
 	auto& renderer = world.AddSystem<Nz::RenderSystem>();

include/NazaraImgui/ImguiHandler.hpp

@@ -0,0 +1,15 @@
+#pragma once
+
+/*
+    ImguiHandler.hpp
+    Inherit from this base class for your Imgui code to be called by the Imgui renderer
+*/
+
+namespace Nz
+{
+    struct ImguiHandler
+    {
+    public:
+        virtual void OnRenderImgui() = 0;
+    };
+}

include/NazaraImgui/ImguiWidgets.hpp

@@ -0,0 +1,30 @@
+#pragma once
+
+#include <NazaraImgui/Config.hpp>
+
+#include <Nazara/Math/Rect.hpp>
+
+namespace Nz
+{
+    class Texture;
+}
+
+namespace ImGui
+{
+    // custom ImGui widgets for Nazara
+
+    // Image overloads
+    NAZARA_IMGUI_API void Image(const Nz::Texture* texture, const Nz::Color& tintColor = Nz::Color::White(), const Nz::Color& borderColor = Nz::Color(0, 0, 0, 0));
+    NAZARA_IMGUI_API void Image(const Nz::Texture* texture, const Nz::Vector2f& size, const Nz::Color& tintColor = Nz::Color::White(), const Nz::Color& borderColor = Nz::Color(0, 0, 0, 0));
+    NAZARA_IMGUI_API void Image(const Nz::Texture* texture, const Nz::Rectf& textureRect, const Nz::Color& tintColor = Nz::Color::White(), const Nz::Color& borderColor = Nz::Color(0, 0, 0, 0));
+    NAZARA_IMGUI_API void Image(const Nz::Texture* texture, const Nz::Vector2f& size, const Nz::Rectf& textureRect, const Nz::Color& tintColor = Nz::Color::White(), const Nz::Color& borderColor = Nz::Color(0, 0, 0, 0));
+
+    // ImageButton overloads
+    NAZARA_IMGUI_API bool ImageButton(const Nz::Texture* texture, const int framePadding = -1, const Nz::Color& bgColor = Nz::Color(0, 0, 0, 0), const Nz::Color& tintColor = Nz::Color::White());
+    NAZARA_IMGUI_API bool ImageButton(const Nz::Texture* texture, const Nz::Vector2f& size, const int framePadding = -1, const Nz::Color& bgColor = Nz::Color(0, 0, 0, 0), const Nz::Color& tintColor = Nz::Color::White());
+
+    // Draw_list overloads. All positions are in relative coordinates (relative to top-left of the current window)
+    NAZARA_IMGUI_API void DrawLine(const Nz::Vector2f& a, const Nz::Vector2f& b, const Nz::Color& col, float thickness = 1.0f);
+    NAZARA_IMGUI_API void DrawRect(const Nz::Rectf& rect, const Nz::Color& color, float rounding = 0.0f, int rounding_corners = 0x0F, float thickness = 1.0f);
+    NAZARA_IMGUI_API void DrawRectFilled(const Nz::Rectf& rect, const Nz::Color& color, float rounding = 0.0f, int rounding_corners = 0x0F);
+}

include/NazaraImgui/NazaraImgui.hpp

@@ -2,7 +2,6 @@
 
 #include <Nazara/Core/ModuleBase.hpp>
 #include <Nazara/Graphics/Graphics.hpp>
-#include <Nazara/Math/Rect.hpp>
 #include <NazaraImgui/Config.hpp>
 #include <NazaraImgui/ImguiDrawer.hpp>
 
@@ -19,11 +18,7 @@ namespace Nz
     class Window;
     class WindowEventHandler;
 
-    struct ImguiHandler
+    struct ImguiHandler;
-    {
-    public:
-        virtual void OnRenderImgui() = 0;
-    };
 
     class NAZARA_IMGUI_API Imgui : public Nz::ModuleBase<Imgui>
     {
@@ -91,23 +86,6 @@ namespace Nz
 
 namespace ImGui
 {
-    // custom ImGui widgets for Nazara
-
-    // Image overloads
-    NAZARA_IMGUI_API void Image(const Nz::Texture* texture, const Nz::Color& tintColor = Nz::Color::White(), const Nz::Color& borderColor = Nz::Color(0, 0, 0, 0));
-    NAZARA_IMGUI_API void Image(const Nz::Texture* texture, const Nz::Vector2f& size, const Nz::Color& tintColor = Nz::Color::White(), const Nz::Color& borderColor = Nz::Color(0, 0, 0, 0));
-    NAZARA_IMGUI_API void Image(const Nz::Texture* texture, const Nz::Rectf& textureRect, const Nz::Color& tintColor = Nz::Color::White(), const Nz::Color& borderColor = Nz::Color(0, 0, 0, 0));
-    NAZARA_IMGUI_API void Image(const Nz::Texture* texture, const Nz::Vector2f& size, const Nz::Rectf& textureRect, const Nz::Color& tintColor = Nz::Color::White(), const Nz::Color& borderColor = Nz::Color(0, 0, 0, 0));
-
-    // ImageButton overloads
-    NAZARA_IMGUI_API bool ImageButton(const Nz::Texture* texture, const int framePadding = -1, const Nz::Color& bgColor = Nz::Color(0,0,0,0), const Nz::Color& tintColor = Nz::Color::White());
-    NAZARA_IMGUI_API bool ImageButton(const Nz::Texture* texture, const Nz::Vector2f& size, const int framePadding = -1, const Nz::Color& bgColor = Nz::Color(0,0,0,0), const Nz::Color& tintColor = Nz::Color::White());
-
-    // Draw_list overloads. All positions are in relative coordinates (relative to top-left of the current window)
-    NAZARA_IMGUI_API void DrawLine(const Nz::Vector2f& a, const Nz::Vector2f& b, const Nz::Color& col, float thickness = 1.0f);
-    NAZARA_IMGUI_API void DrawRect(const Nz::Rectf& rect, const Nz::Color& color, float rounding = 0.0f, int rounding_corners = 0x0F, float thickness = 1.0f);
-    NAZARA_IMGUI_API void DrawRectFilled(const Nz::Rectf& rect, const Nz::Color& color, float rounding = 0.0f, int rounding_corners = 0x0F);
-
     inline void EnsureContextOnThisThread()
     {
         auto* context = Nz::Imgui::GetCurrentContext();

src/NazaraImgui/ImguiDrawer.cpp

@@ -2,11 +2,11 @@
 
 #include <NazaraImgui/NazaraImgui.hpp>
 
+#include <Nazara/Core/VertexStruct.hpp>
 #include <Nazara/Renderer/CommandBufferBuilder.hpp>
 #include <Nazara/Renderer/RenderDevice.hpp>
 #include <Nazara/Renderer/RenderFrame.hpp>
 #include <Nazara/Renderer/UploadPool.hpp>
-#include <Nazara/Utility/VertexStruct.hpp>
 
 
 #include <NZSL/Parser.hpp>
@@ -69,7 +69,7 @@ namespace Nz
         m_drawCalls.clear();
 
         ImDrawData* drawData = ImGui::GetDrawData();
-        if (drawData->CmdListsCount == 0)
+        if (drawData == nullptr || drawData->CmdListsCount == 0)
             return;
 
 		ImGuiIO& io = ImGui::GetIO();
@@ -123,6 +123,8 @@ namespace Nz
             m_drawCalls.push_back(std::move(drawCall));
         }
 
+        frame.PushForRelease(std::move(m_vertexBuffer));
+        frame.PushForRelease(std::move(m_indexBuffer));
 
         // now that we have macro buffers, allocate them on gpu
         size_t size = vertices.size() * sizeof(Nz::VertexStruct_XYZ_Color_UV);
@@ -191,7 +193,7 @@ namespace Nz
         }
     }
 
-    void ImguiDrawer::Reset(RenderResources& renderFrame)
+    void ImguiDrawer::Reset(RenderResources& /*renderFrame*/)
     {
         m_drawCalls.clear();
     }
@@ -223,7 +225,7 @@ namespace Nz
         textureBinding.setIndex = 1;
         textureBinding.bindingIndex = 0;
         textureBinding.shaderStageFlags = nzsl::ShaderStageType::Fragment;
-        textureBinding.type = Nz::ShaderBindingType::Texture;
+        textureBinding.type = Nz::ShaderBindingType::Sampler;
 
         std::shared_ptr<Nz::RenderPipelineLayout> renderPipelineLayout = m_renderDevice.InstantiateRenderPipelineLayout(std::move(pipelineLayoutInfo));
 

src/NazaraImgui/ImguiPipelinePass.cpp

@@ -7,7 +7,7 @@
 
 namespace Nz
 {
-	ImguiPipelinePass::ImguiPipelinePass(PassData& passData, std::string passName, const ParameterList& /*parameters*/) :
+	ImguiPipelinePass::ImguiPipelinePass(PassData& /*passData*/, std::string passName, const ParameterList& /*parameters*/) :
 		FramePipelinePass({})
 		, m_passName(std::move(passName))
 	{
@@ -21,10 +21,10 @@ namespace Nz
 
 	FramePass& ImguiPipelinePass::RegisterToFrameGraph(FrameGraph& frameGraph, const PassInputOuputs& inputOuputs)
 	{
-		if (inputOuputs.inputCount != 1)
+		if (inputOuputs.inputAttachments.size() != 1)
 			throw std::runtime_error("one input expected");
 
-		if (inputOuputs.outputCount != 1)
+		if (inputOuputs.outputAttachments.size() != 1)
 			throw std::runtime_error("one output expected");
 
 		FramePass& imguiPass = frameGraph.AddPass("Imgui pass");

src/NazaraImgui/NazaraImgui.cpp

@@ -1,6 +1,8 @@
 #include <NazaraImgui/NazaraImgui.hpp>
 #include <NazaraImgui/ImguiPipelinePass.hpp>
 #include <NazaraImgui/ImguiDrawer.hpp>
+#include <NazaraImgui/ImguiHandler.hpp>
+#include <NazaraImgui/ImguiWidgets.hpp>
 
 #include <Nazara/Core/DynLib.hpp>
 #include <Nazara/Core/Log.hpp>
@@ -287,8 +289,13 @@ namespace Nz
             int fb_height = static_cast<int>(io.DisplaySize.y * io.DisplayFramebufferScale.y);
             Nz::Recti renderRect(0, 0, fb_width, fb_height);
 
+            Nz::CommandBufferBuilder::ClearValues clearValues[2] = {
+                { .color = Nz::Color::Black() },
+                { .depth = 1.f }
+            };
+
             builder.BeginDebugRegion("ImGui", Nz::Color::Green());
-            builder.BeginRenderPass(renderTarget->GetFramebuffer(frame.GetImageIndex()), renderTarget->GetRenderPass(), renderRect);
+            builder.BeginRenderPass(renderTarget->GetFramebuffer(frame.GetImageIndex()), renderTarget->GetRenderPass(), renderRect, clearValues, 2);
             m_imguiDrawer.Draw(builder);
             builder.EndRenderPass();
             builder.EndDebugRegion();
@@ -353,8 +360,8 @@ namespace Nz
         texParams.height = height;
         texParams.pixelFormat = Nz::PixelFormat::RGBA8;
         texParams.type = Nz::ImageType::E2D;
-        m_fontTexture = renderDevice->InstantiateTexture(texParams);
+        m_fontTexture = renderDevice->InstantiateTexture(texParams, pixels, true);
-        m_fontTexture->Update(pixels, width, height);
+        m_fontTexture->UpdateDebugName("FontTexture");
 
         ImTextureID textureID = m_fontTexture.get();
         io.Fonts->TexID = textureID;

xmake.lua

@@ -11,6 +11,7 @@ add_requires("nazaraengine", { alias = "nazara", debug = is_mode("debug") })
 add_requires("imgui v1.87-docking", { alias = "imgui" })
 
 add_includedirs("include", "src")
+set_exceptions("cxx")
 set_languages("c89", "c++20")
 set_rundir("./bin/$(plat)_$(arch)_$(mode)")
 set_targetdir("./bin/$(plat)_$(arch)_$(mode)")
@@ -51,7 +52,8 @@ elseif is_mode("releasedbg") then
 end
 
 target("NazaraImgui")
-	add_packages("nazara", "nzsl", "imgui", {public = true})
+	add_packages("nazara", {public = true, components = "graphics"})
+	add_packages("nzsl", "imgui", {public = true})
 	set_kind("$(kind)")
 	set_group("Libraries")
 	add_headerfiles("include/(NazaraImgui/**.hpp)")