Mini Milestone 2

.github/workflows/build.yml

@@ -0,0 +1,63 @@
+name: Build
+
+on:
+  push:
+    branches:
+      - dev
+  pull_request:
+
+jobs:
+  client-windows:
+    name: Client on Windows 
+    runs-on: windows-latest
+    steps:
+    - uses: actions/checkout@v4
+    - uses: ilammy/msvc-dev-cmd@v1
+    - name: Create build dir
+      run: mkdir -p build
+    - name: Run CMake
+      run: cd build && cmake -G "Ninja" -DCMAKE_CXX_COMPILER=cl -DCMAKE_C_COMPILER=cl ..
+    - name: Build
+      run: cd build && ninja client
+  client-linux:
+    name: Client on Linux (Ubuntu) 
+    runs-on: ubuntu-latest
+    steps:
+    - name: Install OpenGL
+      run: sudo apt-get update && sudo apt-get install --fix-missing cmake pkg-config mesa-utils libgl1-mesa-dev libglu1-mesa-dev freeglut3-dev mesa-common-dev libglew-dev libglfw3-dev libglm-dev libao-dev libmpg123-dev libxkbcommon-dev libxinerama-dev libxcursor-dev libxi-dev xvfb
+    - name: Install SFML
+      run: sudo apt-get update && sudo apt-get install libudev-dev libopenal-dev libvorbis-dev libflac-dev libfreetype-dev
+    - uses: actions/checkout@v4
+    - name: Create build dir
+      run: mkdir -p build
+    - name: Run CMake
+      run: cd build && cmake ..
+    - name: Build
+      run: cd build && make client
+  server-windows:
+    name: Server on Windows 
+    runs-on: windows-latest
+    steps:
+    - uses: actions/checkout@v4
+    - uses: ilammy/msvc-dev-cmd@v1
+    - name: Create build dir
+      run: mkdir -p build
+    - name: Run CMake
+      run: cd build && cmake -G "Ninja" -DCMAKE_CXX_COMPILER=cl -DCMAKE_C_COMPILER=cl ..
+    - name: Build
+      run: cd build && ninja server
+  server-linux:
+    name: Server on Linux (Ubuntu) 
+    runs-on: ubuntu-latest
+    steps:
+    - name: Install OpenGL
+      run: sudo apt-get update && sudo apt-get install --fix-missing cmake pkg-config mesa-utils libgl1-mesa-dev libglu1-mesa-dev freeglut3-dev mesa-common-dev libglew-dev libglfw3-dev libglm-dev libao-dev libmpg123-dev libxkbcommon-dev libxinerama-dev libxcursor-dev libxi-dev xvfb
+    - name: Install SFML
+      run: sudo apt-get update && sudo apt-get install libudev-dev libopenal-dev libvorbis-dev libflac-dev libfreetype-dev
+    - uses: actions/checkout@v4
+    - name: Create build dir
+      run: mkdir -p build
+    - name: Run CMake
+      run: cd build && cmake ..
+    - name: Build
+      run: cd build && make server 

.github/workflows/docs.yml

@@ -0,0 +1,27 @@
+name: Docs
+
+on:
+  push:
+    branches:
+      - dev
+
+jobs:
+  build-and-deploy-docs:
+    name: Build and Deploy Documentation 
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
+      - name: Build docs with Doxygen
+        uses: mattnotmitt/doxygen-action@v1.9.5
+      - name: Deploy to server 
+        uses: appleboy/scp-action@v0.1.7
+        with:
+          host: ${{ secrets.SITE_HOST }}
+          username: ${{ secrets.SITE_USER }}
+          key: ${{ secrets.SITE_KEY }}
+          port: ${{ secrets.SITE_PORT }}
+          source: docs/*
+          target: /var/www/html/class/cse125/www/cse125/2024/cse125g3/site/docs/
+          rm: true
+          strip_components: 1

.github/workflows/lint.yml

@@ -0,0 +1,28 @@
+name: Lint
+
+on:
+  push:
+    branches:
+      - dev
+  pull_request:
+
+jobs:
+  cppcheck:
+    name: cppcheck 
+    runs-on: ubuntu-latest
+    steps:
+    - name: Install CppCheck
+      run: sudo apt-get update && sudo apt-get install cppcheck
+    - name: CppCheck version 
+      run: cppcheck --version
+    - name: Install OpenGL
+      run: sudo apt-get update && sudo apt-get install --fix-missing cmake pkg-config mesa-utils libgl1-mesa-dev libglu1-mesa-dev freeglut3-dev mesa-common-dev libglew-dev libglfw3-dev libglm-dev libao-dev libmpg123-dev libxkbcommon-dev libxinerama-dev libxcursor-dev libxi-dev xvfb
+    - name: Install SFML
+      run: sudo apt-get update && sudo apt-get install libudev-dev libopenal-dev libvorbis-dev libflac-dev libfreetype-dev
+    - uses: actions/checkout@v4
+    - name: Create build dir
+      run: mkdir -p build
+    - name: Run CMake
+      run: cd build && cmake ..
+    - name: Lint
+      run: cd build && make lint 

.github/workflows/test.yml

@@ -0,0 +1,90 @@
+name: Test
+
+on:
+  push:
+    branches:
+      - dev
+  pull_request:
+
+jobs:
+  client-windows:
+    name: Client on Windows 
+    runs-on: windows-latest
+    steps:
+    - uses: actions/checkout@v4
+    - uses: ilammy/msvc-dev-cmd@v1
+    - name: Create build dir
+      run: mkdir -p build
+    - name: Run CMake
+      run: cd build && cmake -G "Ninja" -DCMAKE_CXX_COMPILER=cl -DCMAKE_C_COMPILER=cl ..
+    - name: Test
+      run: cd build && ninja run_client_tests 
+  client-linux:
+    name: Client on Linux (Ubuntu) 
+    runs-on: ubuntu-latest
+    steps:
+    - name: Install OpenGL
+      run: sudo apt-get update && sudo apt-get install --fix-missing cmake pkg-config mesa-utils libgl1-mesa-dev libglu1-mesa-dev freeglut3-dev mesa-common-dev libglew-dev libglfw3-dev libglm-dev libao-dev libmpg123-dev libxkbcommon-dev libxinerama-dev libxcursor-dev libxi-dev xvfb
+    - name: Install SFML
+      run: sudo apt-get update && sudo apt-get install libudev-dev libopenal-dev libvorbis-dev libflac-dev libfreetype-dev
+    - uses: actions/checkout@v4
+    - name: Create build dir
+      run: mkdir -p build
+    - name: Run CMake
+      run: cd build && cmake ..
+    - name: Test
+      run: cd build && make run_client_tests
+  server-windows:
+    name: Server on Windows 
+    runs-on: windows-latest
+    steps:
+    - uses: actions/checkout@v4
+    - uses: ilammy/msvc-dev-cmd@v1
+    - name: Create build dir
+      run: mkdir -p build
+    - name: Run CMake
+      run: cd build && cmake -G "Ninja" -DCMAKE_CXX_COMPILER=cl -DCMAKE_C_COMPILER=cl ..
+    - name: Test
+      run: cd build && ninja run_server_tests
+  server-linux:
+    name: Server on Linux (Ubuntu) 
+    runs-on: ubuntu-latest
+    steps:
+    - name: Install OpenGL
+      run: sudo apt-get update && sudo apt-get install --fix-missing cmake pkg-config mesa-utils libgl1-mesa-dev libglu1-mesa-dev freeglut3-dev mesa-common-dev libglew-dev libglfw3-dev libglm-dev libao-dev libmpg123-dev libxkbcommon-dev libxinerama-dev libxcursor-dev libxi-dev xvfb
+    - name: Install SFML
+      run: sudo apt-get update && sudo apt-get install libudev-dev libopenal-dev libvorbis-dev libflac-dev libfreetype-dev
+    - uses: actions/checkout@v4
+    - name: Create build dir
+      run: mkdir -p build
+    - name: Run CMake
+      run: cd build && cmake ..
+    - name: Test
+      run: cd build && make run_server_tests
+  shared-windows:
+    name: Shared on Windows 
+    runs-on: windows-latest
+    steps:
+    - uses: actions/checkout@v4
+    - uses: ilammy/msvc-dev-cmd@v1
+    - name: Create build dir
+      run: mkdir -p build
+    - name: Run CMake
+      run: cd build && cmake -G "Ninja" -DCMAKE_CXX_COMPILER=cl -DCMAKE_C_COMPILER=cl ..
+    - name: Test
+      run: cd build && ninja run_server_tests
+  shared-linux:
+    name: Shared on Linux (Ubuntu) 
+    runs-on: ubuntu-latest
+    steps:
+    - name: Install OpenGL
+      run: sudo apt-get update && sudo apt-get install --fix-missing cmake pkg-config mesa-utils libgl1-mesa-dev libglu1-mesa-dev freeglut3-dev mesa-common-dev libglew-dev libglfw3-dev libglm-dev libao-dev libmpg123-dev libxkbcommon-dev libxinerama-dev libxcursor-dev libxi-dev xvfb
+    - name: Install SFML
+      run: sudo apt-get update && sudo apt-get install libudev-dev libopenal-dev libvorbis-dev libflac-dev libfreetype-dev
+    - uses: actions/checkout@v4
+    - name: Create build dir
+      run: mkdir -p build
+    - name: Run CMake
+      run: cd build && cmake ..
+    - name: Test
+      run: cd build && make run_shared_tests

.gitignore

@@ -1,4 +1,7 @@
 build/
-assets/*
 .vscode/
-.vs/
+.vs/
+.cache/
+
+docs/*
+!docs/.gitkeep

CMakeLists.txt

@@ -14,6 +14,21 @@ endif()
 set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/build/bin)
 
+# Generate a "compile_commands.json" file for VScode to use 
+set(CMAKE_EXPORT_COMPILE_COMMANDS True)
+
+# Tell CMake to ignore warnings from stuff in our dependencies. Surely GLM
+# knows what it is doing... https://7tv.app/emotes/61e8fae862858c6406126ced
+IF (NOT WIN32)
+    set_property(
+        DIRECTORY build 
+        PROPERTY COMPILE_OPTIONS "-w"
+    )
+ENDIF()
+
+# Add google test to CMake
+add_subdirectory(dependencies/google-test) 
+
 # If we need any compiler / linker flags, add them here
 SET(GCC_COMPILE_FLAGS "")
 SET(GCC_LINK_FLAGS    "")
@@ -26,6 +41,42 @@ project(game VERSION 1.0)
 # Custom Variables
 SET(INCLUDE_DIRECTORY ${PROJECT_SOURCE_DIR}/include)
 
+# Dependencies
+
+# For some reason I had to add this in two places to make it work on certain lab computers???
+
+add_subdirectory(dependencies/boost) # include boost libraries that we use
+add_subdirectory(dependencies/json) # include boost libraries that we use
+add_subdirectory(dependencies/glm) # include glm library
+
 add_subdirectory(src/shared) # define game_shared_lib
 add_subdirectory(src/client) # create client executable
-add_subdirectory(src/server) # create server executable
+add_subdirectory(src/server) # create server executable
+add_subdirectory(src/debugger) # create debugger executable
+
+find_program(CPPCHECK "cppcheck")
+add_custom_target(lint
+    COMMAND ${CPPCHECK}
+    # checks to enable
+    --enable=warning,style,performance,portability
+    # allow us to suppress individual lines with // cppcheck-suppress <check-name>
+    --inline-suppr
+    # return error exit code 1 on failures
+    --error-exitcode=1
+    # ignore certain warnings that are annoying
+    --suppress=unusedVariable
+    # tell it about our include directory
+    -I ${CMAKE_SOURCE_DIR}/include
+    # only check include and src
+    ${CMAKE_SOURCE_DIR}/include
+    ${CMAKE_SOURCE_DIR}/src
+    # ignore test directories
+    -i${CMAKE_SOURCE_DIR}/src/client/tests
+    -i${CMAKE_SOURCE_DIR}/src/server/tests
+    -i${CMAKE_SOURCE_DIR}/src/shared/tests
+)
+
+add_custom_target(pull_models
+  COMMAND 
+  gdown 1N7a5cDgMcXbPO0RtgznnEo-1XUfdMScM -O ${CMAKE_SOURCE_DIR}/assets/graphics --folder
+)