Network panic mode

include/GEngine/interface/network/Networked.hpp

@@ -55,8 +55,8 @@ class Networked : public Base {
 #endif
         Network::NET::start();
 
-        m_remote.registerSystem<gengine::system::AutoMainLoop>();
-        m_local.registerSystem<gengine::system::AutoMainLoop>();
+        m_remote.registerSystem<gengine::system::AutoMainLoop>(60, 40);
+        m_local.registerSystem<gengine::system::AutoMainLoop>(60, 40);
     }
 
     ~Networked() {

include/GEngine/interface/network/systems/VoIPManager.hpp

@@ -10,7 +10,7 @@
 #include "GEngine/BaseEngine.hpp"
 
 #include "GEngine/libdev/System.hpp"
-#include "GEngine/libdev/systems/events/GameLoop.hpp"
+#include "GEngine/libdev/systems/events/MainLoop.hpp"
 #include "GEngine/libdev/systems/events/Native.hpp"
 
 #include "GEngine/interface/components/RemoteLocal.hpp"
@@ -25,7 +25,7 @@ class VoIPManager : public System<VoIPManager, interface::component::RemoteLocal
 
 public:
     void init(void) override;
-    void onGameLoop(gengine::system::event::GameLoop &);
+    void onMainLoop(gengine::system::event::MainLoop &);
 };
 
 } // namespace gengine::interface::network::system

include/GEngine/libdev/Constants.hpp

@@ -0,0 +1,10 @@
+/*
+** EPITECH PROJECT, 2024
+** GEngine
+** File description:
+** Constants.hpp
+*/
+
+#pragma once
+
+#define TPS_MAGIC_NUMBER 1.5f

include/GEngine/libdev/systems/Motions.hpp

@@ -19,6 +19,7 @@
 #include "GEngine/libdev/components/Transforms.hpp"
 #include "GEngine/libdev/components/Velocities.hpp"
 #include "GEngine/libdev/systems/events/GameLoop.hpp"
+#include "GEngine/libdev/systems/events/RenderLoop.hpp"
 
 namespace gengine::system {
 class Motion2D : public System<Motion2D, component::Transform2D, component::Velocity2D> {

include/GEngine/libdev/systems/driver/input/KeyboardCatcher.hpp

@@ -16,7 +16,6 @@
 #include "module/raylib_safe.h"
 
 #include "GEngine/libdev/System.hpp"
-#include "GEngine/libdev/systems/events/MainLoop.hpp"
 #include "GEngine/libdev/systems/events/Native.hpp"
 #include "GEngine/libdev/systems/events/RenderLoop.hpp"
 #include "GEngine/libdev/systems/events/driver/input/Keyboard.hpp"

include/GEngine/libdev/systems/driver/output/Animate.hpp

@@ -20,7 +20,6 @@
 
 #include "GEngine/libdev/System.hpp"
 #include "GEngine/libdev/systems/events/GameLoop.hpp"
-#include "GEngine/libdev/systems/events/MainLoop.hpp"
 #include "GEngine/libdev/systems/events/Native.hpp"
 
 #include <nlohmann/json.hpp>

include/GEngine/libdev/systems/driver/output/AudioManager.hpp

@@ -51,7 +51,7 @@ class AudioManager
                     geg::component::network::NetSend());
     }
 
-    void onMainLoop(geg::event::MainLoop &e);
+    void onMainLoop(geg::event::RenderLoop &e);
     void onSoundPlayed(gengine::interface::event::SharedEvent<gengine::system::event::driver::output::SoundPlayed> &e);
     void onMusic(gengine::system::event::driver::output::Music &e) {
         auto &musics = getComponents<gengine::component::driver::output::Music>();

include/GEngine/net/msg.hpp

@@ -287,8 +287,10 @@ class AMessage {
         if (!isCompressed())
             throw MsgError("Message is not compressed");
 
-        if (m_curSize + offset + getBitBuffer() / 8 > getMaxMsgSize())
-            throw MsgError("Message overflow when reading");
+        if (m_curSize + offset + getBitBuffer() / 8 > getMaxMsgSize()) {
+            throw MsgError("Message overflow when reading: SIZE=" +
+                           std::to_string(m_curSize + offset + getBitBuffer() / 8));
+        }
         return m_huffman.decompressContinuous(*this, offset, (byte_t *)&data, sizeof(T));
     }
 

source/GEngine/interface/network/systems/Snapshot.cpp

@@ -68,53 +68,44 @@ void Snapshot::getAndSendDeltaDiff(void) {
         auto &current = snapshots[m_currentSnapshotId % MAX_SNAPSHOT];
         auto &last = fullSnapshot ? m_dummySnapshot : snapshots[lastId % MAX_SNAPSHOT];
 
-        try {
-            auto &lastNetSends = std::any_cast<ecs::component::SparseArray<component::NetSend> &>(
-                last[std::type_index(typeid(component::NetSend))]);
-
-            Network::UDPMessage msg(Network::UDPMessage::HEADER | Network::UDPMessage::ACK |
-                                        Network::UDPMessage::COMPRESSED,
-                                    Network::SV_SNAPSHOT);
-            msg.setFullAck(fullSnapshot);
-
-            uint32_t nbEntity = 0;
-            msg.appendData(nbEntity);
-            msg.startCompressingSegment(false);
-            for (auto [entity, currentNetSend] : currentNetSends) {
-                if (!lastNetSends.contains(entity) || lastNetSends.get(entity) != currentNetSend) {
-                    auto [bytes, comps] = getDeltaDiff(entity, current, last);
-                    msg.appendData(uint32_t(entity));
-                    for (auto &byte : bytes)
-                        msg.appendData(byte);
-                    for (auto &[typeId, comp] : comps) {
-                        auto &type = getTypeindex(typeId);
-                        msg.appendData(toVoid(type, comp), getComponentSize(type));
-                    }
-                    nbEntity++;
+        auto &lastNetSends = std::any_cast<ecs::component::SparseArray<component::NetSend> &>(
+            last[std::type_index(typeid(component::NetSend))]);
+
+        Network::UDPMessage msg(Network::UDPMessage::HEADER | Network::UDPMessage::ACK |
+                                    Network::UDPMessage::COMPRESSED,
+                                Network::SV_SNAPSHOT);
+        msg.setFullAck(fullSnapshot);
+
+        uint32_t nbEntity = 0;
+        msg.appendData(nbEntity);
+        msg.startCompressingSegment(false);
+        for (auto [entity, currentNetSend] : currentNetSends) {
+            if (!lastNetSends.contains(entity) || lastNetSends.get(entity) != currentNetSend) {
+                auto [bytes, comps] = getDeltaDiff(entity, current, last);
+                msg.appendData(uint32_t(entity));
+                for (auto &byte : bytes)
+                    msg.appendData(byte);
+                for (auto &[typeId, comp] : comps) {
+                    auto &type = getTypeindex(typeId);
+                    msg.appendData(toVoid(type, comp), getComponentSize(type));
                 }
+                nbEntity++;
             }
-            for (auto [entity, lastNetSend] : lastNetSends) {
-                if (!currentNetSends.contains(entity)) {
-                    auto [bytes, comps] = getDeltaDiff(entity, current, last);
-                    msg.appendData(uint32_t(entity));
-                    for (auto &byte : bytes)
-                        msg.appendData(byte);
-                    for (auto &[typeId, comp] : comps) {
-                        auto &type = getTypeindex(typeId);
-                        msg.appendData(toVoid(type, comp), getComponentSize(type));
-                    }
-                    nbEntity++;
-                }
-            } // TODO cleaner
-            msg.stopCompressingSegment(false);
-            msg.writeData(nbEntity, sizeof(Network::UDPG_NetChannelHeader), 0, false);
-
-            if (!server.isRunning())
-                continue;
-            client.getNet()->pushData(msg, true);
-        } catch (std::bad_any_cast &e) {
-            continue;
         }
+        for (auto [entity, lastNetSend] : lastNetSends) {
+            if (!currentNetSends.contains(entity)) {
+                auto [bytes, comps] = getDeltaDiff(entity, current, last);
+                msg.appendData(uint32_t(entity));
+                for (auto &byte : bytes)
+                    msg.appendData(byte);
+                nbEntity++;
+            }
+        } // TODO cleaner
+        msg.stopCompressingSegment(false);
+        msg.writeData(nbEntity, sizeof(Network::UDPG_NetChannelHeader), 0, false);
+        if (!server.isRunning())
+            continue;
+        client.getNet()->pushData(msg, true);
     }
 }
 

source/GEngine/interface/network/systems/Updater.cpp

@@ -47,6 +47,7 @@ int getNthBit(uint8_t byte, int n) {
 
 void Updater::handleSnapshotMsg(Network::UDPMessage &msg, size_t readCount) {
     int nbComp = m_localWorld.size();
+    // std::cout <<  "RECV:" << msg.getSize() << std::endl;
     uint32_t nbEntity;
     msg.readContinuousData(nbEntity, readCount);
     msg.startCompressingSegment(true);

source/GEngine/interface/network/systems/VoIPManager.cpp

@@ -16,10 +16,10 @@
 namespace gengine::interface::network::system {
 
 void VoIPManager::init(void) {
-    subscribeToEvent<gengine::system::event::GameLoop>(&VoIPManager::onGameLoop);
+    subscribeToEvent<gengine::system::event::MainLoop>(&VoIPManager::onMainLoop);
 }
 
-void VoIPManager::onGameLoop(gengine::system::event::GameLoop &) {
+void VoIPManager::onMainLoop(gengine::system::event::MainLoop &) {
     auto &clientsSys = getSystem<gengine::interface::network::system::ServerClientsHandler>();
     std::vector<Network::UDPMessage> udpMsgs;
     Network::UDPMessage msgSend(Network::UDPMessage::HEADER, Network::SV_VOIP);

source/GEngine/libdev/systems/Motions.cpp

@@ -7,6 +7,8 @@
 
 #include "GEngine/libdev/systems/Motions.hpp"
 
+#include "GEngine/libdev/Constants.hpp"
+
 namespace gengine::system {
 void Motion2D::init(void) {
     subscribeToEvent<event::GameLoop>(&Motion2D::onGameLoop);
@@ -17,8 +19,8 @@ void Motion2D::onGameLoop(event::GameLoop &e) {
     auto &velocities = getComponents<component::Velocity2D>();
 
     for (auto [entity, tr, vel] : Zip(transforms, velocities)) {
-        tr.pos.x += vel.x;
-        tr.pos.y += vel.y;
+        tr.pos.x += vel.x * TPS_MAGIC_NUMBER;
+        tr.pos.y += vel.y * TPS_MAGIC_NUMBER;
     }
 }
 
@@ -30,9 +32,9 @@ void Motion3D::onGameLoop(event::GameLoop &e) {
     auto &velocities = getComponents<component::Velocity3D>();
 
     for (auto [entity, tr, vel] : Zip(transforms, velocities)) {
-        tr.pos.x += vel.x;
-        tr.pos.y += vel.y;
-        tr.pos.z += vel.z;
+        tr.pos.x += vel.x * TPS_MAGIC_NUMBER;
+        tr.pos.y += vel.y * TPS_MAGIC_NUMBER;
+        tr.pos.z += vel.z * TPS_MAGIC_NUMBER;
     }
 }
 

source/GEngine/libdev/systems/driver/output/AudioManager.cpp

@@ -57,7 +57,7 @@ const Sound &AudioManager::get(const std::string &path) {
     return sound->second.second;
 }
 
-void AudioManager::onMainLoop(geg::event::MainLoop &e) {
+void AudioManager::onMainLoop(geg::event::RenderLoop &e) {
     auto &sounds = getComponents<gengine::component::driver::output::Sound>();
     auto &musics = getComponents<gengine::component::driver::output::Music>();
 
@@ -141,7 +141,7 @@ AudioManagerLocal::AudioManagerLocal(const std::string &soundFolder, const std::
 void AudioManagerLocal::init(void) {
     subscribeToEvent<gengine::system::event::StartEngine>(&AudioManager::onStartEngine);
     subscribeToEvent<gengine::system::event::StopEngine>(&AudioManager::onStopEngine);
-    subscribeToEvent<geg::event::MainLoop>(&AudioManager::onMainLoop);
+    subscribeToEvent<geg::event::RenderLoop>(&AudioManager::onMainLoop);
 }
 
 AudioManagerRemote::AudioManagerRemote(const std::string &soundFolder, const std::string &musicFolder)

source/GEngine/net/msg/msg.cpp

@@ -66,7 +66,8 @@ void AMessage::readDataCompressed(void *data, size_t &offset, std::size_t size)
         throw MsgError("Message should be compressed");
 
     if (m_curSize + offset + getBitBuffer() / 8 > getMaxMsgSize())
-        throw MsgError("Message overflow when reading");
+        throw MsgError("Message overflow when reading: SIZE=" +
+                       std::to_string(m_curSize + offset + getBitBuffer() / 8));
     m_huffman.decompressContinuous(*this, offset, (byte_t *)data, size);
 }