chore: finish flattening & remove unused mvLog header

hoffstadt · Nov 11, 2022 · 8bc662d · 8bc662d
1 parent 677ebd7
commit 8bc662d
Show file tree

Hide file tree

Showing 30 changed files with 112 additions and 177 deletions.
diff --git a/sandbox/main.cpp b/sandbox/main.cpp
@@ -9,7 +9,6 @@
 #include <sstream>
 #include <filesystem>
 #include "mvViewport.h"
-#include "mvLog.h"
 
 namespace fs = std::filesystem;
 

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -3,117 +3,117 @@
 
 set(MARVEL_SOURCES
 
-	# core
-	"mvContext.cpp"
-	"mvMath.cpp"
-	"mvProfiler.cpp"
-	"dearpygui.cpp"
-
-	# platform
-	"$<$<PLATFORM_ID:Windows>:mvViewport_win32.cpp>"
-	"$<$<PLATFORM_ID:Windows>:mvUtilities_win32.cpp>"
-	"$<$<PLATFORM_ID:Windows>:mvGraphics_win32.cpp>"
-
-	"$<$<PLATFORM_ID:Darwin>:mvViewport_apple.mm>"
-	"$<$<PLATFORM_ID:Darwin>:mvUtilities_apple.mm>"
-	"$<$<PLATFORM_ID:Darwin>:mvGraphics_apple.mm>"
-
-	"$<$<PLATFORM_ID:Linux>:mvUtilities_linux.cpp>"
-	"$<$<PLATFORM_ID:Linux>:mvViewport_linux.cpp>"
-	"$<$<PLATFORM_ID:Linux>:mvGraphics_linux.cpp>"
-
-	# python
-	"mvPyUtils.cpp"
-		"mvCustomTypes.cpp"
-
-	# ui
-	"mvBasicWidgets.cpp"
-	"mvTables.cpp"
-	"mvThemes.cpp"
-	"mvNodes.cpp"
-	"mvDrawings.cpp"
-	"mvGlobalHandlers.cpp"
-	"mvItemHandlers.cpp"
-	"mvValues.cpp"
-	"mvTextureItems.cpp"
-	"mvFontItems.cpp"
-	"mvColors.cpp"
-	"mvPlotting.cpp"
-	"mvContainers.cpp"
-
-	"mvCallbackRegistry.cpp"
+        # core
+        "mvContext.cpp"
+        "mvMath.cpp"
+        "mvProfiler.cpp"
+        "dearpygui.cpp"
+
+        # platform
+        "$<$<PLATFORM_ID:Windows>:mvViewport_win32.cpp>"
+        "$<$<PLATFORM_ID:Windows>:mvUtilities_win32.cpp>"
+        "$<$<PLATFORM_ID:Windows>:mvGraphics_win32.cpp>"
+
+        "$<$<PLATFORM_ID:Darwin>:mvViewport_apple.mm>"
+        "$<$<PLATFORM_ID:Darwin>:mvUtilities_apple.mm>"
+        "$<$<PLATFORM_ID:Darwin>:mvGraphics_apple.mm>"
+
+        "$<$<PLATFORM_ID:Linux>:mvUtilities_linux.cpp>"
+        "$<$<PLATFORM_ID:Linux>:mvViewport_linux.cpp>"
+        "$<$<PLATFORM_ID:Linux>:mvGraphics_linux.cpp>"
+
+        # python
+        "mvPyUtils.cpp"
+        "mvCustomTypes.cpp"
+
+        # ui
+        "mvBasicWidgets.cpp"
+        "mvTables.cpp"
+        "mvThemes.cpp"
+        "mvNodes.cpp"
+        "mvDrawings.cpp"
+        "mvGlobalHandlers.cpp"
+        "mvItemHandlers.cpp"
+        "mvValues.cpp"
+        "mvTextureItems.cpp"
+        "mvFontItems.cpp"
+        "mvColors.cpp"
+        "mvPlotting.cpp"
+        "mvContainers.cpp"
+
+        "mvCallbackRegistry.cpp"
         "mvLoadingIndicatorCustom.cpp"
-	"mvFontManager.cpp"
-	"mvToolManager.cpp"
-	"mvToolWindow.cpp"
-	"mvAboutWindow.cpp"
-	"mvDocWindow.cpp"
-	"mvMetricsWindow.cpp"
-	"mvStyleWindow.cpp"
-	"mvDebugWindow.cpp"
-	"mvLayoutWindow.cpp"
-	"mvAppItemState.cpp"
-	"mvAppItem.cpp"
-	"mvItemRegistry.cpp"
-
-	"custom/mvDatePicker.cpp"
-	"custom/mvTimePicker.cpp"
-	"custom/mvSlider3D.cpp"
-	"custom/mvLoadingIndicator.cpp"
-	"composite/mvFileDialog.cpp"
-	"composite/mvFileExtension.cpp"
-
-	# imnodes
-	"../thirdparty/imnodes/imnodes.cpp"
-
-	# implot
-    "../thirdparty/implot/implot.cpp"
-	"../thirdparty/implot/implot_items.cpp"
-	"../thirdparty/implot/implot_demo.cpp"
-
-	# ImGuiFileDialog
-	"../thirdparty/ImGuiFileDialog/ImGuiFileDialog.cpp"
-
-	# imgui
-	"../thirdparty/imgui/misc/cpp/imgui_stdlib.cpp"
-	"../thirdparty/imgui/imgui.cpp"
-	"../thirdparty/imgui/imgui_demo.cpp"
-	"../thirdparty/imgui/imgui_draw.cpp"
-	"../thirdparty/imgui/imgui_widgets.cpp"
-	"../thirdparty/imgui/imgui_tables.cpp"
-	"$<$<PLATFORM_ID:Windows>:../thirdparty/imgui/misc/freetype/imgui_freetype.cpp>"
-	"$<$<PLATFORM_ID:Windows>:../thirdparty/imgui/backends/imgui_impl_win32.cpp>"
-	"$<$<PLATFORM_ID:Windows>:../thirdparty/imgui/backends/imgui_impl_dx11.cpp>"
-	"$<$<PLATFORM_ID:Darwin>:../thirdparty/imgui/backends/imgui_impl_metal.mm>"
-	"$<$<PLATFORM_ID:Darwin>:../thirdparty/imgui/backends/imgui_impl_glfw.cpp>"
-	"$<$<PLATFORM_ID:Linux>:../thirdparty/imgui/backends/imgui_impl_glfw.cpp>"
-	"$<$<PLATFORM_ID:Linux>:../thirdparty/imgui/backends/imgui_impl_opengl3.cpp>"
-	"$<$<PLATFORM_ID:Linux>:../thirdparty/imgui/examples/libs/gl3w/GL/gl3w.c>"
-)
+        "mvFontManager.cpp"
+        "mvToolManager.cpp"
+        "mvToolWindow.cpp"
+        "mvAboutWindow.cpp"
+        "mvDocWindow.cpp"
+        "mvMetricsWindow.cpp"
+        "mvStyleWindow.cpp"
+        "mvDebugWindow.cpp"
+        "mvLayoutWindow.cpp"
+        "mvAppItemState.cpp"
+        "mvAppItem.cpp"
+        "mvItemRegistry.cpp"
+
+        "mvDatePicker.cpp"
+        "mvTimePicker.cpp"
+        "mvSlider3D.cpp"
+        "mvLoadingIndicator.cpp"
+        "mvFileDialog.cpp"
+        "mvFileExtension.cpp"
+
+        # imnodes
+        "../thirdparty/imnodes/imnodes.cpp"
+
+        # implot
+        "../thirdparty/implot/implot.cpp"
+        "../thirdparty/implot/implot_items.cpp"
+        "../thirdparty/implot/implot_demo.cpp"
+
+        # ImGuiFileDialog
+        "../thirdparty/ImGuiFileDialog/ImGuiFileDialog.cpp"
+
+        # imgui
+        "../thirdparty/imgui/misc/cpp/imgui_stdlib.cpp"
+        "../thirdparty/imgui/imgui.cpp"
+        "../thirdparty/imgui/imgui_demo.cpp"
+        "../thirdparty/imgui/imgui_draw.cpp"
+        "../thirdparty/imgui/imgui_widgets.cpp"
+        "../thirdparty/imgui/imgui_tables.cpp"
+        "$<$<PLATFORM_ID:Windows>:../thirdparty/imgui/misc/freetype/imgui_freetype.cpp>"
+        "$<$<PLATFORM_ID:Windows>:../thirdparty/imgui/backends/imgui_impl_win32.cpp>"
+        "$<$<PLATFORM_ID:Windows>:../thirdparty/imgui/backends/imgui_impl_dx11.cpp>"
+        "$<$<PLATFORM_ID:Darwin>:../thirdparty/imgui/backends/imgui_impl_metal.mm>"
+        "$<$<PLATFORM_ID:Darwin>:../thirdparty/imgui/backends/imgui_impl_glfw.cpp>"
+        "$<$<PLATFORM_ID:Linux>:../thirdparty/imgui/backends/imgui_impl_glfw.cpp>"
+        "$<$<PLATFORM_ID:Linux>:../thirdparty/imgui/backends/imgui_impl_opengl3.cpp>"
+        "$<$<PLATFORM_ID:Linux>:../thirdparty/imgui/examples/libs/gl3w/GL/gl3w.c>"
+        )
 
 set(MARVEL_INCLUDE_DIR
-	"."
-	"../thirdparty/implot"
-	"../thirdparty/stb"
-	"../thirdparty/imnodes"
-	"../thirdparty/ImGuiFileDialog"
-	"../thirdparty/glfw/include/"
-	"../thirdparty/glfw/deps/"
-	"../thirdparty/imgui/"
-	"../thirdparty/gl3w/"
-	"../thirdparty/imgui/misc/freetype/"
-	"../thirdparty/imgui/backends/"
-	"../thirdparty/imgui/examples/libs/gl3w"
-	"../thirdparty/cpython/"
-	"../thirdparty/cpython/Include/"
-	"../thirdparty/cpython/build/debug/"
-	"$<$<PLATFORM_ID:Windows>:${CMAKE_SOURCE_DIR}/thirdparty/cpython/PC/>"
-	"$<IF:$<CONFIG:Release>,${CMAKE_SOURCE_DIR}/thirdparty/cpython/build/release/,${CMAKE_SOURCE_DIR}/thirdparty/cpython/build/debug/>"
-)
+        "."
+        "../thirdparty/implot"
+        "../thirdparty/stb"
+        "../thirdparty/imnodes"
+        "../thirdparty/ImGuiFileDialog"
+        "../thirdparty/glfw/include/"
+        "../thirdparty/glfw/deps/"
+        "../thirdparty/imgui/"
+        "../thirdparty/gl3w/"
+        "../thirdparty/imgui/misc/freetype/"
+        "../thirdparty/imgui/backends/"
+        "../thirdparty/imgui/examples/libs/gl3w"
+        "../thirdparty/cpython/"
+        "../thirdparty/cpython/Include/"
+        "../thirdparty/cpython/build/debug/"
+        "$<$<PLATFORM_ID:Windows>:${CMAKE_SOURCE_DIR}/thirdparty/cpython/PC/>"
+        "$<IF:$<CONFIG:Release>,${CMAKE_SOURCE_DIR}/thirdparty/cpython/build/release/,${CMAKE_SOURCE_DIR}/thirdparty/cpython/build/debug/>"
+        )
 
 
 if(MVDIST_ONLY)
-	include("distribution.cmake")
+    include("distribution.cmake")
 else()
-	include("embedded.cmake")
+    include("embedded.cmake")
 endif()
diff --git a/src/dearpygui.cpp b/src/dearpygui.cpp
@@ -9,7 +9,6 @@
 #include "mvPyUtils.h"
 #include "mvViewport.h"
 #include <stb_image.h>
-#include "mvLog.h"
 #include "mvProfiler.h"
 #include "dearpygui_commands.h"
 #include "dearpygui_parsers.h"

diff --git a/src/dearpygui_commands.h b/src/dearpygui_commands.h
@@ -9,7 +9,6 @@
 #include "mvViewport.h"
 #include "stb_image.h"
 #include "stb_image_write.h"
-#include "mvLog.h"
 #include "mvProfiler.h"
 #include "mvUtilities.h"
 

diff --git a/src/dearpygui_parsers.h b/src/dearpygui_parsers.h
@@ -8,7 +8,6 @@
 #include "mvPyUtils.h"
 #include "mvViewport.h"
 #include <stb_image.h>
-#include "mvLog.h"
 #include "mvProfiler.h"
 
 static void

diff --git a/src/mvAppItem.cpp b/src/mvAppItem.cpp
@@ -3,7 +3,6 @@
 #include "mvItemRegistry.h"
 #include "mvCore.h"
 #include "mvAppItemCommons.h"
-#include "mvLog.h"
 #include "mvPyUtils.h"
 
 static void

diff --git a/src/mvAppItemCommons.h b/src/mvAppItemCommons.h
@@ -13,9 +13,9 @@
 #include "mvColors.h"
 #include "mvPlotting.h"
 #include "mvContainers.h"
-#include "custom/mvTimePicker.h"
-#include "custom/mvDatePicker.h"
-#include "custom/mvSlider3D.h"
-#include "custom/mvLoadingIndicator.h"
-#include "composite/mvFileDialog.h"
-#include "composite/mvFileExtension.h"
+#include "mvTimePicker.h"
+#include "mvDatePicker.h"
+#include "mvSlider3D.h"
+#include "mvLoadingIndicator.h"
+#include "mvFileDialog.h"
+#include "mvFileExtension.h"
diff --git a/src/mvContext.cpp b/src/mvContext.cpp
@@ -11,7 +11,6 @@
 #include "mvCallbackRegistry.h"
 #include "mvPyUtils.h"
 #include <frameobject.h>
-#include "mvLog.h"
 #include "mvToolManager.h"
 #include <imnodes.h>
 #include <thread>

diff --git a/src/custom/mvDatePicker.cpp → src/mvDatePicker.cpp b/src/custom/mvDatePicker.cpp → src/mvDatePicker.cpp
diff --git a/src/custom/mvDatePicker.h → src/mvDatePicker.h b/src/custom/mvDatePicker.h → src/mvDatePicker.h
diff --git a/src/mvDrawings.cpp b/src/mvDrawings.cpp
@@ -1,5 +1,4 @@
 #include "mvDrawings.h"
-#include "mvLog.h"
 #include "mvItemRegistry.h"
 #include "mvPyUtils.h"
 #include "mvAppItemCommons.h"

diff --git a/src/composite/mvFileDialog.cpp → src/mvFileDialog.cpp b/src/composite/mvFileDialog.cpp → src/mvFileDialog.cpp
@@ -2,7 +2,6 @@
 #include "mvFileExtension.h"
 #include "mvItemRegistry.h"
 #include "mvPyUtils.h"
-#include "mvLog.h"
 
 static void Panel(const char* vFilter, IGFDUserDatas vUserDatas, bool* vCantContinue)
 {

diff --git a/src/composite/mvFileDialog.h → src/mvFileDialog.h b/src/composite/mvFileDialog.h → src/mvFileDialog.h
diff --git a/src/composite/mvFileExtension.cpp → src/mvFileExtension.cpp b/src/composite/mvFileExtension.cpp → src/mvFileExtension.cpp
@@ -2,7 +2,6 @@
 #include "mvFileDialog.h"
 #include "mvItemRegistry.h"
 #include "mvPyUtils.h"
-#include "mvLog.h"
 
 void mvFileExtension::applySpecificTemplate(mvAppItem* item)
 {

diff --git a/src/composite/mvFileExtension.h → src/mvFileExtension.h b/src/composite/mvFileExtension.h → src/mvFileExtension.h
diff --git a/src/mvFontItems.cpp b/src/mvFontItems.cpp
@@ -1,7 +1,6 @@
 #include "mvFontItems.h"
 #include "mvTextureItems.h"
 #include "mvPyUtils.h"
-#include "mvLog.h"
 #include "mvToolManager.h"
 #include "mvFontManager.h"
 

diff --git a/src/mvGlobalHandlers.cpp b/src/mvGlobalHandlers.cpp
@@ -1,6 +1,5 @@
 #include "mvGlobalHandlers.h"
 #include "mvPyUtils.h"
-#include "mvLog.h"
 #include "mvUtilities.h"
 
 void mvHandlerRegistry::draw(ImDrawList* drawlist, float x, float y)

diff --git a/src/mvItemHandlers.cpp b/src/mvItemHandlers.cpp
@@ -1,6 +1,5 @@
 #include "mvItemHandlers.h"
 #include "mvPyUtils.h"
-#include "mvLog.h"
 
 void mvItemHandlerRegistry::checkEvents(void* data)
 {

diff --git a/src/mvItemRegistry.cpp b/src/mvItemRegistry.cpp
@@ -2,7 +2,6 @@
 #include "mvProfiler.h"
 #include "mvContext.h"
 #include "mvAppItemCommons.h"
-#include "mvLog.h"
 #include "mvPyUtils.h"
 #include "mvToolManager.h"
 #include "mvFontManager.h"

diff --git a/src/custom/mvLoadingIndicator.cpp → src/mvLoadingIndicator.cpp b/src/custom/mvLoadingIndicator.cpp → src/mvLoadingIndicator.cpp
diff --git a/src/custom/mvLoadingIndicator.h → src/mvLoadingIndicator.h b/src/custom/mvLoadingIndicator.h → src/mvLoadingIndicator.h
diff --git a/src/mvLog.h b/src/mvLog.h
diff --git a/src/mvNodes.cpp b/src/mvNodes.cpp
@@ -2,7 +2,6 @@
 #include <imnodes.h>
 #include "mvContext.h"
 #include "mvItemRegistry.h"
-#include "mvLog.h"
 #include "mvPyUtils.h"
 #include "mvItemHandlers.h"
 #include "mvThemes.h"

diff --git a/src/custom/mvSlider3D.cpp → src/mvSlider3D.cpp b/src/custom/mvSlider3D.cpp → src/mvSlider3D.cpp
diff --git a/src/custom/mvSlider3D.h → src/mvSlider3D.h b/src/custom/mvSlider3D.h → src/mvSlider3D.h