From 1669649186a507a5273f85695d4f28526e7ebcd3 Mon Sep 17 00:00:00 2001 From: stiffly Date: Tue, 15 Dec 2015 16:24:09 +0100 Subject: [PATCH] Fixed bug with entityID. Also trying to fix movement WIP. --- src/Engine/Network/Client.cpp | 6 +++--- src/Engine/Network/Server.cpp | 11 ++++++++--- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/src/Engine/Network/Client.cpp b/src/Engine/Network/Client.cpp index 96f218e0..3d94ad15 100644 --- a/src/Engine/Network/Client.cpp +++ b/src/Engine/Network/Client.cpp @@ -46,10 +46,10 @@ void Client::Update() while (m_PlayersToCreate.size() > 0) { unsigned int i = m_PlayersToCreate.size() - 1; unsigned int tempID = m_World->CreateEntity(); - ComponentWrapper transform = m_World->AttachComponent(m_PlayerDefinitions[m_PlayersToCreate[i]].EntityID, "Transform"); - ComponentWrapper model = m_World->AttachComponent(m_PlayerDefinitions[m_PlayersToCreate[i]].EntityID, "Model"); + ComponentWrapper transform = m_World->AttachComponent(tempID, "Transform"); + ComponentWrapper model = m_World->AttachComponent(tempID, "Model"); model["Resource"] = "Models/Core/UnitSphere.obj"; - ComponentWrapper player = m_World->AttachComponent(m_PlayerDefinitions[m_PlayersToCreate[i]].EntityID, "Player"); + ComponentWrapper player = m_World->AttachComponent(tempID, "Player"); m_PlayerDefinitions[m_PlayersToCreate[i]].EntityID = tempID; m_PlayersToCreate.pop_back(); } diff --git a/src/Engine/Network/Server.cpp b/src/Engine/Network/Server.cpp index e2e65d10..3800b88e 100644 --- a/src/Engine/Network/Server.cpp +++ b/src/Engine/Network/Server.cpp @@ -30,12 +30,12 @@ void Server::Update() while (m_PlayersToCreate.size() > 0) { unsigned int i = m_PlayersToCreate.size() - 1; unsigned int tempID = m_World->CreateEntity(); - ComponentWrapper transform = m_World->AttachComponent(m_PlayerDefinitions[m_PlayersToCreate[i]].EntityID, "Transform"); + ComponentWrapper transform = m_World->AttachComponent(tempID, "Transform"); transform["Position"] = glm::vec3(-1.5f, 0.f, 0.f); - ComponentWrapper model = m_World->AttachComponent(m_PlayerDefinitions[m_PlayersToCreate[i]].EntityID, "Model"); + ComponentWrapper model = m_World->AttachComponent(tempID, "Model"); model["Resource"] = "Models/Core/UnitSphere.obj"; model["Color"] = glm::vec4(rand()%255 / 255.f, rand()%255 / 255.f, rand() %255 / 255.f, 1.f); - ComponentWrapper player = m_World->AttachComponent(m_PlayerDefinitions[m_PlayersToCreate[i]].EntityID, "Player"); + ComponentWrapper player = m_World->AttachComponent(tempID, "Player"); m_PlayerDefinitions[m_PlayersToCreate[i]].EntityID = tempID; m_PlayersToCreate.pop_back(); } @@ -300,6 +300,11 @@ void Server::ParseEvent(char * data, size_t length) return; 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)) { m_World->GetComponent(entityId, "Player")["Forward"] = true; }