BTH/escape-the-dawn
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[WIP] Colliderar saker

Browse Source
This commit is contained in:
Tobias Dahl
2014-03-13 21:38:29 +01:00
parent 80a033e72e
commit 329262fe5a
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Escape-the-Dawn/Systems/PlayerSystem.cpp
+9
View File
@@ -26,6 +26,15 @@ void Systems::PlayerSystem::UpdateEntity(double dt, EntityID entity, EntityID pa
if (input == nullptr) if (input == nullptr)
return; return;
auto collision = m_World->GetComponent<Components::Collision>(entity, "Collision");
if(collision == nullptr)
return;
if(collision->CollidingEntities.size() > 0)
{
m_World->RemoveEntity(entity);
}
auto name = m_World->GetProperty<std::string>(entity, "Name"); auto name = m_World->GetProperty<std::string>(entity, "Name");
if (name == "Camera" && freecamEnabled) { if (name == "Camera" && freecamEnabled) {
glm::vec3 Camera_Right = glm::vec3(glm::vec4(1, 0, 0, 0) * transform->Orientation); glm::vec3 Camera_Right = glm::vec3(glm::vec4(1, 0, 0, 0) * transform->Orientation);