Merge pull request #153 from FppEpitech/143-fix-clock-the-velocity

FIX: Clock the velocity

Engine/Client/Src/Application/Application.cpp

@@ -47,7 +47,8 @@ void Application::_keyboardHandler(std::size_t key)
     try {
         if (key == KEY_NULL)
             return;
-        _sceneManager->processInput(KEY_MAP(key), this->_client->getIdxPlayerComponent());
+        if (!_sceneManager->processInput(KEY_MAP(key), this->_client->getIdxPlayerComponent()))
+            return;
         _client->sendKeyPacket(KEY_MAP(key));
     } catch (const std::exception& e) {
         std::cerr << "Exception: " << e.what() << std::endl;

Engine/Server/Src/Network/NetworkServer.cpp

@@ -111,8 +111,8 @@ void Network::Server::_startReceive(ECS::Registry& reg)
                     if (it != _clients.end()) {
                         if (it->second == asio::ip::udp::endpoint())
                             _clients[packet.getToken()] = _remote_endpoint;
-                        if (this->_messageHandler)
-                            this->_messageHandler(packet, this->_remote_endpoint, reg);
+                        // if (this->_messageHandler)
+                        //     this->_messageHandler(packet, this->_remote_endpoint, reg);
                     }
                 } catch (const std::exception& e) {
                     _startReceive(reg);

Game/GameData/Entities/Shoot.json

@@ -20,7 +20,7 @@
     },
     "VelocityComponent":
     {
-        "vx": 5,
+        "vx": 600,
         "vy": 0
     },
     "ShootComponent":

R-TypeGame/Components/Velocity/VelocityComponent.cpp

@@ -10,4 +10,5 @@
 VelocityComponent::VelocityComponent(float vx, float vy) :
     vx(vx), vy(vy), AComponent("VelocityComponent")
 {
+    frameRate = std::chrono::high_resolution_clock::now();
 }

R-TypeGame/Components/Velocity/VelocityComponent.hpp

@@ -7,6 +7,8 @@
 
 #pragma once
 
+#include <chrono>
+
 #include "../../../Engine/Shared/Interface/IComponent.hpp"
 
 /**
@@ -19,6 +21,7 @@ class VelocityComponent : public AComponent {
 
         float vx;  // Velocity x.
         float vy;  // Velocity y.
+        std::chrono::high_resolution_clock::time_point frameRate; // Velocity frameRate.
 
         /**
          * @brief Construct a new Velocity Component object.

R-TypeGame/Parser/Position2DParser/Position2DParser.cpp

@@ -20,6 +20,9 @@ std::shared_ptr<Position2DComponent> parsePosition2D(std::string pathFile)
         Json::Reader reader;
         Json::Value root;
 
+        if (!file.is_open())
+            return nullptr;
+
         if (!reader.parse(file, root, false))
             return nullptr;
 

R-TypeGame/Parser/ScaleParser/ScaleParser.cpp

@@ -20,6 +20,9 @@ std::shared_ptr<ScaleComponent> parseScale(std::string pathFile)
         Json::Reader reader;
         Json::Value root;
 
+        if (!file.is_open())
+            return nullptr;
+
         if (!reader.parse(file, root, false))
             return nullptr;
 

R-TypeGame/Parser/ShootParser/ShootParser.cpp

@@ -20,6 +20,9 @@ std::shared_ptr<ShootComponent> parseShoot(std::string pathFile)
         Json::Reader reader;
         Json::Value root;
 
+        if (!file.is_open())
+            return nullptr;
+
         if (!reader.parse(file, root, false))
             return nullptr;
 

R-TypeGame/Parser/SpeedParser/SpeedParser.cpp

@@ -20,6 +20,9 @@ std::shared_ptr<SpeedComponent> parseSpeed(std::string pathFile)
         Json::Reader reader;
         Json::Value root;
 
+        if (!file.is_open())
+            return nullptr;
+
         if (!reader.parse(file, root, false))
             return nullptr;
 

R-TypeGame/Parser/TextureRectParser/TextureRectParser.cpp

@@ -20,6 +20,9 @@ std::shared_ptr<TextureRectComponent> parseTextureRect(std::string pathFile)
         Json::Reader reader;
         Json::Value root;
 
+        if (!file.is_open())
+            return nullptr;
+
         if (!reader.parse(file, root, false))
             return nullptr;
 

R-TypeGame/Parser/VelocityParser/VelocityParser.cpp

@@ -20,6 +20,9 @@ std::shared_ptr<VelocityComponent> parseVelocity(std::string pathFile)
         Json::Reader reader;
         Json::Value root;
 
+        if (!file.is_open())
+            return nullptr;
+
         if (!reader.parse(file, root, false))
             return nullptr;
 

R-TypeGame/Systems/Background/PlanetInitSystem.cpp

@@ -39,7 +39,7 @@ void PlanetInitSystem::_initPlanet(ECS::Registry& reg, int idxPacketEntities)
     std::uniform_int_distribution<unsigned> distrib(0, NB_JSON - 1);
     std::uniform_int_distribution<unsigned> distribX(1920, 5000);
     std::uniform_int_distribution<unsigned> distribY(0, 1080);
-    std::uniform_real_distribution<float> distribVelocity(0.3, 1.5);
+    std::uniform_real_distribution<float> distribVelocity(30, 150);
 
     int randomJson = distrib(gen);
 

R-TypeGame/Systems/Background/PlanetRestartSystem.cpp

@@ -7,7 +7,6 @@
 
 #include "PlanetRestartSystem.hpp"
 #include "PlanetComponent.hpp"
-#include "GetGraphicalLibrary.hpp"
 #include "UpdatePlanet.hpp"
 
 PlanetRestartSystem::PlanetRestartSystem() :
@@ -18,10 +17,6 @@ PlanetRestartSystem::PlanetRestartSystem() :
 void PlanetRestartSystem::_restartPlanet(ECS::Registry& reg, int idxPacketEntities)
 {
     try {
-        std::shared_ptr<IGraphic> libGraphic = getGraphicalLibrary();
-        if (!libGraphic)
-            return;
-
         ECS::SparseArray<IComponent> positions = reg.get_components<IComponent>("Position2DComponent");
         ECS::SparseArray<IComponent> velocities = reg.get_components<IComponent>("VelocityComponent");
         ECS::SparseArray<IComponent> planets = reg.get_components<IComponent>("PlanetComponent");

R-TypeGame/Systems/Background/UpdatePlanet.cpp

@@ -29,7 +29,7 @@ void updateNewPositions(std::shared_ptr<VelocityComponent> velocity, std::shared
     std::mt19937 gen(getRandomSeed());
     std::uniform_int_distribution<unsigned> distribX(1920, 5000);
     std::uniform_int_distribution<unsigned> distribY(0, 1080);
-    std::uniform_real_distribution<float> distribVelocity(0.3, 1.5);
+    std::uniform_real_distribution<float> distribVelocity(30, 150);
 
     position->x = distribX(gen);
     position->y = distribY(gen);

R-TypeGame/Systems/CMakeLists.txt

@@ -66,6 +66,7 @@ add_library(system_initPlayerOne SHARED
     ${CMAKE_SOURCE_DIR}/Engine/Shared/Component/SpriteSheetAnimationComponent.cpp
     ${CMAKE_SOURCE_DIR}/Engine/Shared/Component/Entities/Player/PlayerComponent.cpp
     ../Components/Speed/SpeedComponent.cpp
+    ../Components/Shoot/ShootComponent.cpp
     ../Parser/TextureRectParser/TextureRectParser.cpp
     ../Parser/Position2DParser/Position2DParser.cpp
     ../Parser/LifeParser/LifeParser.cpp
@@ -182,7 +183,6 @@ target_link_libraries(system_shoot PRIVATE JsonCpp::JsonCpp)
 
 add_library(system_shootDestroy SHARED
     Shoot/ShootDestroySystem.cpp
-    ${CMAKE_SOURCE_DIR}/Engine/Client/Src/GetGraphicalLibrary/GetGraphicalLibrary.cpp
     ${CMAKE_SOURCE_DIR}/Engine/Shared/Ecs/Src/Registry.cpp
 )
 
@@ -215,7 +215,6 @@ target_link_libraries(system_initPlanet PRIVATE JsonCpp::JsonCpp)
 
 add_library(system_restartPlanet SHARED
     Background/PlanetRestartSystem.cpp
-    ${CMAKE_SOURCE_DIR}/Engine/Client/Src/GetGraphicalLibrary/GetGraphicalLibrary.cpp
     Background/UpdatePlanet.cpp
 )
 

R-TypeGame/Systems/Move/MoveEntities/MoveEntitiesSystem.cpp

@@ -9,6 +9,8 @@
 #include "VelocityComponent.hpp"
 #include "Position2DComponent.hpp"
 
+#include <chrono>
+
 MoveEntitiesSystem::MoveEntitiesSystem() :
     ASystem("MoveEntitiesSystem")
 {
@@ -25,8 +27,15 @@ void MoveEntitiesSystem::_moveEntities(ECS::Registry& reg, int idxPacketEntities
             std::shared_ptr<VelocityComponent> velocity = std::dynamic_pointer_cast<VelocityComponent>(velocities[entity]);
             if (!position || !velocity)
                 continue;
-            position->x += velocity->vx;
-            position->y += velocity->vy;
+
+            const std::chrono::high_resolution_clock::time_point now = std::chrono::high_resolution_clock::now();
+            double timeElapsed = std::chrono::duration<double, std::milli>(now - velocity->frameRate).count() / 1000;
+
+            if (0.005 < timeElapsed) {
+                position->x += velocity->vx * timeElapsed;
+                position->y += velocity->vy;
+                velocity->frameRate = std::chrono::high_resolution_clock::now();
+            }
         }
     } catch (std::exception e) {
     }

R-TypeGame/Systems/Players/PlayerInitOneSystem.cpp

@@ -20,6 +20,7 @@
 #include "PlayerParser.hpp"
 #include "SpeedParser.hpp"
 #include "SpriteSheetAnimationParser.hpp"
+#include "ShootComponent.hpp"
 
 #include <fstream>
 #include <json/json.h>
@@ -33,6 +34,9 @@ PlayerInitSystem::PlayerInitSystem() :
 
 void PlayerInitSystem::_initPlayer(ECS::Registry& reg, int idxPacketEntities)
 {
+
+    reg.register_component<IComponent>("ShootComponent");
+
     std::shared_ptr<TextureRectComponent> textureRect = parseTextureRect(PATH_JSON);
     if (textureRect) {
         reg.register_component<IComponent>(textureRect->getType());

R-TypeGame/Systems/Shoot/ShootDestroySystem.cpp

@@ -8,7 +8,6 @@
 #include "ShootDestroySystem.hpp"
 #include "Position2DComponent.hpp"
 #include "ShootComponent.hpp"
-#include "GetGraphicalLibrary.hpp"
 
 ShootDestroySystem::ShootDestroySystem() :
     ASystem("ShootDestroySystem")
@@ -18,9 +17,6 @@ ShootDestroySystem::ShootDestroySystem() :
 void ShootDestroySystem::_shootDestroy(ECS::Registry& reg, int idxPacketEntities)
 {
     try {
-        std::shared_ptr<IGraphic> libGraphic = getGraphicalLibrary();
-        if (!libGraphic)
-            return;
 
         ECS::SparseArray<IComponent> positions = reg.get_components<IComponent>("Position2DComponent");
         ECS::SparseArray<IComponent> shoots = reg.get_components<IComponent>("ShootComponent");
@@ -34,8 +30,7 @@ void ShootDestroySystem::_shootDestroy(ECS::Registry& reg, int idxPacketEntities
             std::shared_ptr<Position2DComponent> position = std::dynamic_pointer_cast<Position2DComponent>(positions[entity]);
 
             if (position && shoot->friendlyFire) {
-                if (position->x >= -100 && position->x <= libGraphic->getWindowSize().first &&
-                    position->y >= 0 && position->y <= libGraphic->getWindowSize().second)
+                if (position->x >= -100 && position->x <= 1920 && position->y >= 0 && position->y <= 1080)
                     continue;
                 reg.kill_entity(entity);
             }

R-TypeGame/Systems/Shoot/ShootSystem.cpp

@@ -17,6 +17,8 @@ ShootSystem::ShootSystem() :
 
 void ShootSystem::_shoot(ECS::Registry& reg, int idxPacketEntities)
 {
+    if (idxPacketEntities > reg.getEntities().size())
+        return;
     ECS::entity_t shoot = reg.spawn_entity();
     ShootInitSystem().getFunction()(reg, shoot);
 
@@ -33,15 +35,13 @@ void ShootSystem::_shoot(ECS::Registry& reg, int idxPacketEntities)
             }
         }
 
-
         reg.messageType = 0x02;
         reg.payload.clear();
 
         std::string componentType = "ShootSystem";
         reg.payload.push_back(static_cast<uint8_t>(componentType.size()));
         reg.payload.insert(reg.payload.end(), componentType.begin(), componentType.end());
 
-
         reg.payload.push_back(static_cast<uint8_t>(idxPacketEntities >> 24) & 0xFF);
         reg.payload.push_back(static_cast<uint8_t>((idxPacketEntities >> 16) & 0xFF));
         reg.payload.push_back(static_cast<uint8_t>((idxPacketEntities >> 8) & 0xFF));