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

Updated movement code once again.

Browse Source
This commit is contained in:
stiffly
2015-12-15 16:50:59 +01:00
parent 889e0bb3d3
commit 9b348a7d97
2 changed files with 24 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Engine/Network/Client.cpp
+13 -6
View File
@@ -111,14 +111,21 @@ void Client::SendSnapshotToServer()
} }
if (m_NextSnapshot.InputForward != "") { if (m_NextSnapshot.InputForward != "") {
Package message(MessageType::Event, m_SendPacketID); Package package(MessageType::Event, m_SendPacketID);
message.AddString(m_NextSnapshot.InputForward); package.AddString(m_NextSnapshot.InputForward);
Send(message); Send(package);
} else {
Package package(MessageType::Event, m_SendPacketID);
package.AddString("0Forward");
} }
if (m_NextSnapshot.InputRight != "") { if (m_NextSnapshot.InputRight != "") {
Package message(MessageType::Event, m_SendPacketID); Package package(MessageType::Event, m_SendPacketID);
message.AddString(m_NextSnapshot.InputRight); package.AddString(m_NextSnapshot.InputRight);
Send(message); Send(package);
} else {
Package package(MessageType::Event, m_SendPacketID);
package.AddString("0Right");
Send(package);
} }
} }
src/Engine/Network/Server.cpp
+11 -11
View File
@@ -26,7 +26,7 @@ void Server::Start(World* world, EventBroker* eventBroker)
} }
void Server::Update() void Server::Update()
{ {
while (m_PlayersToCreate.size() > 0) { while (m_PlayersToCreate.size() > 0) {
unsigned int i = m_PlayersToCreate.size() - 1; unsigned int i = m_PlayersToCreate.size() - 1;
unsigned int tempID = m_World->CreateEntity(); unsigned int tempID = m_World->CreateEntity();
@@ -80,7 +80,7 @@ void Server::ReadFromClients()
std::cout << m_PacketID << ": Read from client crashed: " << err.what(); std::cout << m_PacketID << ": Read from client crashed: " << err.what();
//} //}
} }
} }
std::clock_t currentTime = std::clock(); std::clock_t currentTime = std::clock();
// int tempTestRemovePlz = (1000 * (currentTime - previousSnapshotMessage) / (double)CLOCKS_PER_SEC); // int tempTestRemovePlz = (1000 * (currentTime - previousSnapshotMessage) / (double)CLOCKS_PER_SEC);
@@ -300,22 +300,22 @@ void Server::ParseEvent(char * data, size_t length)
return; return;
unsigned int entityId = m_PlayerDefinitions[i].EntityID; unsigned int entityId = m_PlayerDefinitions[i].EntityID;
m_World->GetComponent(entityId, "Player")["Forward"] = false;
m_World->GetComponent(entityId, "Player")["Left"] = false;
m_World->GetComponent(entityId, "Player")["Back"] = false;
m_World->GetComponent(entityId, "Player")["Right"] = false;
if ("+Forward" == std::string(data)) { if ("+Forward" == std::string(data)) {
m_World->GetComponent(entityId, "Player")["Forward"] = true; m_World->GetComponent(entityId, "Player")["Forward"] = true;
} } else if ("-Forward" == std::string(data)) {
if ("-Forward" == std::string(data)) {
m_World->GetComponent(entityId, "Player")["Back"] = true; m_World->GetComponent(entityId, "Player")["Back"] = true;
} else if ("0Forward" == std::string(data)) {
m_World->GetComponent(entityId, "Player")["Forward"] = false;
m_World->GetComponent(entityId, "Player")["Back"] = false;
} }
if ("+Right" == std::string(data)) { if ("+Right" == std::string(data)) {
m_World->GetComponent(entityId, "Player")["Right"] = true; m_World->GetComponent(entityId, "Player")["Right"] = true;
} } else if ("-Right" == std::string(data)) {
if ("-Right" == std::string(data)) {
m_World->GetComponent(entityId, "Player")["Left"] = true; m_World->GetComponent(entityId, "Player")["Left"] = true;
} else if ("0Right" == std::string(data)) {
m_World->GetComponent(entityId, "Player")["Right"] = false;
m_World->GetComponent(entityId, "Player")["Left"] = false;
} }
} }
@@ -331,7 +331,7 @@ void Server::ParseConnect(char * data, size_t length)
for (int i = 0; i < MAXCONNECTIONS; i++) { for (int i = 0; i < MAXCONNECTIONS; i++) {
if (m_PlayerDefinitions[i].Endpoint.address() == boost::asio::ip::address()) { if (m_PlayerDefinitions[i].Endpoint.address() == boost::asio::ip::address()) {
//Events::CreatePlayer e; //Events::CreatePlayer e;
//e.entityID = (m_PlayerDefinitions[i].EntityID); //e.entityID = (m_PlayerDefinitions[i].EntityID);
//e.modelPath = "Models/Core/UnitSphere.obj"; //e.modelPath = "Models/Core/UnitSphere.obj";