Skip to content
Snippets Groups Projects
Commit f3131963 authored by Tofu Linden's avatar Tofu Linden
Browse files

Backed out changeset 90f0ce75b2d7

parent f972cc4b
No related branches found
No related tags found
No related merge requests found
...@@ -270,7 +270,6 @@ void main() ...@@ -270,7 +270,6 @@ void main()
vec2 scol_ambocc = texture2DRect(lightMap, vary_fragcoord.xy).rg; vec2 scol_ambocc = texture2DRect(lightMap, vary_fragcoord.xy).rg;
float scol = max(scol_ambocc.r, diffuse.a); float scol = max(scol_ambocc.r, diffuse.a);
float ambocc = scol_ambocc.g; float ambocc = scol_ambocc.g;
float glowresult = 0.0;
calcAtmospherics(pos.xyz, ambocc); calcAtmospherics(pos.xyz, ambocc);
...@@ -286,7 +285,6 @@ void main() ...@@ -286,7 +285,6 @@ void main()
vec3 refnormpersp = normalize(reflect(pos.xyz, norm.xyz)); vec3 refnormpersp = normalize(reflect(pos.xyz, norm.xyz));
float sa = dot(refnormpersp, vary_light.xyz); float sa = dot(refnormpersp, vary_light.xyz);
vec3 dumbshiny = vary_SunlitColor*scol_ambocc.r*texture2D(lightFunc, vec2(sa, spec.a)).a; vec3 dumbshiny = vary_SunlitColor*scol_ambocc.r*texture2D(lightFunc, vec2(sa, spec.a)).a;
glowresult = 0.08 * dot(dumbshiny.rgb, spec.rgb);
// screen-space cheap fakey reflection map // screen-space cheap fakey reflection map
// //
...@@ -336,5 +334,5 @@ void main() ...@@ -336,5 +334,5 @@ void main()
col = scaleSoftClip(col); col = scaleSoftClip(col);
gl_FragColor.rgb = col; gl_FragColor.rgb = col;
gl_FragColor.a = glowresult; gl_FragColor.a = 0.0;
} }
...@@ -269,7 +269,6 @@ void main() ...@@ -269,7 +269,6 @@ void main()
vec2 scol_ambocc = texture2DRect(lightMap, vary_fragcoord.xy).rg; vec2 scol_ambocc = texture2DRect(lightMap, vary_fragcoord.xy).rg;
float scol = max(scol_ambocc.r, diffuse.a); float scol = max(scol_ambocc.r, diffuse.a);
float ambocc = scol_ambocc.g; float ambocc = scol_ambocc.g;
float glowresult = 0.0;
calcAtmospherics(pos.xyz, ambocc); calcAtmospherics(pos.xyz, ambocc);
...@@ -285,7 +284,6 @@ void main() ...@@ -285,7 +284,6 @@ void main()
vec3 refnormpersp = normalize(reflect(pos.xyz, norm.xyz)); vec3 refnormpersp = normalize(reflect(pos.xyz, norm.xyz));
float sa = dot(refnormpersp, vary_light.xyz); float sa = dot(refnormpersp, vary_light.xyz);
vec3 dumbshiny = vary_SunlitColor*scol_ambocc.r*texture2D(lightFunc, vec2(sa, spec.a)).a; vec3 dumbshiny = vary_SunlitColor*scol_ambocc.r*texture2D(lightFunc, vec2(sa, spec.a)).a;
glowresult = 0.08 * dot(dumbshiny.rgb, spec.rgb);
// screen-space cheap fakey reflection map // screen-space cheap fakey reflection map
// //
...@@ -336,5 +334,5 @@ void main() ...@@ -336,5 +334,5 @@ void main()
col = scaleSoftClip(col); col = scaleSoftClip(col);
gl_FragColor.rgb = col; gl_FragColor.rgb = col;
gl_FragColor.a = glowresult; gl_FragColor.a = 0.0;
} }
...@@ -272,7 +272,6 @@ void main() ...@@ -272,7 +272,6 @@ void main()
vec2 scol_ambocc = texture2DRect(lightMap, vary_fragcoord.xy).rg; vec2 scol_ambocc = texture2DRect(lightMap, vary_fragcoord.xy).rg;
float scol = max(scol_ambocc.r, diffuse.a); float scol = max(scol_ambocc.r, diffuse.a);
float ambocc = scol_ambocc.g; float ambocc = scol_ambocc.g;
float glowresult = 0.0;
calcAtmospherics(pos.xyz, ambocc); calcAtmospherics(pos.xyz, ambocc);
...@@ -288,7 +287,6 @@ void main() ...@@ -288,7 +287,6 @@ void main()
vec3 refnormpersp = normalize(reflect(pos.xyz, norm.xyz)); vec3 refnormpersp = normalize(reflect(pos.xyz, norm.xyz));
float sa = dot(refnormpersp, vary_light.xyz); float sa = dot(refnormpersp, vary_light.xyz);
vec3 dumbshiny = vary_SunlitColor*scol*texture2D(lightFunc, vec2(sa, spec.a)).a; vec3 dumbshiny = vary_SunlitColor*scol*texture2D(lightFunc, vec2(sa, spec.a)).a;
glowresult = 0.08 * dot(dumbshiny.rgb, spec.rgb);
// screen-space cheap fakey reflection map // screen-space cheap fakey reflection map
// //
...@@ -342,7 +340,7 @@ void main() ...@@ -342,7 +340,7 @@ void main()
gl_FragColor.rgb = col; gl_FragColor.rgb = col;
//gl_FragColor.rgb = gi_col.rgb; //gl_FragColor.rgb = gi_col.rgb;
gl_FragColor.a = glowresult; gl_FragColor.a = 0.0;
//gl_FragColor.rg = scol_ambocc.rg; //gl_FragColor.rg = scol_ambocc.rg;
//gl_FragColor.rgb = texture2DRect(lightMap, vary_fragcoord.xy).rgb; //gl_FragColor.rgb = texture2DRect(lightMap, vary_fragcoord.xy).rgb;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment