From 36ae451ea62c2f9067794e7f431dcdc59a55da31 Mon Sep 17 00:00:00 2001 From: stiffly Date: Fri, 11 Dec 2015 16:22:14 +0100 Subject: [PATCH] Indentation --- src/Engine/Network/Client.cpp | 103 +++++++++++++++++----------------- 1 file changed, 51 insertions(+), 52 deletions(-) diff --git a/src/Engine/Network/Client.cpp b/src/Engine/Network/Client.cpp index c80a6d56..f3840caf 100644 --- a/src/Engine/Network/Client.cpp +++ b/src/Engine/Network/Client.cpp @@ -6,9 +6,9 @@ using namespace boost::asio::ip; Client::Client() : m_Socket(m_IOService) { // Set up network stream - m_ReceiverEndpoint = udp::endpoint(boost::asio::ip::address::from_string("192.168.1.6"), 13); - m_NextSnapshot.InputForward = ""; - m_NextSnapshot.InputRight = ""; + m_ReceiverEndpoint = udp::endpoint(boost::asio::ip::address::from_string("192.168.1.2"), 13); + m_NextSnapshot.InputForward = ""; + m_NextSnapshot.InputRight = ""; } Client::~Client() @@ -74,9 +74,9 @@ void Client::ReadFromServer() void Client::SendSnapshotToServer() { // Reset previouse key state in snapshot. - Package message(MessageType::Event, m_SendPacketID); - message.AddString(m_NextSnapshot.InputForward); - Send(message); + Package message(MessageType::Event, m_SendPacketID); + message.AddString(m_NextSnapshot.InputForward); + Send(message); m_NextSnapshot.InputRight = ""; m_NextSnapshot.InputRight = ""; // See if any movement keys are down @@ -96,14 +96,14 @@ void Client::SendSnapshotToServer() } if (m_NextSnapshot.InputForward != "") { - Package message(MessageType::Event, m_SendPacketID); - message.AddString(m_NextSnapshot.InputForward); - Send(message); + Package message(MessageType::Event, m_SendPacketID); + message.AddString(m_NextSnapshot.InputForward); + Send(message); } if (m_NextSnapshot.InputRight != "") { - Package message(MessageType::Event, m_SendPacketID); - message.AddString(m_NextSnapshot.InputRight); - Send(message); + Package message(MessageType::Event, m_SendPacketID); + message.AddString(m_NextSnapshot.InputRight); + Send(message); } } @@ -113,11 +113,11 @@ void Client::ParseMessageType(char* data, size_t length) memcpy(&messageType, data, sizeof(int)); // Read what type off message was sent from server MoveMessageHead(data, length, sizeof(int)); // Move the message head to know where to read from - // Read packet ID - m_PreviousPacketID = m_PacketID; // Set previous packet id - memcpy(&m_PacketID, data, sizeof(int)); //Read new packet id - MoveMessageHead(data, length, sizeof(int)); - IdentifyPacketLoss(); + // Read packet ID + m_PreviousPacketID = m_PacketID; // Set previous packet id + memcpy(&m_PacketID, data, sizeof(int)); //Read new packet id + MoveMessageHead(data, length, sizeof(int)); + IdentifyPacketLoss(); switch (static_cast(messageType)) { case MessageType::Connect: @@ -146,22 +146,22 @@ void Client::ParseMessageType(char* data, size_t length) void Client::ParseConnect(char* data, size_t len) { - memcpy(&m_PacketID, data, sizeof(int)); - m_PreviousPacketID = m_PacketID; - std::cout << m_PacketID << ": I am player: " << m_PlayerID << std::endl; + memcpy(&m_PacketID, data, sizeof(int)); + m_PreviousPacketID = m_PacketID; + std::cout << m_PacketID << ": I am player: " << m_PlayerID << std::endl; } void Client::ParsePing() { m_DurationOfPingTime = 1000 * (std::clock() - m_StartPingTime) / static_cast(CLOCKS_PER_SEC); - std::cout << m_PacketID << ": response time with ctime(ms): " << m_DurationOfPingTime << std::endl; + std::cout << m_PacketID << ": response time with ctime(ms): " << m_DurationOfPingTime << std::endl; } void Client::ParseServerPing() { - Package message(MessageType::ServerPing, m_SendPacketID); - message.AddString("Ping recieved"); - Send(message); + Package message(MessageType::ServerPing, m_SendPacketID); + message.AddString("Ping recieved"); + Send(message); //std::cout << "Parsing ping." << std::endl; } @@ -176,7 +176,7 @@ void Client::ParseEventMessage(char* data, size_t length) // Sett Player name m_PlayerDefinitions[Id].Name = command.erase(0, 7); } else { - std::cout << m_PacketID << ": Event message: " << std::string(data) << std::endl; + std::cout << m_PacketID << ": Event message: " << std::string(data) << std::endl; } MoveMessageHead(data, length, std::string(data).size() + 1); @@ -184,7 +184,7 @@ void Client::ParseEventMessage(char* data, size_t length) void Client::ParseSnapshot(char* data, size_t length) { - std::cout << m_PacketID << ": Parsing incoming snapshot." << std::endl; + std::cout << m_PacketID << ": Parsing incoming snapshot." << std::endl; std::string tempName; for (size_t i = 0; i < MAXCONNECTIONS; i++) { // We're checking for empty name for now. This might not be the best way, @@ -226,7 +226,7 @@ int Client::Receive(char* data, size_t length) ::asio::buffer((void*)data, length), m_ReceiverEndpoint, 0, error); - + if (error) { std::cout << "ReadFromServer crashed: " << error.message(); } @@ -236,33 +236,33 @@ int Client::Receive(char* data, size_t length) void Client::Send(Package& package) { - m_Socket.send_to(boost::asio::buffer( - package.Data(), - package.Size()), - m_ReceiverEndpoint, 0); + m_Socket.send_to(boost::asio::buffer( + package.Data(), + package.Size()), + m_ReceiverEndpoint, 0); } void Client::Connect() { - Package message(MessageType::Connect, m_SendPacketID); - message.AddString(m_PlayerName); - m_StartPingTime = std::clock(); - Send(message); + Package message(MessageType::Connect, m_SendPacketID); + message.AddString(m_PlayerName); + m_StartPingTime = std::clock(); + Send(message); } void Client::Disconnect() { - Package message(MessageType::Connect, m_SendPacketID); - message.AddString("+Disconnect"); - Send(message); + Package message(MessageType::Connect, m_SendPacketID); + message.AddString("+Disconnect"); + Send(message); } void Client::Ping() { - Package message(MessageType::Connect, m_SendPacketID); - message.AddString("Ping"); - m_StartPingTime = std::clock(); - Send(message); + Package message(MessageType::Connect, m_SendPacketID); + message.AddString("Ping"); + m_StartPingTime = std::clock(); + Send(message); } void Client::MoveMessageHead(char*& data, size_t& length, size_t stepSize) @@ -304,11 +304,11 @@ bool Client::OnKeyUp(const Events::KeyUp & e) m_IsWASDKeyDown.W = false; return true; } - if (e.KeyCode == GLFW_KEY_A){ + if (e.KeyCode == GLFW_KEY_A) { m_IsWASDKeyDown.A = false; return true; } - if (e.KeyCode == GLFW_KEY_S){ + if (e.KeyCode == GLFW_KEY_S) { m_IsWASDKeyDown.S = false; return true; } @@ -329,12 +329,11 @@ void Client::CreateNewPlayer(int i) void Client::IdentifyPacketLoss() { - // if no packets lost, difference should be equal to 1 - int difference = m_PacketID - m_PreviousPacketID; - if (difference != 1) { - for (int i = m_PreviousPacketID + 1; i < m_PacketID; i++) - { - LOG_INFO("Packet %i was lost...", i); - } - } + // if no packets lost, difference should be equal to 1 + int difference = m_PacketID - m_PreviousPacketID; + if (difference != 1) { + for (int i = m_PreviousPacketID + 1; i < m_PacketID; i++) { + LOG_INFO("Packet %i was lost...", i); + } + } }