BTH/axyz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Cleaned code

Browse Source
This commit is contained in:
stiffly
2015-12-17 10:47:08 +01:00
parent 97a0d97b0b
commit 4c29e071af
2 changed files with 43 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/Engine/Network/Client.h
+35 -38
View File
@@ -5,7 +5,6 @@
#include <ctime>
#include <glm/common.hpp>
#include <GLFW/glfw3.h> // For input event
#include "Network/MessageType.h"
#include "Network/NetworkDefinitions.h"
@@ -14,68 +13,66 @@
#include "Network/WinLeakCheck.h"
#include "Core/World.h"
#include "Core/EventBroker.h"
#include "Core/EKeyDown.h"
#include "Core/EKeyUp.h"
#include "Input/EInputCommand.h"
#include "Network/Network.h"
class Client : public Network
{
public:
Client();
~Client();
void Start(World* world, EventBroker* eventBroker);
Client();
~Client();
void Start(World* world, EventBroker* eventBroker);
void Update();
void Close();
private:
void ReadFromServer();
void SendSnapshotToServer();
void ReadFromServer();
void SendSnapshotToServer();
int Receive(char* data, size_t length);
void Send(Package& message);
int CreateMessage(MessageType type, std::string message, char* data);
int Receive(char* data, size_t length);
void Send(Package& message);
void Connect();
void Disconnect();
void Ping();
void MoveMessageHead(char*& data, size_t& length, size_t stepSize);
void ParseMessageType(Package& package);
void ParseEventMessage(Package& package);
void ParseConnect(Package& package);
void ParsePing();
void ParseServerPing();
void ParseSnapshot(Package& package);
void CreateNewPlayer(int i);
void IdentifyPacketLoss();
void MoveMessageHead(char*& data, size_t& length, size_t stepSize);
void ParseMessageType(Package& package);
void ParseEventMessage(Package& package);
void ParseConnect(Package& package);
void ParsePing();
void ParseServerPing();
void ParseSnapshot(Package& package);
void CreateNewPlayer(int i);
void IdentifyPacketLoss();
// udp stuff
boost::asio::ip::udp::endpoint m_ReceiverEndpoint;
boost::asio::io_service m_IOService;
boost::asio::ip::udp::socket m_Socket;
// UDP logic
boost::asio::ip::udp::endpoint m_ReceiverEndpoint;
boost::asio::io_service m_IOService;
boost::asio::ip::udp::socket m_Socket;
// Packet loss logic
// Packet loss logic
unsigned int m_PacketID = 0;
unsigned int m_PreviousPacketID = 0;
unsigned int m_PreviousPacketID = 0;
unsigned int m_SendPacketID = 0;
// Game Logic
// Game logic
World* m_World;
std::vector<unsigned int> m_PlayersToCreate;
glm::vec2 m_PlayerPositions[MAXCONNECTIONS];
std::string m_PlayerName;
int m_PlayerID = -1;
IsWASDKeyDown m_IsWASDKeyDown;
World* m_World;
int m_PlayerID = -1;
glm::vec2 m_PlayerPositions[MAXCONNECTIONS];
PlayerDefinition m_PlayerDefinitions[MAXCONNECTIONS];
SnapshotDefinitions m_NextSnapshot;
std::clock_t m_StartPingTime;
double m_DurationOfPingTime;
std::string m_PlayerName;
// Network logic
PlayerDefinition m_PlayerDefinitions[MAXCONNECTIONS];
SnapshotDefinitions m_NextSnapshot;
bool m_ThreadIsRunning = true;
double m_DurationOfPingTime;
std::clock_t m_StartPingTime;
// Use to check if we should send disconnect message
// if game is turned of by closing window.
bool m_WasStarted = false;
IsWASDKeyDown m_IsWASDKeyDown;
// Events
EventBroker* m_EventBroker;
// Events
EventBroker* m_EventBroker;
EventRelay<Client, Events::InputCommand> m_EInputCommand;
bool OnInputCommand(const Events::InputCommand &e);
};