assets and gui moved back into the lunarium project

dearimgui moved into external

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_subdirectory(external/dearimgui)
-
-# add gui
-add_subdirectory(src/internal_libs/gui)
-
-# add assets
-add_subdirectory(src/internal_libs/assets)
 
 # 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 external/dearimgui
-    PRIVATE src/internal_libs/assets
     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)

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}" )

src/core/core.cpp

@@ -11,7 +11,7 @@
 
 #include "core_console.h"
 
-#include <gui/dearimgui/imgui.h>
+#include <dearimgui/imgui.h>
 #include <LunariumConfig.h>
 
 #include <platform/terminal.h>

src/core/core_console.cpp

@@ -7,8 +7,8 @@
 ******************************************************************************/
 
 #include "core_console.h"
-#include <gui/dearimgui/imgui.h>
+#include <dearimgui/imgui.h>
-#include <gui/dearimgui/imgui_internal.h>   // To use the DockWindowXXX methods
+#include <dearimgui/imgui_internal.h>   // To use the DockWindowXXX methods
 
 #include <iostream>
 

src/gui/console.cpp

@@ -8,7 +8,7 @@
 ******************************************************************************/
 
 #include "console.h"
-#include <gui/dearimgui/imgui.h>
+#include <dearimgui/imgui.h>
 #include <core/core.h>
 #include <input/input_manager.h>
 #include <cstring>

src/internal_libs/assets/CMakeLists.txt

@@ -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
-)

src/internal_libs/gui/CMakeLists.txt

@@ -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
-)

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/
 )

src/run_modes/editor/editor.cpp

@@ -14,7 +14,7 @@
 #include <utils/logger.h>
 #include <internal_data/data_manager.h>
 #include <gui/gui.h>
-#include <gui/dearimgui/imgui.h>
+#include <dearimgui/imgui.h>
 
 // Panels
 #include "panels/world_tree.h"

src/run_modes/editor/panel_manager.cpp

@@ -9,7 +9,7 @@
 #include "panel_manager.h"
 #include "editor.h"
 #include <utils/logger.h>
-#include <gui/dearimgui/imgui_internal.h>   // To use the DockWindowXXX methods
+#include <dearimgui/imgui_internal.h>   // To use the DockWindowXXX methods
 #include <filesystem>
 
 // Panels

src/run_modes/editor/panel_manager.h

@@ -10,7 +10,7 @@
 #define PANEL_MANAGER_H_
 
 #include <utils/op_res.h>
-#include <gui/dearimgui/imgui.h>
+#include <dearimgui/imgui.h>
 #include <gui/panel.h>
 #include <map>
 #include <vector>

src/run_modes/editor/panels/about.cpp

@@ -7,7 +7,7 @@
 ******************************************************************************/
 
 #include "about.h"
-#include <gui/dearimgui/imgui.h>
+#include <dearimgui/imgui.h>
 #include <core/version.h>
 #include <editor/editor.h>
 

src/run_modes/editor/panels/asset_browser.cpp

@@ -7,7 +7,7 @@
 ******************************************************************************/
 
 #include "asset_browser.h"
-#include <gui/dearimgui/imgui.h>
+#include <dearimgui/imgui.h>
 #include <editor/editor.h>
 
 namespace lunarium

src/run_modes/editor/panels/properties_view.cpp

@@ -8,7 +8,7 @@
 ******************************************************************************/
 
 #include "properties_view.h"
-#include <gui/dearimgui/imgui.h>
+#include <dearimgui/imgui.h>
 #include <editor/editor.h>
 
 namespace lunarium { namespace editor 

src/run_modes/editor/panels/world_tree.cpp

@@ -8,7 +8,7 @@
 
 #include "world_tree.h"
 #include <game/world/world.h>
-#include <gui/dearimgui/imgui.h>
+#include <dearimgui/imgui.h>
 #include <editor/editor.h>
 
 namespace lunarium

src/run_modes/editor/panels/world_view.cpp

@@ -9,7 +9,7 @@
 #include "world_view.h"
 #include <utils/logger.h>
 #include <game/world/world.h>
-#include <gui/dearimgui/imgui.h>
+#include <dearimgui/imgui.h>
 #include <editor/editor.h>
 #include "../panel_manager.h"
 

src/run_modes/editor/tools/map_editor/map_editor.cpp

@@ -13,7 +13,7 @@
 #include <assets/types/image.h>
 #include <editor/editor.h>
 #include <gui/panel.h>
-#include <gui/dearimgui/imgui.h>
+#include <dearimgui/imgui.h>
 #include <editor/contents/content_manager.h>
 #include <editor/contents/tile_set.h>
 #include <editor/contents/tile_map.h>

src/run_modes/editor/tools/map_editor/panels/map_canvas.cpp

@@ -10,7 +10,7 @@
 #include "../map_editor.h"
 #include <editor/editor.h>
 #include <editor/contents/tile_map.h>
-#include <gui/dearimgui/imgui.h>
+#include <dearimgui/imgui.h>
 #include <core/core.h>
 #include <graphics/graphics.h>
 #include <assets/types/image.h>

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)

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
+Pos=953,56
-Size=209,657
+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