Merge pull request #14 from fszewczyk/ecs

Entity Component System, Rendering and Asset Management

.gitignore

@@ -6,3 +6,4 @@ resources/*.py
 *.clang-format
 *.ini
 *.vscode
+.DS_Store

.gitmodules

@@ -16,3 +16,6 @@
 	path = extern/pybind11
 	url = ../../pybind/pybind11
 	branch = stable
+[submodule "extern/tinyobjloader"]
+	path = extern/tinyobjloader
+	url = git@github.com:tinyobjloader/tinyobjloader.git

CMakeLists.txt

@@ -19,121 +19,33 @@ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
 
-find_package(PythonLibs REQUIRED)
+find_package (Python3 COMPONENTS Interpreter Development)
 include_directories(${PYTHON_INCLUDE_DIRS})
 
 include(${CMAKE_CURRENT_SOURCE_DIR}/extern/extern.cmake)
 
-add_library(
-    ui
-    src/ui/UI.cpp
-    src/ui/Widget.cpp
-    src/ui/UIComponent.cpp
-
-    src/ui/widgets/PreviewWidget.cpp
-    src/ui/widgets/ObjectsWidget.cpp
-    src/ui/widgets/ConsoleWidget.cpp
-    src/ui/widgets/PropertiesWidget.cpp
-    src/ui/widgets/FilesystemWidget.cpp
-    src/ui/widgets/SceneWidget.cpp
-
-    src/ui/components/TransformUIComponent.cpp
-    src/ui/components/ScriptUIComponent.cpp
-    src/ui/components/shapes/ShapeUIComponent.cpp
-    src/ui/components/shapes/ShapeCircleUIComponent.cpp
-    src/ui/components/shapes/ShapeRectangleUIComponent.cpp
-    src/ui/components/shapes/ShapeLineUIComponent.cpp
-)
-
-add_library(
-    core
-    src/core/Entity.cpp
-    src/core/Image.cpp
-    src/core/Filesystem.cpp
-    src/core/UUID.cpp
-)
-
-
-add_library(
-    game
-    src/game/Game.cpp
-    src/game/GameObject.cpp
-    src/game/Component.cpp
-
-    src/game/components/ScriptComponent.cpp
-    src/game/components/shapes/ShapeComponent.cpp
-    src/game/components/shapes/ShapeCircleComponent.cpp
-    src/game/components/shapes/ShapeRectangleComponent.cpp
-    src/game/components/shapes/ShapeLineComponent.cpp
-)
-
-add_library(
-    renderer
-    src/renderer/Renderer.cpp
-)
-
-add_library(
-    python
-    src/python/Interpreter.cpp
-    src/python/Events.cpp
-    src/python/StaticAnalysis.cpp
-)
+add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/src/AssetManager)
+add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/src/Components)
+add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/src/ECS)
+add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/src/Rendering)
+add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/src/Runtime)
+add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/src/UI)
+add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/src/InputManager)
+add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/src/Systems)
 
 add_executable(ShkyeraEngine src/main.cpp)
 
-target_include_directories(ShkyeraEngine PRIVATE src)
-target_include_directories(ui PRIVATE 
-    src
-    ${CMAKE_CURRENT_SOURCE_DIR}/extern/imgui
-    ${CMAKE_CURRENT_SOURCE_DIR}/extern/glfw/include
-)
-target_include_directories(core PRIVATE 
-    src
-    ${CMAKE_CURRENT_SOURCE_DIR}/extern/glm
-    ${CMAKE_CURRENT_SOURCE_DIR}/extern/stbi
-)
-target_include_directories(game PRIVATE 
-    src
-    ${CMAKE_CURRENT_SOURCE_DIR}/extern/glm
-)
-target_include_directories(renderer PRIVATE 
-    src
-)
-target_include_directories(python PRIVATE 
-    src
-    ${CMAKE_CURRENT_SOURCE_DIR}/extern/pybind11/include
-)
+target_include_directories(
+    ShkyeraEngine
+    PUBLIC
 
-target_link_libraries(ShkyeraEngine ui)
-target_link_libraries(ui 
-    imgui
-    glfw 
-    glad
-    game
-    python
-    renderer
-)
-target_link_libraries(game  
-    core
-    python
-    renderer
-)
-target_link_libraries(renderer  
-    glfw 
-    glad
-    glm::glm
-)
-target_link_libraries(core 
-    stb_image
-    glfw 
-    glad
-    glm::glm
-)
-target_link_libraries(python 
-    ${PYTHON_LIBRARIES}
-    pybind11::embed
-    renderer
-    ui
+    ${CMAKE_SOURCE_DIR}/src
 )
 
+target_link_libraries(
+    ShkyeraEngine
+    PUBLIC 
 
+    UI
+    Runtime
+)

extern/buildTinyobjloader.cmake

@@ -0,0 +1 @@
+add_subdirectory(extern/tinyobjloader)

extern/extern.cmake

@@ -6,3 +6,4 @@ include(${CMAKE_CURRENT_SOURCE_DIR}/extern/buildGlad.cmake)
 include(${CMAKE_CURRENT_SOURCE_DIR}/extern/buildGlm.cmake)
 include(${CMAKE_CURRENT_SOURCE_DIR}/extern/buildStbi.cmake)
 include(${CMAKE_CURRENT_SOURCE_DIR}/extern/buildPybind.cmake)
+include(${CMAKE_CURRENT_SOURCE_DIR}/extern/buildTinyobjloader.cmake)