You can now AssaultDash in the air

include/Engine/Input/EInputCommand.h

@@ -16,8 +16,6 @@ struct InputCommand : Event
 	std::string Command;
 	/** The value of the command. */
 	float Value = 0;
-    /** Timestamp of the command. */
-    double TimeStamp = 0;
 };
 
 }

include/Engine/Input/FirstPersonInputController.h

@@ -202,7 +202,7 @@ void FirstPersonInputController<EventContext>::AssaultDashCheck(double dt, bool
     }
 
     //dashing with shift
-    if (m_ShiftDashing && m_AssaultDashCoolDownTimer <= 0.0f && !isJumping) {
+    if (m_ShiftDashing && m_AssaultDashCoolDownTimer <= 0.0f) {
         //player is dashing with shift
         //the wanted-direction is set in playermovement already so we dont need to check what direction we want to dash in!
         m_AssaultDashCoolDownTimer = assaultDashCoolDownMaxTimer;
@@ -227,7 +227,7 @@ void FirstPersonInputController<EventContext>::AssaultDashCheck(double dt, bool
     }
     m_ValidDoubleTap = false;
 
-    if (!(m_AssaultDashCoolDownTimer <= 0.0f && !isJumping)) {
+    if (!(m_AssaultDashCoolDownTimer <= 0.0f)) {
         //if we cant dash at the moment, then just reset the tap-sensitivity-timer
         m_AssaultDashDoubleTapDeltaTime = 0.f;
         return;

include/Engine/Network/Client.h

@@ -33,8 +33,8 @@ public:
     ~Client();
 
     void Connect(std::string address, int port);
-    void Update(double dt) override;
+    void Update() override;
-private:
+
     std::vector<Events::PlayerSpawned> m_PlayerSpawnEvents;
     void parseSpawnEvents();
     // Save for children
@@ -56,13 +56,13 @@ private:
     bool m_IsConnected = false;
     EntityWrapper m_LocalPlayer = EntityWrapper::Invalid;
     // Server Client Lookup map
+    // Assumes that root node for client and server is EntityID 0.
+
     // Don't Add items to these two maps with insert, use insertIntoServerClientMaps(EntityID, EntityID)!!!!
     std::unordered_map<EntityID, EntityID> m_ServerIDToClientID;
     std::unordered_map<EntityID, EntityID> m_ClientIDToServerID;
 
     // Network logic
-    UDPClient m_Unreliable;
-    TCPClient m_Reliable;
     PlayerDefinition m_PlayerDefinitions[8];
     SnapshotDefinitions m_NextSnapshot;
     double m_DurationOfPingTime;
@@ -70,9 +70,9 @@ private:
     std::clock_t m_TimeSinceSentInputs;
     unsigned int m_SendInputIntervalMs;
     std::vector<Events::InputCommand> m_InputCommandBuffer;
-    std::vector<Events::InputCommand> m_ReceivedInputCommands;
 
     // Private member functions
+    size_t  receive(char* data);
     void disconnect();
     void parseMessageType(Packet& packet);
     void updateFields(Packet& packet, const ComponentInfo& componentInfo, const EntityID& entityID);
@@ -88,8 +88,6 @@ private:
     void parseComponentDeletion(Packet& packet);
     void InterpolateFields(Packet & packet, const ComponentInfo & componentInfo, const EntityID & entityID, const std::string & componentType);
     void parseSnapshot(Packet& packet);
-    void parseOnInputCommand(Packet& packet);
-    void publishInputCommands();
     void identifyPacketLoss();
     void hasServerTimedOut();
     EntityID createPlayer();
@@ -112,6 +110,9 @@ private:
     EventRelay<Client, Events::PlayerSpawned> m_EPlayerSpawned;
     bool OnPlayerSpawned(const Events::PlayerSpawned& e);
     void parsePlayerDamage(Packet& packet);
+private:
+    UDPClient m_Unreliable;
+    TCPClient m_Reliable;
 };
 
 #endif

include/Engine/Network/Network.h

@@ -22,13 +22,11 @@ public:
     Network(World* world, EventBroker* eventBroker);
     virtual ~Network() { };
 
-    virtual void Update(double dt) = 0;
+    virtual void Update() = 0;
 
 protected:
     World* m_World;
     EventBroker* m_EventBroker;
-    // for network
-    double m_TimeStamp = 0;
 
     // For Debug 
     bool isReadingData = false;

include/Engine/Network/Server.h

@@ -26,7 +26,7 @@ public:
     Server(World* world, EventBroker* eventBroker, int port);
     ~Server();
 
-    void Update(double dt) override;
+    void Update() override;
 
 private:
     // Network channels
@@ -52,7 +52,6 @@ private:
     int checkTimeOutInterval = 100;
     int m_NextPlayerID = 0;
     std::vector<Events::InputCommand> m_InputCommandsToBroadcast;
-    std::vector<Events::InputCommand> m_InputCommandsToPublish;
     //Timers
     std::clock_t m_StartPingTime;
     
@@ -83,7 +82,6 @@ private:
     void parseTCPConnect(Packet & packet);
     void parseDisconnect();
     bool shouldSendToClient(EntityWrapper childEntity);
-    void publishInputCommands();
 
     // Debug event
     EventRelay<Server, Events::InputCommand> m_EInputCommand;

include/Game/Systems/PlayerMovementSystem.h

@@ -39,5 +39,5 @@ private:
     bool OnPlayerSpawned(Events::PlayerSpawned& e);
 
     void updateMovementControllers(double dt);
-    void updateVelocity(EntityWrapper player, double dt);
+    void updateVelocity(double dt);
 };

resources/Schema/Entities/NewMap.xml

@@ -5019,7 +5019,7 @@
           </Team>
         </c:Team>
         <c:Transform>
-          <Position X="-60.3695679" Y="2.14482641" Z="-79.3789597"/>
+          <Position X="-60.3695679" Y="5.64500046" Z="-79.3789597"/>
         </c:Transform>
       </Components>
       <Children>
@@ -5089,7 +5089,7 @@
           </Team>
         </c:Team>
         <c:Transform>
-          <Position X="60.0169258" Y="2.37972379" Z="76.2893906"/>
+          <Position X="60.0169258" Y="5.78000021" Z="76.2893906"/>
         </c:Transform>
       </Components>
       <Children>
@@ -5165,7 +5165,7 @@
             <c:Transform>
               <Position X="48.9189453" Y="7.06223536" Z="-78.9347992"/>
               <Scale X="0.300000012" Y="0.300000012" Z="0.300000012"/>
-              <Orientation X="0" Y="71.4059677" Z="0"/>
+              <Orientation X="0" Y="75.6124268" Z="0"/>
             </c:Transform>
             <c:Trigger/>
           </Components>
@@ -5184,7 +5184,7 @@
             <c:Transform>
               <Position X="-59.3499641" Y="7.46932745" Z="-20.6276321"/>
               <Scale X="0.300000012" Y="0.300000012" Z="0.300000012"/>
-              <Orientation X="0" Y="68.0603104" Z="0"/>
+              <Orientation X="0" Y="72.2667694" Z="0"/>
             </c:Transform>
             <c:Trigger/>
           </Components>
@@ -5203,7 +5203,7 @@
             <c:Transform>
               <Position X="-1.13644195" Y="1.38919806" Z="38.9768829"/>
               <Scale X="0.300000012" Y="0.300000012" Z="0.300000012"/>
-              <Orientation X="0" Y="65.6683426" Z="0"/>
+              <Orientation X="0" Y="69.8748016" Z="0"/>
             </c:Transform>
             <c:Trigger/>
           </Components>
@@ -5222,7 +5222,7 @@
             <c:Transform>
               <Position X="54.7225227" Y="6.51863909" Z="29.0052128"/>
               <Scale X="0.300000012" Y="0.300000012" Z="0.300000012"/>
-              <Orientation X="0" Y="65.9822693" Z="0"/>
+              <Orientation X="0" Y="70.1887283" Z="0"/>
             </c:Transform>
             <c:Trigger/>
           </Components>
@@ -5241,7 +5241,7 @@
             <c:Transform>
               <Position X="-51.6792374" Y="8.44526482" Z="32.5153465"/>
               <Scale X="0.300000012" Y="0.300000012" Z="0.300000012"/>
-              <Orientation X="0" Y="65.4309921" Z="0"/>
+              <Orientation X="0" Y="69.6374512" Z="0"/>
             </c:Transform>
             <c:Trigger/>
           </Components>
@@ -5260,7 +5260,7 @@
             <c:Transform>
               <Position X="-42.3974304" Y="7.28327894" Z="81.9305344"/>
               <Scale X="0.300000012" Y="0.300000012" Z="0.300000012"/>
-              <Orientation X="0" Y="63.560215" Z="0"/>
+              <Orientation X="0" Y="67.7666702" Z="0"/>
             </c:Transform>
             <c:Trigger/>
           </Components>
@@ -5279,7 +5279,7 @@
             <c:Transform>
               <Position X="-9.85184956" Y="8.25567532" Z="39.6119232"/>
               <Scale X="0.300000012" Y="0.300000012" Z="0.300000012"/>
-              <Orientation X="0" Y="62.6090584" Z="0"/>
+              <Orientation X="0" Y="66.8154602" Z="0"/>
             </c:Transform>
             <c:Trigger/>
           </Components>
@@ -5298,7 +5298,7 @@
             <c:Transform>
               <Position X="49.2257118" Y="7.39368248" Z="-31.1810112"/>
               <Scale X="0.300000012" Y="0.300000012" Z="0.300000012"/>
-              <Orientation X="0" Y="59.8201942" Z="0"/>
+              <Orientation X="0" Y="64.0265808" Z="0"/>
             </c:Transform>
             <c:Trigger/>
           </Components>

src/Engine/Network/Client.cpp

@@ -41,11 +41,9 @@ void Client::Connect(std::string address, int port)
     }
 }
 
-void Client::Update(double dt)
+void Client::Update()
 {
     m_EventBroker->Process<Client>();
-    //m_TimeStamp += dt;
-    publishInputCommands();
     while (m_Unreliable.IsSocketAvailable()) {
         // Packet will get real data in receive
         Packet packet(MessageType::Invalid);
@@ -74,8 +72,7 @@ void Client::Update(double dt)
             sendInputCommands();
             m_TimeSinceSentInputs = std::clock();
         }
-        // HACK: Send absolute player positions for now to avoid desync until we have reliable messages.
+        // HACK: Send absolute player positions for now to avoid desync until we have reliable messages
-        // Reliable messages and timestamps did not fix it.
         sendLocalPlayerTransform();
 
         hasServerTimedOut();
@@ -125,9 +122,6 @@ void Client::parseMessageType(Packet& packet)
     case MessageType::OnPlayerDamage:
         parsePlayerDamage(packet);
         break;
-    case MessageType::OnInputCommand:
-        //parsePlayerDamage(packet);
-        break;
     default:
         break;
     }
@@ -290,30 +284,21 @@ void Client::ignoreFields(Packet& packet, const ComponentInfo& componentInfo)
 
 void Client::parseSnapshot(Packet& packet)
 {
-    //// Read input commands
+    // Read input commands
-    //std::size_t numInputCommands = packet.ReadPrimitive<std::size_t>();
+    std::size_t numInputCommands = packet.ReadPrimitive<std::size_t>();
-    //for (std::size_t i = 0; i < numInputCommands; ++i) {
+    for (std::size_t i = 0; i < numInputCommands; ++i) {
-    //    Events::InputCommand e;
+        Events::InputCommand e;
-    //    e.PlayerID = packet.ReadPrimitive<EntityID>();
+        e.PlayerID = packet.ReadPrimitive<EntityID>();
-    //    EntityID player = packet.ReadPrimitive<EntityID>();
+        EntityID player = packet.ReadPrimitive<EntityID>();
-    //    std::string command = packet.ReadString();
+        std::string command = packet.ReadString();
-    //    float value = packet.ReadPrimitive<float>();
+        float value = packet.ReadPrimitive<float>();
-    //    double timestamp = packet.ReadPrimitive<double>();
+        if (m_ServerIDToClientID.find(player) != m_ServerIDToClientID.end()) {
-    //    if (m_ServerIDToClientID.find(player) != m_ServerIDToClientID.end()) {
+            e.Player = EntityWrapper(m_World, m_ServerIDToClientID.at(player));
-    //        e.Player = EntityWrapper(m_World, m_ServerIDToClientID.at(player));
+            e.Command = command;
-    //        e.Command = command;
+            e.Value = value;
-    //        e.Value = value;
+            m_EventBroker->Publish(e);
-    //        e.TimeStamp = timestamp;
+        }
-    //        m_EventBroker->Publish(e);
+    }
-    //    }
-    //}
-
-    // Read timestamp
-    double remoteTimestamp = packet.ReadPrimitive<double>();
-    //if (abs(remoteTimestamp - m_TimeStamp) > 0.100) {
-    //    m_TimeStamp = remoteTimestamp;
-    //    LOG_INFO("Resynced remote and local timestamp");
-    //}
 
     // Read world state
     while (packet.DataReadSize() < packet.Size()) {
@@ -374,36 +359,6 @@ void Client::parseSnapshot(Packet& packet)
     parseSpawnEvents();
 }
 
-
-void Client::parseOnInputCommand(Packet & packet)
-{ 
-    while (packet.DataReadSize() < packet.Size()) {
-        Events::InputCommand e;
-        e.PlayerID = packet.ReadPrimitive<int>();
-        e.Player = EntityWrapper(m_World, packet.ReadPrimitive<int>());
-        e.Command = packet.ReadString();
-        e.Value = packet.ReadPrimitive<float>();
-        e.TimeStamp = packet.ReadPrimitive<double>();
-        m_EventBroker->Publish(e);
-        m_ReceivedInputCommands.push_back(e);
-        //LOG_INFO("Server::parseOnInputCommand: Command is %s. Value is %f. PlayerID is %i.", e.Command.c_str(), e.Value, e.PlayerID);
-    }
-}
-
-void Client::publishInputCommands()
-{ 
-    std::vector<Events::InputCommand> notPublishedEvents;
-    for (int i = 0; i < m_ReceivedInputCommands.size(); i++) {
-        if (m_ReceivedInputCommands.at(i).TimeStamp < m_TimeStamp) {
-            m_EventBroker->Publish(m_ReceivedInputCommands.at(i));
-        }
-        else { 
-            notPublishedEvents.push_back(m_ReceivedInputCommands.at(i));
-        }
-    }
-    m_ReceivedInputCommands = notPublishedEvents;
-}
-
 void Client::disconnect()
 {
     m_IsConnected = false;
@@ -447,9 +402,7 @@ bool Client::OnInputCommand(const Events::InputCommand & e)
         }
     } else {
         if (m_IsConnected) {
-            Events::InputCommand setTimestamp = e;
+            m_InputCommandBuffer.push_back(e);
-            setTimestamp.TimeStamp = m_TimeStamp;
-            m_InputCommandBuffer.push_back(setTimestamp);
         }
         //LOG_DEBUG("Client::OnInputCommand: Command is %s. Value is %f. PlayerID is %i.", e.Command.c_str(), e.Value, e.PlayerID);
         return true;
@@ -484,12 +437,11 @@ void Client::parsePlayerDamage(Packet& packet)
 {
     Events::PlayerDamage e;
     PlayerID victimID = packet.ReadPrimitive<EntityID>();
-    PlayerID inflictorID = packet.ReadPrimitive<EntityID>();
+    if(serverClientMapsHasEntity(victimID)){
-    if(!serverClientMapsHasEntity(victimID) || !serverClientMapsHasEntity(inflictorID)){
         return;
     }
     e.Inflictor = EntityWrapper(m_World, m_ServerIDToClientID.at(victimID));
-    e.Victim = EntityWrapper(m_World, m_ServerIDToClientID.at(inflictorID));
+    e.Victim = EntityWrapper(m_World, m_ServerIDToClientID.at(packet.ReadPrimitive<EntityID>()));
     e.Damage = packet.ReadPrimitive<double>();
     // Don't rebroadcast our own player damage events or we'll have an infinite loop!
     if (e.Inflictor != m_LocalPlayer) {
@@ -563,7 +515,6 @@ void Client::sendInputCommands()
         for (int i = 0; i < m_InputCommandBuffer.size(); i++) {
             packet.WriteString(m_InputCommandBuffer[i].Command);
             packet.WritePrimitive(m_InputCommandBuffer[i].Value);
-            packet.WritePrimitive(m_InputCommandBuffer[i].TimeStamp);
         }
         m_Reliable.Send(packet);
         m_InputCommandBuffer.clear();

src/Engine/Network/Network.cpp

@@ -9,7 +9,7 @@ Network::Network(World* world, EventBroker* eventBroker)
     m_TimeoutMs = config->Get<int>("Networking.TimeoutMs", 20000);
 }
 
-void Network::Update(double dt)
+void Network::Update()
 { 
     updateNetworkData();
 }

src/Engine/Network/Server.cpp

@@ -26,12 +26,10 @@ Server::~Server()
 
 }
 
-void Server::Update(double dt)
+void Server::Update()
 {
-    m_EventBroker->Process<Server>();
-    m_TimeStamp += dt;
-    publishInputCommands();
     PlayerDefinition pd;
+
     m_Reliable.AcceptNewConnections(m_NextPlayerID, m_ConnectedPlayers);
     for (auto& kv : m_ConnectedPlayers) {
         while (kv.second.TCPSocket->available()) {
@@ -82,9 +80,11 @@ void Server::Update(double dt)
         checkForTimeOuts();
         timOutTimer = currentTime;
     }
+    m_EventBroker->Process<Server>();
     if (isReadingData) {
-        Network::Update(dt);
+        Network::Update();
     }
+
 }
 
 void Server::parseMessageType(Packet& packet)
@@ -146,8 +146,7 @@ void Server::unreliableBroadcast(Packet& packet)
 void Server::sendSnapshot()
 {
     Packet packet(MessageType::Snapshot);
-    //addInputCommandsToPacket(packet);
+    addInputCommandsToPacket(packet);
-    packet.WritePrimitive(m_TimeStamp/*+ somePingvalue + offset*/);
     addChildrenToPacket(packet, EntityID_Invalid);
     unreliableBroadcast(packet);
 }
@@ -161,7 +160,6 @@ void Server::addInputCommandsToPacket(Packet& packet)
         packet.WritePrimitive(m_ConnectedPlayers.at(command.PlayerID).EntityID);
         packet.WriteString(command.Command);
         packet.WritePrimitive(command.Value);
-        packet.WritePrimitive(command.TimeStamp);
     }
     m_InputCommandsToBroadcast.clear();
 }
@@ -335,7 +333,6 @@ void Server::disconnect(PlayerID playerID)
     e.PlayerID = playerID;
     m_EventBroker->Publish(e);
     //m_World->DeleteEntity(m_ConnectedPlayers[playerID].EntityID);
-    // TODO Kolla Anders crashade efter timeout med break point
     m_ConnectedPlayers[playerID].TCPSocket->shutdown(boost::asio::ip::tcp::socket::shutdown_both);
     m_ConnectedPlayers[playerID].TCPSocket->close();
     m_World->DeleteEntity(m_ConnectedPlayers[playerID].EntityID);
@@ -378,7 +375,8 @@ bool Server::OnInputCommand(const Events::InputCommand & e)
         }
         isReadingData = !isReadingData;
         m_SaveDataTimer = std::clock();
-    } else if (e.Command == "KickPlayer" && e.Value > 0) {
+    }
+    if (e.Command == "KickPlayer" && e.Value > 0) {
         kick(0);
     }
 
@@ -468,9 +466,7 @@ void Server::parseOnInputCommand(Packet& packet)
             e.PlayerID = player; // Set correct player id
             e.Player = EntityWrapper(m_World, m_ConnectedPlayers.at(player).EntityID);
             e.Value = packet.ReadPrimitive<float>();
-            e.TimeStamp = packet.ReadPrimitive<double>();
+            m_EventBroker->Publish(e);
-            /* m_EventBroker->Publish(e);*/
-            m_InputCommandsToPublish.push_back(e);
             if (e.Command == "PrimaryFire" || e.Command == "Reload") {
                 m_InputCommandsToBroadcast.push_back(e);
             }
@@ -520,20 +516,6 @@ bool Server::shouldSendToClient(EntityWrapper childEntity)
     return childEntity.HasComponent("Player") || childEntity.FirstParentWithComponent("Player").Valid();
 }
 
-void Server::publishInputCommands()
-{
-    std::vector<Events::InputCommand> notPublishedEvents;
-    for (int i = 0; i < m_InputCommandsToPublish.size(); i++) {
-        if (m_InputCommandsToPublish.at(i).TimeStamp < m_TimeStamp) {
-            m_EventBroker->Publish(m_InputCommandsToPublish.at(i));
-        } else {
-            LOG_INFO("Did not instantly publish command");
-            notPublishedEvents.push_back(m_InputCommandsToPublish.at(i));
-        }
-    }
-    m_InputCommandsToPublish = notPublishedEvents;
-}
-
 PlayerID Server::GetPlayerIDFromEndpoint()
 {
     // check both tcp and udp connection

src/Game/Game.cpp

@@ -199,10 +199,10 @@ void Game::Tick()
     // Update network
     m_EventBroker->Process<MultiplayerSnapshotFilter>();
     if (m_NetworkClient != nullptr) {
-        m_NetworkClient->Update(dt);
+        m_NetworkClient->Update();
     }
     if (m_NetworkServer != nullptr) {
-        m_NetworkServer->Update(dt);
+        m_NetworkServer->Update();
     }
     //m_SoundManager->Update(dt);
 

src/Game/Systems/PlayerMovementSystem.cpp

@@ -16,9 +16,7 @@ PlayerMovementSystem::~PlayerMovementSystem()
 void PlayerMovementSystem::Update(double dt)
 {
     updateMovementControllers(dt);
-    if (LocalPlayer.Valid()) {
+    updateVelocity(dt);
-        updateVelocity(LocalPlayer, dt);
-    }
 }
 
 void PlayerMovementSystem::updateMovementControllers(double dt)
@@ -223,11 +221,15 @@ void PlayerMovementSystem::updateMovementControllers(double dt)
 }
 
 
-void PlayerMovementSystem::updateVelocity(EntityWrapper player, double dt)
+void PlayerMovementSystem::updateVelocity(double dt)
 {
     // Only apply velocity to local player
-    ComponentWrapper& cTransform = player["Transform"];
+    if (!LocalPlayer.Valid()) {
-    ComponentWrapper& cPhysics = player["Physics"];
+        return;
+    }
+
+    ComponentWrapper& cTransform = LocalPlayer["Transform"];
+    ComponentWrapper& cPhysics = LocalPlayer["Physics"];
     glm::vec3& velocity = cPhysics["Velocity"];
     bool isOnGround = (bool)cPhysics["IsOnGround"];