[RFR] : refactor for the new LayoutManager

aiekick · Mar 12, 2024 · abcf06b · abcf06b
1 parent 62f75b1
commit abcf06b
Show file tree

Hide file tree

Showing 35 changed files with 79 additions and 75 deletions.
diff --git a/.clang-format b/.clang-format
@@ -1,7 +1,7 @@
 ---
 BasedOnStyle:  Google
 Language:        Cpp
-Standard: Cpp03
+Standard: Latest
 AccessModifierOffset: -4
 AlignAfterOpenBracket: Align
 AlignConsecutiveAssignments: false
@@ -17,14 +17,14 @@ AllowShortIfStatementsOnASingleLine: false
 AllowShortLoopsOnASingleLine: false
 AlwaysBreakAfterDefinitionReturnType: None
 AlwaysBreakAfterReturnType: None
-AlwaysBreakBeforeMultilineStrings: false
+AlwaysBreakBeforeMultilineStrings: true
 AlwaysBreakTemplateDeclarations: Yes
-BinPackArguments: true
-BinPackParameters: true
+BinPackArguments: false
+BinPackParameters: false
 BraceWrapping:   
   AfterClass:      false
   AfterControlStatement: false
-  AfterEnum:       false
+  AfterEnum:       true
   AfterFunction:   false
   AfterNamespace:  false
   AfterObjCDeclaration: false
@@ -34,9 +34,9 @@ BraceWrapping:
   BeforeCatch:     false
   BeforeElse:      false
   IndentBraces:    false
-  SplitEmptyFunction: true
-  SplitEmptyRecord: true
-  SplitEmptyNamespace: true
+  SplitEmptyFunction: false
+  SplitEmptyRecord: false
+  SplitEmptyNamespace: false
 BreakBeforeBinaryOperators: None
 BreakBeforeBraces: Attach
 BreakBeforeInheritanceComma: false
@@ -46,7 +46,7 @@ BreakConstructorInitializersBeforeComma: false
 BreakConstructorInitializers: BeforeColon
 BreakAfterJavaFieldAnnotations: false
 BreakStringLiterals: true
-ColumnLimit:     150
+ColumnLimit:     170
 CommentPragmas:  '^ IWYU pragma:'
 CompactNamespaces: false
 ConstructorInitializerAllOnOneLineOrOnePerLine: true
@@ -89,9 +89,9 @@ ObjCSpaceAfterProperty: false
 ObjCSpaceBeforeProtocolList: true
 PenaltyBreakAssignment: 2
 PenaltyBreakBeforeFirstCallParameter: 1
-PenaltyBreakComment: 300
+PenaltyBreakComment: 200
 PenaltyBreakFirstLessLess: 120
-PenaltyBreakString: 1000
+PenaltyBreakString: 200
 PenaltyBreakTemplateDeclaration: 10
 PenaltyExcessCharacter: 1000000
 PenaltyReturnTypeOnItsOwnLine: 200
@@ -142,7 +142,6 @@ SpacesInContainerLiterals: true
 SpacesInCStyleCastParentheses: false
 SpacesInParentheses: false
 SpacesInSquareBrackets: false
-Standard:        Auto
 StatementMacros: 
   - Q_UNUSED
   - QT_REQUIRE_VERSION

diff --git a/3rdparty/SoGLSL b/3rdparty/SoGLSL
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -53,7 +53,7 @@ set(CMAKE_PDB_OUTPUT_DIRECTORY "${FINAL_BIN_DIR}/debug")
 ## some defines for debug mode (before 3rdparty.cmake)
 if(MSVC)
 	set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>") ## MT in release or MTd in debug
-	set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -D_DEBUG /Zi")
+	set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /W4 -D_DEBUG /Zi")
 else()
 	set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -D_DEBUG -g")
 endif()
@@ -84,7 +84,7 @@ add_definitions(-DCUSTOM_SOGLSL_CONFIG="${CMAKE_SOURCE_DIR}/src/Headers/CustomSo
 add_definitions(-DCUSTOM_IMWIDGETS_CONFIG="${CMAKE_SOURCE_DIR}/src/Headers/CustomImWidgetsConfig.h")
 add_definitions(-DCUSTOM_IN_APP_GPU_PROFILER_CONFIG="${CMAKE_SOURCE_DIR}/src/Headers/CustomInAppGpuProfiler.h")
 add_definitions(-DCUSTOM_IMGUIFILEDIALOG_CONFIG="${CMAKE_SOURCE_DIR}/src/Headers/CustomImGuiFileDialogConfig.h")
-add_definitions(-DUSE_IMGUI="${CMAKE_SOURCE_DIR}/3rdparty/SoGLSL/3rdparty/ImGuiPack/3rdparty/imgui/imgui.h")
+add_definitions(-DIMGUI_INCLUDE="${CMAKE_SOURCE_DIR}/3rdparty/SoGLSL/3rdparty/ImGuiPack/3rdparty/imgui_docking/imgui.h")
 
 set(LLVM_USE_CRT_DEBUG MTd CACHE STRING "" FORCE)
 set(LLVM_USE_CRT_MINSIZEREL MT CACHE STRING "" FORCE)
@@ -155,16 +155,16 @@ source_group(TREE ${CMAKE_CURRENT_SOURCE_DIR}/src PREFIX src FILES ${PROJECT_SRC
 
 if (USE_SDL)
 	file(GLOB IMGUI_IMPL_SRC 
-		${CMAKE_SOURCE_DIR}/3rdparty/SoGLSL/3rdparty/ImGuiPack/3rdparty/imgui/backends/imgui_impl_opengl3.cpp
-		${CMAKE_SOURCE_DIR}/3rdparty/SoGLSL/3rdparty/ImGuiPack/3rdparty/imgui/backends/imgui_impl_opengl3.h
-		${CMAKE_SOURCE_DIR}/3rdparty/SoGLSL/3rdparty/ImGuiPack/3rdparty/imgui/backends/imgui_impl_sdl.cpp
-		${CMAKE_SOURCE_DIR}/3rdparty/SoGLSL/3rdparty/ImGuiPack/3rdparty/imgui/backends/imgui_impl_sdl.h)
+		${CMAKE_SOURCE_DIR}/3rdparty/SoGLSL/3rdparty/ImGuiPack/3rdparty/imgui_docking/backends/imgui_impl_opengl3.cpp
+		${CMAKE_SOURCE_DIR}/3rdparty/SoGLSL/3rdparty/ImGuiPack/3rdparty/imgui_docking/backends/imgui_impl_opengl3.h
+		${CMAKE_SOURCE_DIR}/3rdparty/SoGLSL/3rdparty/ImGuiPack/3rdparty/imgui_docking/backends/imgui_impl_sdl.cpp
+		${CMAKE_SOURCE_DIR}/3rdparty/SoGLSL/3rdparty/ImGuiPack/3rdparty/imgui_docking/backends/imgui_impl_sdl.h)
 else()
 	file(GLOB IMGUI_IMPL_SRC 
-		${CMAKE_SOURCE_DIR}/3rdparty/SoGLSL/3rdparty/ImGuiPack/3rdparty/imgui/backends/imgui_impl_opengl3.cpp
-		${CMAKE_SOURCE_DIR}/3rdparty/SoGLSL/3rdparty/ImGuiPack/3rdparty/imgui/backends/imgui_impl_opengl3.h
-		${CMAKE_SOURCE_DIR}/3rdparty/SoGLSL/3rdparty/ImGuiPack/3rdparty/imgui/backends/imgui_impl_glfw.cpp
-		${CMAKE_SOURCE_DIR}/3rdparty/SoGLSL/3rdparty/ImGuiPack/3rdparty/imgui/backends/imgui_impl_glfw.h)
+		${CMAKE_SOURCE_DIR}/3rdparty/SoGLSL/3rdparty/ImGuiPack/3rdparty/imgui_docking/backends/imgui_impl_opengl3.cpp
+		${CMAKE_SOURCE_DIR}/3rdparty/SoGLSL/3rdparty/ImGuiPack/3rdparty/imgui_docking/backends/imgui_impl_opengl3.h
+		${CMAKE_SOURCE_DIR}/3rdparty/SoGLSL/3rdparty/ImGuiPack/3rdparty/imgui_docking/backends/imgui_impl_glfw.cpp
+		${CMAKE_SOURCE_DIR}/3rdparty/SoGLSL/3rdparty/ImGuiPack/3rdparty/imgui_docking/backends/imgui_impl_glfw.h)
 endif()
 source_group(src/Impl FILES ${IMGUI_IMPL_SRC})
 
@@ -186,8 +186,8 @@ add_executable(${PROJECT}
 if (USE_IMPLOT)
 	target_compile_definitions(${PROJECT} PUBLIC USE_IMPLOT)
 endif()
-if (USE_IMCOOL_BAR)
-	target_compile_definitions(${PROJECT} PUBLIC USE_IMCOOL_BAR)
+if (USE_IM_COOL_BAR)
+	target_compile_definitions(${PROJECT} PUBLIC USE_IM_COOL_BAR)
 endif()
 if (USE_IM_GRADIENT_HDR)
 	target_compile_definitions(${PROJECT} PUBLIC USE_IM_GRADIENT_HDR)
@@ -296,6 +296,8 @@ include_directories(
 	include
 	3rdparty
 	3rdparty/SoGLSL
+	3rdparty/SoGLSL/3rdparty/ImGuiPack
+	3rdparty/SoGLSL/3rdparty/ImGuiPack/3rdparty/imgui
 	${ZLIB_INCLUDE_DIR}
 	${NVAPI_INCLUDE_DIR}
 	${SOGSL_INCLUDE_DIRS}

diff --git a/src/Backends/MainBackend.cpp b/src/Backends/MainBackend.cpp
@@ -24,6 +24,7 @@
 #include <Headers/RenderPackHeaders.h>
 #include <glad/glad.h>
 #include <ImGuiPack.h>
+#include <InAppGpuProfiler/InAppGpuProfiler.h>
 #include <ctools/Logger.h>
 #include <ctools/GLVersionChecker.h>
 #include <ImGuiPack.h>

diff --git a/src/Gui/MainFrame.cpp b/src/Gui/MainFrame.cpp
@@ -144,27 +144,27 @@ bool MainFrame::Init() {
 
         PathSystem::Instance()->Save();  // apply paths who was loaded before in LoadConfigFile
 
-        LayoutManager::Instance()->SetPaneDisposalSize(PaneDisposal::LEFT, 300.0f);
-        LayoutManager::Instance()->SetPaneDisposalSize(PaneDisposal::RIGHT, 300.0f);
-        LayoutManager::Instance()->SetPaneDisposalSize(PaneDisposal::BOTTOM, 300.0f);
+        LayoutManager::Instance()->SetPaneDisposalRatio("LEFT", 0.3f);
+        LayoutManager::Instance()->SetPaneDisposalRatio("RIGHT", 0.3f);
+        LayoutManager::Instance()->SetPaneDisposalRatio("BOTTOM", 0.3f);
 
         LayoutManager::Instance()->Init(ICON_NDP2_DESKTOP_MAC " Layouts", "Default Layout");
-        LayoutManager::Instance()->AddPane(ConfigPane::Instance(), ICON_NDP2_VIEW_LIST " Config", "", PaneDisposal::LEFT, false, true);
-        LayoutManager::Instance()->AddPane(UniformsPane::Instance(), ICON_NDP2_TUNE " Tuning", "", PaneDisposal::RIGHT, false, true);
-        LayoutManager::Instance()->AddPane(TimeLinePane::Instance(), ICON_NDP2_VECTOR_CURVE " TimeLine", "", PaneDisposal::BOTTOM, false, true);
-        LayoutManager::Instance()->AddPane(ConfigSwitcherPane::Instance(), ICON_NDP2_LAYERS_TRIPLE " Tuning Switcher", "", PaneDisposal::RIGHT, false, false);
-        LayoutManager::Instance()->AddPane(InfosPane::Instance(), ICON_NDP2_FILE_DOCUMENT_BOX " Notes", "", PaneDisposal::CENTRAL, false, false);
+        LayoutManager::Instance()->AddPane(ConfigPane::Instance(), ICON_NDP2_VIEW_LIST " Config", "", "LEFT", 0.3f, false, true);
+        LayoutManager::Instance()->AddPane(UniformsPane::Instance(), ICON_NDP2_TUNE " Tuning", "", "RIGHT", 0.3f, false, true);
+        LayoutManager::Instance()->AddPane(TimeLinePane::Instance(), ICON_NDP2_VECTOR_CURVE " TimeLine", "", "BOTTOM", 0.3f, false, true);
+        LayoutManager::Instance()->AddPane(ConfigSwitcherPane::Instance(), ICON_NDP2_LAYERS_TRIPLE " Tuning Switcher", "", "RIGHT", 0.3f, false, false);
+        LayoutManager::Instance()->AddPane(InfosPane::Instance(), ICON_NDP2_FILE_DOCUMENT_BOX " Notes", "", "CENTRAL", 0.3f, false, false);
 #ifdef USE_HELP_IN_APP
-        LayoutManager::Instance()->AddPane(HelpPane::Instance(), ICON_NDP2_COMMENT_QUESTION " Help", "", PaneDisposal::CENTRAL, false, false);
+        LayoutManager::Instance()->AddPane(HelpPane::Instance(), ICON_NDP2_COMMENT_QUESTION " Help", "", "CENTRAL", 0.3f, false, false);
 #endif
-        LayoutManager::Instance()->AddPane(ProfilerPane::Instance(), ICON_NDP2_CLIPBOARD_PULSE " Profiler", "", PaneDisposal::BOTTOM, false, false);
-        LayoutManager::Instance()->AddPane(ConsolePane::Instance(), ICON_NDP2_COMMENT_TEXT_MULTIPLE " Console", "", PaneDisposal::BOTTOM, false, false);
-        LayoutManager::Instance()->AddPane(MessagePane::Instance(), ICON_NDP2_COMMENT_TEXT " Message", "", PaneDisposal::CENTRAL, false, false);
-        LayoutManager::Instance()->AddPane(CodePane::Instance(), ICON_NDP2_FILE_DOCUMENT_EDIT " Code", "", PaneDisposal::LEFT, false, false);
+        LayoutManager::Instance()->AddPane(ProfilerPane::Instance(), ICON_NDP2_CLIPBOARD_PULSE " Profiler", "", "BOTTOM", 0.3f, false, false);
+        LayoutManager::Instance()->AddPane(ConsolePane::Instance(), ICON_NDP2_COMMENT_TEXT_MULTIPLE " Console", "", "BOTTOM", 0.3f, false, false);
+        LayoutManager::Instance()->AddPane(MessagePane::Instance(), ICON_NDP2_COMMENT_TEXT " Message", "", "CENTRAL", 0.3f, false, false);
+        LayoutManager::Instance()->AddPane(CodePane::Instance(), ICON_NDP2_FILE_DOCUMENT_EDIT " Code", "", "LEFT", 0.3f, false, false);
 #ifdef _DEBUG
-        LayoutManager::Instance()->AddPane(InspectorPane::Instance(), ICON_NDP2_ORBIT " Inspector", "", PaneDisposal::BOTTOM, false, false);
+        LayoutManager::Instance()->AddPane(InspectorPane::Instance(), ICON_NDP2_ORBIT " Inspector", "", "BOTTOM", 0.3f, false, false);
 #endif
-        LayoutManager::Instance()->AddPane(BufferPreview::Instance(), ICON_NDP2_VIEW_GRID " Buffers Preview", "", PaneDisposal::RIGHT, false, false);
+        LayoutManager::Instance()->AddPane(BufferPreview::Instance(), ICON_NDP2_VIEW_GRID " Buffers Preview", "", "RIGHT", 0.3f, false, false);
 
 #ifdef USE_VR
         VRGui::Instance()->SetCodeTree(MainBackend::Instance()->puCodeTree);

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 708
+#define NoodlesPlate_BuildNumber 716
 #define NoodlesPlate_MinorNumber 7
 #define NoodlesPlate_MajorNumber 0
-#define NoodlesPlate_BuildId "0.7.708"
+#define NoodlesPlate_BuildId "0.7.716"
diff --git a/src/Panes/BufferPreview.cpp b/src/Panes/BufferPreview.cpp
@@ -48,7 +48,7 @@ void BufferPreview::Unit() {
 }
 
 bool BufferPreview::DrawPanes(const uint32_t& vCurrentFrame, PaneFlags& vInOutPaneShown, ImGuiContext* vContextPtr,
-                              const std::string& vUserDatas) {
+                              void* vUserDatas) {
 
     if (vInOutPaneShown & paneFlag) {
         static ImGuiWindowFlags flags = ImGuiWindowFlags_NoCollapse | ImGuiWindowFlags_NoBringToFrontOnFocus | ImGuiWindowFlags_MenuBar;

diff --git a/src/Panes/BufferPreview.h b/src/Panes/BufferPreview.h
@@ -29,7 +29,7 @@ class BufferPreview : public AbstractPane, public conf::ConfigAbstract
 public:
 	bool Init() override;
 	void Unit() override;
-	bool DrawPanes(const uint32_t& vCurrentFrame, PaneFlags& vInOutPaneShown, ImGuiContext* vContextPtr = nullptr, const std::string& vUserDatas = {}) override;
+	bool DrawPanes(const uint32_t& vCurrentFrame, PaneFlags& vInOutPaneShown, ImGuiContext* vContextPtr = nullptr, void* vUserDatas = nullptr) override;
     bool CanWeDisplay() override;
 
 	// configuration

diff --git a/src/Panes/CodePane.cpp b/src/Panes/CodePane.cpp
@@ -48,7 +48,7 @@ void CodePane::Unit()
 
 }
 
-bool CodePane::DrawPanes(const uint32_t& vCurrentFrame, PaneFlags& vInOutPaneShown, ImGuiContext* vContextPtr, const std::string& vUserDatas)
+bool CodePane::DrawPanes(const uint32_t& vCurrentFrame, PaneFlags& vInOutPaneShown, ImGuiContext* vContextPtr, void* vUserDatas)
 {
 	if (vInOutPaneShown & paneFlag)
 	{

diff --git a/src/Panes/CodePane.h b/src/Panes/CodePane.h
@@ -26,7 +26,7 @@ class CodePane : public AbstractPane, public conf::ConfigAbstract
 public:
 	bool Init() override;
 	void Unit() override;
-	bool DrawPanes(const uint32_t& vCurrentFrame, PaneFlags& vInOutPaneShown, ImGuiContext* vContextPtr = nullptr, const std::string& vUserDatas = {}) override;
+	bool DrawPanes(const uint32_t& vCurrentFrame, PaneFlags& vInOutPaneShown, ImGuiContext* vContextPtr = nullptr, void* vUserDatas = nullptr) override;
 
 	TextEditor* GetEditor();
 

diff --git a/src/Panes/ConfigPane.cpp b/src/Panes/ConfigPane.cpp
@@ -56,7 +56,7 @@ bool ConfigPane::Init() {
 void ConfigPane::Unit() {
 }
 
-bool ConfigPane::DrawPanes(const uint32_t& vCurrentFrame, PaneFlags& vInOutPaneShown, ImGuiContext* vContextPtr, const std::string& vUserDatas) {
+bool ConfigPane::DrawPanes(const uint32_t& vCurrentFrame, PaneFlags& vInOutPaneShown, ImGuiContext* vContextPtr, void* vUserDatas) {
 
     if (vInOutPaneShown & paneFlag) {
         static ImGuiWindowFlags flags = ImGuiWindowFlags_NoCollapse | ImGuiWindowFlags_NoBringToFrontOnFocus | ImGuiWindowFlags_MenuBar;

diff --git a/src/Panes/ConfigPane.h b/src/Panes/ConfigPane.h
@@ -27,7 +27,7 @@ class ConfigPane : public AbstractPane, public conf::ConfigAbstract
 public:
 	bool Init() override;
 	void Unit() override;
-	bool DrawPanes(const uint32_t& vCurrentFrame, PaneFlags& vInOutPaneShown, ImGuiContext* vContextPtr = nullptr, const std::string& vUserDatas = {}) override;
+	bool DrawPanes(const uint32_t& vCurrentFrame, PaneFlags& vInOutPaneShown, ImGuiContext* vContextPtr = nullptr, void* vUserDatas = nullptr) override;
 
 	// configuration
 	std::string getXml(const std::string& vOffset, const std::string& vUserDatas = "") override;

diff --git a/src/Panes/ConfigSwitcherPane.cpp b/src/Panes/ConfigSwitcherPane.cpp
@@ -50,7 +50,7 @@ void ConfigSwitcherPane::Unit()
 
 }
 
-bool ConfigSwitcherPane::DrawPanes(const uint32_t& vCurrentFrame, PaneFlags& vInOutPaneShown, ImGuiContext* vContextPtr, const std::string& vUserDatas)
+bool ConfigSwitcherPane::DrawPanes(const uint32_t& vCurrentFrame, PaneFlags& vInOutPaneShown, ImGuiContext* vContextPtr, void* vUserDatas)
 {
 	if (vInOutPaneShown & paneFlag) {
         static ImGuiWindowFlags flags =               //
@@ -95,7 +95,7 @@ bool ConfigSwitcherPane::DrawPanes(const uint32_t& vCurrentFrame, PaneFlags& vIn
 	return false;
 }
 
-bool ConfigSwitcherPane::DrawDialogsAndPopups(const uint32_t& vCurrentFrame, const ImVec2& vMaxSize, ImGuiContext* vContextPtr, const std::string& vUserDatas)
+bool ConfigSwitcherPane::DrawDialogsAndPopups(const uint32_t& vCurrentFrame, const ImVec2& vMaxSize, ImGuiContext* vContextPtr, void* vUserDatas)
 {
     ShaderKeyConfigSwitcherUnified::Instance()->DrawDialog();
     return false;

diff --git a/src/Panes/ConfigSwitcherPane.h b/src/Panes/ConfigSwitcherPane.h
@@ -27,8 +27,8 @@ class ConfigSwitcherPane : public AbstractPane, public conf::ConfigAbstract
 public:
 	bool Init() override;
 	void Unit() override;
-	bool DrawPanes(const uint32_t& vCurrentFrame, PaneFlags& vInOutPaneShown, ImGuiContext* vContextPtr = nullptr, const std::string& vUserDatas = {}) override;
-    bool DrawDialogsAndPopups(const uint32_t& vCurrentFrame, const ImVec2& vMaxSize, ImGuiContext* vContextPtr = nullptr, const std::string& vUserDatas = {}) override;
+	bool DrawPanes(const uint32_t& vCurrentFrame, PaneFlags& vInOutPaneShown, ImGuiContext* vContextPtr = nullptr, void* vUserDatas = nullptr) override;
+    bool DrawDialogsAndPopups(const uint32_t& vCurrentFrame, const ImVec2& vMaxSize, ImGuiContext* vContextPtr = nullptr, void* vUserDatas = nullptr) override;
 
 	// configuration
 	std::string getXml(const std::string& vOffset, const std::string& vUserDatas = "") override;

diff --git a/src/Panes/ConsolePane.cpp b/src/Panes/ConsolePane.cpp
@@ -46,7 +46,7 @@ void ConsolePane::Unit()
 
 }
 
-bool ConsolePane::DrawPanes(const uint32_t& vCurrentFrame, PaneFlags& vInOutPaneShown, ImGuiContext* vContextPtr, const std::string& vUserDatas)
+bool ConsolePane::DrawPanes(const uint32_t& vCurrentFrame, PaneFlags& vInOutPaneShown, ImGuiContext* vContextPtr, void* vUserDatas)
 {
 	if (vInOutPaneShown & paneFlag)
 	{

diff --git a/src/Panes/ConsolePane.h b/src/Panes/ConsolePane.h
@@ -26,7 +26,7 @@ class ConsolePane : public AbstractPane, public conf::ConfigAbstract
 public:
 	bool Init() override;
 	void Unit() override;
-	bool DrawPanes(const uint32_t& vCurrentFrame, PaneFlags& vInOutPaneShown, ImGuiContext* vContextPtr = nullptr, const std::string& vUserDatas = {}) override;
+	bool DrawPanes(const uint32_t& vCurrentFrame, PaneFlags& vInOutPaneShown, ImGuiContext* vContextPtr = nullptr, void* vUserDatas = nullptr) override;
 
 	// configuration
 	std::string getXml(const std::string& vOffset, const std::string& vUserDatas = "") override;

diff --git a/src/Panes/HelpPane.cpp b/src/Panes/HelpPane.cpp
@@ -47,7 +47,7 @@ void HelpPane::Unit()
 
 }
 
-bool HelpPane::DrawPanes(const uint32_t& vCurrentFrame, PaneFlags& vInOutPaneShown, ImGuiContext* vContextPtr, const std::string& vUserDatas)
+bool HelpPane::DrawPanes(const uint32_t& vCurrentFrame, PaneFlags& vInOutPaneShown, ImGuiContext* vContextPtr, void* vUserDatas)
 {
 	if (vInOutPaneShown & paneFlag)
 	{

diff --git a/src/Panes/HelpPane.h b/src/Panes/HelpPane.h
@@ -26,7 +26,7 @@ class HelpPane : public AbstractPane, public conf::ConfigAbstract
 public:
 	bool Init() override;
 	void Unit() override;
-	bool DrawPanes(const uint32_t& vCurrentFrame, PaneFlags& vInOutPaneShown, ImGuiContext* vContextPtr = nullptr, const std::string& vUserDatas = {}) override;
+	bool DrawPanes(const uint32_t& vCurrentFrame, PaneFlags& vInOutPaneShown, ImGuiContext* vContextPtr = nullptr, void* vUserDatas = nullptr) override;
 
 	// configuration
 	std::string getXml(const std::string& vOffset, const std::string& vUserDatas = "") override;

diff --git a/src/Panes/InfosPane.cpp b/src/Panes/InfosPane.cpp
@@ -47,7 +47,7 @@ void InfosPane::Unit()
 
 }
 
-bool InfosPane::DrawPanes(const uint32_t& vCurrentFrame, PaneFlags& vInOutPaneShown, ImGuiContext* vContextPtr, const std::string& vUserDatas)
+bool InfosPane::DrawPanes(const uint32_t& vCurrentFrame, PaneFlags& vInOutPaneShown, ImGuiContext* vContextPtr, void* vUserDatas)
 {
 	if (vInOutPaneShown & paneFlag)
 	{

diff --git a/src/Panes/InfosPane.h b/src/Panes/InfosPane.h
@@ -26,7 +26,7 @@ class InfosPane : public AbstractPane, public conf::ConfigAbstract
 public:
 	bool Init() override;
 	void Unit() override;
-	bool DrawPanes(const uint32_t& vCurrentFrame, PaneFlags& vInOutPaneShown, ImGuiContext* vContextPtr = nullptr, const std::string& vUserDatas = {}) override;
+	bool DrawPanes(const uint32_t& vCurrentFrame, PaneFlags& vInOutPaneShown, ImGuiContext* vContextPtr = nullptr, void* vUserDatas = nullptr) override;
 
 	// configuration
 	std::string getXml(const std::string& vOffset, const std::string& vUserDatas = "") override;

diff --git a/src/Panes/InspectorPane.cpp b/src/Panes/InspectorPane.cpp
@@ -132,7 +132,7 @@ inline int DrawBufferChain(RenderPackWeak vRoot, RenderPackWeak vRP, std::set<st
 	return res;
 }
 
-bool InspectorPane::DrawPanes(const uint32_t& vCurrentFrame, PaneFlags& vInOutPaneShown, ImGuiContext* vContextPtr, const std::string& vUserDatas)
+bool InspectorPane::DrawPanes(const uint32_t& vCurrentFrame, PaneFlags& vInOutPaneShown, ImGuiContext* vContextPtr, void* vUserDatas)
 {
 	if (vInOutPaneShown & paneFlag)
 	{

diff --git a/src/Panes/InspectorPane.h b/src/Panes/InspectorPane.h
@@ -26,7 +26,7 @@ class InspectorPane : public AbstractPane, public conf::ConfigAbstract
 public:
 	bool Init() override;
 	void Unit() override;
-	bool DrawPanes(const uint32_t& vCurrentFrame, PaneFlags& vInOutPaneShown, ImGuiContext* vContextPtr = nullptr, const std::string& vUserDatas = {}) override;
+	bool DrawPanes(const uint32_t& vCurrentFrame, PaneFlags& vInOutPaneShown, ImGuiContext* vContextPtr = nullptr, void* vUserDatas = nullptr) override;
 
 	// configuration
 	std::string getXml(const std::string& vOffset, const std::string& vUserDatas = "") override;

diff --git a/src/Panes/MessagePane.cpp b/src/Panes/MessagePane.cpp
@@ -49,7 +49,7 @@ void MessagePane::Unit()
 
 }
 
-bool MessagePane::DrawPanes(const uint32_t& vCurrentFrame, PaneFlags& vInOutPaneShown, ImGuiContext* vContextPtr, const std::string& vUserDatas)
+bool MessagePane::DrawPanes(const uint32_t& vCurrentFrame, PaneFlags& vInOutPaneShown, ImGuiContext* vContextPtr, void* vUserDatas)
 {
 	IsThereSomeMessages(false);
+4 −0		.gitmodules
+1 −1		3rdparty/ImGuiPack
+1 −0		3rdparty/InAppGpuProfiler
+1 −1		3rdparty/ctools
+8 −8		CMakeLists.txt
+3 −0		cmake/3rdparty.cmake
+20 −0		cmake/iagp.cmake
+1 −2		cmake/imguipack.cmake
+1 −0		src/Buffer/FrameBufferAttachment.cpp
+1 −0		src/Mesh/Model/PNCMesh.cpp
+1 −0		src/Mesh/Model/PNCModel.cpp
+1 −0		src/Mesh/Model/PNTBTCMesh.cpp
+1 −0		src/Mesh/Model/PNTBTCModel.cpp
+1 −0		src/Mesh/Model/PNTCModel.cpp
+1 −0		src/Mesh/Model/PointModel.cpp
+1 −0		src/Mesh/Model/QuadModel.cpp
+1 −0		src/Renderer/RenderPack.cpp
+1 −0		src/Uniforms/UniformHelper.cpp
+1 −0		src/VR/Backend/VRBackend.cpp
+1 −0		submodules.init.txt
-Original file line number
+Diff line change
@@ Expand Up / @@ -48,7 +48,7 @@ void CodePane::Unit() @@
     }
-    bool CodePane::DrawPanes(const uint32_t& vCurrentFrame, PaneFlags& vInOutPaneShown, ImGuiContext* vContextPtr, const std::string& vUserDatas)
+    bool CodePane::DrawPanes(const uint32_t& vCurrentFrame, PaneFlags& vInOutPaneShown, ImGuiContext* vContextPtr, void* vUserDatas)
     {
     	if (vInOutPaneShown & paneFlag)
     	{
@@ Expand Down @@