~ Changed Pipelines

(Default2DPipeline: Has Lights, Post-ProcessingEffects, etc.)
(Basic2DPipeline: Simple Color and Texture stuff, thats it)
This commit is contained in:
Michel Fedde 2020-12-19 18:31:44 +01:00
parent 1ed03fec3f
commit 5d4b360b05
23 changed files with 243 additions and 59 deletions

View file

@ -8,15 +8,22 @@ struct Light {
// pointStuff;
float Power;
float Inner;
float Outer;
};
in vec2 vTexture;
in vec2 FragPos;
uniform vec2 FragSize;
uniform vec4 Ambient = vec4(1);
uniform Light[24] Lights;
uniform int LightCount;
uniform float ShadowSensitivty;
uniform sampler2D OccluderMap;
layout(location = 0) out vec4 color;
vec4 GetRenderColor();
@ -24,10 +31,27 @@ vec4 GetRenderColor();
vec3 calcPointLight(Light light) {
vec2 diff = light.Position - FragPos;
float dif = light.Power / length(diff);
float intensity = 4 * PI * dif * (dif * dif);
float dif = 20 / length(diff);
float intensity = light.Power * (dif) * (dif * dif);
return vec3(intensity);
return vec3(light.Color * intensity);
}
float occluded(Light light) {
float occluder = 1 - length(texture(OccluderMap, vTexture).rgb);
if (occluder != 0) {
vec2 diff = light.Position - FragPos;
vec2 dir = normalize(diff);
float steps = length(diff) / ShadowSensitivty;
vec2 curPos = FragPos;
for(int i = 0; i < steps; i++) {
curPos += dir * i * ShadowSensitivty;
}
}
return occluder;
}
vec3 calcLight() {
@ -36,11 +60,13 @@ vec3 calcLight() {
for(int i = 0; i < LightCount; i++) {
Light light = Lights[i];
vec3 lightColor;
switch(light.Type) {
case 0:
addedLight += calcPointLight(light);
lightColor += calcPointLight(light);
break;
}
addedLight += lightColor * occluded(light);
}
return addedLight;
@ -51,5 +77,5 @@ void main() {
color = render * Ambient;
color += vec4(calcLight() * render.xyz, 1);
color += vec4(calcLight(), 1);
}