From ea1986c8f220bc8063f59a49aefff9e85d11b298 Mon Sep 17 00:00:00 2001 From: Patricia Aas Date: Fri, 27 Nov 2020 15:09:41 +0100 Subject: [PATCH] Move files into their own directory --- CMakeLists.txt | 6 +++--- pacman/CMakeLists.txt | 1 + {assets => pacman/assets}/maze.png | Bin {assets => pacman/assets}/sprites32.png | Bin conanfile.py => pacman/conanfile.py | 0 {src => pacman/src}/Board.cpp | 0 {src => pacman/src}/Board.h | 0 {src => pacman/src}/CMakeLists.txt | 4 ++-- {src => pacman/src}/Direction.h | 0 {src => pacman/src}/Game.cpp | 0 {src => pacman/src}/Game.h | 0 {src => pacman/src}/GameWindow.cpp | 4 ++-- {src => pacman/src}/GameWindow.h | 0 {src => pacman/src}/InputState.cpp | 0 {src => pacman/src}/InputState.h | 0 {src => pacman/src}/PacMan.cpp | 0 {src => pacman/src}/PacMan.h | 0 {src => pacman/src}/Position.h | 0 {src => pacman/src}/main.cpp | 0 19 files changed, 8 insertions(+), 7 deletions(-) create mode 100644 pacman/CMakeLists.txt rename {assets => pacman/assets}/maze.png (100%) rename {assets => pacman/assets}/sprites32.png (100%) rename conanfile.py => pacman/conanfile.py (100%) rename {src => pacman/src}/Board.cpp (100%) rename {src => pacman/src}/Board.h (100%) rename {src => pacman/src}/CMakeLists.txt (78%) rename {src => pacman/src}/Direction.h (100%) rename {src => pacman/src}/Game.cpp (100%) rename {src => pacman/src}/Game.h (100%) rename {src => pacman/src}/GameWindow.cpp (96%) rename {src => pacman/src}/GameWindow.h (100%) rename {src => pacman/src}/InputState.cpp (100%) rename {src => pacman/src}/InputState.h (100%) rename {src => pacman/src}/PacMan.cpp (100%) rename {src => pacman/src}/PacMan.h (100%) rename {src => pacman/src}/Position.h (100%) rename {src => pacman/src}/main.cpp (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index e40cffe..ab2bc0b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.17) -project(pacman) +project(modern_cpp_exercises ) set(CMAKE_CXX_STANDARD 20) @@ -10,5 +10,5 @@ if (NOT EXISTS "${CMAKE_BINARY_DIR}/conan.cmake") "${CMAKE_BINARY_DIR}/conan.cmake") endif () -set(CMAKE_MODULE_PATH ${CMAKE_BINARY_DIR}/src) -add_subdirectory(src) +set(CMAKE_MODULE_PATH ${CMAKE_BINARY_DIR}/pacman/src) +add_subdirectory(pacman) diff --git a/pacman/CMakeLists.txt b/pacman/CMakeLists.txt new file mode 100644 index 0000000..130b119 --- /dev/null +++ b/pacman/CMakeLists.txt @@ -0,0 +1 @@ +add_subdirectory(src) \ No newline at end of file diff --git a/assets/maze.png b/pacman/assets/maze.png similarity index 100% rename from assets/maze.png rename to pacman/assets/maze.png diff --git a/assets/sprites32.png b/pacman/assets/sprites32.png similarity index 100% rename from assets/sprites32.png rename to pacman/assets/sprites32.png diff --git a/conanfile.py b/pacman/conanfile.py similarity index 100% rename from conanfile.py rename to pacman/conanfile.py diff --git a/src/Board.cpp b/pacman/src/Board.cpp similarity index 100% rename from src/Board.cpp rename to pacman/src/Board.cpp diff --git a/src/Board.h b/pacman/src/Board.h similarity index 100% rename from src/Board.h rename to pacman/src/Board.h diff --git a/src/CMakeLists.txt b/pacman/src/CMakeLists.txt similarity index 78% rename from src/CMakeLists.txt rename to pacman/src/CMakeLists.txt index e8949bd..8405220 100644 --- a/src/CMakeLists.txt +++ b/pacman/src/CMakeLists.txt @@ -8,5 +8,5 @@ find_package(sdl2_image REQUIRED) include_directories(${sdl2_INCLUDE_DIRS} ${sdl2_image_INCLUDE_DIRS}) file(GLOB_RECURSE sources CONFIGURE_DEPENDS "*.cpp") -add_executable(${PROJECT_NAME} ${sources}) -target_link_libraries(${PROJECT_NAME} sdl2::sdl2 sdl2_image::sdl2_image) \ No newline at end of file +add_executable(PacMan ${sources}) +target_link_libraries(PacMan sdl2::sdl2 sdl2_image::sdl2_image) \ No newline at end of file diff --git a/src/Direction.h b/pacman/src/Direction.h similarity index 100% rename from src/Direction.h rename to pacman/src/Direction.h diff --git a/src/Game.cpp b/pacman/src/Game.cpp similarity index 100% rename from src/Game.cpp rename to pacman/src/Game.cpp diff --git a/src/Game.h b/pacman/src/Game.h similarity index 100% rename from src/Game.h rename to pacman/src/Game.h diff --git a/src/GameWindow.cpp b/pacman/src/GameWindow.cpp similarity index 96% rename from src/GameWindow.cpp rename to pacman/src/GameWindow.cpp index e551f15..c99708b 100644 --- a/src/GameWindow.cpp +++ b/pacman/src/GameWindow.cpp @@ -12,8 +12,8 @@ GameWindow::GameWindow(int width, int height) { auto sdl_renderer = createRenderer(sdl_window); createWindowSurface(sdl_window); setDrawColor(sdl_renderer); - maze_texture = loadTexture(sdl_renderer, "../../../assets/maze.png"); - sprite_texture = loadTexture(sdl_renderer, "../../../assets/sprites32.png"); + maze_texture = loadTexture(sdl_renderer, "../../../../pacman/assets/maze.png"); + sprite_texture = loadTexture(sdl_renderer, "../../../../pacman/assets/sprites32.png"); } void GameWindow::update(const PacMan & pacMan, Board board) { diff --git a/src/GameWindow.h b/pacman/src/GameWindow.h similarity index 100% rename from src/GameWindow.h rename to pacman/src/GameWindow.h diff --git a/src/InputState.cpp b/pacman/src/InputState.cpp similarity index 100% rename from src/InputState.cpp rename to pacman/src/InputState.cpp diff --git a/src/InputState.h b/pacman/src/InputState.h similarity index 100% rename from src/InputState.h rename to pacman/src/InputState.h diff --git a/src/PacMan.cpp b/pacman/src/PacMan.cpp similarity index 100% rename from src/PacMan.cpp rename to pacman/src/PacMan.cpp diff --git a/src/PacMan.h b/pacman/src/PacMan.h similarity index 100% rename from src/PacMan.h rename to pacman/src/PacMan.h diff --git a/src/Position.h b/pacman/src/Position.h similarity index 100% rename from src/Position.h rename to pacman/src/Position.h diff --git a/src/main.cpp b/pacman/src/main.cpp similarity index 100% rename from src/main.cpp rename to pacman/src/main.cpp