[WIP] Collisions and sun stuff

This commit is contained in:
Tobias Dahl
2014-03-13 23:02:08 +01:00
parent fe1605a158
commit 28b83905e9
2 changed files with 12 additions and 9 deletions
+2 -2
View File
@@ -23,7 +23,7 @@ in VertexData {
vec3 ShadowCoord;
} Input;
vec3 scene_ambient = vec3(0.3);
vec3 scene_ambient = vec3(0.98f, 0.95f, 0.8f);
out vec4 fragmentColor;
@@ -54,7 +54,7 @@ void main() {
float bias = 0.0005;
vec4 shadowMapValue = texture(shadowMap, Input.ShadowCoord.xy);
if (shadowMapValue.z < clamp(Input.ShadowCoord.z - bias, 0, 1)) {
visibility = 0.5;
visibility = 0.3;
}
}
+8 -5
View File
@@ -27,15 +27,18 @@ void Systems::PlayerSystem::UpdateEntity(double dt, EntityID entity, EntityID pa
return;
auto collision = m_World->GetComponent<Components::Collision>(entity, "Collision");
if(collision == nullptr)
return;
if(collision->CollidingEntities.size() > 0)
auto name = m_World->GetProperty<std::string>(entity, "Name");
if(collision != nullptr)
{
for(auto ent : collision->CollidingEntities)
{
if(m_World->GetProperty<std::string>(ent, "Name") == "Obstacle")
{
m_World->RemoveEntity(entity);
}
auto name = m_World->GetProperty<std::string>(entity, "Name");
}
}
if (name == "Camera") {