Merge pull request #99 from maelbecel/fix/server

Fix/server
maelbecel · Jan 2, 2024 · fd8cb92 · fd8cb92
2 parents a5d423b + 3f41122
commit fd8cb92
Show file tree

Hide file tree

Showing 202 changed files with 4,813 additions and 659 deletions.
diff --git a/.gitignore b/.gitignore
@@ -41,8 +41,7 @@ bin*
 ExodiaProfile-*.json
 
 # Binaries for programs and plugins
-r-type_client
-r-type_server
+r-type_*
 exodia
 
 # ImGui
@@ -55,6 +54,9 @@ vgcore.*
 .idea/
 .vscode/
 
-#Windows
+# Windows
 Release/
-Debug/Assets/
+Debug/Assets/
+
+# R-Type
+.rtype
diff --git a/CMake/Dependencies.cmake b/CMake/Dependencies.cmake
@@ -14,6 +14,7 @@ find_package(glad  CONFIG REQUIRED) # glad::glad
     # -- Audio Library ---------------------------------------------------------
 find_package(OpenAL   CONFIG REQUIRED) # OpenAL::OpenAL
 find_package(FreeALUT CONFIG REQUIRED) # FreeALUT::alut
+find_package(Vorbis   CONFIG REQUIRED) # Vorbis::vorbisfile
 
     # -- Serialization Library -------------------------------------------------
 find_package(yaml-cpp CONFIG REQUIRED) # yaml-cpp::yaml-cpp

diff --git a/Client/CMakeLists.txt b/Client/CMakeLists.txt
@@ -66,6 +66,7 @@ target_link_libraries(r-type_client PRIVATE
     yaml-cpp::yaml-cpp
     imguizmo::imguizmo
     FreeALUT::alut
+    Vorbis::vorbisfile
 )
 
 target_include_directories(r-type_client PRIVATE ${Stb_INCLUDE_DIR})

diff --git a/GameEngine/CMakeLists.txt b/GameEngine/CMakeLists.txt
@@ -160,6 +160,7 @@ target_link_libraries(GameEngine PRIVATE
     yaml-cpp::yaml-cpp
     imguizmo::imguizmo
     FreeALUT::alut
+    Vorbis::vorbisfile
 )
 
 target_include_directories(GameEngine PRIVATE ${INCLUDE_DIRS_GAME_ENGINE})

diff --git a/GameEngine/src/Exodia/Core/Application/Window.hpp b/GameEngine/src/Exodia/Core/Application/Window.hpp
@@ -94,6 +94,8 @@ namespace Exodia {
          */
         virtual uint32_t GetHeight() const = 0;
 
+        virtual void Resize(uint32_t width, uint32_t height) = 0;
+
         /**
          * @brief Set the event callback function
          * Call this function to set the event callback function