diff --git a/CMakeLists.txt b/CMakeLists.txt index c30b34a..b85132a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -74,7 +74,15 @@ set(LUNARIUM_SRC "src/graphics/opengl/glGraphics.cpp" "src/graphics/opengl/glText.cpp" "src/graphics/opengl/glShader.cpp" +"src/gui/gui.cpp" +"src/gui/file_browser.cpp" +"src/gui/panel.cpp" +"src/gui/console.cpp" "src/internal_data/data_manager.cpp" +"src/assets/asset_manager.cpp" +"src/assets/types/asset.cpp" +"src/assets/types/image.cpp" +"src/assets/loaders/asset_index.cpp" "src/input/keyboard.cpp" "src/input/input_manager.cpp" "src/scripting/script_manager.cpp" @@ -135,13 +143,7 @@ add_subdirectory(external/glad/src) add_subdirectory(external/glm) # add dearimgui -add_subdirectory(src/internal_libs/gui/dearimgui) - -# add gui -add_subdirectory(src/internal_libs/gui) - -# add assets -add_subdirectory(src/internal_libs/assets) +add_subdirectory(external/dearimgui) # add lua -- https://github.com/walterschell/Lua add_subdirectory(external/lua) @@ -172,7 +174,7 @@ target_include_directories(${PROJECT_NAME} PUBLIC external/glfw/include PUBLIC external/glm PUBLIC external/lua/lua5.4.3/include - PUBLIC src/internal_libs/dearimgui + PUBLIC external/dearimgui PUBLIC external/pugixml/src PUBLIC external/glad/include PUBLIC external/freetype/include @@ -182,15 +184,14 @@ target_include_directories(${PROJECT_NAME} target_link_directories(${PROJECT_NAME} PRIVATE external/glfw/src PRIVATE external/glm - PRIVATE src/internal_libs/gui/dearimgui - PRIVATE src/internal_libs/assets + PRIVATE external/dearimgui PRIVATE src/run_modes/tester PRIVATE external/glad/src PRIVATE external/freetype/src PRIVATE external/box2d/bin ) -target_link_libraries(${PROJECT_NAME} box2d glfw glad glm gui dearimgui assets lua_static pugixml freetype testbed game) +target_link_libraries(${PROJECT_NAME} box2d glfw glad glm dearimgui lua_static pugixml freetype testbed game) if (NOT NO_EDITOR) target_link_libraries(${PROJECT_NAME} editor) diff --git a/src/internal_libs/gui/dearimgui/CMakeLists.txt b/external/dearimgui/CMakeLists.txt similarity index 62% rename from src/internal_libs/gui/dearimgui/CMakeLists.txt rename to external/dearimgui/CMakeLists.txt index 02f8a99..306c591 100644 --- a/src/internal_libs/gui/dearimgui/CMakeLists.txt +++ b/external/dearimgui/CMakeLists.txt @@ -1,7 +1,7 @@ add_library(dearimgui imgui.cpp imgui_demo.cpp imgui_widgets.cpp imgui_tables.cpp imgui_draw.cpp imgui_impl_glfw.cpp imgui_impl_opengl3.cpp) target_include_directories(dearimgui - PUBLIC ../../../../external/glfw/include + PUBLIC ../glfw/include ) # message( " current source dir: ${CMAKE_CURRENT_SOURCE_DIR}" ) \ No newline at end of file diff --git a/src/internal_libs/gui/dearimgui/LICENSE.txt b/external/dearimgui/LICENSE.txt similarity index 100% rename from src/internal_libs/gui/dearimgui/LICENSE.txt rename to external/dearimgui/LICENSE.txt diff --git a/src/internal_libs/gui/dearimgui/imconfig.h b/external/dearimgui/imconfig.h similarity index 100% rename from src/internal_libs/gui/dearimgui/imconfig.h rename to external/dearimgui/imconfig.h diff --git a/src/internal_libs/gui/dearimgui/imgui.cpp b/external/dearimgui/imgui.cpp similarity index 100% rename from src/internal_libs/gui/dearimgui/imgui.cpp rename to external/dearimgui/imgui.cpp diff --git a/src/internal_libs/gui/dearimgui/imgui.h b/external/dearimgui/imgui.h similarity index 100% rename from src/internal_libs/gui/dearimgui/imgui.h rename to external/dearimgui/imgui.h diff --git a/src/internal_libs/gui/dearimgui/imgui_demo.cpp b/external/dearimgui/imgui_demo.cpp similarity index 100% rename from src/internal_libs/gui/dearimgui/imgui_demo.cpp rename to external/dearimgui/imgui_demo.cpp diff --git a/src/internal_libs/gui/dearimgui/imgui_draw.cpp b/external/dearimgui/imgui_draw.cpp similarity index 100% rename from src/internal_libs/gui/dearimgui/imgui_draw.cpp rename to external/dearimgui/imgui_draw.cpp diff --git a/src/internal_libs/gui/dearimgui/imgui_impl_glfw.cpp b/external/dearimgui/imgui_impl_glfw.cpp similarity index 100% rename from src/internal_libs/gui/dearimgui/imgui_impl_glfw.cpp rename to external/dearimgui/imgui_impl_glfw.cpp diff --git a/src/internal_libs/gui/dearimgui/imgui_impl_glfw.h b/external/dearimgui/imgui_impl_glfw.h similarity index 100% rename from src/internal_libs/gui/dearimgui/imgui_impl_glfw.h rename to external/dearimgui/imgui_impl_glfw.h diff --git a/src/internal_libs/gui/dearimgui/imgui_impl_opengl3.cpp b/external/dearimgui/imgui_impl_opengl3.cpp similarity index 100% rename from src/internal_libs/gui/dearimgui/imgui_impl_opengl3.cpp rename to external/dearimgui/imgui_impl_opengl3.cpp diff --git a/src/internal_libs/gui/dearimgui/imgui_impl_opengl3.h b/external/dearimgui/imgui_impl_opengl3.h similarity index 100% rename from src/internal_libs/gui/dearimgui/imgui_impl_opengl3.h rename to external/dearimgui/imgui_impl_opengl3.h diff --git a/src/internal_libs/gui/dearimgui/imgui_impl_opengl3_loader.h b/external/dearimgui/imgui_impl_opengl3_loader.h similarity index 100% rename from src/internal_libs/gui/dearimgui/imgui_impl_opengl3_loader.h rename to external/dearimgui/imgui_impl_opengl3_loader.h diff --git a/src/internal_libs/gui/dearimgui/imgui_internal.h b/external/dearimgui/imgui_internal.h similarity index 100% rename from src/internal_libs/gui/dearimgui/imgui_internal.h rename to external/dearimgui/imgui_internal.h diff --git a/src/internal_libs/gui/dearimgui/imgui_tables.cpp b/external/dearimgui/imgui_tables.cpp similarity index 100% rename from src/internal_libs/gui/dearimgui/imgui_tables.cpp rename to external/dearimgui/imgui_tables.cpp diff --git a/src/internal_libs/gui/dearimgui/imgui_widgets.cpp b/external/dearimgui/imgui_widgets.cpp similarity index 100% rename from src/internal_libs/gui/dearimgui/imgui_widgets.cpp rename to external/dearimgui/imgui_widgets.cpp diff --git a/src/internal_libs/gui/dearimgui/imstb_rectpack.h b/external/dearimgui/imstb_rectpack.h similarity index 100% rename from src/internal_libs/gui/dearimgui/imstb_rectpack.h rename to external/dearimgui/imstb_rectpack.h diff --git a/src/internal_libs/gui/dearimgui/imstb_textedit.h b/external/dearimgui/imstb_textedit.h similarity index 100% rename from src/internal_libs/gui/dearimgui/imstb_textedit.h rename to external/dearimgui/imstb_textedit.h diff --git a/src/internal_libs/gui/dearimgui/imstb_truetype.h b/external/dearimgui/imstb_truetype.h similarity index 100% rename from src/internal_libs/gui/dearimgui/imstb_truetype.h rename to external/dearimgui/imstb_truetype.h diff --git a/src/internal_libs/assets/asset_manager.cpp b/src/assets/asset_manager.cpp similarity index 100% rename from src/internal_libs/assets/asset_manager.cpp rename to src/assets/asset_manager.cpp diff --git a/src/internal_libs/assets/asset_manager.h b/src/assets/asset_manager.h similarity index 100% rename from src/internal_libs/assets/asset_manager.h rename to src/assets/asset_manager.h diff --git a/src/internal_libs/assets/loaders/asset_index.cpp b/src/assets/loaders/asset_index.cpp similarity index 100% rename from src/internal_libs/assets/loaders/asset_index.cpp rename to src/assets/loaders/asset_index.cpp diff --git a/src/internal_libs/assets/loaders/asset_index.h b/src/assets/loaders/asset_index.h similarity index 100% rename from src/internal_libs/assets/loaders/asset_index.h rename to src/assets/loaders/asset_index.h diff --git a/src/internal_libs/assets/types/asset.cpp b/src/assets/types/asset.cpp similarity index 100% rename from src/internal_libs/assets/types/asset.cpp rename to src/assets/types/asset.cpp diff --git a/src/internal_libs/assets/types/asset.h b/src/assets/types/asset.h similarity index 100% rename from src/internal_libs/assets/types/asset.h rename to src/assets/types/asset.h diff --git a/src/internal_libs/assets/types/image.cpp b/src/assets/types/image.cpp similarity index 100% rename from src/internal_libs/assets/types/image.cpp rename to src/assets/types/image.cpp diff --git a/src/internal_libs/assets/types/image.h b/src/assets/types/image.h similarity index 100% rename from src/internal_libs/assets/types/image.h rename to src/assets/types/image.h diff --git a/src/internal_libs/assets/types/script.cpp b/src/assets/types/script.cpp similarity index 100% rename from src/internal_libs/assets/types/script.cpp rename to src/assets/types/script.cpp diff --git a/src/internal_libs/assets/types/script.h b/src/assets/types/script.h similarity index 100% rename from src/internal_libs/assets/types/script.h rename to src/assets/types/script.h diff --git a/src/core/core.cpp b/src/core/core.cpp index ade1593..93112a6 100644 --- a/src/core/core.cpp +++ b/src/core/core.cpp @@ -11,7 +11,7 @@ #include "core_console.h" -#include +#include #include #include diff --git a/src/core/core_console.cpp b/src/core/core_console.cpp index aae9862..216150e 100644 --- a/src/core/core_console.cpp +++ b/src/core/core_console.cpp @@ -7,8 +7,8 @@ ******************************************************************************/ #include "core_console.h" -#include -#include // To use the DockWindowXXX methods +#include +#include // To use the DockWindowXXX methods #include diff --git a/src/internal_libs/gui/console.cpp b/src/gui/console.cpp similarity index 99% rename from src/internal_libs/gui/console.cpp rename to src/gui/console.cpp index 26bd32d..65b627f 100644 --- a/src/internal_libs/gui/console.cpp +++ b/src/gui/console.cpp @@ -8,7 +8,7 @@ ******************************************************************************/ #include "console.h" -#include +#include #include #include #include diff --git a/src/internal_libs/gui/console.h b/src/gui/console.h similarity index 100% rename from src/internal_libs/gui/console.h rename to src/gui/console.h diff --git a/src/internal_libs/gui/file_browser.cpp b/src/gui/file_browser.cpp similarity index 100% rename from src/internal_libs/gui/file_browser.cpp rename to src/gui/file_browser.cpp diff --git a/src/internal_libs/gui/file_browser.h b/src/gui/file_browser.h similarity index 100% rename from src/internal_libs/gui/file_browser.h rename to src/gui/file_browser.h diff --git a/src/internal_libs/gui/gui.cpp b/src/gui/gui.cpp similarity index 100% rename from src/internal_libs/gui/gui.cpp rename to src/gui/gui.cpp diff --git a/src/internal_libs/gui/gui.h b/src/gui/gui.h similarity index 100% rename from src/internal_libs/gui/gui.h rename to src/gui/gui.h diff --git a/src/internal_libs/gui/logGui.cpp b/src/gui/logGui.cpp similarity index 100% rename from src/internal_libs/gui/logGui.cpp rename to src/gui/logGui.cpp diff --git a/src/internal_libs/gui/logGui.h b/src/gui/logGui.h similarity index 100% rename from src/internal_libs/gui/logGui.h rename to src/gui/logGui.h diff --git a/src/internal_libs/gui/luaConsole.cpp b/src/gui/luaConsole.cpp similarity index 100% rename from src/internal_libs/gui/luaConsole.cpp rename to src/gui/luaConsole.cpp diff --git a/src/internal_libs/gui/luaConsole.h b/src/gui/luaConsole.h similarity index 100% rename from src/internal_libs/gui/luaConsole.h rename to src/gui/luaConsole.h diff --git a/src/internal_libs/gui/panel.cpp b/src/gui/panel.cpp similarity index 100% rename from src/internal_libs/gui/panel.cpp rename to src/gui/panel.cpp diff --git a/src/internal_libs/gui/panel.h b/src/gui/panel.h similarity index 100% rename from src/internal_libs/gui/panel.h rename to src/gui/panel.h diff --git a/src/internal_libs/gui/panel_defs.h b/src/gui/panel_defs.h similarity index 100% rename from src/internal_libs/gui/panel_defs.h rename to src/gui/panel_defs.h diff --git a/src/internal_libs/assets/CMakeLists.txt b/src/internal_libs/assets/CMakeLists.txt deleted file mode 100644 index c212f1c..0000000 --- a/src/internal_libs/assets/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -add_library(assets asset_manager.cpp types/asset.cpp types/image.cpp loaders/asset_index.cpp) - -# add utils -target_link_directories(assets - PRIVATE ../utils -) - -target_include_directories(assets - PUBLIC ../ - PUBLIC ../../ - PUBLIC ../../../external/glm - PUBLIC ../../../external/box2d/include -) \ No newline at end of file diff --git a/src/internal_libs/gui/CMakeLists.txt b/src/internal_libs/gui/CMakeLists.txt deleted file mode 100644 index 8b9633a..0000000 --- a/src/internal_libs/gui/CMakeLists.txt +++ /dev/null @@ -1,23 +0,0 @@ - -# Source Files -set(GUI_SRC -"gui.cpp" -"file_browser.cpp" -"panel.cpp" -"console.cpp" -) - -add_library(gui ${GUI_SRC}) -target_link_libraries(gui assets dearimgui glfw) - -target_include_directories(gui - PUBLIC "${PROJECT_BINARY_DIR}" - PUBLIC ../../ - PUBLIC ../../internal_libs - PUBLIC ../../run_modes - PUBLIC ../../../external/glm - PUBLIC ../../../external/glad/include - PUBLIC ../../../external/glfw/include - PUBLIC ../../../external/box2d/include - PUBLIC ../../../external/pugixml/src -) \ No newline at end of file diff --git a/src/run_modes/editor/CMakeLists.txt b/src/run_modes/editor/CMakeLists.txt index efbaa9d..03f807b 100644 --- a/src/run_modes/editor/CMakeLists.txt +++ b/src/run_modes/editor/CMakeLists.txt @@ -21,16 +21,16 @@ set(EDITOR_SRC add_library(editor ${EDITOR_SRC}) -target_link_libraries(editor gui assets) +target_link_libraries(editor) target_include_directories(editor PUBLIC "${PROJECT_BINARY_DIR}" PUBLIC ../../ - PUBLIC ../../internal_libs PUBLIC ../../run_modes PUBLIC ../../../external/glm PUBLIC ../../../external/glad/include PUBLIC ../../../external/glfw/include PUBLIC ../../../external/box2d/include PUBLIC ../../../external/pugixml/src + PUBLIC ../../../external/ ) \ No newline at end of file diff --git a/src/run_modes/editor/editor.cpp b/src/run_modes/editor/editor.cpp index 4a6090a..f0dcb7b 100644 --- a/src/run_modes/editor/editor.cpp +++ b/src/run_modes/editor/editor.cpp @@ -14,7 +14,7 @@ #include #include #include -#include +#include // Panels #include "panels/world_tree.h" diff --git a/src/run_modes/editor/panel_manager.cpp b/src/run_modes/editor/panel_manager.cpp index 269e287..d337179 100644 --- a/src/run_modes/editor/panel_manager.cpp +++ b/src/run_modes/editor/panel_manager.cpp @@ -9,7 +9,7 @@ #include "panel_manager.h" #include "editor.h" #include -#include // To use the DockWindowXXX methods +#include // To use the DockWindowXXX methods #include // Panels diff --git a/src/run_modes/editor/panel_manager.h b/src/run_modes/editor/panel_manager.h index 63fc0be..c79691c 100644 --- a/src/run_modes/editor/panel_manager.h +++ b/src/run_modes/editor/panel_manager.h @@ -10,7 +10,7 @@ #define PANEL_MANAGER_H_ #include -#include +#include #include #include #include diff --git a/src/run_modes/editor/panels/about.cpp b/src/run_modes/editor/panels/about.cpp index bb8548e..79ba4b2 100644 --- a/src/run_modes/editor/panels/about.cpp +++ b/src/run_modes/editor/panels/about.cpp @@ -7,7 +7,7 @@ ******************************************************************************/ #include "about.h" -#include +#include #include #include diff --git a/src/run_modes/editor/panels/asset_browser.cpp b/src/run_modes/editor/panels/asset_browser.cpp index 84eca10..8d2c402 100644 --- a/src/run_modes/editor/panels/asset_browser.cpp +++ b/src/run_modes/editor/panels/asset_browser.cpp @@ -7,7 +7,7 @@ ******************************************************************************/ #include "asset_browser.h" -#include +#include #include namespace lunarium diff --git a/src/run_modes/editor/panels/properties_view.cpp b/src/run_modes/editor/panels/properties_view.cpp index d0b8cee..7f785f0 100644 --- a/src/run_modes/editor/panels/properties_view.cpp +++ b/src/run_modes/editor/panels/properties_view.cpp @@ -8,7 +8,7 @@ ******************************************************************************/ #include "properties_view.h" -#include +#include #include namespace lunarium { namespace editor diff --git a/src/run_modes/editor/panels/world_tree.cpp b/src/run_modes/editor/panels/world_tree.cpp index 6697c8e..cebe2f7 100644 --- a/src/run_modes/editor/panels/world_tree.cpp +++ b/src/run_modes/editor/panels/world_tree.cpp @@ -8,7 +8,7 @@ #include "world_tree.h" #include -#include +#include #include namespace lunarium diff --git a/src/run_modes/editor/panels/world_view.cpp b/src/run_modes/editor/panels/world_view.cpp index 884febf..2d0fed6 100644 --- a/src/run_modes/editor/panels/world_view.cpp +++ b/src/run_modes/editor/panels/world_view.cpp @@ -9,7 +9,7 @@ #include "world_view.h" #include #include -#include +#include #include #include "../panel_manager.h" diff --git a/src/run_modes/editor/tools/map_editor/map_editor.cpp b/src/run_modes/editor/tools/map_editor/map_editor.cpp index c06e77c..08fdd62 100644 --- a/src/run_modes/editor/tools/map_editor/map_editor.cpp +++ b/src/run_modes/editor/tools/map_editor/map_editor.cpp @@ -13,7 +13,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/run_modes/editor/tools/map_editor/panels/map_canvas.cpp b/src/run_modes/editor/tools/map_editor/panels/map_canvas.cpp index 871fe7e..b673449 100644 --- a/src/run_modes/editor/tools/map_editor/panels/map_canvas.cpp +++ b/src/run_modes/editor/tools/map_editor/panels/map_canvas.cpp @@ -10,7 +10,7 @@ #include "../map_editor.h" #include #include -#include +#include #include #include #include diff --git a/src/run_modes/testbed/CMakeLists.txt b/src/run_modes/testbed/CMakeLists.txt index 2492d0a..19b6122 100644 --- a/src/run_modes/testbed/CMakeLists.txt +++ b/src/run_modes/testbed/CMakeLists.txt @@ -5,11 +5,11 @@ add_library(testbed testbed.cpp scenes/base_scene.cpp scenes/simple_render_scene target_include_directories(testbed PUBLIC "${PROJECT_BINARY_DIR}" PUBLIC ../../ - PUBLIC ../../internal_libs PUBLIC ../../../external/glm PUBLIC ../../../external/glad/include PUBLIC ../../../external/glfw/include PUBLIC ../../../external/box2d/include + PUBLIC ../../../external/dearimgui ) target_link_libraries(testbed box2d dearimgui) \ No newline at end of file diff --git a/test_data/imgui.ini b/test_data/imgui.ini index 348f42c..78b420f 100644 --- a/test_data/imgui.ini +++ b/test_data/imgui.ini @@ -37,38 +37,43 @@ Size=400,400 Collapsed=0 [Window][Map Editor] -ViewportPos=714,179 +ViewportPos=416,108 ViewportId=0xDAA48CA2 -Size=1060,721 +Size=1290,772 Collapsed=0 [Window][Map Canvas] -ViewportPos=714,179 +ViewportPos=416,108 ViewportId=0xDAA48CA2 Pos=8,56 -Size=833,657 +Size=943,708 Collapsed=0 DockId=0x0000000E,0 -ClassId=0x0000044A +ClassId=0x000000C3 [Window][Tile Set View] -ViewportPos=714,179 +ViewportPos=416,108 ViewportId=0xDAA48CA2 -Pos=843,56 -Size=209,657 +Pos=953,56 +Size=329,708 Collapsed=0 DockId=0x0000000C,0 -ClassId=0x0000044A +ClassId=0x000000C3 + +[Window][File Browser] +Pos=150,80 +Size=600,400 +Collapsed=0 [Docking][Data] -DockSpace ID=0x27CF68A1 Pos=722,235 Size=1044,657 Split=Y +DockSpace ID=0x27CF68A1 Pos=424,164 Size=1274,708 Split=Y DockNode ID=0x00000009 Parent=0x27CF68A1 SizeRef=1280,538 Split=X - DockNode ID=0x0000000B Parent=0x00000009 SizeRef=1022,538 Split=X + DockNode ID=0x0000000B Parent=0x00000009 SizeRef=943,538 Split=X DockNode ID=0x0000000D Parent=0x0000000B SizeRef=204,538 DockNode ID=0x0000000E Parent=0x0000000B SizeRef=816,538 CentralNode=1 Selected=0xB3CA1100 - DockNode ID=0x0000000C Parent=0x00000009 SizeRef=256,538 Selected=0xB093288C + DockNode ID=0x0000000C Parent=0x00000009 SizeRef=329,538 Selected=0xB093288C DockNode ID=0x0000000A Parent=0x27CF68A1 SizeRef=1280,180 -DockSpace ID=0x2F8DD699 Window=0xBEB76114 Pos=100,124 Size=1280,696 Split=Y +DockSpace ID=0x2F8DD699 Window=0xBEB76114 Pos=244,144 Size=1280,696 Split=Y DockNode ID=0x00000001 Parent=0x2F8DD699 SizeRef=1280,538 Split=X DockNode ID=0x00000005 Parent=0x00000001 SizeRef=1022,538 Split=X DockNode ID=0x00000007 Parent=0x00000005 SizeRef=204,538 Selected=0xFD1747F8