|
@@ -26,14 +26,14 @@ in vec2 loc;
|
|
in vec4 vColor;
|
|
in vec4 vColor;
|
|
out vec4 color;
|
|
out vec4 color;
|
|
|
|
|
|
-vec4 getLight()
|
|
+vec3 getLight()
|
|
{
|
|
{
|
|
vec3 light = vec3(0, 0, 0);
|
|
vec3 light = vec3(0, 0, 0);
|
|
for(int i = 0; i < 32; i++)
|
|
for(int i = 0; i < 32; i++)
|
|
{
|
|
{
|
|
light += lights[i].color * max(1 - lights[i].strength * length(loc - lights[i].pos), 0);
|
|
light += lights[i].color * max(1 - lights[i].strength * length(loc - lights[i].pos), 0);
|
|
}
|
|
}
|
|
- return vec4(min(light, vec3(1, 1, 1)), 1);
|
|
+ return light;
|
|
}
|
|
}
|
|
|
|
|
|
void main(void)
|
|
void main(void)
|
|
@@ -64,6 +64,6 @@ void main(void)
|
|
|
|
|
|
if(useLight)
|
|
if(useLight)
|
|
{
|
|
{
|
|
- color = pow(pow(color, vec4(1 / 2.2)) * vec4(ambientLight, 1.0) + getLight(), vec4(2.2));
|
|
+ color = vec4(pow(pow(color.xyz, vec3(1 / 2.2)) * (ambientLight + getLight()), vec3(2.2)), color.w);
|
|
}
|
|
}
|
|
}
|
|
}
|