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

Merge remote-tracking branch 'origin/Networking' into Networking

Browse Source 
# Conflicts:
#	src/Engine/Network/Client.cpp
This commit is contained in:
stiffly
2015-12-10 17:16:22 +01:00
parent 58952725e9 99543a300d
commit 641a43b2ec
5 changed files with 212 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/Engine/Network/Client.h
+2 -1
View File
@@ -27,7 +27,7 @@ public:
void Close();
private:
void ReadFromServer();
void SendToServer();
void SendSnapshotToServer();
int Receive(char* data, size_t length);
void Send(Package& message);
@@ -66,6 +66,7 @@ private:
// 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;
include/Engine/Network/NetworkDefinitions.h
+3
View File
@@ -10,9 +10,12 @@
#define MAXCONNECTIONS 8
#define INPUTSIZE 128
#define PACKETMODULUS 1000 // How many packets to send before the number resets
#define PLAYERSPEED 0.2f;
typedef boost::shared_ptr<boost::asio::ip::udp::socket> socket_ptr;
typedef boost::shared_ptr<std::string> string_ptr;
typedef boost::shared_ptr<std::queue<string_ptr>> messageQueue_ptr;
#endif
include/Engine/Network/SnapshotDefinitions.h
+10 -2
View File
@@ -4,9 +4,17 @@
struct SnapshotDefinitions
{
// "+Forward" is 8 characters * sizeof(char) = 8
char* inputForward = new char[8];
char* InputForward = new char[8];
// "+Right" is 6 characters * sizeof(char) = 6
char* inputRight = new char[6];
char* InputRight = new char[6];
};
struct IsWASDKeyDown
{
bool W = false;
bool A = false;
bool S = false;
bool D = false;
};
#endif
src/Engine/Network/Client.cpp
+62 -23
View File
@@ -7,8 +7,8 @@ Client::Client() : m_Socket(m_IOService)
{
// Set up network stream
m_ReceiverEndpoint = udp::endpoint(boost::asio::ip::address::from_string("192.168.1.2"), 13);
m_NextSnapshot.inputForward = "";
m_NextSnapshot.inputRight = "";
m_NextSnapshot.InputForward = "";
m_NextSnapshot.InputRight = "";
}
Client::~Client()
@@ -65,23 +65,45 @@ void Client::ReadFromServer()
}
std::clock_t currentTime = std::clock();
if (snapshotInterval < (1000 * (currentTime - previousSnapshotMessage) / (double)CLOCKS_PER_SEC)) {
SendToServer();
SendSnapshotToServer();
previousSnapshotMessage = currentTime;
}
}
}
void Client::SendToServer()
void Client::SendSnapshotToServer()
{
if (m_NextSnapshot.inputForward != "" && m_NextSnapshot.inputForward[0] != '\0') {
// Reset previouse key state in snapshot.
Package message(MessageType::Event);
message.AddString(m_NextSnapshot.inputForward);
message.AddString(m_NextSnapshot.InputForward);
Send(message);
m_NextSnapshot.InputRight = "";
m_NextSnapshot.InputRight = "";
// See if any movement keys are down
// We dont care if it's overwritten by later
// if statement. Watcha gonna do, right!
if (m_IsWASDKeyDown.W) {
m_NextSnapshot.InputRight = "+Forward";
}
if (m_IsWASDKeyDown.A) {
m_NextSnapshot.InputRight = "-Right";
}
if (m_IsWASDKeyDown.S) {
m_NextSnapshot.InputRight = "-Forward";
}
if (m_IsWASDKeyDown.D) {
m_NextSnapshot.InputRight = "+Right";
}
if (m_NextSnapshot.InputForward != "") {
Package message(MessageType::Event);
message.AddString(m_NextSnapshot.InputForward);
Send(message);
}
if (m_NextSnapshot.inputRight != "" && m_NextSnapshot.inputRight[0] != '\0') {
if (m_NextSnapshot.InputRight != "") {
Package message(MessageType::Event);
message.AddString(m_NextSnapshot.inputRight);
message.AddString(m_NextSnapshot.InputRight);
Send(message);
}
}
@@ -141,6 +163,7 @@ void Client::ParseServerPing()
Package message(MessageType::ServerPing);
message.AddString("Ping recieved");
Send(message);
//std::cout << "Parsing ping." << std::endl;
}
void Client::ParseEventMessage(char* data, size_t length)
@@ -153,8 +176,7 @@ void Client::ParseEventMessage(char* data, size_t length)
MoveMessageHead(data, length, sizeof(int));
// Sett Player name
m_PlayerDefinitions[Id].Name = command.erase(0, 7);
}
else {
} else {
std::cout << m_PacketID << ": Event message: " << std::string(data) << std::endl;
}
@@ -185,12 +207,10 @@ void Client::ParseSnapshot(char* data, size_t length)
// New player connected on the server side
if (m_PlayerDefinitions[i].Name == "" && tempName != "") {
CreateNewPlayer(i);
}
else if (m_PlayerDefinitions[i].Name != "" && tempName == "") {
} else if (m_PlayerDefinitions[i].Name != "" && tempName == "") {
// Someone disconnected
// TODO: Insert code here
}
else if (m_PlayerDefinitions[i].Name == "" && tempName == "") {
} else if (m_PlayerDefinitions[i].Name == "" && tempName == "") {
// Not a connected player
break;
}
@@ -201,10 +221,15 @@ void Client::ParseSnapshot(char* data, size_t length)
int Client::Receive(char* data, size_t length)
{
boost::system::error_code error;
int bytesReceived = m_Socket.receive_from(boost
::asio::buffer((void*)data, length),
m_ReceiverEndpoint,
0);
0, error);
std::cout << "ReadFromServer crashed: " << error.message();
return bytesReceived;
}
@@ -249,16 +274,20 @@ bool Client::OnKeyDown(const Events::KeyDown& event)
{
char* dataPackage = new char[INPUTSIZE]; // The package that will be sent to the server, when filled
if (event.KeyCode == GLFW_KEY_W) {
m_NextSnapshot.inputForward = "+Forward";
m_IsWASDKeyDown.W = true;
//m_NextSnapshot.inputForward = "+Forward";
}
if (event.KeyCode == GLFW_KEY_A) {
m_NextSnapshot.inputRight = "-Right";
m_IsWASDKeyDown.A = true;
//m_NextSnapshot.inputRight = "-Right";
}
if (event.KeyCode == GLFW_KEY_S) {
m_NextSnapshot.inputForward = "-Forward";
m_IsWASDKeyDown.S = true;
//m_NextSnapshot.inputForward = "-Forward";
}
if (event.KeyCode == GLFW_KEY_D) {
m_NextSnapshot.inputRight = "+Right";
m_IsWASDKeyDown.D = true;
//m_NextSnapshot.inputRight = "+Right";
}
if (event.KeyCode == GLFW_KEY_V) {
@@ -277,12 +306,22 @@ bool Client::OnKeyDown(const Events::KeyDown& event)
bool Client::OnKeyUp(const Events::KeyUp & e)
{
if (e.KeyCode == GLFW_KEY_W || e.KeyCode == GLFW_KEY_S) {
m_NextSnapshot.inputForward = "";
if (e.KeyCode == GLFW_KEY_W) {
m_IsWASDKeyDown.W = false;
//m_NextSnapshot.inputForward = "";
return true;
}
if (e.KeyCode == GLFW_KEY_A || e.KeyCode == GLFW_KEY_D) {
m_NextSnapshot.inputRight = "";
if (e.KeyCode == GLFW_KEY_A){
m_IsWASDKeyDown.A = false;
return true;
}
if (e.KeyCode == GLFW_KEY_S){
m_IsWASDKeyDown.S = false;
return true;
}
if (e.KeyCode == GLFW_KEY_D) {
m_IsWASDKeyDown.D = false;
//m_NextSnapshot.inputRight = "";
return true;
}
return false;