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

Changed reflection value to normalmaps alfa.

Browse Source 
Fixed order in color conversion in stars shader.
This commit is contained in:
stele
2018-12-22 16:44:22 +01:00
parent 45ffc56802
commit 89231426e3
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
shaders/mat_normalmap.frag
View File

@@ -22,7 +22,7 @@ layout(location = 1) out vec4 out_motion;
#texture (diffuse, 0, sRGB_A) #texture (diffuse, 0, sRGB_A)
uniform sampler2D diffuse; uniform sampler2D diffuse;
#texture (normalmap, 1, RGB) #texture (normalmap, 1, RGBA)
uniform sampler2D normalmap; uniform sampler2D normalmap;
#if SHADOWMAP_ENABLED #if SHADOWMAP_ENABLED
@@ -58,7 +58,7 @@ void main()
{ {
vec2 part = calc_dir_light(lights[0]); vec2 part = calc_dir_light(lights[0]);
vec3 c = (part.x * param[1].x + part.y * param[1].y) * calc_shadow() * lights[0].color; vec3 c = (part.x * param[1].x + part.y * param[1].y) * calc_shadow() * lights[0].color;
result += mix(c, envcolor, param[1].z); result += mix(c, envcolor, param[1].z * texture(normalmap, f_coord).a);
} }
for (uint i = 1U; i < lights_count; i++) for (uint i = 1U; i < lights_count; i++)

4
shaders/mat_reflmap.frag
View File

@@ -21,7 +21,7 @@ layout(location = 1) out vec4 out_motion;
#texture (diffuse, 0, sRGB_A) #texture (diffuse, 0, sRGB_A)
uniform sampler2D diffuse; uniform sampler2D diffuse;
#texture (reflmap, 1, R) #texture (reflmap, 1, RGBA)
uniform sampler2D reflmap; uniform sampler2D reflmap;
#if SHADOWMAP_ENABLED #if SHADOWMAP_ENABLED
@@ -56,7 +56,7 @@ void main()
{ {
vec2 part = calc_dir_light(lights[0]); vec2 part = calc_dir_light(lights[0]);
vec3 c = (part.x * param[1].x + part.y * param[1].y) * calc_shadow() * lights[0].color; vec3 c = (part.x * param[1].x + part.y * param[1].y) * calc_shadow() * lights[0].color;
result += mix(c, envcolor, param[1].z * texture(reflmap, f_coord).r); result += mix(c, envcolor, param[1].z * texture(reflmap, f_coord).a);
} }
for (uint i = 1U; i < lights_count; i++) for (uint i = 1U; i < lights_count; i++)

2
shaders/mat_stars.frag
View File

@@ -17,7 +17,7 @@ void main()
discard; discard;
// color data space is shared with normals, ugh // color data space is shared with normals, ugh
vec4 color = vec4(pow(f_normal_raw.bgr, vec3(2.2)), 1.0f); vec4 color = vec4(pow(f_normal_raw.rgb, vec3(2.2)), 1.0f);
#if POSTFX_ENABLED #if POSTFX_ENABLED
out_color = color; out_color = color;
#else #else