Clean Up Folder Structure

CMakeLists.txt

@@ -23,8 +23,8 @@ FetchContent_MakeAvailable(highfive)
 
 # Quellen sammeln
 file(GLOB_RECURSE ADVANCED_WARS_SOURCES
-        "${PROJECT_SOURCE_DIR}/src/*.cpp"
-        "${PROJECT_SOURCE_DIR}/src/*.hpp"
+        "${PROJECT_SOURCE_DIR}/src/game/*.cpp"
+        "${PROJECT_SOURCE_DIR}/src/game/*.hpp"
 )
 
 # C++ Standard festlegen
@@ -109,10 +109,23 @@ else()
 endif()
 
 # leveleditor
-add_subdirectory(leveleditor)
+# Find Qt
+find_package(Qt6 REQUIRED COMPONENTS Widgets)
+
+file(GLOB_RECURSE LEVELEDITOR_SOURCES
+        "${PROJECT_SOURCE_DIR}/src/editor/*.cpp"
+        "${PROJECT_SOURCE_DIR}/src/editor/*.hpp"
+)
+
+# Add executable
+add_executable(editor ${LEVELEDITOR_SOURCES})
+
+# Link Qt libraries
+target_link_libraries(editor PRIVATE Qt6::Widgets)
+
 
 # writelevel
-add_executable(writelevel ${PROJECT_SOURCE_DIR}/writelevel.cpp)
+add_executable(writelevel ${PROJECT_SOURCE_DIR}/src/util/writelevel.cpp)
 target_include_directories(writelevel
     PRIVATE 
         ${highfive_SOURCE_DIR}/include

leveleditor/CMakeLists.txt

-# Find Qt
-find_package(Qt6 REQUIRED COMPONENTS Widgets)
-
-file(GLOB_RECURSE LEVELEDITOR_SOURCES
-        "${PROJECT_SOURCE_DIR}/leveleditor/src/*.cpp"
-        "${PROJECT_SOURCE_DIR}/leveleditor/src/*.hpp"
-)
-
-# Add executable
-add_executable(editor ${LEVELEDITOR_SOURCES})
-
-# Link Qt libraries
-target_link_libraries(editor PRIVATE Qt6::Widgets)
-
-
-

leveleditor/src/MainWindow.cpp → src/editor/MainWindow.cpp

@@ -12,7 +12,7 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent) {
 
     QGraphicsScene* scene = new QGraphicsScene(this);
     scene->setSceneRect(0, 0, 400, 400); // Set the scene dimensions
-    SpriteProvider tileprovider = SpriteProvider::from_spritesheet("spritesheet.h5");
+    SpriteProvider tileprovider = SpriteProvider::from_spritesheet("../res/spritesheet.h5");
     QPixmap pixmap = tileprovider.get_sprite(0);
     QGraphicsPixmapItem* pixmapitem = scene->addPixmap(pixmap);
 

src/main.cpp → src/game/main.cpp

@@ -97,7 +97,7 @@ int main() {
 
   engine.set_scene(level);
 
-  Spritesheet spritesheet("/media/data/rust/sprite-extractor/spritesheet.h5",
+  Spritesheet spritesheet("../res/spritesheet.h5",
                           engine);
 
   engine.set_spritesheet(spritesheet);