From f4902fda5d7d7b888eae8e135c309692d1e55781 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=9F=D0=B5=D1=87=D0=B5=D0=BD=D0=B8=D0=BD=20=D0=94=D0=B0?=
 =?UTF-8?q?=D0=BD=D0=B8=D0=BB=D0=B0=20=D0=9C=D0=B8=D1=85=D0=B0=D0=B9=D0=BB?=
 =?UTF-8?q?=D0=BE=D0=B2=D0=B8=D1=87?= <dmpechenin@edu.hse.ru>
Date: Sun, 9 Mar 2025 00:00:39 +0300
Subject: [PATCH] Refactoring of the directories

---
 .../{States/GameState => BasicAbstractions}/IPreparable.h   | 0
 source/States/GameState/{ => Context}/ContextManager.cpp    | 2 +-
 source/States/GameState/{ => Context}/ContextManager.h      | 2 +-
 source/States/GameState/{ => Context}/GameContext.cpp       | 2 +-
 source/States/GameState/{ => Context}/GameContext.h         | 6 +++---
 .../Entities/{ => DynamicEntities}/DynamicEntities.cpp      | 2 +-
 .../Entities/{ => DynamicEntities}/DynamicEntities.h        | 0
 source/States/GameState/Entities/IEntity.h                  | 4 ++--
 source/States/GameState/Entities/{ => Pacman}/Pacman.cpp    | 2 +-
 source/States/GameState/Entities/{ => Pacman}/Pacman.h      | 0
 .../Entities/{ => StaticEntities}/StaticEntities.cpp        | 2 +-
 .../Entities/{ => StaticEntities}/StaticEntities.h          | 0
 source/States/GameState/GameState.h                         | 2 +-
 source/States/GameState/Maze/Maze.h                         | 2 +-
 source/States/GameState/Maze/{ => Room}/Room.cpp            | 2 +-
 source/States/GameState/Maze/{ => Room}/Room.h              | 4 ++--
 .../States/GameState/Maze/{ => Room/RoomSide}/RoomSide.cpp  | 0
 source/States/GameState/Maze/{ => Room/RoomSide}/RoomSide.h | 2 +-
 18 files changed, 17 insertions(+), 17 deletions(-)
 rename source/{States/GameState => BasicAbstractions}/IPreparable.h (100%)
 rename source/States/GameState/{ => Context}/ContextManager.cpp (89%)
 rename source/States/GameState/{ => Context}/ContextManager.h (86%)
 rename source/States/GameState/{ => Context}/GameContext.cpp (88%)
 rename source/States/GameState/{ => Context}/GameContext.h (59%)
 rename source/States/GameState/Entities/{ => DynamicEntities}/DynamicEntities.cpp (92%)
 rename source/States/GameState/Entities/{ => DynamicEntities}/DynamicEntities.h (100%)
 rename source/States/GameState/Entities/{ => Pacman}/Pacman.cpp (90%)
 rename source/States/GameState/Entities/{ => Pacman}/Pacman.h (100%)
 rename source/States/GameState/Entities/{ => StaticEntities}/StaticEntities.cpp (87%)
 rename source/States/GameState/Entities/{ => StaticEntities}/StaticEntities.h (100%)
 rename source/States/GameState/Maze/{ => Room}/Room.cpp (94%)
 rename source/States/GameState/Maze/{ => Room}/Room.h (89%)
 rename source/States/GameState/Maze/{ => Room/RoomSide}/RoomSide.cpp (100%)
 rename source/States/GameState/Maze/{ => Room/RoomSide}/RoomSide.h (94%)

diff --git a/source/States/GameState/IPreparable.h b/source/BasicAbstractions/IPreparable.h
similarity index 100%
rename from source/States/GameState/IPreparable.h
rename to source/BasicAbstractions/IPreparable.h
diff --git a/source/States/GameState/ContextManager.cpp b/source/States/GameState/Context/ContextManager.cpp
similarity index 89%
rename from source/States/GameState/ContextManager.cpp
rename to source/States/GameState/Context/ContextManager.cpp
index cbd7f8a..28ba4eb 100644
--- a/source/States/GameState/ContextManager.cpp
+++ b/source/States/GameState/Context/ContextManager.cpp
@@ -1,4 +1,4 @@
-#include <States/GameState/ContextManager.h>
+#include <States/GameState/Context/ContextManager.h>
 
 void ContextManager::reset(GameContext&& context) {
     while (!m_contexts.empty())
diff --git a/source/States/GameState/ContextManager.h b/source/States/GameState/Context/ContextManager.h
similarity index 86%
rename from source/States/GameState/ContextManager.h
rename to source/States/GameState/Context/ContextManager.h
index 8c0adc9..9c84bc3 100644
--- a/source/States/GameState/ContextManager.h
+++ b/source/States/GameState/Context/ContextManager.h
@@ -1,5 +1,5 @@
 #pragma once
-#include <States/GameState/GameContext.h>
+#include <States/GameState/Context/GameContext.h>
 #include <stack>
 
 class ContextManager {
diff --git a/source/States/GameState/GameContext.cpp b/source/States/GameState/Context/GameContext.cpp
similarity index 88%
rename from source/States/GameState/GameContext.cpp
rename to source/States/GameState/Context/GameContext.cpp
index e6aac1a..db0c2c1 100644
--- a/source/States/GameState/GameContext.cpp
+++ b/source/States/GameState/Context/GameContext.cpp
@@ -1,4 +1,4 @@
-#include <States/GameState/GameContext.h>
+#include <States/GameState/Context/GameContext.h>
 
 GameContext GameContext::clone() const {
     GameContext new_game_context;
diff --git a/source/States/GameState/GameContext.h b/source/States/GameState/Context/GameContext.h
similarity index 59%
rename from source/States/GameState/GameContext.h
rename to source/States/GameState/Context/GameContext.h
index 8c295d2..81b3bdc 100644
--- a/source/States/GameState/GameContext.h
+++ b/source/States/GameState/Context/GameContext.h
@@ -1,7 +1,7 @@
 #pragma once
-#include <States/GameState/Entities/Pacman.h>
-#include <States/GameState/Entities/StaticEntities.h>
-#include <States/GameState/Entities/DynamicEntities.h>
+#include <States/GameState/Entities/Pacman/Pacman.h>
+#include <States/GameState/Entities/StaticEntities/StaticEntities.h>
+#include <States/GameState/Entities/DynamicEntities/DynamicEntities.h>
 
 struct GameContext {
     [[nodiscard]] GameContext clone() const;
diff --git a/source/States/GameState/Entities/DynamicEntities.cpp b/source/States/GameState/Entities/DynamicEntities/DynamicEntities.cpp
similarity index 92%
rename from source/States/GameState/Entities/DynamicEntities.cpp
rename to source/States/GameState/Entities/DynamicEntities/DynamicEntities.cpp
index 8c4cd83..c2f0ffa 100644
--- a/source/States/GameState/Entities/DynamicEntities.cpp
+++ b/source/States/GameState/Entities/DynamicEntities/DynamicEntities.cpp
@@ -1,5 +1,5 @@
 #include <Configuration.h>
-#include <States/GameState/Entities/DynamicEntities.h>
+#include <States/GameState/Entities/DynamicEntities/DynamicEntities.h>
 
 Enemy::Enemy() : m_rectangle({config::GAME_ENEMY_SIZE, config::GAME_ENEMY_SIZE}) {
     m_rectangle.setFillColor(config::GAME_ENEMY_COLOR);
diff --git a/source/States/GameState/Entities/DynamicEntities.h b/source/States/GameState/Entities/DynamicEntities/DynamicEntities.h
similarity index 100%
rename from source/States/GameState/Entities/DynamicEntities.h
rename to source/States/GameState/Entities/DynamicEntities/DynamicEntities.h
diff --git a/source/States/GameState/Entities/IEntity.h b/source/States/GameState/Entities/IEntity.h
index c8e40f1..51bc31b 100644
--- a/source/States/GameState/Entities/IEntity.h
+++ b/source/States/GameState/Entities/IEntity.h
@@ -1,6 +1,6 @@
 #pragma once
-#include <States/GameState/IPreparable.h>
-#include <States/GameState/Maze/Room.h>
+#include <BasicAbstractions/IPreparable.h>
+#include <States/GameState/Maze/Room/Room.h>
 
 class IEntity : public IPreparable {
 public:
diff --git a/source/States/GameState/Entities/Pacman.cpp b/source/States/GameState/Entities/Pacman/Pacman.cpp
similarity index 90%
rename from source/States/GameState/Entities/Pacman.cpp
rename to source/States/GameState/Entities/Pacman/Pacman.cpp
index e6f04f8..b7b96e0 100644
--- a/source/States/GameState/Entities/Pacman.cpp
+++ b/source/States/GameState/Entities/Pacman/Pacman.cpp
@@ -1,5 +1,5 @@
 #include <Configuration.h>
-#include <States/GameState/Entities/Pacman.h>
+#include <States/GameState/Entities/Pacman/Pacman.h>
 
 Pacman::Pacman() : m_circle{ config::GAME_PACMAN_SIZE } {
     m_circle.setFillColor(config::GAME_COLOR_PACMAN);
diff --git a/source/States/GameState/Entities/Pacman.h b/source/States/GameState/Entities/Pacman/Pacman.h
similarity index 100%
rename from source/States/GameState/Entities/Pacman.h
rename to source/States/GameState/Entities/Pacman/Pacman.h
diff --git a/source/States/GameState/Entities/StaticEntities.cpp b/source/States/GameState/Entities/StaticEntities/StaticEntities.cpp
similarity index 87%
rename from source/States/GameState/Entities/StaticEntities.cpp
rename to source/States/GameState/Entities/StaticEntities/StaticEntities.cpp
index 5e22de1..9d915e6 100644
--- a/source/States/GameState/Entities/StaticEntities.cpp
+++ b/source/States/GameState/Entities/StaticEntities/StaticEntities.cpp
@@ -1,4 +1,4 @@
-#include <States/GameState/Entities/StaticEntities.h>
+#include <States/GameState/Entities/StaticEntities/StaticEntities.h>
 #include <Configuration.h>
 
 Food::Food() : m_circle(config::GAME_FOOD_SIZE, 6) {
diff --git a/source/States/GameState/Entities/StaticEntities.h b/source/States/GameState/Entities/StaticEntities/StaticEntities.h
similarity index 100%
rename from source/States/GameState/Entities/StaticEntities.h
rename to source/States/GameState/Entities/StaticEntities/StaticEntities.h
diff --git a/source/States/GameState/GameState.h b/source/States/GameState/GameState.h
index 21be148..63d49f6 100644
--- a/source/States/GameState/GameState.h
+++ b/source/States/GameState/GameState.h
@@ -2,7 +2,7 @@
 #include <BasicAbstractions/IState.h>
 #include <BasicAbstractions/IWindowKeeper.h>
 #include <States/GameState/Maze/Maze.h>
-#include <States/GameState/ContextManager.h>
+#include <States/GameState/Context/ContextManager.h>
 
 class GameState : public IState, public IWindowKeeper {
 public:
diff --git a/source/States/GameState/Maze/Maze.h b/source/States/GameState/Maze/Maze.h
index db98cae..ee99379 100644
--- a/source/States/GameState/Maze/Maze.h
+++ b/source/States/GameState/Maze/Maze.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <States/GameState/Maze/Room.h>
+#include <States/GameState/Maze/Room/Room.h>
 
 #include <vector>
 
diff --git a/source/States/GameState/Maze/Room.cpp b/source/States/GameState/Maze/Room/Room.cpp
similarity index 94%
rename from source/States/GameState/Maze/Room.cpp
rename to source/States/GameState/Maze/Room/Room.cpp
index aa62c09..ea3b4a7 100644
--- a/source/States/GameState/Maze/Room.cpp
+++ b/source/States/GameState/Maze/Room/Room.cpp
@@ -1,4 +1,4 @@
-#include <States/GameState/Maze/Room.h>
+#include <States/GameState/Maze/Room/Room.h>
 
 Room::Room(float size) : m_rectangle({size, size}) {
     m_rectangle.setOrigin(size/2, size/2);
diff --git a/source/States/GameState/Maze/Room.h b/source/States/GameState/Maze/Room/Room.h
similarity index 89%
rename from source/States/GameState/Maze/Room.h
rename to source/States/GameState/Maze/Room/Room.h
index 87f10b0..2825cb2 100644
--- a/source/States/GameState/Maze/Room.h
+++ b/source/States/GameState/Maze/Room/Room.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <States/GameState/IPreparable.h>
-#include <States/GameState/Maze/RoomSide.h>
+#include <BasicAbstractions/IPreparable.h>
+#include <States/GameState/Maze/Room/RoomSide/RoomSide.h>
 
 #include <array>
 
diff --git a/source/States/GameState/Maze/RoomSide.cpp b/source/States/GameState/Maze/Room/RoomSide/RoomSide.cpp
similarity index 100%
rename from source/States/GameState/Maze/RoomSide.cpp
rename to source/States/GameState/Maze/Room/RoomSide/RoomSide.cpp
diff --git a/source/States/GameState/Maze/RoomSide.h b/source/States/GameState/Maze/Room/RoomSide/RoomSide.h
similarity index 94%
rename from source/States/GameState/Maze/RoomSide.h
rename to source/States/GameState/Maze/Room/RoomSide/RoomSide.h
index f730f21..411fc35 100644
--- a/source/States/GameState/Maze/RoomSide.h
+++ b/source/States/GameState/Maze/Room/RoomSide/RoomSide.h
@@ -1,5 +1,5 @@
 #pragma once
-#include <States/GameState/IPreparable.h>
+#include <BasicAbstractions/IPreparable.h>
 
 class IEntity;
 class Room;
-- 
GitLab