chore: move core module into its own dedicated directory

.clangd

@@ -1,11 +0,0 @@
-CompileFlags: # Tweak the parse settings, example directory given to show format
-  Add:
-    - "--include-directory=../../src"
-    - "--include-directory=../src"
-    - "--include-directory=./editor_autogen/include"
-    - "--include-directory=../.."
-    - "--include-directory=/usr/include/qt6/QtWidgets"
-    - "--include-directory=/usr/include/qt6/QtOpenGLWidgets"
-    - "--include-directory=/usr/include/qt6"
-    - "--include-directory=/usr/include/qt6/QtGui"
-    - "--include-directory=/usr/include/qt6/QtCore"

.gitignore

@@ -9,4 +9,8 @@ Makefile
 .lupdate/
 *.pro.user*
 CMakeLists.txt.user*
-*_autogen/
+*_autogen/
+
+# Clangd
+/compile_commands.json
+/.cache

CMakeLists.txt

@@ -7,44 +7,8 @@ set( CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin )
 set( CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib )
 set( CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/lib )
 
-SET(BASEPATH "${CMAKE_SOURCE_DIR}")
+set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
-include_directories("${BASEPATH}")
-include_directories("src")
 
-find_package(OpenGL REQUIRED COMPONENTS OpenGL)
+add_subdirectory(core)
-
+add_subdirectory(client)
-find_package(SDL2 REQUIRED)
+add_subdirectory(editor)
-include_directories(${SDL2_INCLUDE_DIRS})
-
-find_package(GLEW REQUIRED)
-include_directories(${GLEW_INCLUDE_DIRS})
-
-find_package(GLUT REQUIRED)
-include_directories(${GLUT_INCLUDE_DIRS})
-
-find_package(glfw3 REQUIRED)
-find_package(OpenGL)
-find_package(glm CONFIG REQUIRED)
-find_package(assimp REQUIRED)
-find_package(ReactPhysics3D REQUIRED)
-find_package(pugixml REQUIRED)
-
-# PkgConfig packages
-# find_package(PkgConfig REQUIRED)
-# pkg_check_modules(PUGIXML REQUIRED pugixml)
-
-file(MAKE_DIRECTORY bin)
-
-include_directories("include")
-
-file(GLOB_RECURSE SOURCES "src/*.cpp" "src/*.h")
-add_library(openblocks ${SOURCES})
-set_target_properties(openblocks PROPERTIES OUTPUT_NAME "openblocks")
-target_link_libraries(openblocks ${SDL2_LIBRARIES} ${GLEW_LIBRARIES} ${GLUT_LIBRARIES} ${PUGIXML_LIBRARIES} OpenGL::GL OpenGL::GLU glfw glm::glm assimp ReactPhysics3D::ReactPhysics3D pugixml::pugixml)
-
-# add_executable(client "client/src/main.cpp" $<TARGET_OBJECTS:openblocks>)
-# include_directories("src")
-# target_link_libraries(client ${SDL2_LIBRARIES} ${GLEW_LIBRARIES} ${GLUT_LIBRARIES} OpenGL::GL OpenGL::GLU glfw glm::glm assimp ReactPhysics3D::ReactPhysics3D)
-
-add_subdirectory("client")
-add_subdirectory("editor")

client/CMakeLists.txt

@@ -1,4 +1,4 @@
+find_package(glfw3 REQUIRED)
 
-add_executable(client "src/main.cpp" $<TARGET_OBJECTS:openblocks>)
+add_executable(client "src/main.cpp")
-include_directories("../src")
+target_link_libraries(client PRIVATE openblocks glfw)
-target_link_libraries(client ${SDL2_LIBRARIES} ${GLEW_LIBRARIES} ${GLUT_LIBRARIES} OpenGL::GL OpenGL::GLU glfw glm::glm assimp ReactPhysics3D::ReactPhysics3D pugixml::pugixml)

core/CMakeLists.txt

@@ -0,0 +1,24 @@
+find_package(OpenGL REQUIRED COMPONENTS OpenGL)
+
+find_package(SDL2 REQUIRED)
+include_directories(${SDL2_INCLUDE_DIRS})
+
+find_package(GLEW REQUIRED)
+include_directories(${GLEW_INCLUDE_DIRS})
+
+find_package(GLUT REQUIRED)
+include_directories(${GLUT_INCLUDE_DIRS})
+
+find_package(OpenGL)
+find_package(glm CONFIG REQUIRED)
+# find_package(assimp REQUIRED)
+find_package(ReactPhysics3D REQUIRED)
+find_package(pugixml REQUIRED)
+
+file(MAKE_DIRECTORY bin)
+
+file(GLOB_RECURSE SOURCES "src/*.cpp" "src/*.h")
+add_library(openblocks ${SOURCES})
+set_target_properties(openblocks PROPERTIES OUTPUT_NAME "openblocks")
+target_link_libraries(openblocks ${SDL2_LIBRARIES} ${GLEW_LIBRARIES} ${GLUT_LIBRARIES} OpenGL::GL OpenGL::GLU ReactPhysics3D::ReactPhysics3D pugixml::pugixml)
+target_include_directories(openblocks PUBLIC "src" "../include")

core/src/objects/base/instance.h

@@ -10,7 +10,8 @@
 #include <variant>
 #include <map>
 #include <vector>
-#include <../include/expected.hpp>
+// #include <../../include/expected.hpp>
+#include <expected.hpp>
 #include <pugixml.hpp>
 
 #include "member.h"

editor/CMakeLists.txt

@@ -14,8 +14,6 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON)
 find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Widgets LinguistTools)
 find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Widgets LinguistTools)
 
-include_directories("../src")
-
 set(TS_FILES editor_en_US.ts)
 
 set(PROJECT_SOURCES
@@ -40,7 +38,6 @@ if(${QT_VERSION_MAJOR} GREATER_EQUAL 6)
     qt_add_executable(editor
         MANUAL_FINALIZATION
         ${PROJECT_SOURCES}
-        $<TARGET_OBJECTS:openblocks>
     )
 # Define target properties for Android with Qt 6 as:
 #    set_property(TARGET editor APPEND PROPERTY QT_ANDROID_PACKAGE_SOURCE_DIR
@@ -59,14 +56,14 @@ else()
         add_executable(editor
             ${PROJECT_SOURCES}
             mainglwidget.h mainglwidget.cpp
-            $<TARGET_OBJECTS:openblocks>
         )
     endif()
 
     qt5_create_translation(QM_FILES ${CMAKE_SOURCE_DIR} ${TS_FILES})
 endif()
 
-target_link_libraries(editor PRIVATE Qt${QT_VERSION_MAJOR}::Widgets ${SDL2_LIBRARIES} ${GLEW_LIBRARIES} ${GLUT_LIBRARIES} OpenGL::GL OpenGL::GLU glfw glm::glm assimp ReactPhysics3D::ReactPhysics3D pugixml::pugixml)
+target_include_directories(editor PUBLIC "../core/src" "../include")
+target_link_libraries(editor PRIVATE openblocks Qt${QT_VERSION_MAJOR}::Widgets)
 
 # Qt for iOS sets MACOSX_BUNDLE_GUI_IDENTIFIER automatically since Qt 6.1.
 # If you are developing for iOS or macOS you should consider setting an