Fixed client movement.
This commit is contained in:
Jocke
+219
-193
@@ -5,8 +5,8 @@ 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);
|
||||
// Set up network stream
|
||||
m_ReceiverEndpoint = udp::endpoint(boost::asio::ip::address::from_string("192.168.1.6"), 13);
|
||||
}
|
||||
|
||||
Client::~Client()
|
||||
@@ -19,22 +19,22 @@ void Client::Start(World* world, EventBroker* eventBroker)
|
||||
{
|
||||
m_WasStarted = true;
|
||||
m_EventBroker = eventBroker;
|
||||
m_World = world;
|
||||
|
||||
// Subscribe to events
|
||||
m_EKeyDown = decltype(m_EKeyDown)(std::bind(&Client::OnKeyDown, this, std::placeholders::_1));
|
||||
m_World = world;
|
||||
|
||||
// Subscribe to events
|
||||
m_EKeyDown = decltype(m_EKeyDown)(std::bind(&Client::OnKeyDown, this, std::placeholders::_1));
|
||||
m_EventBroker->Subscribe(m_EKeyDown);
|
||||
m_EKeyUp = decltype(m_EKeyUp)(std::bind(&Client::OnKeyUp, this, std::placeholders::_1));
|
||||
m_EventBroker->Subscribe(m_EKeyUp);
|
||||
|
||||
std::cout << "Please enter you name: ";
|
||||
std::cin >> m_PlayerName;
|
||||
while (m_PlayerName.size() > 7) {
|
||||
std::cout << "Please enter you name(No longer than 7 characters): ";
|
||||
std::cin >> m_PlayerName;
|
||||
}
|
||||
m_Socket.connect(m_ReceiverEndpoint);
|
||||
std::cout << "I am client. BIP BOP\n";
|
||||
m_EKeyUp = decltype(m_EKeyUp)(std::bind(&Client::OnKeyUp, this, std::placeholders::_1));
|
||||
m_EventBroker->Subscribe(m_EKeyUp);
|
||||
|
||||
std::cout << "Please enter you name: ";
|
||||
std::cin >> m_PlayerName;
|
||||
while (m_PlayerName.size() > 7) {
|
||||
std::cout << "Please enter you name(No longer than 7 characters): ";
|
||||
std::cin >> m_PlayerName;
|
||||
}
|
||||
m_Socket.connect(m_ReceiverEndpoint);
|
||||
std::cout << "I am client. BIP BOP\n";
|
||||
ReadFromServer();
|
||||
}
|
||||
|
||||
@@ -50,193 +50,205 @@ void Client::Close()
|
||||
|
||||
void Client::ReadFromServer()
|
||||
{
|
||||
int bytesRead = -1;
|
||||
char readBuf[1024] = { 0 };
|
||||
int bytesRead = -1;
|
||||
char readBuf[1024] = { 0 };
|
||||
|
||||
int snapshotInterval = 33;
|
||||
std::clock_t previousSnapshotMessage = std::clock();
|
||||
int snapshotInterval = 33;
|
||||
std::clock_t previousSnapshotMessage = std::clock();
|
||||
|
||||
while (m_ThreadIsRunning) {
|
||||
if (m_Socket.available()) {
|
||||
bytesRead = Receive(readBuf, INPUTSIZE);
|
||||
ParseMessageType(readBuf, bytesRead);
|
||||
}
|
||||
std::clock_t currentTime = std::clock();
|
||||
if (snapshotInterval < (1000 * (currentTime - previousSnapshotMessage) / (double)CLOCKS_PER_SEC)) {
|
||||
SendToServer();
|
||||
previousSnapshotMessage = currentTime;
|
||||
}
|
||||
|
||||
}
|
||||
while (m_ThreadIsRunning) {
|
||||
if (m_Socket.available()) {
|
||||
bytesRead = Receive(readBuf, INPUTSIZE);
|
||||
ParseMessageType(readBuf, bytesRead);
|
||||
}
|
||||
std::clock_t currentTime = std::clock();
|
||||
if (snapshotInterval < (1000 * (currentTime - previousSnapshotMessage) / (double)CLOCKS_PER_SEC)) {
|
||||
SendSnapshotToServer();
|
||||
previousSnapshotMessage = currentTime;
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
void Client::SendToServer()
|
||||
void Client::SendSnapshotToServer()
|
||||
{
|
||||
if (m_NextSnapshot.inputForward != "") {
|
||||
char* dataPackage = new char[INPUTSIZE]; // The package that will be sent to the server, when filled
|
||||
int len = CreateMessage(MessageType::Event, m_NextSnapshot.inputForward, dataPackage);
|
||||
m_Socket.send_to(boost::asio::buffer(
|
||||
dataPackage,
|
||||
len),
|
||||
m_ReceiverEndpoint, 0);
|
||||
// Reset previouse key state in snapshot.
|
||||
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 != "") {
|
||||
char* dataPackage = new char[INPUTSIZE]; // The package that will be sent to the server, when filled
|
||||
int len = CreateMessage(MessageType::Event, m_NextSnapshot.InputForward, dataPackage);
|
||||
m_Socket.send_to(boost::asio::buffer(
|
||||
dataPackage,
|
||||
len),
|
||||
m_ReceiverEndpoint, 0);
|
||||
delete[] dataPackage;
|
||||
}
|
||||
if (m_NextSnapshot.inputRight != "") {
|
||||
char* dataPackage = new char[INPUTSIZE]; // The package that will be sent to the server, when filled
|
||||
int len = CreateMessage(MessageType::Event, m_NextSnapshot.inputRight, dataPackage);
|
||||
m_Socket.send_to(boost::asio::buffer(
|
||||
dataPackage,
|
||||
len),
|
||||
m_ReceiverEndpoint, 0);
|
||||
}
|
||||
if (m_NextSnapshot.InputRight != "") {
|
||||
char* dataPackage = new char[INPUTSIZE]; // The package that will be sent to the server, when filled
|
||||
int len = CreateMessage(MessageType::Event, m_NextSnapshot.InputRight, dataPackage);
|
||||
m_Socket.send_to(boost::asio::buffer(
|
||||
dataPackage,
|
||||
len),
|
||||
m_ReceiverEndpoint, 0);
|
||||
delete[] dataPackage;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void Client::ParseMessageType(char* data, size_t length)
|
||||
{
|
||||
int messageType = -1;
|
||||
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
|
||||
int messageType = -1;
|
||||
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
|
||||
|
||||
switch (static_cast<MessageType>(messageType)) {
|
||||
case MessageType::Connect:
|
||||
ParseConnect(data, length);
|
||||
break;
|
||||
case MessageType::ClientPing:
|
||||
ParsePing();
|
||||
break;
|
||||
case MessageType::ServerPing:
|
||||
ParseServerPing();
|
||||
break;
|
||||
case MessageType::Message:
|
||||
break;
|
||||
case MessageType::Snapshot:
|
||||
ParseSnapshot(data, length);
|
||||
break;
|
||||
case MessageType::Disconnect:
|
||||
break;
|
||||
case MessageType::Event:
|
||||
ParseEventMessage(data, length);
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
switch (static_cast<MessageType>(messageType)) {
|
||||
case MessageType::Connect:
|
||||
ParseConnect(data, length);
|
||||
break;
|
||||
case MessageType::ClientPing:
|
||||
ParsePing();
|
||||
break;
|
||||
case MessageType::ServerPing:
|
||||
ParseServerPing();
|
||||
break;
|
||||
case MessageType::Message:
|
||||
break;
|
||||
case MessageType::Snapshot:
|
||||
ParseSnapshot(data, length);
|
||||
break;
|
||||
case MessageType::Disconnect:
|
||||
break;
|
||||
case MessageType::Event:
|
||||
ParseEventMessage(data, length);
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
void Client::ParseConnect(char* data, size_t len)
|
||||
{
|
||||
memcpy(&m_PlayerID, data, sizeof(int));
|
||||
std::cout << "I am player: " << m_PlayerID << std::endl;
|
||||
memcpy(&m_PlayerID, data, sizeof(int));
|
||||
std::cout << "I am player: " << m_PlayerID << std::endl;
|
||||
}
|
||||
|
||||
void Client::ParsePing()
|
||||
{
|
||||
m_DurationOfPingTime = 1000 * (std::clock() - m_StartPingTime) / static_cast<double>(CLOCKS_PER_SEC);
|
||||
std::cout << "response time with ctime(ms): " << m_DurationOfPingTime << std::endl;
|
||||
m_DurationOfPingTime = 1000 * (std::clock() - m_StartPingTime) / static_cast<double>(CLOCKS_PER_SEC);
|
||||
std::cout << "response time with ctime(ms): " << m_DurationOfPingTime << std::endl;
|
||||
}
|
||||
|
||||
void Client::ParseServerPing()
|
||||
{
|
||||
char* testMessage = new char[128];
|
||||
int testOffset = CreateMessage(MessageType::ServerPing, "Ping recieved", testMessage);
|
||||
char* testMessage = new char[128];
|
||||
int testOffset = CreateMessage(MessageType::ServerPing, "Ping recieved", testMessage);
|
||||
|
||||
//std::cout << "Parsing ping." << std::endl;
|
||||
//std::cout << "Parsing ping." << std::endl;
|
||||
|
||||
m_Socket.send_to(boost::asio::buffer(
|
||||
m_Socket.send_to(boost::asio::buffer(
|
||||
testMessage,
|
||||
testOffset),
|
||||
m_ReceiverEndpoint, 0);
|
||||
testOffset),
|
||||
m_ReceiverEndpoint, 0);
|
||||
delete[] testMessage;
|
||||
}
|
||||
|
||||
void Client::ParseEventMessage(char* data, size_t length)
|
||||
{
|
||||
int Id = -1;
|
||||
std::string command = std::string(data);
|
||||
if (command.find("+Player") != std::string::npos) {
|
||||
MoveMessageHead(data, length, command.size() + 1);
|
||||
memcpy(&Id, data, sizeof(int));
|
||||
MoveMessageHead(data, length, sizeof(int));
|
||||
// Sett Player name
|
||||
m_PlayerDefinitions[Id].Name = command.erase(0, 7);
|
||||
}
|
||||
else {
|
||||
std::cout << "Event message: " << std::string(data) << std::endl;
|
||||
}
|
||||
int Id = -1;
|
||||
std::string command = std::string(data);
|
||||
if (command.find("+Player") != std::string::npos) {
|
||||
MoveMessageHead(data, length, command.size() + 1);
|
||||
memcpy(&Id, data, sizeof(int));
|
||||
MoveMessageHead(data, length, sizeof(int));
|
||||
// Sett Player name
|
||||
m_PlayerDefinitions[Id].Name = command.erase(0, 7);
|
||||
} else {
|
||||
std::cout << "Event message: " << std::string(data) << std::endl;
|
||||
}
|
||||
|
||||
MoveMessageHead(data, length, std::string(data).size() + 1);
|
||||
MoveMessageHead(data, length, std::string(data).size() + 1);
|
||||
}
|
||||
|
||||
void Client::ParseSnapshot(char* data, size_t length)
|
||||
{
|
||||
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,
|
||||
// but it is to avoid sending redundant data.
|
||||
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,
|
||||
// but it is to avoid sending redundant data.
|
||||
|
||||
// Read position data
|
||||
glm::vec3 playerPos;
|
||||
memcpy(&playerPos.x, data, sizeof(float));
|
||||
MoveMessageHead(data, length, sizeof(float));
|
||||
memcpy(&playerPos.y, data, sizeof(float));
|
||||
MoveMessageHead(data, length, sizeof(float));
|
||||
memcpy(&playerPos.z, data, sizeof(float));
|
||||
MoveMessageHead(data, length, sizeof(float));
|
||||
|
||||
tempName = std::string(data);
|
||||
// +1 for null terminator
|
||||
MoveMessageHead(data, length, tempName.size() + 1);
|
||||
// Apply the position data read to the player entity
|
||||
// New player connected on the server side
|
||||
if (m_PlayerDefinitions[i].Name == "" && tempName != "") {
|
||||
CreateNewPlayer(i);
|
||||
}
|
||||
else if (m_PlayerDefinitions[i].Name != "" && tempName == "") {
|
||||
// Someone disconnected
|
||||
// TODO: Insert code here
|
||||
}
|
||||
else if (m_PlayerDefinitions[i].Name == "" && tempName == "") {
|
||||
// Not a connected player
|
||||
break;
|
||||
}
|
||||
m_World->GetComponent(m_PlayerDefinitions[i].EntityID, "Transform")["Position"] = playerPos;
|
||||
m_PlayerDefinitions[i].Name = tempName;
|
||||
}
|
||||
// Read position data
|
||||
glm::vec3 playerPos;
|
||||
memcpy(&playerPos.x, data, sizeof(float));
|
||||
MoveMessageHead(data, length, sizeof(float));
|
||||
memcpy(&playerPos.y, data, sizeof(float));
|
||||
MoveMessageHead(data, length, sizeof(float));
|
||||
memcpy(&playerPos.z, data, sizeof(float));
|
||||
MoveMessageHead(data, length, sizeof(float));
|
||||
|
||||
tempName = std::string(data);
|
||||
// +1 for null terminator
|
||||
MoveMessageHead(data, length, tempName.size() + 1);
|
||||
// Apply the position data read to the player entity
|
||||
// New player connected on the server side
|
||||
if (m_PlayerDefinitions[i].Name == "" && tempName != "") {
|
||||
CreateNewPlayer(i);
|
||||
} else if (m_PlayerDefinitions[i].Name != "" && tempName == "") {
|
||||
// Someone disconnected
|
||||
// TODO: Insert code here
|
||||
} else if (m_PlayerDefinitions[i].Name == "" && tempName == "") {
|
||||
// Not a connected player
|
||||
break;
|
||||
}
|
||||
m_World->GetComponent(m_PlayerDefinitions[i].EntityID, "Transform")["Position"] = playerPos;
|
||||
m_PlayerDefinitions[i].Name = tempName;
|
||||
}
|
||||
}
|
||||
|
||||
int Client::Receive(char* data, size_t length)
|
||||
{
|
||||
boost::system::error_code error;
|
||||
|
||||
try {
|
||||
int bytesReceived = m_Socket.receive_from(boost
|
||||
::asio::buffer((void*)data, length),
|
||||
m_ReceiverEndpoint,
|
||||
0);
|
||||
return bytesReceived;
|
||||
} catch (const std::exception& err) {
|
||||
// To not spam "socket closed messages"
|
||||
//if (std::string(err.what()).find("forcefully closed") != std::string::npos) {
|
||||
std::cout << "Read from client crashed: " << err.what();
|
||||
//}
|
||||
}
|
||||
return 0;
|
||||
int bytesReceived = m_Socket.receive_from(boost
|
||||
::asio::buffer((void*)data, length),
|
||||
m_ReceiverEndpoint,
|
||||
0, error);
|
||||
|
||||
std::cout << "ReadFromServer crashed: " << error.message();
|
||||
|
||||
return bytesReceived;
|
||||
}
|
||||
|
||||
int Client::CreateMessage(MessageType type, std::string message, char* data)
|
||||
{
|
||||
int lengthOfMessage = 0;
|
||||
int messageType = static_cast<int>(type);
|
||||
lengthOfMessage = message.size();
|
||||
int lengthOfMessage = 0;
|
||||
int messageType = static_cast<int>(type);
|
||||
lengthOfMessage = message.size();
|
||||
|
||||
int offset = 0;
|
||||
// Message type
|
||||
memcpy(data + offset, &messageType, sizeof(int));
|
||||
offset += sizeof(int);
|
||||
// Message, add one extra byte for null terminator
|
||||
memcpy(data + offset, message.data(), (lengthOfMessage + 1) * sizeof(char));
|
||||
offset += (lengthOfMessage + 1) * sizeof(char);
|
||||
int offset = 0;
|
||||
// Message type
|
||||
memcpy(data + offset, &messageType, sizeof(int));
|
||||
offset += sizeof(int);
|
||||
// Message, add one extra byte for null terminator
|
||||
memcpy(data + offset, message.data(), (lengthOfMessage + 1) * sizeof(char));
|
||||
offset += (lengthOfMessage + 1) * sizeof(char);
|
||||
|
||||
return offset;
|
||||
return offset;
|
||||
}
|
||||
|
||||
void Client::Connect()
|
||||
@@ -263,7 +275,7 @@ void Client::Disconnect()
|
||||
}
|
||||
|
||||
void Client::Ping()
|
||||
{
|
||||
{
|
||||
char* dataPackage = new char[INPUTSIZE];
|
||||
if (GetAsyncKeyState('P')) { // Maybe use previous key here
|
||||
int length = CreateMessage(MessageType::ClientPing, "Ping", dataPackage);
|
||||
@@ -279,57 +291,71 @@ void Client::Ping()
|
||||
|
||||
void Client::MoveMessageHead(char*& data, size_t& length, size_t stepSize)
|
||||
{
|
||||
data += stepSize;
|
||||
length -= stepSize;
|
||||
data += stepSize;
|
||||
length -= stepSize;
|
||||
}
|
||||
|
||||
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";
|
||||
}
|
||||
if (event.KeyCode == GLFW_KEY_A) {
|
||||
m_NextSnapshot.inputRight = "-Right";
|
||||
}
|
||||
if (event.KeyCode == GLFW_KEY_S) {
|
||||
m_NextSnapshot.inputForward = "-Forward";
|
||||
}
|
||||
if (event.KeyCode == GLFW_KEY_D) {
|
||||
m_NextSnapshot.inputRight = "+Right";
|
||||
}
|
||||
char* dataPackage = new char[INPUTSIZE]; // The package that will be sent to the server, when filled
|
||||
if (event.KeyCode == GLFW_KEY_W) {
|
||||
m_IsWASDKeyDown.W = true;
|
||||
//m_NextSnapshot.inputForward = "+Forward";
|
||||
}
|
||||
if (event.KeyCode == GLFW_KEY_A) {
|
||||
m_IsWASDKeyDown.A = true;
|
||||
//m_NextSnapshot.inputRight = "-Right";
|
||||
}
|
||||
if (event.KeyCode == GLFW_KEY_S) {
|
||||
m_IsWASDKeyDown.S = true;
|
||||
//m_NextSnapshot.inputForward = "-Forward";
|
||||
}
|
||||
if (event.KeyCode == GLFW_KEY_D) {
|
||||
m_IsWASDKeyDown.D = true;
|
||||
//m_NextSnapshot.inputRight = "+Right";
|
||||
}
|
||||
|
||||
if (event.KeyCode == GLFW_KEY_V) {
|
||||
Disconnect();
|
||||
}
|
||||
if (event.KeyCode == GLFW_KEY_C) {
|
||||
Connect();
|
||||
}
|
||||
if (event.KeyCode == GLFW_KEY_V) {
|
||||
Disconnect();
|
||||
}
|
||||
if (event.KeyCode == GLFW_KEY_C) {
|
||||
Connect();
|
||||
}
|
||||
if (event.KeyCode == GLFW_KEY_P) {
|
||||
Ping();
|
||||
}
|
||||
memset(dataPackage, 0, INPUTSIZE);
|
||||
delete[] dataPackage;
|
||||
return true;
|
||||
memset(dataPackage, 0, INPUTSIZE);
|
||||
delete[] dataPackage;
|
||||
return true;
|
||||
}
|
||||
|
||||
bool Client::OnKeyUp(const Events::KeyUp & e)
|
||||
{
|
||||
if (e.KeyCode == GLFW_KEY_W || e.KeyCode == GLFW_KEY_S) {
|
||||
m_NextSnapshot.inputForward = "";
|
||||
return true;
|
||||
}
|
||||
if (e.KeyCode == GLFW_KEY_A || e.KeyCode == GLFW_KEY_D) {
|
||||
m_NextSnapshot.inputRight = "";
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
if (e.KeyCode == GLFW_KEY_W) {
|
||||
m_IsWASDKeyDown.W = false;
|
||||
//m_NextSnapshot.inputForward = "";
|
||||
return true;
|
||||
}
|
||||
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;
|
||||
}
|
||||
|
||||
void Client::CreateNewPlayer(int i)
|
||||
{
|
||||
m_PlayerDefinitions[i].EntityID = m_World->CreateEntity();
|
||||
ComponentWrapper transform = m_World->AttachComponent(m_PlayerDefinitions[i].EntityID, "Transform");
|
||||
ComponentWrapper model = m_World->AttachComponent(m_PlayerDefinitions[i].EntityID, "Model");
|
||||
model["Resource"] = "Models/Core/UnitSphere.obj";
|
||||
m_PlayerDefinitions[i].EntityID = m_World->CreateEntity();
|
||||
ComponentWrapper transform = m_World->AttachComponent(m_PlayerDefinitions[i].EntityID, "Transform");
|
||||
ComponentWrapper model = m_World->AttachComponent(m_PlayerDefinitions[i].EntityID, "Model");
|
||||
model["Resource"] = "Models/Core/UnitSphere.obj";
|
||||
}
|
||||
Reference in New Issue
Block a user