Code refactor: stage 3

Author: PfAndrey

.github/workflows/win32-build.yml

@@ -0,0 +1,91 @@
+name: Windows x64 Build & Package
+
+on:
+  push:
+    branches: [ main, master ]
+    tags: [ 'v*' ]
+  pull_request:
+
+jobs:
+  build:
+    runs-on: windows-latest
+
+    env:
+      BUILD_TYPE: Release
+      OUTPUT_DIR: Build
+      ARCH: x64
+      BUILD_DIR: build-x64               # per-arch build directory
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Show toolchain versions
+        shell: pwsh
+        run: |
+          cmake --version
+          ninja --version || echo "Ninja not used (VS generator expected)"
+
+      # Ensure a clean build dir to avoid generator/platform mismatch
+      - name: Clean build dir (if exists)
+        shell: pwsh
+        run: |
+          if (Test-Path $env:BUILD_DIR) { Remove-Item -Recurse -Force $env:BUILD_DIR }
+
+      # Cache only the per-arch _deps to avoid re-downloading SFML/tinyxml2
+      - name: Cache CMake deps
+        uses: actions/cache@v4
+        with:
+          path: |
+            ${{ env.BUILD_DIR }}/_deps
+          key: ${{ runner.os }}-${{ env.ARCH }}-${{ env.BUILD_TYPE }}-cmake-deps-${{ hashFiles('cmake/**', '**/CMakeLists.txt') }}
+
+      - name: Configure (CMake, x64)
+        shell: pwsh
+        run: >
+          cmake -S . -B $env:BUILD_DIR
+          -A $env:ARCH
+          -DCMAKE_BUILD_TYPE=$env:BUILD_TYPE
+
+      - name: Build
+        shell: pwsh
+        run: cmake --build $env:BUILD_DIR --config $env:BUILD_TYPE --parallel
+
+      # Validate outputs: only the exe and res/ are required
+      - name: Verify outputs
+        shell: pwsh
+        run: |
+          $binDir = Join-Path $PWD $env:OUTPUT_DIR
+          $exe = Join-Path $binDir "SuperMario.exe"
+          $res = Join-Path $binDir "res"
+          if (-not (Test-Path $exe)) { throw "SuperMario.exe not found at $exe" }
+          if (-not (Test-Path $res)) { throw "res folder not found at $res" }
+          Write-Host "Artifacts OK: $exe and $res"
+
+      - name: Package zip (exe + res/)
+        shell: pwsh
+        run: |
+          $binDir = Join-Path $PWD $env:OUTPUT_DIR
+          $exe = Join-Path $binDir "SuperMario.exe"
+          $res = Join-Path $binDir "res"
+          $zipName = "SuperMario-x64-${{ env.BUILD_TYPE }}.zip"
+          if (Test-Path $zipName) { Remove-Item $zipName -Force }
+          Compress-Archive -Path $exe, $res -DestinationPath $zipName
+          Write-Host "Created $zipName"
+
+      - name: Upload artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: SuperMario-x64-${{ env.BUILD_TYPE }}
+          path: SuperMario-x64-${{ env.BUILD_TYPE }}.zip
+          if-no-files-found: error
+
+      - name: Upload to GitHub Release (on tag)
+        if: startsWith(github.ref, 'refs/tags/v')
+        uses: softprops/action-gh-release@v2
+        with:
+          files: SuperMario-x64-${{ env.BUILD_TYPE }}.zip
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.gitmodules

@@ -1,6 +0,0 @@
-[submodule "ext/SFML"]
-	path = ext/SFML
-	url = git://github.com/SFML/SFML.git
-[submodule "ext/tinyxml2"]
-	path = ext/tinyxml2
-	url = git://github.com/leethomason/tinyxml2.git

CMakeLists.txt

@@ -1,50 +1,24 @@
-cmake_minimum_required(VERSION 3.8)
+cmake_minimum_required(VERSION 3.21)
 
 project(SuperMario VERSION 0.99 LANGUAGES C CXX)
 
 set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
+set(CMAKE_CXX_EXTENSIONS OFF)
 
-if(NOT CMAKE_BUILD_TYPE)
-    set(CMAKE_BUILD_TYPE "Release")
+if (NOT CMAKE_CONFIGURATION_TYPES AND NOT CMAKE_BUILD_TYPE)
+    set(CMAKE_BUILD_TYPE Release)
 endif()
 
-# BUILD EXTERNAL LIBRARIES
-include(${CMAKE_ROOT}/Modules/ExternalProject.cmake)
-ExternalProject_Add(SFML
-        #GIT_REPOSITORY https://github.com/SFML/SFML.git GIT_TAG 2.5.1
-        SOURCE_DIR  ${CMAKE_SOURCE_DIR}/ext/SFML
-            CMAKE_ARGS
-            -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
-            -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE})
-        ExternalProject_Get_Property(SFML INSTALL_DIR)
-set(SFML_LIB ${INSTALL_DIR})
-
-ExternalProject_Add(TinyXml2
-        #GIT_REPOSITORY https://github.com/leethomason/tinyxml2.git
-        SOURCE_DIR  ${CMAKE_SOURCE_DIR}/ext/tinyxml2
-            CMAKE_ARGS
-            -DBUILD_TESTS=OFF
-            -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
-            -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>)
-ExternalProject_Get_Property(TinyXml2 INSTALL_DIR)
-set(TINY_XML_LIB ${INSTALL_DIR})
-
-link_directories(${SFML_LIB}/lib ${TINY_XML_LIB}/lib)
+list(PREPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
+
 
 set(MARIO_SOURCE_DIR ${CMAKE_SOURCE_DIR}/source)
 
+
+add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/source/game_framework)
+
 set(SOURCE
-    ${MARIO_SOURCE_DIR}/game_framework/Collisions.cpp
-    ${MARIO_SOURCE_DIR}/game_framework/InputManager.cpp
-    ${MARIO_SOURCE_DIR}/game_framework/TimerManager.cpp
-    ${MARIO_SOURCE_DIR}/game_framework/GameObject.cpp
-    ${MARIO_SOURCE_DIR}/game_framework/Property.cpp
-    ${MARIO_SOURCE_DIR}/game_framework/StateMachine.cpp
-    ${MARIO_SOURCE_DIR}/game_framework/Logger.cpp
-    ${MARIO_SOURCE_DIR}/game_framework/Rect.cpp
-    ${MARIO_SOURCE_DIR}/game_framework/Vector.cpp
-    ${MARIO_SOURCE_DIR}/utils/Format.cpp
     ${MARIO_SOURCE_DIR}/Blocks.cpp
     ${MARIO_SOURCE_DIR}/GameEngine.cpp
     ${MARIO_SOURCE_DIR}/Items.cpp
@@ -71,18 +45,6 @@ set(SOURCE
 )
 
 set(HEADERS
-    ${MARIO_SOURCE_DIR}/game_framework/Collisions.hpp
-    ${MARIO_SOURCE_DIR}/game_framework/InputManager.hpp
-    ${MARIO_SOURCE_DIR}/game_framework/TimerManager.hpp
-    ${MARIO_SOURCE_DIR}/game_framework/GameObject.hpp
-    ${MARIO_SOURCE_DIR}/game_framework/Logger.hpp
-    ${MARIO_SOURCE_DIR}/game_framework/Property.hpp
-    ${MARIO_SOURCE_DIR}/game_framework/Rect.hpp
-    ${MARIO_SOURCE_DIR}/game_framework/StateMachine.hpp
-    ${MARIO_SOURCE_DIR}/game_framework/ResourceManager.hpp
-    ${MARIO_SOURCE_DIR}/game_framework/Vector.hpp
-    ${MARIO_SOURCE_DIR}/utils/Format.hpp
-    ${MARIO_SOURCE_DIR}/utils/RTIIX.hpp
     ${MARIO_SOURCE_DIR}/Character.hpp
     ${MARIO_SOURCE_DIR}/TileMap.hpp
     ${MARIO_SOURCE_DIR}/Blocks.hpp
@@ -112,7 +74,13 @@ set(HEADERS
 )
 
 # Target
-add_executable(SuperMario ${SOURCE} ${HEADERS})
+add_executable(SuperMario)
+
+target_sources(SuperMario
+PRIVATE
+    ${SOURCE}
+    ${HEADERS}
+)
 
 # Include directories
 target_include_directories(SuperMario
@@ -121,10 +89,6 @@ target_include_directories(SuperMario
     ${MARIO_SOURCE_DIR}/enemies
     ${MARIO_SOURCE_DIR}/game_framework
     ${MARIO_SOURCE_DIR}/pickups
-    ${MARIO_SOURCE_DIR}/utils
-    ${CMAKE_SOURCE_DIR}/include
-    ${SFML_LIB}/include
-    ${TINY_XML_LIB}/include
 )
 
 if (MSVC)
@@ -133,43 +97,21 @@ if (MSVC)
     set_target_properties( SuperMario PROPERTIES RUNTIME_OUTPUT_DIRECTORY_DEBUG "${CMAKE_SOURCE_DIR}/Build")
     set(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS} /SUBSYSTEM:WINDOWS /ENTRY:mainCRTStartup")
 
-    file(GLOB_RECURSE GAME_FILES CONFIGURE_DEPENDS
-    "${CMAKE_SOURCE_DIR}/source/*.cpp"
-    "${CMAKE_SOURCE_DIR}/source/*.c"
-    "${CMAKE_SOURCE_DIR}/source/*.hpp"
-    "${CMAKE_SOURCE_DIR}/source/*.h"
-)
-
-source_group(TREE "${CMAKE_SOURCE_DIR}/source" FILES ${GAME_FILES})
-
+    source_group(TREE "${MARIO_SOURCE_DIR}" FILES ${SOURCE} ${HEADERS})
 
 endif(MSVC)
 
-# ADD DEPENDISIES FOR EXECUTABLE
-add_dependencies(SuperMario SFML TinyXml2)
-
-#find_library(MYLIB1 NAMES mylibrary1 PATHS /path/to/libraries REQUIRED)
-
 target_link_libraries(SuperMario
-    optimized sfml-system       debug sfml-system-d
-    optimized sfml-window       debug sfml-window-d
-    optimized sfml-graphics     debug sfml-graphics-d
-    optimized sfml-audio        debug sfml-audio-d
-    optimized tinyxml2          debug tinyxml2d
+    PRIVATE
+    game-framework
 )
 
 if (UNIX AND NOT APPLE)
     target_link_libraries(SuperMario  stdc++ m pthread)
 endif()
 
-# POST BUILD SCRIPTS
-set(POST_LIB_DIR "lib")
-if (WIN32)
-    set(POST_LIB_DIR "bin")
-endif()
-
-ADD_CUSTOM_COMMAND(TARGET SuperMario POST_BUILD
-    COMMAND ${CMAKE_COMMAND} -E copy_directory "${SFML_LIB}/${POST_LIB_DIR}" "${CMAKE_CURRENT_BINARY_DIR}"
-    COMMAND ${CMAKE_COMMAND} -E copy_directory "${TINY_XML_LIB}/${POST_LIB_DIR}" "${CMAKE_CURRENT_BINARY_DIR}"
-    COMMAND ${CMAKE_COMMAND} -E copy_directory "${CMAKE_SOURCE_DIR}/res" "${CMAKE_CURRENT_BINARY_DIR}/res")
-
+add_custom_command(TARGET SuperMario POST_BUILD
+  COMMAND "${CMAKE_COMMAND}" -E copy_directory
+          "${CMAKE_SOURCE_DIR}/res"
+          "$<TARGET_FILE_DIR:SuperMario>/res"
+)

cmake/SFML3.cmake

@@ -0,0 +1,25 @@
+# Simple FetchContent for SFML 3.x
+include(FetchContent)
+
+set(SFML2_TAG "3.0.1" CACHE STRING "SFML 2.x tag to fetch")
+
+set(SFML_BUILD_EXAMPLES OFF CACHE BOOL "" FORCE)
+set(SFML_BUILD_DOC      OFF CACHE BOOL "" FORCE)
+# set(BUILD_SHARED_LIBS ON CACHE BOOL "" FORCE)
+
+FetchContent_Declare(
+  sfml3
+  GIT_REPOSITORY https://github.com/SFML/SFML.git
+  GIT_TAG        ${SFML2_TAG}
+)
+
+# Download and build
+FetchContent_MakeAvailable(sfml3)
+
+add_library(SFML3::all INTERFACE IMPORTED)
+target_link_libraries(SFML3::all INTERFACE
+  sfml-graphics
+  sfml-audio
+  # sfml-network
+)
+

cmake/TinyXML2.cmake

@@ -0,0 +1,17 @@
+# Simple FetchContent for tinyxml2
+include(FetchContent)
+
+set(TINYXML2_TAG "10.0.0" CACHE STRING "tinyxml2 tag to fetch")
+
+set(BUILD_TESTS OFF CACHE BOOL "" FORCE)
+
+FetchContent_Declare(
+  tinyxml2
+  GIT_REPOSITORY https://github.com/leethomason/tinyxml2.git
+  GIT_TAG        ${TINYXML2_TAG}
+)
+
+# Download and build
+FetchContent_MakeAvailable(tinyxml2)
+
+add_library(TinyXML2::TinyXML2 ALIAS tinyxml2)

ext/SFML

@@ -1,4 +1,5 @@
-# SuperMarioHD  
+# SuperMarioHD
+![Build](https://github.com/andriy-parfenyuk/supermariohd/actions/workflows/win-build.yml/badge.svg)
 ![MARIO logo](https://github.com/PfAndrey/supermariohd/blob/master/res/Screen.jpg?raw=true)
 Cross-platform HD remake of Super Mario Bros. (NES, 1985).  
 Project was created for learning purposes only.  
@@ -14,12 +15,9 @@ Visual Studio Community: https://visualstudio.microsoft.com/downloads/ or MinGW
 **3. Install CMake:**  
 	https://cmake.org/download
 
-**4. Install OpenAL:**  
-	https://www.openal.org/downloads
-
-**5. Open git-bash and type:**  
+**4. Open git-bash and type:**
 ```console
-git clone https://github.com/PfAndrey/supermariohd.git --recursive
+git clone https://github.com/PfAndrey/supermariohd.git
 cd supermariohd 
 mkdir build && cd build
 cmake ..
@@ -40,7 +38,7 @@ sudo apt-get -y install libx11-dev libudev-dev xorg-dev freeglut3-dev libalut-de
 
 **3. download mario repo**
 ```console
-git clone https://github.com/PfAndrey/supermariohd.git --recursive
+git clone https://github.com/PfAndrey/supermariohd.git
 ```
 
 **4. build project**