Merge branch 'dev' of https://github.com/UwUClub/R-Type into RT-41-Fl…

…appy-Bird
UwUClub · Nov 1, 2023 · 2f5081d · 2f5081d
2 parents f3cc1fb + b287705
commit 2f5081d
Show file tree

Hide file tree

Showing 16 changed files with 29 additions and 14 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -63,6 +63,7 @@ if(MSVC)
 endif()
 
 file(COPY ${CMAKE_SOURCE_DIR}/assets DESTINATION ${CMAKE_BINARY_DIR}/bin)
+file(COPY ${CMAKE_SOURCE_DIR}/config DESTINATION ${CMAKE_BINARY_DIR}/bin)
 
 # set the startup project for the "play" button in MSVC
 set_property(DIRECTORY PROPERTY VS_STARTUP_PROJECT server)
@@ -94,5 +95,6 @@ else()
 endif()
 
 install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/assets" DESTINATION ${CMAKE_INSTALL_BINDIR})
+install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/config" DESTINATION ${CMAKE_INSTALL_BINDIR})
 
 include(CPack)
diff --git a/assets/sounds/bot_explosion.mp3 b/assets/sounds/bot_explosion.mp3
diff --git a/assets/sounds/enemy_explosion.mp3 b/assets/sounds/enemy_explosion.mp3
diff --git a/assets/sounds/pew.mp3 b/assets/sounds/pew.mp3
diff --git a/assets/sounds/pew.ogg b/assets/sounds/pew.ogg
diff --git a/assets/sounds/rtype.mp3 b/assets/sounds/rtype.mp3
diff --git a/assets/sounds/shot.mp3 b/assets/sounds/shot.mp3
diff --git a/extern/EwECS b/extern/EwECS
diff --git a/src/client/main.cpp b/src/client/main.cpp
@@ -1,16 +1,15 @@
-#include <SFML/Graphics/Rect.hpp>
-#include <iostream>
 #include "AddEntity.hpp"
 #include "ClientGameEvent.hpp"
 #include "Components.hpp"
 #include "EwECS/Asset/AssetManager.hpp"
 #include "EwECS/Event/EventManager.hpp"
-#include "EwECS/EwECS.hpp"
 #include "EwECS/Logger.hpp"
+#include "EwECS/Music/MusicPlugin.hpp"
 #include "EwECS/Network/ClientHandler.hpp"
 #include "EwECS/Network/Packet.hpp"
 #include "EwECS/Physic/PhysicPlugin.hpp"
 #include "EwECS/SFMLDisplayClass/RenderPlugin.hpp"
+#include "EwECS/Sound/SoundPlugin.hpp"
 #include "EwECS/Utils.hpp"
 #include "EwECS/World.hpp"
 #include "IsAlive.hpp"
@@ -54,6 +53,8 @@ int main(int ac, char **av)
         ECS::Render::RenderPlugin renderPlugin;
         ECS::Asset::AssetManager &assetManager = ECS::Asset::AssetManager::getInstance();
         ECS::Physic::PhysicPlugin physicPlugin;
+        ECS::SoundPlugin soundPlugin;
+        ECS::MusicPlugin musicPlugin;
 
         // Graphic systems plug
 
@@ -66,6 +67,8 @@ int main(int ac, char **av)
         ECS::Render::RenderPluginConfig::getInstance().load("config/r-type.json");
         physicPlugin.plug(world, assetManager);
         renderPlugin.plug(world, assetManager);
+        soundPlugin.plug(world, assetManager);
+        musicPlugin.plug(world, assetManager);
 
         // Background systems
         world.addSystem(ECS::System::createBackground);

diff --git a/src/client/systems/System.hpp b/src/client/systems/System.hpp
@@ -10,6 +10,7 @@
 #include "Components.hpp"
 #include "EwECS/Event/KeyboardEvent.hpp"
 #include "EwECS/Event/WindowEvent.hpp"
+#include "EwECS/Music/MusicComponent.hpp"
 #include "EwECS/Physic/HitBox.hpp"
 #include "EwECS/SFMLDisplayClass/LoadedSprite.hpp"
 #include "EwECS/SparseArray.hpp"

diff --git a/src/client/systems/background/System+CreateBackground.cpp b/src/client/systems/background/System+CreateBackground.cpp
@@ -25,14 +25,16 @@ namespace ECS {
             if (payload.isReceiver) {
                 world.killEntity(0);
                 try {
-                    AddEntity::addEntity(ECS::Utils::Vector2f {0, 0}, Component::Speed {BACKGROUND_SPEED},
-                                         Component::TypeEntity {false, false, false, false, false, false, true},
-                                         Component::LoadedSprite {"config/background.json"}, Component::HitBox {},
-                                         Component::IsAlive {false, 0});
+                    auto idx =
+                        AddEntity::addEntity(ECS::Utils::Vector2f {0, 0}, Component::Speed {BACKGROUND_SPEED},
+                                             Component::TypeEntity {false, false, false, false, false, false, true},
+                                             Component::LoadedSprite {"config/background.json"}, Component::HitBox {},
+                                             Component::IsAlive {false, 0});
                     AddEntity::addEntity(ECS::Utils::Vector2f {SCREEN_WIDTH, 0}, Component::Speed {BACKGROUND_SPEED},
                                          Component::TypeEntity {false, false, false, false, false, false, true},
                                          Component::LoadedSprite {"config/background2.json"}, Component::HitBox {},
                                          Component::IsAlive {false, 0});
+                    world.emplaceEntityComponent<Component::MusicComponent>(idx, "assets/sounds/rtype.mp3", 100, true);
                 } catch (const std::exception &e) {
                     ECS::Logger::error("[RType client exception] " + std::string(e.what()));
                 }

diff --git a/src/client/systems/bot/System+TriggerBotDeath.cpp b/src/client/systems/bot/System+TriggerBotDeath.cpp
@@ -14,7 +14,6 @@ namespace ECS {
                                  Core::SparseArray<Component::LoadedSprite> &aSprites)
     {
         auto &world = Core::World::getInstance();
-        auto &display = SFMLDisplayClass::getInstance();
         Event::EventManager *eventManager = Event::EventManager::getInstance();
         auto &events = eventManager->getEventsByType<RType::ClientGameEvent>();
         std::vector<size_t> toRemove;

diff --git a/src/client/systems/bot/System+TriggerBotShoot.cpp b/src/client/systems/bot/System+TriggerBotShoot.cpp
@@ -4,6 +4,8 @@
 #include "EwECS/Event/EventManager.hpp"
 #include "EwECS/Logger.hpp"
 #include "EwECS/SFMLDisplayClass/SFMLDisplayClass.hpp"
+#include "EwECS/Sound/Sound.hpp"
+#include "EwECS/Sound/SoundComponent.hpp"
 #include "EwECS/SparseArray.hpp"
 #include "EwECS/World.hpp"
 #include "IsAlive.hpp"
@@ -18,6 +20,7 @@ namespace ECS {
         auto &events = eventManager->getEventsByType<RType::ClientGameEvent>();
         std::vector<size_t> toRemove;
         const auto size = events.size();
+        auto &world = Core::World::getInstance();
 
         for (size_t i = 0; i < size; i++) {
             auto &gameEvent = events[i];
@@ -29,11 +32,12 @@ namespace ECS {
             const auto &payload = gameEvent.getPayload<RType::Server::PlayerShotPayload>();
 
             try {
-                AddEntity::addEntity(
+                auto entity_id = AddEntity::addEntity(
                     ECS::Utils::Vector2f {payload.posX, payload.posY}, Component::Speed {BULLET_SPEED},
                     Component::TypeEntity {false, false, false, true, false, false, false, payload.bulletId, false},
                     Component::LoadedSprite {"config/missiles.json"},
                     Component::HitBox {BULLET_TEX_WIDTH, BULLET_TEX_HEIGHT}, Component::IsAlive {false, 0});
+                world.emplaceEntityComponent<Component::SoundComponent>(entity_id, "assets/sounds/pew.mp3", 40, false);
             } catch (const std::exception &e) {
                 ECS::Logger::error("[RType client exception] " + std::string(e.what()));
             }

diff --git a/src/client/systems/enemy/System+TriggerEnemyDeath.cpp b/src/client/systems/enemy/System+TriggerEnemyDeath.cpp
@@ -4,6 +4,7 @@
 #include "EwECS/Event/EventManager.hpp"
 #include "EwECS/Logger.hpp"
 #include "EwECS/SFMLDisplayClass/SFMLDisplayClass.hpp"
+#include "EwECS/Sound/SoundComponent.hpp"
 #include "EwECS/World.hpp"
 #include "IsAlive.hpp"
 #include "SFML/Graphics/Rect.hpp"
@@ -44,12 +45,14 @@ namespace ECS {
 
             if (aPos[localEnemyId].has_value()) {
                 try {
-                    AddEntity::addEntity(
+                    auto idx = AddEntity::addEntity(
                         ECS::Utils::Vector2f {aPos[localEnemyId].value().x, aPos[localEnemyId].value().y},
                         Component::Speed {BONUS_SPEED},
                         Component::TypeEntity {false, false, false, false, false, true, false, payload.bonusId, false},
                         Component::LoadedSprite {"config/bonus.json"},
                         Component::HitBox {BONUS_TEX_WIDTH, BONUS_TEX_HEIGHT}, Component::IsAlive {false, 0});
+                    world.emplaceEntityComponent<Component::SoundComponent>(idx, "assets/sounds/enemy_explosion.mp3",
+                                                                            20, false);
                 } catch (const std::exception &e) {
                     ECS::Logger::error("[RType client exception] " + std::string(e.what()));
                 }

diff --git a/src/client/systems/enemy/System+TriggerEnemyShoot.cpp b/src/client/systems/enemy/System+TriggerEnemyShoot.cpp
@@ -4,7 +4,7 @@
 #include "EwECS/Event/EventManager.hpp"
 #include "EwECS/Logger.hpp"
 #include "EwECS/SFMLDisplayClass/SFMLDisplayClass.hpp"
-#include "EwECS/SparseArray.hpp"
+#include "EwECS/Sound/SoundComponent.hpp"
 #include "EwECS/World.hpp"
 #include "IsAlive.hpp"
 #include "ServerPackets.hpp"
@@ -18,6 +18,7 @@ namespace ECS {
         auto &events = eventManager->getEventsByType<RType::ClientGameEvent>();
         const auto size = events.size();
         std::vector<size_t> toRemove;
+        auto &world = Core::World::getInstance();
 
         for (size_t i = 0; i < size; i++) {
             auto &gameEvent = events[i];
@@ -28,11 +29,12 @@ namespace ECS {
             const auto &payload = gameEvent.getPayload<RType::Server::EnemyShotPayload>();
 
             try {
-                AddEntity::addEntity(
+                auto idx = AddEntity::addEntity(
                     ECS::Utils::Vector2f {payload.posX, payload.posY}, Component::Speed {MISSILES_SPEED},
                     Component::TypeEntity {false, false, false, false, false, false, false, payload.bulletId, true},
                     Component::LoadedSprite {"config/bullet.json"},
                     Component::HitBox {MISSILES_TEX_WIDTH, MISSILES_TEX_HEIGHT}, Component::IsAlive {false, 0});
+                world.emplaceEntityComponent<Component::SoundComponent>(idx, "assets/sounds/shot.mp3", 20, false);
             } catch (const std::exception &e) {
                 ECS::Logger::error("[RType client exception] " + std::string(e.what()));
             }

diff --git a/src/server/main.cpp b/src/server/main.cpp
@@ -50,7 +50,6 @@ int main(int ac, char **av)
         ECS::Asset::AssetManager &assetManager = ECS::Asset::AssetManager::getInstance();
 
         // Components
-        world.registerComponent<ECS::Utils::Vector2f>();
         world.registerComponent<Component::Speed>();
         world.registerComponent<Component::TypeEntity>();
         world.registerComponent<Component::IsAlive>();
+1 −1		includes/EwECS/CMakeLists.txt
+1 −0		includes/EwECS/Music/CMakeLists.txt
+125 −0		includes/EwECS/Music/Music.hpp
+50 −0		includes/EwECS/Music/MusicComponent.hpp
+25 −0		includes/EwECS/Music/MusicPlugin.hpp
+4 −4		includes/EwECS/SFMLDisplayClass/TextComponent.hpp
+47 −31		includes/EwECS/Sound/Sound.hpp
+48 −0		includes/EwECS/Sound/SoundComponent.hpp
+25 −0		includes/EwECS/Sound/SoundPlugin.hpp
+43 −0		includes/EwECS/Sound/SoundsComponent.hpp
+25 −0		includes/EwECS/Utils.hpp
+1 −0		src/CMakeLists.txt
+5 −2		src/ConfigReader/ConfigReader.cpp
+6 −0		src/Music/CMakeLists.txt
+136 −0		src/Music/Music.cpp
+35 −0		src/Music/MusicPlugin.cpp
+9 −0		src/Network/ServerHandler.cpp
+3 −19		src/SFMLDisplayClass/SFMLDisplayClass.cpp
+1 −0		src/Sound/CMakeLists.txt
+97 −51		src/Sound/Sound.cpp
+35 −0		src/Sound/SoundPlugin.cpp