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

material work, use multibind and dsa in main texture binding

Browse Source
This commit is contained in:
milek7
2018-07-19 00:20:42 +02:00
parent ee16821509
commit a53224b47d
16 changed files with 128 additions and 178 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
shaders/mat_default.frag
View File

@@ -7,7 +7,11 @@ in vec4 f_light_pos;
#include <common>
#texture (tex1, 0, sRGB_A)
#param (color, 0, 0, 4, diffuse)
#param (diffuse, 1, 0, 1, one)
#param (specular, 1, 1, 1, specular)
#texture (diffuse, 0, sRGB_A)
uniform sampler2D tex1;
uniform sampler2DShadow shadowmap;
@@ -56,6 +60,7 @@ float calc_light(vec3 light_dir)
float diffuse_v = max(dot(normal, light_dir), 0.0);
float specular_v = pow(max(dot(normal, halfway_dir), 0.0), 15.0);
//return specular_v * param[1].y + diffuse_v * param[1].x;
return specular_v + diffuse_v;
}
@@ -113,7 +118,7 @@ void main()
if (i == 0U)
part *= shadow;
result += light.color * part * envcolor;
result += light.color * part;// * envcolor;
}
vec3 c = apply_fog(result * tex_color.xyz);