feat: GampLoop 함수 분리 및 서버 메세지 수신 테스트 로직 추가

Author: leeleeleeleejun

CMakeLists.txt

@@ -24,8 +24,17 @@ add_executable(${PROJECT_NAME} src/main.cpp
         src/GameLogic.cpp
         src/GameLoop.hpp
         src/GameLoop.cpp
+        src/NetworkClient.hpp
+        src/NetworkClient.cpp
+        src/BoardRenderer.hpp
+        src/BoardRenderer.cpp
+        src/GameStateUpdater.hpp
+        src/GameStateUpdater.cpp
+        src/InputHandler.hpp
+        src/InputHandler.cpp
 )
 
+
 # C++ 표준 설정
 target_compile_features(${PROJECT_NAME} PRIVATE cxx_std_20)
 

src/BoardRenderer.cpp

@@ -0,0 +1,111 @@
+#include "BoardRenderer.hpp"
+#include <SFML/Graphics.hpp>
+
+void drawBoardAndUI(
+    sf::RenderWindow& window,
+    sf::RectangleShape& tile,
+    sf::Color& lightColor,
+    sf::Color& darkColor,
+    sf::Color& checkedKingTileColor,
+    std::optional<sf::Vector2i>& selectedPiecePos,
+    std::vector<sf::Vector2i>& possibleMoves,
+    sf::Text& whiteTimerText,
+    sf::Text& blackTimerText,
+    sf::Text& messageText,
+    std::string& gameMessageStr,
+    sf::Text& popupMessageText,
+    sf::RectangleShape& popupBackground,
+    sf::RectangleShape& homeButtonShape,
+    sf::Text& homeButtonText,
+    GameState& currentGameState,
+    PieceColor& currentTurn,
+    sf::Vector2i checkedKingCurrentPos,
+    std::array<std::array<std::optional<Piece>, 8>, 8>& board_state,
+    sf::Text& chooseSidePromptText,
+    sf::RectangleShape& whiteStartButton,
+    sf::Text& whiteStartText,
+    sf::RectangleShape& blackStartButton,
+    sf::Text& blackStartText
+) {
+    window.clear(sf::Color(240,240,240));
+
+    window.clear(sf::Color(240,240,240));
+
+    if (currentGameState == GameState::ChoosingPlayer) {
+        window.draw(chooseSidePromptText);
+        window.draw(whiteStartButton); window.draw(whiteStartText);
+        window.draw(blackStartButton); window.draw(blackStartText);
+    }
+    else {
+        for (int r = 0; r < 8; ++r) for (int c = 0; c < 8; ++c) {
+            bool isLight = (r + c) % 2 == 0;
+            tile.setFillColor(isLight ? lightColor : darkColor);
+            if (checkedKingCurrentPos.x == c && checkedKingCurrentPos.y == r)
+                tile.setFillColor(checkedKingTileColor);
+            else if (selectedPiecePos && selectedPiecePos->x == c && selectedPiecePos->y == r)
+                tile.setFillColor(sf::Color(255, 255, 0, 150));
+            else {
+                for (const auto& move : possibleMoves) {
+                    if (move.x == c && move.y == r) {
+                        if (board_state[r][c] && board_state[r][c]->color != currentTurn)
+                            tile.setFillColor(sf::Color(50, 150, 250, 150));
+                        else
+                            tile.setFillColor(sf::Color(100, 250, 50, 150));
+                        break;
+                    }
+                }
+            }
+            tile.setPosition({c * static_cast<float>(TILE_SIZE), r * static_cast<float>(TILE_SIZE)});
+            window.draw(tile);
+        }
+
+        for (int r = 0; r < 8; ++r) for (int c = 0; c < 8; ++c) {
+            if (board_state[r][c]) {
+                Piece piece = board_state[r][c].value();
+                bool isLosingKing = (currentGameState == GameState::GameOver &&
+                                     piece.type == PieceType::King &&
+                                     piece.color == currentTurn);
+                piece.sprite.setColor(isLosingKing ? sf::Color::Red : sf::Color::White);
+                window.draw(piece.sprite);
+            }
+        }
+
+        window.draw(whiteTimerText);
+        window.draw(blackTimerText);
+
+        if (!gameMessageStr.empty()) {
+            messageText.setString(gameMessageStr);
+            sf::FloatRect msgBounds = messageText.getLocalBounds();
+            messageText.setPosition({BOARD_WIDTH + (BUTTON_PANEL_WIDTH - msgBounds.size.x) / 2.f - msgBounds.position.x,
+                                     (WINDOW_HEIGHT - msgBounds.size.y) / 2.f - msgBounds.position.y});
+            messageText.setFillColor(sf::Color::Black);
+            messageText.setStyle(sf::Text::Regular);
+            if (currentGameState == GameState::GameOver || gameMessageStr.find("wins by") != std::string::npos)
+                messageText.setFillColor(sf::Color::Red), messageText.setStyle(sf::Text::Bold);
+            else if (gameMessageStr.find("Check!") != std::string::npos)
+                messageText.setFillColor(sf::Color(200,0,0)), messageText.setStyle(sf::Text::Bold);
+
+            window.draw(messageText);
+        }
+
+        if (currentGameState == GameState::GameOver) {
+            window.draw(popupBackground);
+            popupMessageText.setString(gameMessageStr);
+            sf::FloatRect popupMsgBounds = popupMessageText.getLocalBounds();
+            popupMessageText.setPosition({popupBackground.getPosition().x - popupMsgBounds.size.x / 2.f - popupMsgBounds.position.x,
+                                          popupBackground.getPosition().y - popupBackground.getSize().y / 2.f + 30.f - popupMsgBounds.position.y});
+            window.draw(popupMessageText);
+
+            homeButtonShape.setPosition({popupBackground.getPosition().x,
+                                         popupBackground.getPosition().y + popupBackground.getSize().y / 2.f - 40.f - homeButtonShape.getSize().y / 2.f});
+            window.draw(homeButtonShape);
+
+            sf::FloatRect homeTextBounds = homeButtonText.getLocalBounds();
+            homeButtonText.setPosition({homeButtonShape.getPosition().x - homeTextBounds.size.x / 2.f - homeTextBounds.position.x,
+                                        homeButtonShape.getPosition().y - homeTextBounds.size.y / 2.f - homeTextBounds.position.y});
+            window.draw(homeButtonText);
+        }
+    }
+
+    window.display();
+}

src/BoardRenderer.hpp

@@ -0,0 +1,31 @@
+#pragma once
+#include <SFML/Graphics.hpp>
+#include "GameData.hpp"
+
+void drawBoardAndUI(
+    sf::RenderWindow& window,
+    sf::RectangleShape& tile,
+    sf::Color& lightColor,
+    sf::Color& darkColor,
+    sf::Color& checkedKingTileColor,
+    std::optional<sf::Vector2i>& selectedPiecePos,
+    std::vector<sf::Vector2i>& possibleMoves,
+    sf::Text& whiteTimerText,
+    sf::Text& blackTimerText,
+    sf::Text& messageText,
+    std::string& gameMessageStr,
+    sf::Text& popupMessageText,
+    sf::RectangleShape& popupBackground,
+    sf::RectangleShape& homeButtonShape,
+    sf::Text& homeButtonText,
+    GameState& currentGameState,
+    PieceColor& currentTurn,
+    sf::Vector2i checkedKingCurrentPos,
+    std::array<std::array<std::optional<Piece>, 8>, 8>& board_state,
+    sf::Text& chooseSidePromptText,
+    sf::RectangleShape& whiteStartButton,
+   sf::Text& whiteStartText,
+   sf::RectangleShape& blackStartButton,
+   sf::Text& blackStartText
+
+);

src/ChessUtils.cpp

@@ -0,0 +1,19 @@
+#include "ChessUtils.hpp"
+
+std::string toChessNotation(int col, int row) {
+    char file = 'a' + col;
+    char rank = '8' - row;
+    return std::string{file} + rank;
+}
+
+std::string pieceTypeToString(PieceType type) {
+    switch (type) {
+        case PieceType::King: return "king";
+        case PieceType::Queen: return "queen";
+        case PieceType::Rook: return "rook";
+        case PieceType::Bishop: return "bishop";
+        case PieceType::Knight: return "knight";
+        case PieceType::Pawn: return "pawn";
+        default: return "unknown";
+    }
+}

src/ChessUtils.hpp

@@ -0,0 +1,9 @@
+#pragma once
+#include <string>
+#include "GameData.hpp"  // PieceType 정의가 필요
+
+// 보드 좌표를 체스 표기법 (예: e2)으로 변환
+std::string toChessNotation(int col, int row);
+
+// 말 타입을 문자열로 변환 (예: "king", "queen")
+std::string pieceTypeToString(PieceType type);