Merge branch 'master' of github.com:sippeangelo/Escape-the-Dawn

This commit is contained in:
ViktorLjung
2014-03-14 00:01:27 +01:00
16 changed files with 218 additions and 69 deletions
@@ -91,10 +91,8 @@ void Systems::LevelGenerationSystem::Update( double dt )
elapsedtime = 0;
}
}
void Systems::LevelGenerationSystem::UpdateEntity( double dt, EntityID entity, EntityID parent )
@@ -112,9 +110,15 @@ void Systems::LevelGenerationSystem::UpdateEntity( double dt, EntityID entity, E
transform->Velocity.y = 0;
}
if(transform->Position.z > 800)
auto model = m_World->GetComponent<Components::Model>(entity, "Model");
if (transform->Position.z > 10 && model->Visible)
{
model->Visible = false;
}
if(transform->Position.z > 800) {
m_World->RemoveEntity(entity);
}
}
if( m_World->GetProperty<std::string>(entity, "Name") == "Player")