Merge pull request #34 from rz5/patch-2

Update crt-easymode-halation.slang
This commit is contained in:
hizzlekizzle 2016-08-11 13:19:10 -05:00 committed by GitHub
commit b036db49ed

View file

@ -104,7 +104,7 @@ float get_scanline_weight(float pos, float beam, float strength)
{ {
float weight = 1.0 - pow(cos(pos * 2.0 * PI) * 0.5 + 0.5, beam); float weight = 1.0 - pow(cos(pos * 2.0 * PI) * 0.5 + 0.5, beam);
return weight * strength * 2.0 + (1.0 - strength);; return weight * strength * 2.0 + (1.0 - strength);
} }
vec2 curve_coordinate(vec2 co, float curvature) vec2 curve_coordinate(vec2 co, float curvature)
@ -204,8 +204,8 @@ void main()
float mask_dither = fract(mask_config.x) * 10.0; float mask_dither = fract(mask_config.x) * 10.0;
vec2 mod_fac = floor( vec2 mod_fac = floor(
vTexCoord * global.OutputSize.xy * global.SourceSize.xy / vTexCoord * global.OutputSize.xy /
(global.SourceSize.xy * vec2(param.MASK_SIZE, mask_dot_height * param.MASK_SIZE)) (vec2(param.MASK_SIZE, mask_dot_height * param.MASK_SIZE))
); );
int dot_no = int(mod((mod_fac.x + mod(mod_fac.y, 2.0) * mask_stagger) / mask_dot_width, mask_colors)); int dot_no = int(mod((mod_fac.x + mod(mod_fac.y, 2.0) * mask_stagger) / mask_dot_width, mask_colors));
@ -223,7 +223,7 @@ void main()
mask_weight *= mix(1.0, mask_mul, mask_dither); mask_weight *= mix(1.0, mask_mul, mask_dither);
mask_weight = mix(vec3(1.0), mask_weight, clamp(param.MASK_TYPE, 0.0, 1.0)); mask_weight = mix(vec3(1.0), mask_weight, clamp(param.MASK_TYPE, 0.0, 1.0));
vec3 col2 = (col * mask_weight) * param.BRIGHTNESS; vec3 col2 = (col * mask_weight) * param.BRIGHTNESS;
float scan_weight = get_scanline_weight(scan_pos - sample_offset, scan_beam, scan_strength); float scan_weight = get_scanline_weight(scan_pos - sample_offset, scan_beam, scan_strength);
col = clamp(col2 * scan_weight, 0.0, 1.0); col = clamp(col2 * scan_weight, 0.0, 1.0);
scan_weight = get_scanline_weight(scan_pos, scan_beam, scan_strength); scan_weight = get_scanline_weight(scan_pos, scan_beam, scan_strength);