Merge pull request #61 from Tatsuya79/master

GB borders new default and additions.
This commit is contained in:
hizzlekizzle 2017-07-25 15:16:44 -05:00 committed by GitHub
commit 7376cec5c2
11 changed files with 165 additions and 41 deletions

View file

@ -31,17 +31,29 @@ scale4 = 1.0
alias4 = "PASS4"
shader5 = shader-files/gb-pass-5.slang
filter_linear5 = true
scale_type5 = source
scale5 = 1.0
parameters = "video_scale;SCALE;OUT_X;OUT_Y;adjacent_texel_alpha_blending;pixel_opacity;shadow_opacity;console_border_enable"
parameters = "video_scale;baseline_alpha;response_time;grey_balance;blending_mode;adjacent_texel_alpha_blending;contrast;screen_light;pixel_opacity;bg_smoothing;shadow_opacity;shadow_offset_x;shadow_offset_y;screen_offset_x;screen_offset_y;console_border_enable;SCALE;OUT_X;OUT_Y"
video_scale = "3.0"
SCALE = "0.6667"
OUT_X = "1600.0"
OUT_Y = "800.0"
adjacent_texel_alpha_blending = "0.18"
pixel_opacity = "0.90"
shadow_opacity = "0.90"
baseline_alpha = "0.03"
response_time = "0.333"
grey_balance = "3.5"
blending_mode = "0.0"
adjacent_texel_alpha_blending = "0.38"
contrast = "0.8"
screen_light = "0.9"
pixel_opacity = "0.95"
bg_smoothing = "0.0"
shadow_opacity = "0.55"
shadow_offset_x = "-1.5"
shadow_offset_y = "1.5"
screen_offset_x = "0.0"
screen_offset_y = "0.0"
console_border_enable = "1.0"
textures = COLOR_PALETTE;BACKGROUND;BORDER

View file

@ -31,15 +31,27 @@ scale4 = 1.0
alias4 = "PASS4"
shader5 = shader-files/gb-pass-5.slang
filter_linear5 = true
parameters = "video_scale;SCALE;OUT_X;OUT_Y;adjacent_texel_alpha_blending;pixel_opacity;shadow_opacity;console_border_enable"
parameters = "video_scale;baseline_alpha;response_time;grey_balance;blending_mode;adjacent_texel_alpha_blending;contrast;screen_light;pixel_opacity;bg_smoothing;shadow_opacity;shadow_offset_x;shadow_offset_y;screen_offset_x;screen_offset_y;console_border_enable;SCALE;OUT_X;OUT_Y"
video_scale = "3.0"
SCALE = "1.0"
OUT_X = "2400.0"
OUT_Y = "1200.0"
adjacent_texel_alpha_blending = "0.15"
pixel_opacity = "0.80"
shadow_opacity = "0.80"
baseline_alpha = "0.03"
response_time = "0.333"
grey_balance = "3.5"
blending_mode = "0.0"
adjacent_texel_alpha_blending = "0.38"
contrast = "0.8"
screen_light = "0.9"
pixel_opacity = "0.95"
bg_smoothing = "0.0"
shadow_opacity = "0.55"
shadow_offset_x = "-1.5"
shadow_offset_y = "1.5"
screen_offset_x = "0.0"
screen_offset_y = "0.0"
console_border_enable = "1.0"
textures = COLOR_PALETTE;BACKGROUND;BORDER

View file

@ -31,15 +31,27 @@ scale4 = 1.0
alias4 = "PASS4"
shader5 = shader-files/gb-pass-5.slang
filter_linear5 = true
parameters = "video_scale;SCALE;OUT_X;OUT_Y;adjacent_texel_alpha_blending;pixel_opacity;shadow_opacity;console_border_enable"
parameters = "video_scale;baseline_alpha;response_time;grey_balance;blending_mode;adjacent_texel_alpha_blending;contrast;screen_light;pixel_opacity;bg_smoothing;shadow_opacity;shadow_offset_x;shadow_offset_y;screen_offset_x;screen_offset_y;console_border_enable;SCALE;OUT_X;OUT_Y"
video_scale = "4.0"
SCALE = "1.0"
OUT_X = "3200.0"
OUT_Y = "1600.0"
adjacent_texel_alpha_blending = "0.14"
pixel_opacity = "0.80"
shadow_opacity = "0.80"
baseline_alpha = "0.03"
response_time = "0.333"
grey_balance = "3.5"
blending_mode = "0.0"
adjacent_texel_alpha_blending = "0.38"
contrast = "0.8"
screen_light = "0.9"
pixel_opacity = "0.95"
bg_smoothing = "0.0"
shadow_opacity = "0.55"
shadow_offset_x = "-1.5"
shadow_offset_y = "1.5"
screen_offset_x = "0.0"
screen_offset_y = "0.0"
console_border_enable = "1.0"
textures = COLOR_PALETTE;BACKGROUND;BORDER

View file

@ -31,15 +31,27 @@ scale4 = 1.0
alias4 = "PASS4"
shader5 = shader-files/gb-pass-5.slang
filter_linear5 = true
parameters = "video_scale;SCALE;OUT_X;OUT_Y;adjacent_texel_alpha_blending;pixel_opacity;shadow_opacity;console_border_enable"
parameters = "video_scale;baseline_alpha;response_time;grey_balance;blending_mode;adjacent_texel_alpha_blending;contrast;screen_light;pixel_opacity;bg_smoothing;shadow_opacity;shadow_offset_x;shadow_offset_y;screen_offset_x;screen_offset_y;console_border_enable;SCALE;OUT_X;OUT_Y"
video_scale = "4.0"
SCALE = "1.25"
OUT_X = "4000.0"
OUT_Y = "2000.0"
adjacent_texel_alpha_blending = "0.14"
pixel_opacity = "0.80"
shadow_opacity = "0.80"
baseline_alpha = "0.03"
response_time = "0.333"
grey_balance = "3.5"
blending_mode = "0.0"
adjacent_texel_alpha_blending = "0.38"
contrast = "0.8"
screen_light = "0.9"
pixel_opacity = "0.95"
bg_smoothing = "0.0"
shadow_opacity = "0.55"
shadow_offset_x = "-1.5"
shadow_offset_y = "1.5"
screen_offset_x = "0.0"
screen_offset_y = "0.0"
console_border_enable = "1.0"
textures = COLOR_PALETTE;BACKGROUND;BORDER

View file

@ -31,15 +31,27 @@ scale4 = 1.0
alias4 = "PASS4"
shader5 = shader-files/gb-pass-5.slang
filter_linear5 = true
parameters = "video_scale;SCALE;OUT_X;OUT_Y;adjacent_texel_alpha_blending;pixel_opacity;shadow_opacity;console_border_enable"
parameters = "video_scale;baseline_alpha;response_time;grey_balance;blending_mode;adjacent_texel_alpha_blending;contrast;screen_light;pixel_opacity;bg_smoothing;shadow_opacity;shadow_offset_x;shadow_offset_y;screen_offset_x;screen_offset_y;console_border_enable;SCALE;OUT_X;OUT_Y"
video_scale = "4.0"
SCALE = "1.5"
OUT_X = "4800.0"
OUT_Y = "2400.0"
adjacent_texel_alpha_blending = "0.14"
pixel_opacity = "0.80"
shadow_opacity = "0.80"
baseline_alpha = "0.03"
response_time = "0.333"
grey_balance = "3.5"
blending_mode = "0.0"
adjacent_texel_alpha_blending = "0.38"
contrast = "0.8"
screen_light = "0.9"
pixel_opacity = "0.95"
bg_smoothing = "0.0"
shadow_opacity = "0.55"
shadow_offset_x = "-1.5"
shadow_offset_y = "1.5"
screen_offset_x = "0.0"
screen_offset_y = "0.0"
console_border_enable = "1.0"
textures = COLOR_PALETTE;BACKGROUND;BORDER

View file

@ -31,17 +31,29 @@ scale4 = 1.0
alias4 = "PASS4"
shader5 = shader-files/gb-pass-5.slang
filter_linear5 = true
scale_type5 = source
scale5 = 1.0
parameters = "video_scale;SCALE;OUT_X;OUT_Y;adjacent_texel_alpha_blending;pixel_opacity;shadow_opacity;console_border_enable"
parameters = "video_scale;baseline_alpha;response_time;grey_balance;blending_mode;adjacent_texel_alpha_blending;contrast;screen_light;pixel_opacity;bg_smoothing;shadow_opacity;shadow_offset_x;shadow_offset_y;screen_offset_x;screen_offset_y;console_border_enable;SCALE;OUT_X;OUT_Y"
video_scale = "3.0"
SCALE = "0.6667"
OUT_X = "1600.0"
OUT_Y = "800.0"
adjacent_texel_alpha_blending = "0.18"
pixel_opacity = "0.90"
shadow_opacity = "0.90"
baseline_alpha = "0.03"
response_time = "0.333"
grey_balance = "3.5"
blending_mode = "0.0"
adjacent_texel_alpha_blending = "0.38"
contrast = "0.8"
screen_light = "0.9"
pixel_opacity = "0.95"
bg_smoothing = "0.0"
shadow_opacity = "0.55"
shadow_offset_x = "-1.5"
shadow_offset_y = "1.5"
screen_offset_x = "0.0"
screen_offset_y = "0.0"
console_border_enable = "1.0"
textures = COLOR_PALETTE;BACKGROUND;BORDER

View file

@ -31,15 +31,27 @@ scale4 = 1.0
alias4 = "PASS4"
shader5 = shader-files/gb-pass-5.slang
filter_linear5 = true
parameters = "video_scale;SCALE;OUT_X;OUT_Y;adjacent_texel_alpha_blending;pixel_opacity;shadow_opacity;console_border_enable"
parameters = "video_scale;baseline_alpha;response_time;grey_balance;blending_mode;adjacent_texel_alpha_blending;contrast;screen_light;pixel_opacity;bg_smoothing;shadow_opacity;shadow_offset_x;shadow_offset_y;screen_offset_x;screen_offset_y;console_border_enable;SCALE;OUT_X;OUT_Y"
video_scale = "3.0"
SCALE = "1.0"
OUT_X = "2400.0"
OUT_Y = "1200.0"
adjacent_texel_alpha_blending = "0.15"
pixel_opacity = "0.80"
shadow_opacity = "0.80"
baseline_alpha = "0.03"
response_time = "0.333"
grey_balance = "3.5"
blending_mode = "0.0"
adjacent_texel_alpha_blending = "0.38"
contrast = "0.8"
screen_light = "0.9"
pixel_opacity = "0.95"
bg_smoothing = "0.0"
shadow_opacity = "0.55"
shadow_offset_x = "-1.5"
shadow_offset_y = "1.5"
screen_offset_x = "0.0"
screen_offset_y = "0.0"
console_border_enable = "1.0"
textures = COLOR_PALETTE;BACKGROUND;BORDER

View file

@ -31,15 +31,27 @@ scale4 = 1.0
alias4 = "PASS4"
shader5 = shader-files/gb-pass-5.slang
filter_linear5 = true
parameters = "video_scale;SCALE;OUT_X;OUT_Y;adjacent_texel_alpha_blending;pixel_opacity;shadow_opacity;console_border_enable"
parameters = "video_scale;baseline_alpha;response_time;grey_balance;blending_mode;adjacent_texel_alpha_blending;contrast;screen_light;pixel_opacity;bg_smoothing;shadow_opacity;shadow_offset_x;shadow_offset_y;screen_offset_x;screen_offset_y;console_border_enable;SCALE;OUT_X;OUT_Y"
video_scale = "4.0"
SCALE = "1.0"
OUT_X = "3200.0"
OUT_Y = "1600.0"
adjacent_texel_alpha_blending = "0.14"
pixel_opacity = "0.80"
shadow_opacity = "0.80"
baseline_alpha = "0.03"
response_time = "0.333"
grey_balance = "3.5"
blending_mode = "0.0"
adjacent_texel_alpha_blending = "0.38"
contrast = "0.8"
screen_light = "0.9"
pixel_opacity = "0.95"
bg_smoothing = "0.0"
shadow_opacity = "0.55"
shadow_offset_x = "-1.5"
shadow_offset_y = "1.5"
screen_offset_x = "0.0"
screen_offset_y = "0.0"
console_border_enable = "1.0"
textures = COLOR_PALETTE;BACKGROUND;BORDER

View file

@ -31,15 +31,27 @@ scale4 = 1.0
alias4 = "PASS4"
shader5 = shader-files/gb-pass-5.slang
filter_linear5 = true
parameters = "video_scale;SCALE;OUT_X;OUT_Y;adjacent_texel_alpha_blending;pixel_opacity;shadow_opacity;console_border_enable"
parameters = "video_scale;baseline_alpha;response_time;grey_balance;blending_mode;adjacent_texel_alpha_blending;contrast;screen_light;pixel_opacity;bg_smoothing;shadow_opacity;shadow_offset_x;shadow_offset_y;screen_offset_x;screen_offset_y;console_border_enable;SCALE;OUT_X;OUT_Y"
video_scale = "4.0"
SCALE = "1.25"
OUT_X = "4000.0"
OUT_Y = "2000.0"
adjacent_texel_alpha_blending = "0.14"
pixel_opacity = "0.80"
shadow_opacity = "0.80"
baseline_alpha = "0.03"
response_time = "0.333"
grey_balance = "3.5"
blending_mode = "0.0"
adjacent_texel_alpha_blending = "0.38"
contrast = "0.8"
screen_light = "0.9"
pixel_opacity = "0.95"
bg_smoothing = "0.0"
shadow_opacity = "0.55"
shadow_offset_x = "-1.5"
shadow_offset_y = "1.5"
screen_offset_x = "0.0"
screen_offset_y = "0.0"
console_border_enable = "1.0"
textures = COLOR_PALETTE;BACKGROUND;BORDER

View file

@ -31,15 +31,27 @@ scale4 = 1.0
alias4 = "PASS4"
shader5 = shader-files/gb-pass-5.slang
filter_linear5 = true
parameters = "video_scale;SCALE;OUT_X;OUT_Y;adjacent_texel_alpha_blending;pixel_opacity;shadow_opacity;console_border_enable"
parameters = "video_scale;baseline_alpha;response_time;grey_balance;blending_mode;adjacent_texel_alpha_blending;contrast;screen_light;pixel_opacity;bg_smoothing;shadow_opacity;shadow_offset_x;shadow_offset_y;screen_offset_x;screen_offset_y;console_border_enable;SCALE;OUT_X;OUT_Y"
video_scale = "4.0"
SCALE = "1.5"
OUT_X = "4800.0"
OUT_Y = "2400.0"
adjacent_texel_alpha_blending = "0.14"
pixel_opacity = "0.80"
shadow_opacity = "0.80"
baseline_alpha = "0.03"
response_time = "0.333"
grey_balance = "3.5"
blending_mode = "0.0"
adjacent_texel_alpha_blending = "0.38"
contrast = "0.8"
screen_light = "0.9"
pixel_opacity = "0.95"
bg_smoothing = "0.0"
shadow_opacity = "0.55"
shadow_offset_x = "-1.5"
shadow_offset_y = "1.5"
screen_offset_x = "0.0"
screen_offset_y = "0.0"
console_border_enable = "1.0"
textures = COLOR_PALETTE;BACKGROUND;BORDER

View file

@ -7,6 +7,7 @@ layout(push_constant) uniform Push
vec4 SourceSize;
vec4 OriginalHistorySize1;
float baseline_alpha;
float grey_balance;
float response_time;
float console_border_enable;
float video_scale;
@ -25,6 +26,9 @@ layout(std140, set = 0, binding = 0) uniform UBO
// Does not affect the border region of the screen - [0, 1]
#pragma parameter baseline_alpha "Baseline Alpha" 0.10 0.0 1.0 0.01
// Fine-tune the balance between the different shades of grey
#pragma parameter grey_balance "Grey Balance" 3.0 2.0 4.0 0.1
// Simulate response time
// Higher values result in longer color transition periods - [0, 1]
#pragma parameter response_time "LCD Response Time" 0.333 0.0 0.777 0.111
@ -148,7 +152,7 @@ void main()
input_rgb += (prev5_rgb - input_rgb) * pow(registers.response_time, 6.0);
input_rgb += (prev6_rgb - input_rgb) * pow(registers.response_time, 7.0);
float rgb_to_alpha = (input_rgb.r + input_rgb.g + input_rgb.b) * 0.333333333
float rgb_to_alpha = (input_rgb.r + input_rgb.g + input_rgb.b) / registers.grey_balance
+ (is_on_dot * registers.baseline_alpha);
// Apply foreground color and assign alpha value