[RFR] : extract uniform widgets in another file

aiekick · Aug 5, 2024 · b83be05 · b83be05
1 parent d739143
commit b83be05
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 10 deletions.
diff --git a/3rdparty/SoGLSL b/3rdparty/SoGLSL
diff --git a/src/Backends/MainBackend.cpp b/src/Backends/MainBackend.cpp
@@ -24,7 +24,7 @@
 #include <Headers/RenderPackHeaders.h>
 #include <glad/glad.h>
 #include <ImGuiPack.h>
-#include <InAppGpuProfiler/iagp.h>
+#include <iagp/iagp.h>
 #include <ctools/Logger.h>
 #include <ctools/GLVersionChecker.h>
 #include <ImGuiPack.h>

diff --git a/src/Headers/NoodlesPlateBuild.h b/src/Headers/NoodlesPlateBuild.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #define NoodlesPlate_Prefix "NoodlesPlate"
-#define NoodlesPlate_BuildNumber 789
+#define NoodlesPlate_BuildNumber 792
 #define NoodlesPlate_MinorNumber 7
 #define NoodlesPlate_MajorNumber 0
-#define NoodlesPlate_BuildId "0.7.789"
+#define NoodlesPlate_BuildId "0.7.792"
diff --git a/src/Panes/ConfigSwitcherPane.cpp b/src/Panes/ConfigSwitcherPane.cpp
@@ -94,7 +94,7 @@ bool ConfigSwitcherPane::DrawPanes(const uint32_t& /*vCurrentFrame*/, bool* vOpe
 	return false;
 }
 
-bool ConfigSwitcherPane::DrawDialogsAndPopups(const uint32_t& /*vCurrentFrame*/, const ImRect& vMaxRect /*vMaxSize*/, ImGuiContext* /*vContextPtr*/, void* /*vUserDatas*/) {
+bool ConfigSwitcherPane::DrawDialogsAndPopups(const uint32_t& /*vCurrentFrame*/, const ImRect& /*vMaxRect*/, ImGuiContext* /*vContextPtr*/, void* /*vUserDatas*/) {
     ShaderKeyConfigSwitcherUnified::Instance()->DrawDialog();
     return false;
 }

diff --git a/src/Panes/ProfilerPane.cpp b/src/Panes/ProfilerPane.cpp
@@ -21,7 +21,7 @@
 #include <Gui/MainFrame.h>
 #include <Backends/MainBackend.h>
 #include <ImGuiPack.h>
-#include <InAppGpuProfiler/iagp.h>
+#include <iagp/iagp.h>
 #include <ctools/cTools.h>
 #include <ctools/Logger.h>
 #include <Helper/InterfacePanes.h>

diff --git a/src/Panes/UniformsPane.cpp b/src/Panes/UniformsPane.cpp
@@ -31,6 +31,7 @@
 #include <SoGLSL/src/CodeTree/CodeTree.h>
 #include <SoGLSL/src/Systems/GizmoSystem.h>
 #include <SoGLSL/src/Systems/TimeLineSystem.h>
+#include <SoGLSL/src/Uniforms/UniformWidgets.h>
 
 #include <cinttypes>  // printf zu
 
@@ -189,8 +190,11 @@ void UniformsPane::DrawImGuiRenderPackCategory(RenderPackWeak vRp, bool vCheckMo
 
 void UniformsPane::DrawImGuiUniformWidget(UniformsMultiLoc* vUniLoc) {
     if (vUniLoc != nullptr) {
-        MainBackend::Instance()->NeedRefresh(//
-            MainBackend::Instance()->puCodeTree->DrawImGuiUniformWidgetForPanes(//
-                vUniLoc->uniform, ImGui::GetContentRegionAvail().x, SHADER_UNIFORM_FIRST_COLUMN_WIDTH));
+        MainBackend::Instance()->NeedRefresh(  //
+            UniformWidgets::drawImGuiUniformWidgetForPanes(    //
+                MainBackend::Instance()->puCodeTree,
+                vUniLoc->uniform,
+                ImGui::GetContentRegionAvail().x,
+                SHADER_UNIFORM_FIRST_COLUMN_WIDTH));
     }
 }
diff --git a/src/main.cpp b/src/main.cpp
@@ -23,7 +23,7 @@
 #include <ctools/Logger.h>
 #include <Headers/RenderPackHeaders.h>
 #include <ImGuiPack.h>
-#include <InAppGpuProfiler/iagp.h>
+#include <iagp/iagp.h>
 #ifdef USE_SDL2
 #include <ImGuiPack/3rdparty/imgui_docking/backends/imgui_impl_sdl.h>
 #else
+2 −2		cmake/Maintained/iagp.cmake
+1 −1		src/Buffer/FrameBufferAttachment.cpp
+3 −1,499		src/CodeTree/CodeTree.cpp
+0 −9		src/CodeTree/CodeTree.h
+99 −18		src/CodeTree/ShaderKey.cpp
+1 −0		src/CodeTree/ShaderKey.h
+9 −4		src/Helper/InterfacePanes.cpp
+22 −4		src/Manager/HelpManager.cpp
+1 −1		src/Mesh/Model/PNCMesh.cpp
+1 −1		src/Mesh/Model/PNCModel.cpp
+1 −1		src/Mesh/Model/PNTBTCMesh.cpp
+1 −1		src/Mesh/Model/PNTBTCModel.cpp
+1 −1		src/Mesh/Model/PNTCModel.cpp
+1 −1		src/Mesh/Model/PointModel.cpp
+1 −1		src/Mesh/Model/QuadModel.cpp
+1 −1		src/Renderer/RenderPack.cpp
+7 −6		src/Systems/GamePadSystem.cpp
+5 −4		src/Systems/GizmoSystem.cpp
+2 −1		src/Systems/GizmoSystem.h
+2 −1		src/Systems/MidiSystem.cpp
+2 −1		src/Systems/MidiSystem.h
+3 −2		src/Systems/SoundSystem.cpp
+1 −1		src/Uniforms/UniformHelper.cpp
+1,517 −0		src/Uniforms/UniformWidgets.cpp
+17 −0		src/Uniforms/UniformWidgets.h
+1 −1		src/VR/Backend/VRBackend.cpp