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

WIP

Browse Source 
Adding models now crashes. Threading
Added a create player event that currently is not used.
This commit is contained in:
stiffly
2015-12-15 11:21:46 +01:00
parent 3f77da4a07
commit b698a0d36f
11 changed files with 161 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/Engine/Network/Client.h
+3
View File
@@ -16,6 +16,7 @@
#include "Core/EventBroker.h" #include "Core/EventBroker.h"
#include "Core/EKeyDown.h" #include "Core/EKeyDown.h"
#include "Core/EKeyUp.h" #include "Core/EKeyUp.h"
#include "Input/EInputCommand.h"
class Client class Client
@@ -75,6 +76,8 @@ private:
bool OnKeyDown(const Events::KeyDown &e); bool OnKeyDown(const Events::KeyDown &e);
EventRelay<Client, Events::KeyUp> m_EKeyUp; EventRelay<Client, Events::KeyUp> m_EKeyUp;
bool OnKeyUp(const Events::KeyUp &e); bool OnKeyUp(const Events::KeyUp &e);
EventRelay<Client, Events::InputCommand> m_EInputCommand;
bool OnInputCommand(const Events::InputCommand &e);
}; };
#endif #endif
include/Engine/Network/PlayerDefinition.h
+1 -1
View File
@@ -3,7 +3,7 @@
#include <string> #include <string>
struct PlayerDefinition { struct PlayerDefinition {
int EntityID = -1; unsigned int EntityID = -1;
std::string Name = ""; std::string Name = "";
boost::asio::ip::udp::endpoint Endpoint; boost::asio::ip::udp::endpoint Endpoint;
}; };
include/Engine/Network/Server.h
+4 -1
View File
@@ -12,13 +12,15 @@
#include "Network/NetworkDefinitions.h" #include "Network/NetworkDefinitions.h"
#include "Network/PlayerDefinition.h" #include "Network/PlayerDefinition.h"
#include "Core/World.h" #include "Core/World.h"
#include "Core/EventBroker.h"
#include "Game/ECreatePlayer.h"
class Server class Server
{ {
public: public:
Server(); Server();
~Server(); ~Server();
void Start(World* m_world); void Start(World* m_world, EventBroker *eventBroker);
void Close(); void Close();
private: private:
@@ -32,6 +34,7 @@ private:
std::clock_t m_StopTimes[8]; std::clock_t m_StopTimes[8];
// Game logic // Game logic
World* m_World; World* m_World;
EventBroker* m_EventBroker;
// Packet loss logic // Packet loss logic
unsigned int m_PacketID; unsigned int m_PacketID;
unsigned int m_PreviousPacketID; unsigned int m_PreviousPacketID;
include/Game/ECreatePlayer.h
+19
View File
@@ -0,0 +1,19 @@
#ifndef Events_CreatePlayer_h__
#define Events_CreatePlayer_h__
#include "Core/EventBroker.h"
#include "Core/World.h"
namespace Events
{
struct CreatePlayer : Event
{
unsigned int entityID;
std::string modelPath;
World* world;
};
}
#endif
include/Game/PlayerSystem.h
+6
View File
@@ -9,6 +9,7 @@
#include "Core/EventBroker.h" #include "Core/EventBroker.h"
#include "Core/EKeyDown.h" #include "Core/EKeyDown.h"
#include "Core/EKeyUp.h" #include "Core/EKeyUp.h"
#include "ECreatePlayer.h"
struct KeyInput struct KeyInput
{ {
@@ -26,6 +27,7 @@ public:
{ {
EVENT_SUBSCRIBE_MEMBER(m_EKeyDown, &PlayerSystem::OnKeyDown); EVENT_SUBSCRIBE_MEMBER(m_EKeyDown, &PlayerSystem::OnKeyDown);
EVENT_SUBSCRIBE_MEMBER(m_EKeyUp, &PlayerSystem::OnKeyUp); EVENT_SUBSCRIBE_MEMBER(m_EKeyUp, &PlayerSystem::OnKeyUp);
EVENT_SUBSCRIBE_MEMBER(m_ECreatePlayer, &PlayerSystem::OnCreatePlayer);
} }
virtual void Update(World* world, ComponentWrapper& player, double dt) override; virtual void Update(World* world, ComponentWrapper& player, double dt) override;
@@ -34,11 +36,15 @@ private:
float m_Speed = 5; float m_Speed = 5;
glm::vec3 m_Direction; glm::vec3 m_Direction;
KeyInput input; KeyInput input;
bool ShouldCreatePlayer = false;
void CreatePlayer(World * world, unsigned int& entityID);
EventRelay<PlayerSystem, Events::KeyDown> m_EKeyDown; EventRelay<PlayerSystem, Events::KeyDown> m_EKeyDown;
bool OnKeyDown(const Events::KeyDown &event); bool OnKeyDown(const Events::KeyDown &event);
EventRelay<PlayerSystem, Events::KeyUp> m_EKeyUp; EventRelay<PlayerSystem, Events::KeyUp> m_EKeyUp;
bool OnKeyUp(const Events::KeyUp &event); bool OnKeyUp(const Events::KeyUp &event);
EventRelay<PlayerSystem, Events::CreatePlayer> m_ECreatePlayer;
bool OnCreatePlayer(const Events::CreatePlayer &event);
}; };
#endif #endif
resources/Schema/Components/Player.xml
+4
View File
@@ -1,3 +1,7 @@
<c:Player> <c:Player>
<Velocity X="0" Y="0" Z="0"/> <Velocity X="0" Y="0" Z="0"/>
<Forward>false</Forward>
<Left>false</Left>
<Back>false</Back>
<Right>false</Right>
</c:Player> </c:Player>
resources/Schema/Components/Player.xsd
+4
View File
@@ -7,6 +7,10 @@
<xs:complexType> <xs:complexType>
<xs:all> <xs:all>
<xs:element name="Velocity" type="t:Vector" minOccurs="0"/> <xs:element name="Velocity" type="t:Vector" minOccurs="0"/>
<xs:element name="Forward" type="t:bool" minOccurs="0"/>
<xs:element name="Left" type="t:bool" minOccurs="0"/>
<xs:element name="Back" type="t:bool" minOccurs="0"/>
<xs:element name="Right" type="t:bool" minOccurs="0"/>
</xs:all> </xs:all>
</xs:complexType> </xs:complexType>
</xs:element> </xs:element>
src/Engine/Network/Client.cpp
+37 -7
View File
@@ -28,7 +28,8 @@ void Client::Start(World* world, EventBroker* eventBroker)
m_EventBroker->Subscribe(m_EKeyDown); m_EventBroker->Subscribe(m_EKeyDown);
m_EKeyUp = decltype(m_EKeyUp)(std::bind(&Client::OnKeyUp, this, std::placeholders::_1)); m_EKeyUp = decltype(m_EKeyUp)(std::bind(&Client::OnKeyUp, this, std::placeholders::_1));
m_EventBroker->Subscribe(m_EKeyUp); m_EventBroker->Subscribe(m_EKeyUp);
m_EInputCommand = decltype(m_EInputCommand)(std::bind(&Client::OnInputCommand, this, std::placeholders::_1));
m_EventBroker->Subscribe(m_EInputCommand);
std::cout << "Please enter you name: "; std::cout << "Please enter you name: ";
std::cin >> m_PlayerName; std::cin >> m_PlayerName;
while (m_PlayerName.size() > 7) { while (m_PlayerName.size() > 7) {
@@ -74,9 +75,9 @@ void Client::ReadFromServer()
void Client::SendSnapshotToServer() void Client::SendSnapshotToServer()
{ {
// Reset previouse key state in snapshot. // Reset previouse key state in snapshot.
Package message(MessageType::Event, m_SendPacketID); //Package message(MessageType::Event, m_SendPacketID);
message.AddString(m_NextSnapshot.InputForward); //message.AddString(m_NextSnapshot.InputForward);
Send(message); //Send(message);
m_NextSnapshot.InputForward = ""; m_NextSnapshot.InputForward = "";
m_NextSnapshot.InputRight = ""; m_NextSnapshot.InputRight = "";
// See if any movement keys are down // See if any movement keys are down
@@ -208,7 +209,7 @@ void Client::ParseSnapshot(char* data, size_t length)
// Apply the position data read to the player entity // Apply the position data read to the player entity
// New player connected on the server side // New player connected on the server side
if (m_PlayerDefinitions[i].Name == "" && tempName != "") { if (m_PlayerDefinitions[i].Name == "" && tempName != "") {
CreateNewPlayer(i); //CreateNewPlayer(i);
} else if (m_PlayerDefinitions[i].Name != "" && tempName == "") { } else if (m_PlayerDefinitions[i].Name != "" && tempName == "") {
// Someone disconnected // Someone disconnected
// TODO: Insert code here // TODO: Insert code here
@@ -216,7 +217,7 @@ void Client::ParseSnapshot(char* data, size_t length)
// Not a connected player // Not a connected player
break; break;
} }
m_World->GetComponent(m_PlayerDefinitions[i].EntityID, "Transform")["Position"] = playerPos; //m_World->GetComponent(m_PlayerDefinitions[i].EntityID, "Transform")["Position"] = playerPos;
m_PlayerDefinitions[i].Name = tempName; m_PlayerDefinitions[i].Name = tempName;
} }
} }
@@ -322,6 +323,35 @@ bool Client::OnKeyUp(const Events::KeyUp & e)
return false; return false;
} }
bool Client::OnInputCommand(const Events::InputCommand & e)
{
if (e.Command == "Forward") {
if (e.Value > 0) {
m_IsWASDKeyDown.W = true;
}
else if (e.Value < 0) {
m_IsWASDKeyDown.S = true;
} else {
m_IsWASDKeyDown.W = false;
m_IsWASDKeyDown.S = false;
}
}
if (e.Command == "Right") {
if (e.Value > 0) {
m_IsWASDKeyDown.D = true;
} else if (e.Value < 0) {
m_IsWASDKeyDown.A = true;
} else {
m_IsWASDKeyDown.A = false;
m_IsWASDKeyDown.D = false;
}
}
if (e.Command == "Sprint") { // Temp connect
Connect();
}
return false;
}
void Client::CreateNewPlayer(int i) void Client::CreateNewPlayer(int i)
{ {
m_PlayerDefinitions[i].EntityID = m_World->CreateEntity(); m_PlayerDefinitions[i].EntityID = m_World->CreateEntity();
@@ -335,6 +365,6 @@ void Client::IdentifyPacketLoss()
// if no packets lost, difference should be equal to 1 // if no packets lost, difference should be equal to 1
int difference = m_PacketID - m_PreviousPacketID; int difference = m_PacketID - m_PreviousPacketID;
if (difference != 1) { if (difference != 1) {
LOG_INFO("%i Packet(s) were lost...", difference); LOG_INFO("%i Packet(s) were lost...", difference);
} }
} }
src/Engine/Network/Server.cpp
+42 -35
View File
@@ -7,9 +7,10 @@ Server::~Server()
{ } { }
void Server::Start(World* world) void Server::Start(World* world, EventBroker* eventBroker)
{ {
m_World = world; m_World = world;
m_EventBroker = eventBroker;
for (size_t i = 0; i < MAXCONNECTIONS; i++) { for (size_t i = 0; i < MAXCONNECTIONS; i++) {
m_StopTimes[i] = std::clock(); m_StopTimes[i] = std::clock();
} }
@@ -42,7 +43,7 @@ void Server::ReadFromClients()
std::clock_t previousePingMessage = std::clock(); std::clock_t previousePingMessage = std::clock();
std::clock_t previousSnapshotMessage = std::clock(); std::clock_t previousSnapshotMessage = std::clock();
std::clock_t timOutTimer = std::clock(); std::clock_t timOutTimer = std::clock();
// How offen we send messages (milliseconds) // How often we send messages (milliseconds)
int intervallMs = 1000; int intervallMs = 1000;
int snapshotInterval = 50; int snapshotInterval = 50;
int timeToCheckTimeOutTime = 100; int timeToCheckTimeOutTime = 100;
@@ -63,6 +64,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);
@@ -121,7 +123,7 @@ void Server::ParseMessageType(char * data, size_t length)
m_PreviousPacketID = m_PacketID; // Set previous packet id m_PreviousPacketID = m_PacketID; // Set previous packet id
memcpy(&m_PacketID, data, sizeof(int)); //Read new packet id memcpy(&m_PacketID, data, sizeof(int)); //Read new packet id
MoveMessageHead(data, length, sizeof(int)); MoveMessageHead(data, length, sizeof(int));
//IdentifyPacketLoss(); // crashed when it started to spam! //IdentifyPacketLoss();
switch (static_cast<MessageType>(messageType)) { switch (static_cast<MessageType>(messageType)) {
case MessageType::Connect: case MessageType::Connect:
@@ -210,7 +212,8 @@ void Server::SendSnapshot()
continue; continue;
} }
// Pack player pos into data package // Pack player pos into data package
glm::vec3 playerPos = m_World->GetComponent(m_PlayerDefinitions[i].EntityID, "Transform")["Position"]; //glm::vec3 playerPos = m_World->GetComponent(m_PlayerDefinitions[i].EntityID, "Transform")["Position"];
glm::vec3 playerPos = glm::vec3(1.0f);
package.AddPrimitive<float>(playerPos.x); package.AddPrimitive<float>(playerPos.x);
package.AddPrimitive<float>(playerPos.y); package.AddPrimitive<float>(playerPos.y);
package.AddPrimitive<float>(playerPos.z); package.AddPrimitive<float>(playerPos.z);
@@ -241,7 +244,6 @@ void Server::SendPing()
void Server::CheckForTimeOuts() void Server::CheckForTimeOuts()
{ {
int timeOutTimeMs = 5000; int timeOutTimeMs = 5000;
int tempStartPing = 1000 * m_StartPingTime int tempStartPing = 1000 * m_StartPingTime
/ static_cast<double>(CLOCKS_PER_SEC); / static_cast<double>(CLOCKS_PER_SEC);
@@ -276,33 +278,33 @@ void Server::ParseEvent(char * data, size_t length)
break; break;
} }
} }
// If no player matches the ip return. // If no player matches the address return.
if (i >= 8) if (i >= 8)
return; return;
unsigned int entityId = m_PlayerDefinitions[i].EntityID; //unsigned int entityId = m_PlayerDefinitions[i].EntityID;
if ("+Forward" == std::string(data)) { //if ("+Forward" == std::string(data)) {
glm::vec3 temp = m_World->GetComponent(entityId, "Transform")["Position"]; // glm::vec3 temp = m_World->GetComponent(entityId, "Transform")["Position"];
temp.z -= 0.1f; // temp.z -= 0.1f;
m_World->GetComponent(entityId, "Transform")["Position"] = temp; // m_World->GetComponent(entityId, "Transform")["Position"] = temp;
} //}
if ("-Forward" == std::string(data)) { //if ("-Forward" == std::string(data)) {
glm::vec3 temp = m_World->GetComponent(entityId, "Transform")["Position"]; // glm::vec3 temp = m_World->GetComponent(entityId, "Transform")["Position"];
temp.z += 0.1f; // temp.z += 0.1f;
m_World->GetComponent(entityId, "Transform")["Position"] = temp; // m_World->GetComponent(entityId, "Transform")["Position"] = temp;
} //}
if ("+Right" == std::string(data)) { //if ("+Right" == std::string(data)) {
glm::vec3 temp = m_World->GetComponent(entityId, "Transform")["Position"]; // glm::vec3 temp = m_World->GetComponent(entityId, "Transform")["Position"];
temp.x += 0.1f; // temp.x += 0.1f;
m_World->GetComponent(entityId, "Transform")["Position"] = temp; // m_World->GetComponent(entityId, "Transform")["Position"] = temp;
} //}
if ("-Right" == std::string(data)) { //if ("-Right" == std::string(data)) {
glm::vec3 temp = m_World->GetComponent(entityId, "Transform")["Position"]; // glm::vec3 temp = m_World->GetComponent(entityId, "Transform")["Position"];
temp.x -= 0.1f; // temp.x -= 0.1f;
m_World->GetComponent(entityId, "Transform")["Position"] = temp; // m_World->GetComponent(entityId, "Transform")["Position"] = temp;
} //}
} }
void Server::ParseConnect(char * data, size_t length) void Server::ParseConnect(char * data, size_t length)
@@ -317,15 +319,20 @@ 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;
//e.entityID = (m_PlayerDefinitions[i].EntityID);
//e.modelPath = "Models/Core/UnitSphere.obj";
//e.world = m_World;
//m_EventBroker->Publish(e);
//int entityID = m_World->CreateEntity();
m_PlayerDefinitions[i].EntityID = m_World->CreateEntity(); //ComponentWrapper transform = m_World->AttachComponent(entityID, "Transform");
ComponentWrapper transform = m_World->AttachComponent(m_PlayerDefinitions[i].EntityID, "Transform"); //transform["Position"] = glm::vec3(-1.5f, 0.f, 0.f);
transform["Position"] = glm::vec3(-1.5f, 0.f, 0.f); //ComponentWrapper model = m_World->AttachComponent(entityID, "Model");
ComponentWrapper model = m_World->AttachComponent(m_PlayerDefinitions[i].EntityID, "Model"); //model["Resource"] = "Models/Core/UnitSphere.obj";//modelPath; // You fix this :)
model["Resource"] = "Models/Core/UnitSphere.obj"; //model["Color"] = glm::vec4(rand()%255 / 255.f, rand()%255 / 255.f, rand() %255 / 255.f, 1.f);
model["Color"] = glm::vec4(rand()%255 / 255.f, rand()%255 / 255.f, rand() %255 / 255.f, 1.f);
m_PlayerDefinitions[i].Endpoint = m_ReceiverEndpoint; m_PlayerDefinitions[i].Endpoint = m_ReceiverEndpoint;
m_PlayerDefinitions[i].Name = std::string(data); m_PlayerDefinitions[i].Name = std::string(data);
// +1 is the null terminator // +1 is the null terminator
src/Game/Game.cpp
+1 -4
View File
@@ -53,9 +53,6 @@ Game::Game(int argc, char* argv[])
m_SystemPipeline->AddSystem<RaptorCopterSystem>(); m_SystemPipeline->AddSystem<RaptorCopterSystem>();
m_SystemPipeline->AddSystem<PlayerSystem>(); m_SystemPipeline->AddSystem<PlayerSystem>();
// Invoke network // Invoke network
if(m_Config->Get<bool>("Networking.StartNetwork", false) == true) if(m_Config->Get<bool>("Networking.StartNetwork", false) == true)
boost::thread workerThread(&Game::NetworkFunction, this); boost::thread workerThread(&Game::NetworkFunction, this);
@@ -144,6 +141,6 @@ void Game::NetworkFunction()
} }
if (inputMessage == "s" || inputMessage == "S") { if (inputMessage == "s" || inputMessage == "S") {
Server m_Server; Server m_Server;
m_Server.Start(m_World); m_Server.Start(m_World, m_EventBroker);
} }
} }
src/Game/PlayerSystem.cpp
+40 -18
View File
@@ -3,24 +3,40 @@
void PlayerSystem::Update(World * world, ComponentWrapper & player, double dt) void PlayerSystem::Update(World * world, ComponentWrapper & player, double dt)
{ {
if (input.Forward) { //if (player["Forward"]) {
m_Direction.z = -1; // ((glm::vec3&)player["Velocity"]).z = m_Speed * float(dt) * -1;
} else if (input.Back) { //}
m_Direction.z = 1; //if (player["Left"]) {
} else { // ((glm::vec3&)player["Velocity"]).x = m_Speed * float(dt) * -1;
m_Direction.z = 0; //}
} //if (player["Back"]) {
if (input.Left) { // ((glm::vec3&)player["Velocity"]).z = m_Speed * float(dt);
m_Direction.x = -1; //}
} else if (input.Right) { //if (player["Right"]) {
m_Direction.x = 1; // ((glm::vec3&)player["Velocity"]).x = m_Speed * float(dt);
} else { //}
m_Direction.x = 0; //ComponentWrapper& transform = world->GetComponent(player.EntityID, "Transform");
} //(glm::vec3&)transform["Position"] += (glm::vec3)player["Velocity"];
m_EventBroker->Process<PlayerSystem>();
ComponentWrapper& transform = world->GetComponent(player.EntityID, "Transform"); //m_EventBroker->Process<PlayerSystem>();
(glm::vec3&)player["Velocity"] = m_Speed * float(dt) * m_Direction;
(glm::vec3&)transform["Position"] += (glm::vec3)player["Velocity"]; //// TODO Jag tror inte vi kan göra det vi vill i updaten.
//// om man lägger till parametrar och tar bort overriden så blir det kanske inte så kul?
//// aja, lycka till!
//if (ShouldCreatePlayer) {
// int entityID = world->CreateEntity();
// ComponentWrapper transform = world->AttachComponent(entityID, "Transform");
// transform["Position"] = glm::vec3(-1.5f, 0.f, 0.f);
// ComponentWrapper model = world->AttachComponent(entityID, "Model");
// model["Resource"] = "Models/Core/UnitSphere.obj";//modelPath; // You fix this :)
// model["Color"] = glm::vec4(rand()%255 / 255.f, rand()%255 / 255.f, rand() %255 / 255.f, 1.f);
// ShouldCreatePlayer = false;
//}
}
void PlayerSystem::CreatePlayer(World * world, unsigned int& entityID)
{
} }
bool PlayerSystem::OnKeyDown(const Events::KeyDown & event) bool PlayerSystem::OnKeyDown(const Events::KeyDown & event)
@@ -56,3 +72,9 @@ bool PlayerSystem::OnKeyUp(const Events::KeyUp & event)
} }
return false; return false;
} }
bool PlayerSystem::OnCreatePlayer(const Events::CreatePlayer & event)
{
ShouldCreatePlayer = true;
return false;
}