diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt index 7d439b2..e5eadc7 100644 --- a/external/CMakeLists.txt +++ b/external/CMakeLists.txt @@ -5,7 +5,6 @@ add_subdirectory(./glad) cmake_minimum_required(VERSION 3.14) set(MIRROR_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../modules/mirror/) -set(ENGINE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../modules/engine/) set(DEPENDENCIES_DIR ${CMAKE_CURRENT_SOURCE_DIR}/) if (CMAKE_COMPILER_IS_GNUCC) diff --git a/modules/CMakeLists.txt b/modules/CMakeLists.txt index 4784706..dc00011 100644 --- a/modules/CMakeLists.txt +++ b/modules/CMakeLists.txt @@ -1,3 +1,4 @@ +# engine add_subdirectory(./base) add_subdirectory(./time) add_subdirectory(./logger) @@ -14,7 +15,9 @@ add_subdirectory(./ui) add_subdirectory(./window) add_subdirectory(./renderer) add_subdirectory(./ecs) -add_subdirectory(./engine) +add_subdirectory(./app) + +# apps add_subdirectory(./mirror) diff --git a/modules/app/CMakeLists.txt b/modules/app/CMakeLists.txt new file mode 100644 index 0000000..d2c53c7 --- /dev/null +++ b/modules/app/CMakeLists.txt @@ -0,0 +1,21 @@ +add_library_module(app + application.cpp + layer.cpp + layer_stack.cpp +) + +target_link_libraries(app +PUBLIC + renderer + logger + ui + asset_parser + asset_manager + lt_debug + ecs + window + glad + time + opengl::opengl + EnTT::EnTT +) diff --git a/modules/engine/include/engine/core/application.hpp b/modules/app/include/app/application.hpp similarity index 100% rename from modules/engine/include/engine/core/application.hpp rename to modules/app/include/app/application.hpp diff --git a/modules/engine/include/engine/core/entrypoint.hpp b/modules/app/include/app/entrypoint.hpp similarity index 94% rename from modules/engine/include/engine/core/entrypoint.hpp rename to modules/app/include/app/entrypoint.hpp index 777c602..276db3e 100644 --- a/modules/engine/include/engine/core/entrypoint.hpp +++ b/modules/app/include/app/entrypoint.hpp @@ -1,6 +1,6 @@ #pragma once -#include +#include int main(int argc, char *argv[]) // NOLINT try diff --git a/modules/engine/include/engine/layer/layer.hpp b/modules/app/include/app/layer.hpp similarity index 99% rename from modules/engine/include/engine/layer/layer.hpp rename to modules/app/include/app/layer.hpp index 592dfed..101f2db 100644 --- a/modules/engine/include/engine/layer/layer.hpp +++ b/modules/app/include/app/layer.hpp @@ -1,12 +1,9 @@ #pragma once - - namespace lt { class Event; -// mouse class MouseMovedEvent; class ButtonPressedEvent; class ButtonReleasedEvent; @@ -36,6 +33,7 @@ public: virtual void on_update(float deltaTime) { } + virtual void on_user_interface_update() { } diff --git a/modules/engine/include/engine/layer/layer_stack.hpp b/modules/app/include/app/layer_stack.hpp similarity index 100% rename from modules/engine/include/engine/layer/layer_stack.hpp rename to modules/app/include/app/layer_stack.hpp diff --git a/modules/engine/src/core/application.cpp b/modules/app/src/application.cpp similarity index 97% rename from modules/engine/src/core/application.cpp rename to modules/app/src/application.cpp index ab7995a..1412126 100644 --- a/modules/engine/src/core/application.cpp +++ b/modules/app/src/application.cpp @@ -1,8 +1,8 @@ +#include +#include +#include #include #include -#include -#include -#include #include #include #include diff --git a/modules/engine/src/layer/layer.cpp b/modules/app/src/layer.cpp similarity index 98% rename from modules/engine/src/layer/layer.cpp rename to modules/app/src/layer.cpp index 945cdc1..7b1998a 100644 --- a/modules/engine/src/layer/layer.cpp +++ b/modules/app/src/layer.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include #include diff --git a/modules/engine/src/layer/layer_stack.cpp b/modules/app/src/layer_stack.cpp similarity index 83% rename from modules/engine/src/layer/layer_stack.cpp rename to modules/app/src/layer_stack.cpp index 3834a36..c6457a0 100644 --- a/modules/engine/src/layer/layer_stack.cpp +++ b/modules/app/src/layer_stack.cpp @@ -1,5 +1,5 @@ -#include -#include +#include +#include namespace lt { diff --git a/modules/engine/CMakeLists.txt b/modules/engine/CMakeLists.txt deleted file mode 100644 index 815af9f..0000000 --- a/modules/engine/CMakeLists.txt +++ /dev/null @@ -1,29 +0,0 @@ -if(NOT WIN32) - add_library_module(engine - core/application.cpp - layer/layer.cpp - layer/layer_stack.cpp - ) -else() - add_library_module(engine - core/application.cpp - layer/layer.cpp - layer/layer_stack.cpp - ) -endif() - -target_link_libraries(engine -PUBLIC - renderer - logger - ui - asset_parser - asset_manager - lt_debug - ecs - window - glad - time - opengl::opengl - EnTT::EnTT -) diff --git a/modules/engine/include/engine/engine.hpp b/modules/engine/include/engine/engine.hpp deleted file mode 100644 index 9711082..0000000 --- a/modules/engine/include/engine/engine.hpp +++ /dev/null @@ -1,14 +0,0 @@ -#pragma once - -#include -#include -#include -#include -#include -#include -#include -#include - -#ifdef LIGHT_ENTRY_POINT - #include -#endif diff --git a/modules/mirror/CMakeLists.txt b/modules/mirror/CMakeLists.txt index 6e85429..efe5578 100644 --- a/modules/mirror/CMakeLists.txt +++ b/modules/mirror/CMakeLists.txt @@ -8,7 +8,7 @@ add_executable_module(mirror target_link_libraries( mirror - PUBLIC engine + PUBLIC app PUBLIC opengl::opengl PUBLIC ui PUBLIC imgui diff --git a/modules/mirror/include/mirror/editor_layer.hpp b/modules/mirror/include/mirror/editor_layer.hpp index 2e624f1..542585f 100644 --- a/modules/mirror/include/mirror/editor_layer.hpp +++ b/modules/mirror/include/mirror/editor_layer.hpp @@ -1,11 +1,12 @@ #pragma once -#include +#include #include #include #include #include #include +#include namespace lt { diff --git a/modules/mirror/include/mirror/panel/asset_browser.hpp b/modules/mirror/include/mirror/panel/asset_browser.hpp index 547428f..aad6365 100644 --- a/modules/mirror/include/mirror/panel/asset_browser.hpp +++ b/modules/mirror/include/mirror/panel/asset_browser.hpp @@ -1,8 +1,8 @@ #pragma once -#include #include #include +#include namespace lt { diff --git a/modules/mirror/src/editor_layer.cpp b/modules/mirror/src/editor_layer.cpp index 4c51f2f..387a514 100644 --- a/modules/mirror/src/editor_layer.cpp +++ b/modules/mirror/src/editor_layer.cpp @@ -1,3 +1,4 @@ +#include #include #include #include @@ -6,6 +7,9 @@ #include #include #include +#include +#include +#include #include namespace lt { diff --git a/modules/mirror/src/mirror.cpp b/modules/mirror/src/mirror.cpp index 7f6c3d0..01f08b3 100644 --- a/modules/mirror/src/mirror.cpp +++ b/modules/mirror/src/mirror.cpp @@ -5,7 +5,9 @@ #include // -#include +#include +#include +#include namespace lt { diff --git a/modules/mirror/src/panel/asset_browser.cpp b/modules/mirror/src/panel/asset_browser.cpp index 6cadbfe..fe97920 100644 --- a/modules/mirror/src/panel/asset_browser.cpp +++ b/modules/mirror/src/panel/asset_browser.cpp @@ -1,9 +1,9 @@ #include #include #include -#include #include #include +#include namespace lt {