Fix class1/2 light sum loops to use light_diffuse[0] for sunlight_color too.
Rearrange ordering of scale down of light in class1 as well.meow-7.2.2
parent
b757c93292
commit
9c8cc0037a
|
|
@ -38,12 +38,10 @@ vec4 sumLights(vec3 pos, vec3 norm, vec4 color, vec4 baseLight)
|
|||
col.a = color.a;
|
||||
|
||||
col.rgb = light_diffuse[1].rgb * calcDirectionalLight(norm, light_position[1].xyz);
|
||||
col.rgb += light_diffuse[0].rgb * calcDirectionalLight(norm, light_position[0].xyz);
|
||||
col.rgb = scaleDownLight(col.rgb);
|
||||
col.rgb += atmosAmbient(baseLight.rgb);
|
||||
col.rgb += atmosAffectDirectionalLight(calcDirectionalLight(norm, light_position[0].xyz));
|
||||
|
||||
col.rgb = min(col.rgb*color.rgb, 1.0);
|
||||
|
||||
return col;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -49,7 +49,7 @@ vec4 sumLights(vec3 pos, vec3 norm, vec4 color, vec4 baseLight)
|
|||
|
||||
// Add windlight lights
|
||||
col.rgb += atmosAmbient(baseLight.rgb);
|
||||
col.rgb += atmosAffectDirectionalLight(calcDirectionalLight(norm, light_position[0].xyz));
|
||||
col.rgb += light_diffuse[0].rgb * calcDirectionalLight(norm, light_position[0].xyz));
|
||||
|
||||
col.rgb = min(col.rgb*color.rgb, 1.0);
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue