eu07/maszyna
16
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-07-22 09:19:18 +02:00
Code Issues 123 Wiki Activity

Merge branch 'master' of https://github.com/tmj-fstate/maszyna into tmj-master

Browse Source
This commit is contained in:
stele
2020-03-09 19:15:01 +01:00
parent 3e7537d88c a8b47c3c97
commit 758b3bfe78
49 changed files with 1026 additions and 410 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
shaders/light_common.glsl
View File

@@ -111,15 +111,15 @@ vec2 calc_headlights(light_s light, vec3 fragnormal)
vec3 apply_lights(vec3 fragcolor, vec3 fragnormal, vec3 texturecolor, float reflectivity, float specularity, float shadowtone)
{
fragcolor *= param[0].rgb;
fragcolor *= param[1].x;
vec3 emissioncolor = param[0].rgb * emission;
vec3 envcolor = envmap_color(fragnormal);
if(lights_count == 0U)
return (fragcolor + emissioncolor + envcolor * reflectivity) * texturecolor;
// fragcolor *= lights[0].intensity;
// fragcolor *= lights[0].intensity;
vec2 sunlight = calc_dir_light(lights[0], fragnormal);
float diffuseamount = (sunlight.x * param[1].x) * lights[0].intensity;