refactor: extract ecs out of engine

modules/CMakeLists.txt

@@ -11,6 +11,7 @@ add_subdirectory(./input)
 add_subdirectory(./ui)
 
 add_subdirectory(./renderer)
+add_subdirectory(./ecs)
 add_subdirectory(./engine)
 
 add_subdirectory(./mirror)

modules/ecs/CMakeLists.txt

@@ -0,0 +1,2 @@
+add_library_module(ecs entity.cpp scene.cpp uuid.cpp)
+target_link_libraries(ecs PUBLIC logger lt_debug EnTT::EnTT renderer input camera)

modules/ecs/include/ecs/components.hpp

@@ -0,0 +1,6 @@
+#pragma once
+
+#include <ecs/components/native_script.hpp>
+#include <ecs/components/sprite_renderer.hpp>
+#include <ecs/components/tag.hpp>
+#include <ecs/components/transform.hpp>

modules/ecs/include/ecs/components/native_script.hpp

@@ -1,7 +1,6 @@
 #pragma once
 
-
-#include <engine/scene/components/scriptable_entity.hpp>
+#include <ecs/components/scriptable_entity.hpp>
 
 namespace lt {
 

modules/ecs/include/ecs/components/scriptable_entity.hpp

@@ -1,7 +1,6 @@
 #pragma once
 
-
-#include <engine/scene/entity.hpp>
+#include <ecs/entity.hpp>
 
 namespace lt {
 

modules/ecs/include/ecs/components/sprite_renderer.hpp

@@ -1,6 +1,5 @@
 #pragma once
 
-
 #include <glm/glm.hpp>
 #include <utility>
 

modules/ecs/include/ecs/components/tag.hpp

@@ -1,6 +1,5 @@
 #pragma once
 
-
 #include <utility>
 
 namespace lt {

modules/ecs/include/ecs/components/transform.hpp

@@ -2,7 +2,6 @@
 
 #define GLM_ENABLE_EXPERIMENTAL
 
-
 #include <glm/glm.hpp>
 #include <glm/gtc/matrix_transform.hpp>
 #include <glm/gtx/transform.hpp>

modules/ecs/include/ecs/components/uuid.hpp

@@ -1,7 +1,6 @@
 #pragma once
 
-
-#include <engine/core/uuid.hpp>
+#include <ecs/uuid.hpp>
 
 namespace lt {
 

modules/ecs/include/ecs/entity.hpp

@@ -1,8 +1,7 @@
 #pragma once
 
-
-#include <engine/scene/components/uuid.hpp>
-#include <engine/scene/scene.hpp>
+#include <ecs/components/uuid.hpp>
+#include <ecs/scene.hpp>
 #include <entt/entt.hpp>
 
 namespace lt {

modules/ecs/include/ecs/scene.hpp

@@ -1,8 +1,7 @@
 #pragma once
 
-
-#include <engine/core/uuid.hpp>
-#include <engine/scene/components/transform.hpp>
+#include <ecs/components/transform.hpp>
+#include <ecs/uuid.hpp>
 #include <entt/entt.hpp>
 #include <glm/glm.hpp>
 

modules/ecs/src/entity.cpp

@@ -1,5 +1,5 @@
-#include <engine/scene/entity.hpp>
-#include <engine/scene/scene.hpp>
+#include <ecs/entity.hpp>
+#include <ecs/scene.hpp>
 
 namespace lt {
 

modules/ecs/src/scene.cpp

@@ -1,7 +1,7 @@
 #include <camera/component.hpp>
-#include <engine/scene/components.hpp>
-#include <engine/scene/entity.hpp>
-#include <engine/scene/scene.hpp>
+#include <ecs/components.hpp>
+#include <ecs/entity.hpp>
+#include <ecs/scene.hpp>
 #include <glm/glm.hpp>
 #include <renderer/renderer.hpp>
 

modules/ecs/src/uuid.cpp

@@ -1,4 +1,4 @@
-#include <engine/core/uuid.hpp>
+#include <ecs/uuid.hpp>
 
 namespace lt {
 

modules/engine/CMakeLists.txt

@@ -1,28 +1,22 @@
 if(NOT WIN32)
     add_library_module(engine 
         core/application.cpp
-        core/uuid.cpp
         debug/exceptions.cpp
         debug/instrumentor.cpp
         layer/layer.cpp
         layer/layer_stack.cpp
         os/linux/l_window.cpp
-        scene/entity.cpp
-        scene/scene.cpp
         time/timer.cpp
         utils/serializer.cpp
     )
 else()
     add_library_module(engine 
         core/application.cpp
-        core/uuid.cpp
         debug/exceptions.cpp
         debug/instrumentor.cpp
         layer/layer.cpp
         layer/layer_stack.cpp
         os/windows/w_window.cpp
-        scene/entity.cpp
-        scene/scene.cpp
         time/timer.cpp
         utils/serializer.cpp
     )
@@ -41,4 +35,5 @@ target_link_libraries(
   PUBLIC yaml-cpp::yaml-cpp
   PUBLIC EnTT::EnTT
   PUBLIC lt_debug 
+  PUBLIC ecs 
 )

modules/engine/include/engine/engine.hpp

@@ -26,11 +26,6 @@
 // third party
 #include <imgui.h>
 
-// scene
-#include <engine/scene/components.hpp>
-#include <engine/scene/entity.hpp>
-#include <engine/scene/scene.hpp>
-
 // entry point
 #ifdef LIGHT_ENTRY_POINT
 	#include <engine/core/entrypoint.hpp>

modules/engine/include/engine/scene/components.hpp

@@ -1,6 +0,0 @@
-#pragma once
-
-#include <engine/scene/components/native_script.hpp>
-#include <engine/scene/components/sprite_renderer.hpp>
-#include <engine/scene/components/tag.hpp>
-#include <engine/scene/components/transform.hpp>

modules/engine/include/engine/utils/serializer.hpp

@@ -1,8 +1,8 @@
 #pragma once
 
 
-#include <engine/scene/entity.hpp>
-#include <engine/scene/scene.hpp>
+#include <ecs/entity.hpp>
+#include <ecs/scene.hpp>
 #include <yaml-cpp/yaml.h>
 
 namespace lt {

modules/engine/src/utils/serializer.cpp

@@ -1,6 +1,6 @@
 #include <asset_manager/asset_manager.hpp>
 #include <camera/component.hpp>
-#include <engine/scene/components.hpp>
+#include <ecs/components.hpp>
 #include <engine/utils/serializer.hpp>
 #include <renderer/texture.hpp>
 

modules/mirror/include/mirror/editor_layer.hpp

@@ -8,6 +8,8 @@
 
 namespace lt {
 
+class Scene;
+
 class EditorLayer: public Layer
 {
 public:

modules/mirror/include/mirror/panel/asset_browser.hpp

@@ -6,6 +6,8 @@
 
 namespace lt {
 
+class Scene;
+
 class AssetBrowserPanel: public Panel
 {
 public:

modules/mirror/include/mirror/panel/properties.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <engine/scene/entity.hpp>
+#include <ecs/entity.hpp>
 #include <mirror/panel/panel.hpp>
 
 namespace lt {

modules/mirror/include/mirror/panel/scene_hierarchy.hpp

@@ -1,8 +1,8 @@
 #pragma once
 
 
-#include <engine/scene/entity.hpp>
-#include <engine/scene/scene.hpp>
+#include <ecs/entity.hpp>
+#include <ecs/scene.hpp>
 #include <mirror/panel/panel.hpp>
 
 namespace lt {

modules/mirror/src/editor_layer.cpp

@@ -1,5 +1,7 @@
 #include <asset_manager/asset_manager.hpp>
 #include <camera/component.hpp>
+#include <ecs/components.hpp>
+#include <ecs/scene.hpp>
 #include <engine/utils/serializer.hpp>
 #include <input/key_codes.hpp>
 #include <mirror/editor_layer.hpp>

modules/mirror/src/panel/asset_browser.cpp

@@ -1,4 +1,5 @@
 #include <asset_manager/asset_manager.hpp>
+#include <ecs/scene.hpp>
 #include <engine/engine.hpp>
 #include <engine/utils/serializer.hpp>
 #include <imgui.h>

modules/mirror/src/panel/properties.cpp

@@ -1,6 +1,6 @@
 #include <asset_manager/asset_manager.hpp>
 #include <camera/component.hpp>
-#include <engine/scene/components.hpp>
+#include <ecs/components.hpp>
 #include <glm/glm.hpp>
 #include <glm/gtc/type_ptr.hpp>
 #include <imgui.h>

modules/mirror/src/panel/scene_hierarchy.cpp

@@ -1,4 +1,4 @@
-#include <engine/scene/components.hpp>
+#include <ecs/components.hpp>
 #include <entt/entt.hpp>
 #include <imgui.h>
 #include <mirror/panel/properties.hpp>

modules/renderer/CMakeLists.txt

@@ -5,12 +5,12 @@ add_library_module(renderer
     graphics_context.cpp
     render_command.cpp
     renderer.cpp
-    renderer_programs/quad.cpp
-    renderer_programs/texture.cpp
-    renderer_programs/tinted_texture.cpp
     shader.cpp
     texture.cpp
     vertex_layout.cpp
+    programs/quad.cpp
+    programs/texture.cpp
+    programs/tinted_texture.cpp
     gl/blender.cpp
     gl/buffers.cpp
     gl/framebuffers.cpp

modules/renderer/include/renderer/programs/quad.hpp

@@ -1,7 +1,7 @@
 #pragma once
 
 #include <glm/glm.hpp>
-#include <renderer/renderer_programs/renderer_program.hpp>
+#include <renderer/programs/renderer_program.hpp>
 
 namespace lt {
 

modules/renderer/include/renderer/programs/texture.hpp

@@ -1,7 +1,7 @@
 #pragma once
 
 #include <glm/glm.hpp>
-#include <renderer/renderer_programs/renderer_program.hpp>
+#include <renderer/programs/renderer_program.hpp>
 
 namespace lt {
 

modules/renderer/include/renderer/programs/tinted_texture.hpp

@@ -1,7 +1,7 @@
 #pragma once
 
 #include <glm/glm.hpp>
-#include <renderer/renderer_programs/renderer_program.hpp>
+#include <renderer/programs/renderer_program.hpp>
 
 namespace lt {
 

modules/renderer/include/renderer/renderer.hpp

@@ -7,9 +7,9 @@
 #include <renderer/renderer.hpp>
 ///
 
-#include <renderer/renderer_programs/quad.hpp>
-#include <renderer/renderer_programs/texture.hpp>
-#include <renderer/renderer_programs/tinted_texture.hpp>
+#include <renderer/programs/quad.hpp>
+#include <renderer/programs/texture.hpp>
+#include <renderer/programs/tinted_texture.hpp>
 #include <utility>
 
 #define LT_MAX_QUAD_RENDERER_VERTICES           (1028u * 4u)

modules/renderer/src/programs/quad.cpp

@@ -1,6 +1,6 @@
 #include <camera/camera.hpp>
 #include <renderer/buffers.hpp>
-#include <renderer/renderer_programs/quad.hpp>
+#include <renderer/programs/quad.hpp>
 #include <renderer/shader.hpp>
 #include <renderer/vertex_layout.hpp>
 

modules/renderer/src/programs/texture.cpp

@@ -1,6 +1,6 @@
 #include <camera/camera.hpp>
 #include <renderer/buffers.hpp>
-#include <renderer/renderer_programs/texture.hpp>
+#include <renderer/programs/texture.hpp>
 #include <renderer/shader.hpp>
 #include <renderer/vertex_layout.hpp>
 

modules/renderer/src/programs/tinted_texture.cpp

@@ -1,6 +1,6 @@
 #include <camera/camera.hpp>
 #include <renderer/buffers.hpp>
-#include <renderer/renderer_programs/tinted_texture.hpp>
+#include <renderer/programs/tinted_texture.hpp>
 #include <renderer/shader.hpp>
 #include <renderer/vertex_layout.hpp>