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

Fixed bug with entityID. Also trying to fix movement WIP.

Browse Source
This commit is contained in:
stiffly
2015-12-15 16:24:09 +01:00
parent 472a8db81a
commit 1669649186
2 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Engine/Network/Client.cpp
+3 -3
View File
@@ -46,10 +46,10 @@ void Client::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();
ComponentWrapper transform = m_World->AttachComponent(m_PlayerDefinitions[m_PlayersToCreate[i]].EntityID, "Transform"); ComponentWrapper transform = m_World->AttachComponent(tempID, "Transform");
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["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_PlayerDefinitions[m_PlayersToCreate[i]].EntityID = tempID;
m_PlayersToCreate.pop_back(); m_PlayersToCreate.pop_back();
} }
src/Engine/Network/Server.cpp
+8 -3
View File
@@ -30,12 +30,12 @@ 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();
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); 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["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);
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_PlayerDefinitions[m_PlayersToCreate[i]].EntityID = tempID;
m_PlayersToCreate.pop_back(); m_PlayersToCreate.pop_back();
} }
@@ -300,6 +300,11 @@ 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;
} }