diff --git a/handheld/console-border/dmg-2x.slangp b/handheld/console-border/dmg-2x.slangp deleted file mode 100644 index 2b2d781..0000000 --- a/handheld/console-border/dmg-2x.slangp +++ /dev/null @@ -1,50 +0,0 @@ -shaders = 6 - -shader0 = shader-files/gb-pass0.slang -filter_linear0 = false -scale_type0 = viewport -scale0 = 1.0 -alias0 = "PASS0" - -shader1 = shader-files/gb-pass1.slang -filter_linear1 = false -scale_type1 = source -scale1 = 1.0 -alias1 = "PASS1" - -shader2 = shader-files/gb-pass2.slang -filter_linear2 = false -scale_type2 = source -scale2 = 1.0 -alias2 = "PASS2" - -shader3 = shader-files/gb-pass3.slang -filter_linear3 = false -scale_type3 = source -scale3 = 1.0 -alias3 = "PASS3" - -shader4 = shader-files/gb-pass4.slang -filter_linear4 = false -scale_type4 = source -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" -video_scale = "3.0" -SCALE = "0.6667" -OUT_X = "1600.0" -OUT_Y = "800.0" - -textures = COLOR_PALETTE;BACKGROUND;BORDER -COLOR_PALETTE = resources/dmg-palette.png -COLOR_PALETTE_linear = false -BACKGROUND = resources/dmg-background.png -BACKGROUND_linear = true -BORDER = resources/dmg-border-square-4x.png -BORDER_linear = true diff --git a/handheld/console-border/dmg-3x.slangp b/handheld/console-border/dmg-3x.slangp deleted file mode 100644 index 09f29b2..0000000 --- a/handheld/console-border/dmg-3x.slangp +++ /dev/null @@ -1,48 +0,0 @@ -shaders = 6 - -shader0 = shader-files/gb-pass0.slang -filter_linear0 = false -scale_type0 = viewport -scale0 = 1.0 -alias0 = "PASS0" - -shader1 = shader-files/gb-pass1.slang -filter_linear1 = false -scale_type1 = source -scale1 = 1.0 -alias1 = "PASS1" - -shader2 = shader-files/gb-pass2.slang -filter_linear2 = false -scale_type2 = source -scale2 = 1.0 -alias2 = "PASS2" - -shader3 = shader-files/gb-pass3.slang -filter_linear3 = false -scale_type3 = source -scale3 = 1.0 -alias3 = "PASS3" - -shader4 = shader-files/gb-pass4.slang -filter_linear4 = false -scale_type4 = source -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" -video_scale = "3.0" -SCALE = "1.0" -OUT_X = "2400.0" -OUT_Y = "1200.0" - -textures = COLOR_PALETTE;BACKGROUND;BORDER -COLOR_PALETTE = resources/dmg-palette.png -COLOR_PALETTE_linear = false -BACKGROUND = resources/dmg-background.png -BACKGROUND_linear = true -BORDER = resources/dmg-border-square-4x.png -BORDER_linear = true diff --git a/handheld/console-border/dmg-4x.slangp b/handheld/console-border/dmg-4x.slangp deleted file mode 100644 index 7a62b12..0000000 --- a/handheld/console-border/dmg-4x.slangp +++ /dev/null @@ -1,48 +0,0 @@ -shaders = 6 - -shader0 = shader-files/gb-pass0.slang -filter_linear0 = false -scale_type0 = viewport -scale0 = 1.0 -alias0 = "PASS0" - -shader1 = shader-files/gb-pass1.slang -filter_linear1 = false -scale_type1 = source -scale1 = 1.0 -alias1 = "PASS1" - -shader2 = shader-files/gb-pass2.slang -filter_linear2 = false -scale_type2 = source -scale2 = 1.0 -alias2 = "PASS2" - -shader3 = shader-files/gb-pass3.slang -filter_linear3 = false -scale_type3 = source -scale3 = 1.0 -alias3 = "PASS3" - -shader4 = shader-files/gb-pass4.slang -filter_linear4 = false -scale_type4 = source -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" -video_scale = "4.0" -SCALE = "1.0" -OUT_X = "3200.0" -OUT_Y = "1600.0" - -textures = COLOR_PALETTE;BACKGROUND;BORDER -COLOR_PALETTE = resources/dmg-palette.png -COLOR_PALETTE_linear = false -BACKGROUND = resources/dmg-background.png -BACKGROUND_linear = true -BORDER = resources/dmg-border-square-4x.png -BORDER_linear = true diff --git a/handheld/console-border/dmg-5x.slangp b/handheld/console-border/dmg-5x.slangp deleted file mode 100644 index 8fcdb3a..0000000 --- a/handheld/console-border/dmg-5x.slangp +++ /dev/null @@ -1,48 +0,0 @@ -shaders = 6 - -shader0 = shader-files/gb-pass0.slang -filter_linear0 = false -scale_type0 = viewport -scale0 = 1.0 -alias0 = "PASS0" - -shader1 = shader-files/gb-pass1.slang -filter_linear1 = false -scale_type1 = source -scale1 = 1.0 -alias1 = "PASS1" - -shader2 = shader-files/gb-pass2.slang -filter_linear2 = false -scale_type2 = source -scale2 = 1.0 -alias2 = "PASS2" - -shader3 = shader-files/gb-pass3.slang -filter_linear3 = false -scale_type3 = source -scale3 = 1.0 -alias3 = "PASS3" - -shader4 = shader-files/gb-pass4.slang -filter_linear4 = false -scale_type4 = source -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" -video_scale = "4.0" -SCALE = "1.25" -OUT_X = "4000.0" -OUT_Y = "2000.0" - -textures = COLOR_PALETTE;BACKGROUND;BORDER -COLOR_PALETTE = resources/dmg-palette.png -COLOR_PALETTE_linear = false -BACKGROUND = resources/dmg-background.png -BACKGROUND_linear = true -BORDER = resources/dmg-border-square-4x.png -BORDER_linear = true diff --git a/handheld/console-border/dmg-6x.slangp b/handheld/console-border/dmg.slangp similarity index 85% rename from handheld/console-border/dmg-6x.slangp rename to handheld/console-border/dmg.slangp index 15a7ea7..a16c0d0 100644 --- a/handheld/console-border/dmg-6x.slangp +++ b/handheld/console-border/dmg.slangp @@ -33,11 +33,8 @@ 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" +parameters = "video_scale;adjacent_texel_alpha_blending;pixel_opacity;shadow_opacity" video_scale = "4.0" -SCALE = "1.5" -OUT_X = "4800.0" -OUT_Y = "2400.0" textures = COLOR_PALETTE;BACKGROUND;BORDER COLOR_PALETTE = resources/dmg-palette.png diff --git a/handheld/console-border/gb-dmg-alt-2x.slangp b/handheld/console-border/gb-dmg-alt-2x.slangp deleted file mode 100644 index c51f515..0000000 --- a/handheld/console-border/gb-dmg-alt-2x.slangp +++ /dev/null @@ -1,49 +0,0 @@ -shaders = 6 -shader0 = shader-files/gb-pass0.slang -shader1 = ../shaders/gameboy/shader-files/gb-pass1.slang -shader2 = ../shaders/gameboy/shader-files/gb-pass2.slang -shader3 = ../shaders/gameboy/shader-files/gb-pass3.slang -shader4 = ../shaders/gameboy/shader-files/gb-pass4.slang -shader5 = shader-files/gb-pass-5.slang - -scale_type0 = viewport -scale0 = 1 - -scale_type1 = source -scale1 = 1 - -scale_type2 = source -scale2 = 1 - -scale_type3 = source -scale3 = 1 - -scale_type4 = source -scale4 = 1 - -scale_type5 = source -scale5 = 1 - -filter_linear0 = false -filter_linear1 = false -filter_linear2 = false -filter_linear3 = false -filter_linear4 = false -filter_linear5 = true - -textures = COLOR_PALETTE;BACKGROUND;BORDER -COLOR_PALETTE = ../shaders/gameboy/resources/sample-palettes/dmg-palette-0.png -COLOR_PALETTE_linear = false -BACKGROUND = ../shaders/gameboy/resources/sample-bgs/dmg-bg.png -BACKGROUND_linear = true -BORDER = resources/dmg-border-square-4x.png -BORDER_linear = true - -parameters = "video_scale;SCALE;OUT_X;OUT_Y;grey_balance;response_time;blending_mode" -video_scale = "2.0" -SCALE = "1.0" -OUT_X = "1600.0" -OUT_Y = "800.0" -grey_balance = 3.0 -response_time = 0.444 -blending_mode = 0.0 diff --git a/handheld/console-border/gb-dmg-alt-3x.slangp b/handheld/console-border/gb-dmg-alt-3x.slangp deleted file mode 100644 index 2973a22..0000000 --- a/handheld/console-border/gb-dmg-alt-3x.slangp +++ /dev/null @@ -1,50 +0,0 @@ -shaders = 6 -shader0 = shader-files/gb-pass0.slang -shader1 = ../shaders/gameboy/shader-files/gb-pass1.slang -shader2 = ../shaders/gameboy/shader-files/gb-pass2.slang -shader3 = ../shaders/gameboy/shader-files/gb-pass3.slang -shader4 = ../shaders/gameboy/shader-files/gb-pass4.slang -shader5 = shader-files/gb-pass-5.slang - -scale_type0 = viewport -scale0 = 1 - -scale_type1 = source -scale1 = 1 - -scale_type2 = source -scale2 = 1 - -scale_type3 = source -scale3 = 1 - -scale_type4 = source -scale4 = 1 - -scale_type5 = source -scale5 = 1 - -filter_linear0 = false -filter_linear1 = false -filter_linear2 = false -filter_linear3 = false -filter_linear4 = false -filter_linear5 = true - -textures = COLOR_PALETTE;BACKGROUND;BORDER -COLOR_PALETTE = ../shaders/gameboy/resources/sample-palettes/dmg-palette-0.png -COLOR_PALETTE_linear = false -BACKGROUND = ../shaders/gameboy/resources/sample-bgs/dmg-bg.png -BACKGROUND_linear = true -BORDER = resources/dmg-border-square-4x.png -BORDER_linear = true - -parameters = "video_scale;SCALE;OUT_X;OUT_Y;grey_balance;response_time;blending_mode" -video_scale = "3.0" -SCALE = "1.0" -OUT_X = "2400.0" -OUT_Y = "1200.0" -grey_balance = 3.0 -response_time = 0.444 -blending_mode = 0.0 - diff --git a/handheld/console-border/gb-dmg-alt-5x.slangp b/handheld/console-border/gb-dmg-alt-5x.slangp deleted file mode 100644 index 9b32357..0000000 --- a/handheld/console-border/gb-dmg-alt-5x.slangp +++ /dev/null @@ -1,49 +0,0 @@ -shaders = 6 -shader0 = shader-files/gb-pass0.slang -shader1 = ../shaders/gameboy/shader-files/gb-pass1.slang -shader2 = ../shaders/gameboy/shader-files/gb-pass2.slang -shader3 = ../shaders/gameboy/shader-files/gb-pass3.slang -shader4 = ../shaders/gameboy/shader-files/gb-pass4.slang -shader5 = shader-files/gb-pass-5.slang - -scale_type0 = viewport -scale0 = 1 - -scale_type1 = source -scale1 = 1 - -scale_type2 = source -scale2 = 1 - -scale_type3 = source -scale3 = 1 - -scale_type4 = source -scale4 = 1 - -scale_type5 = source -scale5 = 1 - -filter_linear0 = false -filter_linear1 = false -filter_linear2 = false -filter_linear3 = false -filter_linear4 = false -filter_linear5 = true - -textures = COLOR_PALETTE;BACKGROUND;BORDER -COLOR_PALETTE = ../shaders/gameboy/resources/sample-palettes/dmg-palette-0.png -COLOR_PALETTE_linear = false -BACKGROUND = ../shaders/gameboy/resources/sample-bgs/dmg-bg.png -BACKGROUND_linear = true -BORDER = resources/dmg-border-square-4x.png -BORDER_linear = true - -parameters = "video_scale;SCALE;OUT_X;OUT_Y;grey_balance;response_time;blending_mode" -video_scale = "5.0" -SCALE = "1.0" -OUT_X = "4000.0" -OUT_Y = "2000.0" -grey_balance = 3.0 -response_time = 0.444 -blending_mode = 0.0 diff --git a/handheld/console-border/gb-dmg-alt-6x.slangp b/handheld/console-border/gb-dmg-alt-6x.slangp deleted file mode 100644 index ddd527d..0000000 --- a/handheld/console-border/gb-dmg-alt-6x.slangp +++ /dev/null @@ -1,49 +0,0 @@ -shaders = 6 -shader0 = shader-files/gb-pass0.slang -shader1 = ../shaders/gameboy/shader-files/gb-pass1.slang -shader2 = ../shaders/gameboy/shader-files/gb-pass2.slang -shader3 = ../shaders/gameboy/shader-files/gb-pass3.slang -shader4 = ../shaders/gameboy/shader-files/gb-pass4.slang -shader5 = shader-files/gb-pass-5.slang - -scale_type0 = viewport -scale0 = 1 - -scale_type1 = source -scale1 = 1 - -scale_type2 = source -scale2 = 1 - -scale_type3 = source -scale3 = 1 - -scale_type4 = source -scale4 = 1 - -scale_type5 = source -scale5 = 1 - -filter_linear0 = false -filter_linear1 = false -filter_linear2 = false -filter_linear3 = false -filter_linear4 = false -filter_linear5 = true - -textures = COLOR_PALETTE;BACKGROUND;BORDER -COLOR_PALETTE = ../shaders/gameboy/resources/sample-palettes/dmg-palette-0.png -COLOR_PALETTE_linear = false -BACKGROUND = ../shaders/gameboy/resources/sample-bgs/dmg-bg.png -BACKGROUND_linear = true -BORDER = resources/dmg-border-square-4x.png -BORDER_linear = true - -parameters = "video_scale;SCALE;OUT_X;OUT_Y;grey_balance;response_time;blending_mode" -video_scale = "6.0" -SCALE = "1.0" -OUT_X = "4800.0" -OUT_Y = "2400.0" -grey_balance = 3.0 -response_time = 0.444 -blending_mode = 0.0 diff --git a/handheld/console-border/gb-dmg-alt-7x.slangp b/handheld/console-border/gb-dmg-alt-7x.slangp deleted file mode 100644 index 10ab678..0000000 --- a/handheld/console-border/gb-dmg-alt-7x.slangp +++ /dev/null @@ -1,49 +0,0 @@ -shaders = 6 -shader0 = shader-files/gb-pass0.slang -shader1 = ../shaders/gameboy/shader-files/gb-pass1.slang -shader2 = ../shaders/gameboy/shader-files/gb-pass2.slang -shader3 = ../shaders/gameboy/shader-files/gb-pass3.slang -shader4 = ../shaders/gameboy/shader-files/gb-pass4.slang -shader5 = shader-files/gb-pass-5.slang - -scale_type0 = viewport -scale0 = 1 - -scale_type1 = source -scale1 = 1 - -scale_type2 = source -scale2 = 1 - -scale_type3 = source -scale3 = 1 - -scale_type4 = source -scale4 = 1 - -scale_type5 = source -scale5 = 1 - -filter_linear0 = false -filter_linear1 = false -filter_linear2 = false -filter_linear3 = false -filter_linear4 = false -filter_linear5 = true - -textures = COLOR_PALETTE;BACKGROUND;BORDER -COLOR_PALETTE = ../shaders/gameboy/resources/sample-palettes/dmg-palette-0.png -COLOR_PALETTE_linear = false -BACKGROUND = ../shaders/gameboy/resources/sample-bgs/dmg-bg.png -BACKGROUND_linear = true -BORDER = resources/dmg-border-square-4x.png -BORDER_linear = true - -parameters = "video_scale;SCALE;OUT_X;OUT_Y;grey_balance;response_time;blending_mode" -video_scale = "7.0" -SCALE = "1.0" -OUT_X = "5600.0" -OUT_Y = "2800.0" -grey_balance = 3.0 -response_time = 0.444 -blending_mode = 0.0 diff --git a/handheld/console-border/gb-dmg-alt-4x.slangp b/handheld/console-border/gb-dmg-alt.slangp similarity index 88% rename from handheld/console-border/gb-dmg-alt-4x.slangp rename to handheld/console-border/gb-dmg-alt.slangp index 4e95704..493ce4a 100644 --- a/handheld/console-border/gb-dmg-alt-4x.slangp +++ b/handheld/console-border/gb-dmg-alt.slangp @@ -39,11 +39,8 @@ BACKGROUND_linear = true BORDER = resources/dmg-border-square-4x.png BORDER_linear = true -parameters = "video_scale;SCALE;OUT_X;OUT_Y;grey_balance;response_time;blending_mode" +parameters = "video_scale;grey_balance;response_time;blending_mode" video_scale = "4.0" -SCALE = "1.0" -OUT_X = "3200.0" -OUT_Y = "1600.0" grey_balance = 3.0 response_time = 0.444 blending_mode = 0.0 diff --git a/handheld/console-border/gb-light-alt-2x.slangp b/handheld/console-border/gb-light-alt-2x.slangp deleted file mode 100644 index 147c125..0000000 --- a/handheld/console-border/gb-light-alt-2x.slangp +++ /dev/null @@ -1,50 +0,0 @@ -shaders = 6 -shader0 = shader-files/gb-pass0.slang -shader1 = ../shaders/gameboy/shader-files/gb-pass1.slang -shader2 = ../shaders/gameboy/shader-files/gb-pass2.slang -shader3 = ../shaders/gameboy/shader-files/gb-pass3.slang -shader4 = ../shaders/gameboy/shader-files/gb-pass4.slang -shader5 = shader-files/gb-pass-5.slang - -scale_type0 = viewport -scale0 = 1 - -scale_type1 = source -scale1 = 1 - -scale_type2 = source -scale2 = 1 - -scale_type3 = source -scale3 = 1 - -scale_type4 = source -scale4 = 1 - -scale_type5 = source -scale5 = 1 - -filter_linear0 = false -filter_linear1 = false -filter_linear2 = false -filter_linear3 = false -filter_linear4 = false -filter_linear5 = true - -textures = COLOR_PALETTE;BACKGROUND;BORDER -COLOR_PALETTE = ../shaders/gameboy/resources/sample-palettes/gblight-palette.png -COLOR_PALETTE_linear = false -BACKGROUND = ../shaders/gameboy/resources/sample-bgs/paper-bg.png -BACKGROUND_linear = true -BORDER = resources/pocket-border-square-4x.png -BORDER_linear = true - -parameters = "video_scale;SCALE;OUT_X;OUT_Y;screen_light;grey_balance;response_time;blending_mode" -video_scale = "2.0" -SCALE = "1.0" -OUT_X = "1600.0" -OUT_Y = "800.0" -screen_light = "1.4" -grey_balance = 3.0 -response_time = 0.444 -blending_mode = 0.0 diff --git a/handheld/console-border/gb-light-alt-3x.slangp b/handheld/console-border/gb-light-alt-3x.slangp deleted file mode 100644 index 0fb6af5..0000000 --- a/handheld/console-border/gb-light-alt-3x.slangp +++ /dev/null @@ -1,50 +0,0 @@ -shaders = 6 -shader0 = shader-files/gb-pass0.slang -shader1 = ../shaders/gameboy/shader-files/gb-pass1.slang -shader2 = ../shaders/gameboy/shader-files/gb-pass2.slang -shader3 = ../shaders/gameboy/shader-files/gb-pass3.slang -shader4 = ../shaders/gameboy/shader-files/gb-pass4.slang -shader5 = shader-files/gb-pass-5.slang - -scale_type0 = viewport -scale0 = 1 - -scale_type1 = source -scale1 = 1 - -scale_type2 = source -scale2 = 1 - -scale_type3 = source -scale3 = 1 - -scale_type4 = source -scale4 = 1 - -scale_type5 = source -scale5 = 1 - -filter_linear0 = false -filter_linear1 = false -filter_linear2 = false -filter_linear3 = false -filter_linear4 = false -filter_linear5 = true - -textures = COLOR_PALETTE;BACKGROUND;BORDER -COLOR_PALETTE = ../shaders/gameboy/resources/sample-palettes/gblight-palette.png -COLOR_PALETTE_linear = false -BACKGROUND = ../shaders/gameboy/resources/sample-bgs/paper-bg.png -BACKGROUND_linear = true -BORDER = resources/pocket-border-square-4x.png -BORDER_linear = true - -parameters = "video_scale;SCALE;OUT_X;OUT_Y;screen_light;grey_balance;response_time;blending_mode" -video_scale = "3.0" -SCALE = "1.0" -OUT_X = "2400.0" -OUT_Y = "1200.0" -screen_light = "1.4" -grey_balance = 3.0 -response_time = 0.444 -blending_mode = 0.0 diff --git a/handheld/console-border/gb-light-alt-5x.slangp b/handheld/console-border/gb-light-alt-5x.slangp deleted file mode 100644 index cd70e4c..0000000 --- a/handheld/console-border/gb-light-alt-5x.slangp +++ /dev/null @@ -1,50 +0,0 @@ -shaders = 6 -shader0 = shader-files/gb-pass0.slang -shader1 = ../shaders/gameboy/shader-files/gb-pass1.slang -shader2 = ../shaders/gameboy/shader-files/gb-pass2.slang -shader3 = ../shaders/gameboy/shader-files/gb-pass3.slang -shader4 = ../shaders/gameboy/shader-files/gb-pass4.slang -shader5 = shader-files/gb-pass-5.slang - -scale_type0 = viewport -scale0 = 1 - -scale_type1 = source -scale1 = 1 - -scale_type2 = source -scale2 = 1 - -scale_type3 = source -scale3 = 1 - -scale_type4 = source -scale4 = 1 - -scale_type5 = source -scale5 = 1 - -filter_linear0 = false -filter_linear1 = false -filter_linear2 = false -filter_linear3 = false -filter_linear4 = false -filter_linear5 = true - -textures = COLOR_PALETTE;BACKGROUND;BORDER -COLOR_PALETTE = ../shaders/gameboy/resources/sample-palettes/gblight-palette.png -COLOR_PALETTE_linear = false -BACKGROUND = ../shaders/gameboy/resources/sample-bgs/paper-bg.png -BACKGROUND_linear = true -BORDER = resources/pocket-border-square-4x.png -BORDER_linear = true - -parameters = "video_scale;SCALE;OUT_X;OUT_Y;screen_light;grey_balance;response_time;blending_mode" -video_scale = "5.0" -SCALE = "1.0" -OUT_X = "4000.0" -OUT_Y = "2000.0" -screen_light = "1.4" -grey_balance = 3.0 -response_time = 0.444 -blending_mode = 0.0 diff --git a/handheld/console-border/gb-light-alt-6x.slangp b/handheld/console-border/gb-light-alt-6x.slangp deleted file mode 100644 index 652ff23..0000000 --- a/handheld/console-border/gb-light-alt-6x.slangp +++ /dev/null @@ -1,50 +0,0 @@ -shaders = 6 -shader0 = shader-files/gb-pass0.slang -shader1 = ../shaders/gameboy/shader-files/gb-pass1.slang -shader2 = ../shaders/gameboy/shader-files/gb-pass2.slang -shader3 = ../shaders/gameboy/shader-files/gb-pass3.slang -shader4 = ../shaders/gameboy/shader-files/gb-pass4.slang -shader5 = shader-files/gb-pass-5.slang - -scale_type0 = viewport -scale0 = 1 - -scale_type1 = source -scale1 = 1 - -scale_type2 = source -scale2 = 1 - -scale_type3 = source -scale3 = 1 - -scale_type4 = source -scale4 = 1 - -scale_type5 = source -scale5 = 1 - -filter_linear0 = false -filter_linear1 = false -filter_linear2 = false -filter_linear3 = false -filter_linear4 = false -filter_linear5 = true - -textures = COLOR_PALETTE;BACKGROUND;BORDER -COLOR_PALETTE = ../shaders/gameboy/resources/sample-palettes/gblight-palette.png -COLOR_PALETTE_linear = false -BACKGROUND = ../shaders/gameboy/resources/sample-bgs/paper-bg.png -BACKGROUND_linear = true -BORDER = resources/pocket-border-square-4x.png -BORDER_linear = true - -parameters = "video_scale;SCALE;OUT_X;OUT_Y;screen_light;grey_balance;response_time;blending_mode" -video_scale = "6.0" -SCALE = "1.0" -OUT_X = "4800.0" -OUT_Y = "2400.0" -screen_light = "1.4" -grey_balance = 3.0 -response_time = 0.444 -blending_mode = 0.0 diff --git a/handheld/console-border/gb-light-alt-7x.slangp b/handheld/console-border/gb-light-alt-7x.slangp deleted file mode 100644 index 101c292..0000000 --- a/handheld/console-border/gb-light-alt-7x.slangp +++ /dev/null @@ -1,50 +0,0 @@ -shaders = 6 -shader0 = shader-files/gb-pass0.slang -shader1 = ../shaders/gameboy/shader-files/gb-pass1.slang -shader2 = ../shaders/gameboy/shader-files/gb-pass2.slang -shader3 = ../shaders/gameboy/shader-files/gb-pass3.slang -shader4 = ../shaders/gameboy/shader-files/gb-pass4.slang -shader5 = shader-files/gb-pass-5.slang - -scale_type0 = viewport -scale0 = 1 - -scale_type1 = source -scale1 = 1 - -scale_type2 = source -scale2 = 1 - -scale_type3 = source -scale3 = 1 - -scale_type4 = source -scale4 = 1 - -scale_type5 = source -scale5 = 1 - -filter_linear0 = false -filter_linear1 = false -filter_linear2 = false -filter_linear3 = false -filter_linear4 = false -filter_linear5 = true - -textures = COLOR_PALETTE;BACKGROUND;BORDER -COLOR_PALETTE = ../shaders/gameboy/resources/sample-palettes/gblight-palette.png -COLOR_PALETTE_linear = false -BACKGROUND = ../shaders/gameboy/resources/sample-bgs/paper-bg.png -BACKGROUND_linear = true -BORDER = resources/pocket-border-square-4x.png -BORDER_linear = true - -parameters = "video_scale;SCALE;OUT_X;OUT_Y;screen_light;grey_balance;response_time;blending_mode" -video_scale = "7.0" -SCALE = "1.0" -OUT_X = "5600.0" -OUT_Y = "2800.0" -screen_light = "1.4" -grey_balance = 3.0 -response_time = 0.444 -blending_mode = 0.0 diff --git a/handheld/console-border/gb-light-alt-4x.slangp b/handheld/console-border/gb-light-alt.slangp similarity index 87% rename from handheld/console-border/gb-light-alt-4x.slangp rename to handheld/console-border/gb-light-alt.slangp index 38bdaf1..cbc058f 100644 --- a/handheld/console-border/gb-light-alt-4x.slangp +++ b/handheld/console-border/gb-light-alt.slangp @@ -39,11 +39,8 @@ BACKGROUND_linear = true BORDER = resources/pocket-border-square-4x.png BORDER_linear = true -parameters = "video_scale;SCALE;OUT_X;OUT_Y;screen_light;grey_balance;response_time;blending_mode" +parameters = "video_scale;screen_light;grey_balance;response_time;blending_mode" video_scale = "4.0" -SCALE = "1.0" -OUT_X = "3200.0" -OUT_Y = "1600.0" screen_light = "1.4" grey_balance = 3.0 response_time = 0.444 diff --git a/handheld/console-border/gb-pocket-2x.slangp b/handheld/console-border/gb-pocket-2x.slangp deleted file mode 100644 index be08147..0000000 --- a/handheld/console-border/gb-pocket-2x.slangp +++ /dev/null @@ -1,58 +0,0 @@ -shaders = 6 - -shader0 = shader-files/gb-pass0.slang -filter_linear0 = false -scale_type0 = viewport -scale0 = 1.0 -alias0 = "PASS0" - -shader1 = shader-files/gb-pass1.slang -filter_linear1 = false -scale_type1 = source -scale1 = 1.0 -alias1 = "PASS1" - -shader2 = shader-files/gb-pass2.slang -filter_linear2 = false -scale_type2 = source -scale2 = 1.0 -alias2 = "PASS2" - -shader3 = shader-files/gb-pass3.slang -filter_linear3 = false -scale_type3 = source -scale3 = 1.0 -alias3 = "PASS3" - -shader4 = shader-files/gb-pass4.slang -filter_linear4 = false -scale_type4 = source -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;baseline_alpha;grey_balance;adjacent_texel_alpha_blending;contrast;screen_light;pixel_opacity;shadow_offset_x;shadow_opacity" -video_scale = "3.0" -SCALE = "0.6667" -OUT_X = "1600.0" -OUT_Y = "800.0" -baseline_alpha = "0.03" -grey_balance = "3.5" -adjacent_texel_alpha_blending = "0.6" -contrast = "0.85" -screen_light = "0.9" -pixel_opacity = "0.95" -shadow_opacity = "0.9" -shadow_offset_x = "-2.0" - -textures = COLOR_PALETTE;BACKGROUND;BORDER -COLOR_PALETTE = resources/pocket-palette.png -COLOR_PALETTE_linear = false -BACKGROUND = resources/pocket-background.png -BACKGROUND_linear = true -BORDER = resources/pocket-border-square-4x.png -BORDER_linear = true diff --git a/handheld/console-border/gb-pocket-3x.slangp b/handheld/console-border/gb-pocket-3x.slangp deleted file mode 100644 index f31a731..0000000 --- a/handheld/console-border/gb-pocket-3x.slangp +++ /dev/null @@ -1,56 +0,0 @@ -shaders = 6 - -shader0 = shader-files/gb-pass0.slang -filter_linear0 = false -scale_type0 = viewport -scale0 = 1.0 -alias0 = "PASS0" - -shader1 = shader-files/gb-pass1.slang -filter_linear1 = false -scale_type1 = source -scale1 = 1.0 -alias1 = "PASS1" - -shader2 = shader-files/gb-pass2.slang -filter_linear2 = false -scale_type2 = source -scale2 = 1.0 -alias2 = "PASS2" - -shader3 = shader-files/gb-pass3.slang -filter_linear3 = false -scale_type3 = source -scale3 = 1.0 -alias3 = "PASS3" - -shader4 = shader-files/gb-pass4.slang -filter_linear4 = false -scale_type4 = source -scale4 = 1.0 -alias4 = "PASS4" - -shader5 = shader-files/gb-pass-5.slang -filter_linear5 = true - -parameters = "video_scale;SCALE;OUT_X;OUT_Y;baseline_alpha;grey_balance;adjacent_texel_alpha_blending;contrast;screen_light;pixel_opacity;shadow_offset_x;shadow_opacity" -video_scale = "3.0" -SCALE = "1.0" -OUT_X = "2400.0" -OUT_Y = "1200.0" -baseline_alpha = "0.03" -grey_balance = "3.5" -adjacent_texel_alpha_blending = "0.6" -contrast = "0.85" -screen_light = "0.9" -pixel_opacity = "0.95" -shadow_opacity = "0.9" -shadow_offset_x = "-2.0" - -textures = COLOR_PALETTE;BACKGROUND;BORDER -COLOR_PALETTE = resources/pocket-palette.png -COLOR_PALETTE_linear = false -BACKGROUND = resources/pocket-background.png -BACKGROUND_linear = true -BORDER = resources/pocket-border-square-4x.png -BORDER_linear = true diff --git a/handheld/console-border/gb-pocket-4x.slangp b/handheld/console-border/gb-pocket-4x.slangp deleted file mode 100644 index b4be1bd..0000000 --- a/handheld/console-border/gb-pocket-4x.slangp +++ /dev/null @@ -1,56 +0,0 @@ -shaders = 6 - -shader0 = shader-files/gb-pass0.slang -filter_linear0 = false -scale_type0 = viewport -scale0 = 1.0 -alias0 = "PASS0" - -shader1 = shader-files/gb-pass1.slang -filter_linear1 = false -scale_type1 = source -scale1 = 1.0 -alias1 = "PASS1" - -shader2 = shader-files/gb-pass2.slang -filter_linear2 = false -scale_type2 = source -scale2 = 1.0 -alias2 = "PASS2" - -shader3 = shader-files/gb-pass3.slang -filter_linear3 = false -scale_type3 = source -scale3 = 1.0 -alias3 = "PASS3" - -shader4 = shader-files/gb-pass4.slang -filter_linear4 = false -scale_type4 = source -scale4 = 1.0 -alias4 = "PASS4" - -shader5 = shader-files/gb-pass-5.slang -filter_linear5 = true - -parameters = "video_scale;SCALE;OUT_X;OUT_Y;baseline_alpha;grey_balance;adjacent_texel_alpha_blending;contrast;screen_light;pixel_opacity;shadow_offset_x;shadow_opacity" -video_scale = "4.0" -SCALE = "1.0" -OUT_X = "3200.0" -OUT_Y = "1600.0" -baseline_alpha = "0.03" -grey_balance = "3.5" -adjacent_texel_alpha_blending = "0.6" -contrast = "0.85" -screen_light = "0.9" -pixel_opacity = "0.95" -shadow_opacity = "0.9" -shadow_offset_x = "-2.0" - -textures = COLOR_PALETTE;BACKGROUND;BORDER -COLOR_PALETTE = resources/pocket-palette.png -COLOR_PALETTE_linear = false -BACKGROUND = resources/pocket-background.png -BACKGROUND_linear = true -BORDER = resources/pocket-border-square-4x.png -BORDER_linear = true diff --git a/handheld/console-border/gb-pocket-5x.slangp b/handheld/console-border/gb-pocket-5x.slangp deleted file mode 100644 index e1904c3..0000000 --- a/handheld/console-border/gb-pocket-5x.slangp +++ /dev/null @@ -1,56 +0,0 @@ -shaders = 6 - -shader0 = shader-files/gb-pass0.slang -filter_linear0 = false -scale_type0 = viewport -scale0 = 1.0 -alias0 = "PASS0" - -shader1 = shader-files/gb-pass1.slang -filter_linear1 = false -scale_type1 = source -scale1 = 1.0 -alias1 = "PASS1" - -shader2 = shader-files/gb-pass2.slang -filter_linear2 = false -scale_type2 = source -scale2 = 1.0 -alias2 = "PASS2" - -shader3 = shader-files/gb-pass3.slang -filter_linear3 = false -scale_type3 = source -scale3 = 1.0 -alias3 = "PASS3" - -shader4 = shader-files/gb-pass4.slang -filter_linear4 = false -scale_type4 = source -scale4 = 1.0 -alias4 = "PASS4" - -shader5 = shader-files/gb-pass-5.slang -filter_linear5 = true - -parameters = "video_scale;SCALE;OUT_X;OUT_Y;baseline_alpha;grey_balance;adjacent_texel_alpha_blending;contrast;screen_light;pixel_opacity;shadow_offset_x;shadow_opacity" -video_scale = "4.0" -SCALE = "1.25" -OUT_X = "4000.0" -OUT_Y = "2000.0" -baseline_alpha = "0.03" -grey_balance = "3.5" -adjacent_texel_alpha_blending = "0.6" -contrast = "0.85" -screen_light = "0.9" -pixel_opacity = "0.95" -shadow_opacity = "0.9" -shadow_offset_x = "-2.0" - -textures = COLOR_PALETTE;BACKGROUND;BORDER -COLOR_PALETTE = resources/pocket-palette.png -COLOR_PALETTE_linear = false -BACKGROUND = resources/pocket-background.png -BACKGROUND_linear = true -BORDER = resources/pocket-border-square-4x.png -BORDER_linear = true diff --git a/handheld/console-border/gb-pocket-alt-2x.slangp b/handheld/console-border/gb-pocket-alt-2x.slangp deleted file mode 100644 index b0b1974..0000000 --- a/handheld/console-border/gb-pocket-alt-2x.slangp +++ /dev/null @@ -1,49 +0,0 @@ -shaders = 6 -shader0 = shader-files/gb-pass0.slang -shader1 = ../shaders/gameboy/shader-files/gb-pass1.slang -shader2 = ../shaders/gameboy/shader-files/gb-pass2.slang -shader3 = ../shaders/gameboy/shader-files/gb-pass3.slang -shader4 = ../shaders/gameboy/shader-files/gb-pass4.slang -shader5 = shader-files/gb-pass-5.slang - -scale_type0 = viewport -scale0 = 1 - -scale_type1 = source -scale1 = 1 - -scale_type2 = source -scale2 = 1 - -scale_type3 = source -scale3 = 1 - -scale_type4 = source -scale4 = 1 - -scale_type5 = source -scale5 = 1 - -filter_linear0 = false -filter_linear1 = false -filter_linear2 = false -filter_linear3 = false -filter_linear4 = false -filter_linear5 = true - -textures = COLOR_PALETTE;BACKGROUND;BORDER -COLOR_PALETTE = ../shaders/gameboy/resources/sample-palettes/gbp-palette.png -COLOR_PALETTE_linear = false -BACKGROUND = ../shaders/gameboy/resources/sample-bgs/paper-bg.png -BACKGROUND_linear = true -BORDER = resources/pocket-border-square-4x.png -BORDER_linear = true - -parameters = "video_scale;SCALE;OUT_X;OUT_Y;grey_balance;response_time;blending_mode" -video_scale = "2.0" -SCALE = "1.0" -OUT_X = "1600.0" -OUT_Y = "800.0" -grey_balance = 3.0 -response_time = 0.444 -blending_mode = 0.0 diff --git a/handheld/console-border/gb-pocket-alt-3x.slangp b/handheld/console-border/gb-pocket-alt-3x.slangp deleted file mode 100644 index ad1768a..0000000 --- a/handheld/console-border/gb-pocket-alt-3x.slangp +++ /dev/null @@ -1,49 +0,0 @@ -shaders = 6 -shader0 = shader-files/gb-pass0.slang -shader1 = ../shaders/gameboy/shader-files/gb-pass1.slang -shader2 = ../shaders/gameboy/shader-files/gb-pass2.slang -shader3 = ../shaders/gameboy/shader-files/gb-pass3.slang -shader4 = ../shaders/gameboy/shader-files/gb-pass4.slang -shader5 = shader-files/gb-pass-5.slang - -scale_type0 = viewport -scale0 = 1 - -scale_type1 = source -scale1 = 1 - -scale_type2 = source -scale2 = 1 - -scale_type3 = source -scale3 = 1 - -scale_type4 = source -scale4 = 1 - -scale_type5 = source -scale5 = 1 - -filter_linear0 = false -filter_linear1 = false -filter_linear2 = false -filter_linear3 = false -filter_linear4 = false -filter_linear5 = true - -textures = COLOR_PALETTE;BACKGROUND;BORDER -COLOR_PALETTE = ../shaders/gameboy/resources/sample-palettes/gbp-palette.png -COLOR_PALETTE_linear = false -BACKGROUND = ../shaders/gameboy/resources/sample-bgs/paper-bg.png -BACKGROUND_linear = true -BORDER = resources/pocket-border-square-4x.png -BORDER_linear = true - -parameters = "video_scale;SCALE;OUT_X;OUT_Y;grey_balance;response_time;blending_mode" -video_scale = "3.0" -SCALE = "1.0" -OUT_X = "2400.0" -OUT_Y = "1200.0" -grey_balance = 3.0 -response_time = 0.444 -blending_mode = 0.0 diff --git a/handheld/console-border/gb-pocket-alt-5x.slangp b/handheld/console-border/gb-pocket-alt-5x.slangp deleted file mode 100644 index 19f62a8..0000000 --- a/handheld/console-border/gb-pocket-alt-5x.slangp +++ /dev/null @@ -1,50 +0,0 @@ -shaders = 6 -shader0 = shader-files/gb-pass0.slang -shader1 = ../shaders/gameboy/shader-files/gb-pass1.slang -shader2 = ../shaders/gameboy/shader-files/gb-pass2.slang -shader3 = ../shaders/gameboy/shader-files/gb-pass3.slang -shader4 = ../shaders/gameboy/shader-files/gb-pass4.slang -shader5 = shader-files/gb-pass-5.slang - -scale_type0 = viewport -scale0 = 1 - -scale_type1 = source -scale1 = 1 - -scale_type2 = source -scale2 = 1 - -scale_type3 = source -scale3 = 1 - -scale_type4 = source -scale4 = 1 - -scale_type5 = source -scale5 = 1 - -filter_linear0 = false -filter_linear1 = false -filter_linear2 = false -filter_linear3 = false -filter_linear4 = false -filter_linear5 = true - -textures = COLOR_PALETTE;BACKGROUND;BORDER -COLOR_PALETTE = ../shaders/gameboy/resources/sample-palettes/gbp-palette.png -COLOR_PALETTE_linear = false -BACKGROUND = ../shaders/gameboy/resources/sample-bgs/paper-bg.png -BACKGROUND_linear = true -BORDER = resources/pocket-border-square-4x.png -BORDER_linear = true - -parameters = "video_scale;SCALE;OUT_X;OUT_Y;grey_balance;response_time;blending_mode" -video_scale = "5.0" -SCALE = "1.0" -OUT_X = "4000.0" -OUT_Y = "2000.0" -grey_balance = 3.0 -response_time = 0.444 -blending_mode = 0.0 - diff --git a/handheld/console-border/gb-pocket-alt-6x.slangp b/handheld/console-border/gb-pocket-alt-6x.slangp deleted file mode 100644 index 41fe929..0000000 --- a/handheld/console-border/gb-pocket-alt-6x.slangp +++ /dev/null @@ -1,50 +0,0 @@ -shaders = 6 -shader0 = shader-files/gb-pass0.slang -shader1 = ../shaders/gameboy/shader-files/gb-pass1.slang -shader2 = ../shaders/gameboy/shader-files/gb-pass2.slang -shader3 = ../shaders/gameboy/shader-files/gb-pass3.slang -shader4 = ../shaders/gameboy/shader-files/gb-pass4.slang -shader5 = shader-files/gb-pass-5.slang - -scale_type0 = viewport -scale0 = 1 - -scale_type1 = source -scale1 = 1 - -scale_type2 = source -scale2 = 1 - -scale_type3 = source -scale3 = 1 - -scale_type4 = source -scale4 = 1 - -scale_type5 = source -scale5 = 1 - -filter_linear0 = false -filter_linear1 = false -filter_linear2 = false -filter_linear3 = false -filter_linear4 = false -filter_linear5 = true - -textures = COLOR_PALETTE;BACKGROUND;BORDER -COLOR_PALETTE = ../shaders/gameboy/resources/sample-palettes/gbp-palette.png -COLOR_PALETTE_linear = false -BACKGROUND = ../shaders/gameboy/resources/sample-bgs/paper-bg.png -BACKGROUND_linear = true -BORDER = resources/pocket-border-square-4x.png -BORDER_linear = true - -parameters = "video_scale;SCALE;OUT_X;OUT_Y;grey_balance;response_time;blending_mode" -video_scale = "6.0" -SCALE = "1.0" -OUT_X = "4800.0" -OUT_Y = "2400.0" -grey_balance = 3.0 -response_time = 0.444 -blending_mode = 0.0 - diff --git a/handheld/console-border/gb-pocket-alt-7x.slangp b/handheld/console-border/gb-pocket-alt-7x.slangp deleted file mode 100644 index 58aaf3d..0000000 --- a/handheld/console-border/gb-pocket-alt-7x.slangp +++ /dev/null @@ -1,50 +0,0 @@ -shaders = 6 -shader0 = shader-files/gb-pass0.slang -shader1 = ../shaders/gameboy/shader-files/gb-pass1.slang -shader2 = ../shaders/gameboy/shader-files/gb-pass2.slang -shader3 = ../shaders/gameboy/shader-files/gb-pass3.slang -shader4 = ../shaders/gameboy/shader-files/gb-pass4.slang -shader5 = shader-files/gb-pass-5.slang - -scale_type0 = viewport -scale0 = 1 - -scale_type1 = source -scale1 = 1 - -scale_type2 = source -scale2 = 1 - -scale_type3 = source -scale3 = 1 - -scale_type4 = source -scale4 = 1 - -scale_type5 = source -scale5 = 1 - -filter_linear0 = false -filter_linear1 = false -filter_linear2 = false -filter_linear3 = false -filter_linear4 = false -filter_linear5 = true - -textures = COLOR_PALETTE;BACKGROUND;BORDER -COLOR_PALETTE = ../shaders/gameboy/resources/sample-palettes/gbp-palette.png -COLOR_PALETTE_linear = false -BACKGROUND = ../shaders/gameboy/resources/sample-bgs/paper-bg.png -BACKGROUND_linear = true -BORDER = resources/pocket-border-square-4x.png -BORDER_linear = true - -parameters = "video_scale;SCALE;OUT_X;OUT_Y;grey_balance;response_time;blending_mode" -video_scale = "7.0" -SCALE = "1.0" -OUT_X = "5600.0" -OUT_Y = "2800.0" -grey_balance = 3.0 -response_time = 0.444 -blending_mode = 0.0 - diff --git a/handheld/console-border/gb-pocket-alt-4x.slangp b/handheld/console-border/gb-pocket-alt.slangp similarity index 88% rename from handheld/console-border/gb-pocket-alt-4x.slangp rename to handheld/console-border/gb-pocket-alt.slangp index dcb440e..19624c9 100644 --- a/handheld/console-border/gb-pocket-alt-4x.slangp +++ b/handheld/console-border/gb-pocket-alt.slangp @@ -39,11 +39,8 @@ BACKGROUND_linear = true BORDER = resources/pocket-border-square-4x.png BORDER_linear = true -parameters = "video_scale;SCALE;OUT_X;OUT_Y;grey_balance;response_time;blending_mode" +parameters = "video_scale;grey_balance;response_time;blending_mode" video_scale = "4.0" -SCALE = "1.0" -OUT_X = "3200.0" -OUT_Y = "1600.0" grey_balance = 3.0 response_time = 0.444 blending_mode = 0.0 diff --git a/handheld/console-border/gb-pocket-6x.slangp b/handheld/console-border/gb-pocket.slangp similarity index 83% rename from handheld/console-border/gb-pocket-6x.slangp rename to handheld/console-border/gb-pocket.slangp index a6e5863..453e709 100644 --- a/handheld/console-border/gb-pocket-6x.slangp +++ b/handheld/console-border/gb-pocket.slangp @@ -33,11 +33,8 @@ alias4 = "PASS4" shader5 = shader-files/gb-pass-5.slang filter_linear5 = true -parameters = "video_scale;SCALE;OUT_X;OUT_Y;baseline_alpha;grey_balance;adjacent_texel_alpha_blending;contrast;screen_light;pixel_opacity;shadow_offset_x;shadow_opacity" +parameters = "video_scale;baseline_alpha;grey_balance;adjacent_texel_alpha_blending;contrast;screen_light;pixel_opacity;shadow_offset_x;shadow_opacity" video_scale = "4.0" -SCALE = "1.5" -OUT_X = "4800.0" -OUT_Y = "2400.0" baseline_alpha = "0.03" grey_balance = "3.5" adjacent_texel_alpha_blending = "0.6" diff --git a/handheld/console-border/gba-3x.slangp b/handheld/console-border/gba-3x.slangp deleted file mode 100644 index ce17c15..0000000 --- a/handheld/console-border/gba-3x.slangp +++ /dev/null @@ -1,34 +0,0 @@ -shaders = "4" - -shader0 = "../../motionblur/shaders/feedback.slang" -scale_type0 = source -scale0 = 1.0 -filter_linear0 = false - -shader1 = "../shaders/color/gba-color.slang" -filter_linear1 = false - -shader2 = "../shaders/lcd-cgwg/lcd-grid.slang" -filter_linear2 = "false" -wrap_mode2 = "clamp_to_border" -scale_type_x2 = "source" -scale_x2 = "3.000000" -scale_type_y2 = "source" -scale_y2 = "3.000000" - -shader3 = "shader-files/gb-pass-5.slang" -filter_linear3 = "true" -wrap_mode3 = "clamp_to_border" - -parameters = "SCALE;OUT_X;OUT_Y;GRID_STRENGTH;mixfactor" -GRID_STRENGTH = "0.150000" -SCALE = "1.0" -OUT_X = "2400.0" -OUT_Y = "1200.0" -mixfactor = "0.50" - -textures = "BORDER" -BORDER = "resources/gba-border-square-4x.png" -BORDER_linear = "true" -BORDER_wrap_mode = "clamp_to_border" -BORDER_mipmap = "false" diff --git a/handheld/console-border/gba-4x.slangp b/handheld/console-border/gba-4x.slangp deleted file mode 100644 index 22eaf2a..0000000 --- a/handheld/console-border/gba-4x.slangp +++ /dev/null @@ -1,34 +0,0 @@ -shaders = "4" - -shader0 = "../../motionblur/shaders/feedback.slang" -scale_type0 = source -scale0 = 1.0 -filter_linear0 = false - -shader1 = "../shaders/color/gba-color.slang" -filter_linear1 = false - -shader2 = "../shaders/lcd-cgwg/lcd-grid.slang" -filter_linear2 = "false" -wrap_mode2 = "clamp_to_border" -scale_type_x2 = "source" -scale_x2 = "4.000000" -scale_type_y2 = "source" -scale_y2 = "4.000000" - -shader3 = "shader-files/gb-pass-5.slang" -filter_linear3 = "true" -wrap_mode3 = "clamp_to_border" - -parameters = "SCALE;OUT_X;OUT_Y;GRID_STRENGTH;mixfactor" -GRID_STRENGTH = "0.150000" -SCALE = "1.0" -OUT_X = "3200.0" -OUT_Y = "1600.0" -mixfactor = "0.50" - -textures = "BORDER" -BORDER = "resources/gba-border-square-4x.png" -BORDER_linear = "true" -BORDER_wrap_mode = "clamp_to_border" -BORDER_mipmap = "false" diff --git a/handheld/console-border/gba-5x.slangp b/handheld/console-border/gba-5x.slangp deleted file mode 100644 index 2e2e04e..0000000 --- a/handheld/console-border/gba-5x.slangp +++ /dev/null @@ -1,34 +0,0 @@ -shaders = "4" - -shader0 = "../../motionblur/shaders/feedback.slang" -scale_type0 = source -scale0 = 1.0 -filter_linear0 = false - -shader1 = "../shaders/color/gba-color.slang" -filter_linear1 = false - -shader2 = "../shaders/lcd-cgwg/lcd-grid.slang" -filter_linear2 = "false" -wrap_mode2 = "clamp_to_border" -scale_type_x2 = "source" -scale_x2 = "5.000000" -scale_type_y2 = "source" -scale_y2 = "5.000000" - -shader3 = "shader-files/gb-pass-5.slang" -filter_linear3 = "true" -wrap_mode3 = "clamp_to_border" - -parameters = "SCALE;OUT_X;OUT_Y;GRID_STRENGTH;mixfactor" -GRID_STRENGTH = "0.150000" -SCALE = "1.25" -OUT_X = "5000.0" -OUT_Y = "2500.0" -mixfactor = "0.50" - -textures = "BORDER" -BORDER = "resources/gba-border-square-4x.png" -BORDER_linear = "true" -BORDER_wrap_mode = "clamp_to_border" -BORDER_mipmap = "false" diff --git a/handheld/console-border/gba-6x.slangp b/handheld/console-border/gba-6x.slangp deleted file mode 100644 index 3892063..0000000 --- a/handheld/console-border/gba-6x.slangp +++ /dev/null @@ -1,34 +0,0 @@ -shaders = "4" - -shader0 = "../../motionblur/shaders/feedback.slang" -scale_type0 = source -scale0 = 1.0 -filter_linear0 = false - -shader1 = "../shaders/color/gba-color.slang" -filter_linear1 = false - -shader2 = "../shaders/lcd-cgwg/lcd-grid.slang" -filter_linear2 = "false" -wrap_mode2 = "clamp_to_border" -scale_type_x2 = "source" -scale_x2 = "6.000000" -scale_type_y2 = "source" -scale_y2 = "6.000000" - -shader3 = "shader-files/gb-pass-5.slang" -filter_linear3 = "true" -wrap_mode3 = "clamp_to_border" - -parameters = "SCALE;OUT_X;OUT_Y;GRID_STRENGTH;mixfactor" -GRID_STRENGTH = "0.150000" -SCALE = "1.5" -OUT_X = "7200.0" -OUT_Y = "3600.0" -mixfactor = "0.50" - -textures = "BORDER" -BORDER = "resources/gba-border-square-4x.png" -BORDER_linear = "true" -BORDER_wrap_mode = "clamp_to_border" -BORDER_mipmap = "false" diff --git a/handheld/console-border/gba-agb001-color-motionblur-2x.slangp b/handheld/console-border/gba-agb001-color-motionblur-2x.slangp deleted file mode 100644 index 5a76a10..0000000 --- a/handheld/console-border/gba-agb001-color-motionblur-2x.slangp +++ /dev/null @@ -1,29 +0,0 @@ -shaders = 4 - -shader0 = ../../motionblur/shaders/response-time.slang -filter_linear0 = false -scale_type0 = source -scale0 = 1.0 - -shader1 = ../shaders/mgba/agb001.slang -filter_linear1 = false -scale_type1 = source -scale1 = 4.0 - -shader2 = ../shaders/color/gba-color.slang -filter_linear2 = false -scale_type2 = source -scale2 = 1.0 - -shader3 = shader-files/gb-pass-5.slang -filter_linear3 = true - -textures = BORDER - -BORDER = resources/gba-border-square-4x.png -BORDER_linear = true - -parameters = "SCALE;OUT_X;OUT_Y" -SCALE = "2.0" -OUT_X = "6400.0" -OUT_Y = "3200.0" diff --git a/handheld/console-border/gba-agb001-color-motionblur-3x.slangp b/handheld/console-border/gba-agb001-color-motionblur-3x.slangp deleted file mode 100644 index 084348d..0000000 --- a/handheld/console-border/gba-agb001-color-motionblur-3x.slangp +++ /dev/null @@ -1,29 +0,0 @@ -shaders = 4 - -shader0 = ../../motionblur/shaders/response-time.slang -filter_linear0 = false -scale_type0 = source -scale0 = 1.0 - -shader1 = ../shaders/mgba/agb001.slang -filter_linear1 = false -scale_type1 = source -scale1 = 4.0 - -shader2 = ../shaders/color/gba-color.slang -filter_linear2 = false -scale_type2 = source -scale2 = 1.0 - -shader3 = shader-files/gb-pass-5.slang -filter_linear3 = true - -textures = BORDER - -BORDER = resources/gba-border-square-4x.png -BORDER_linear = true - -parameters = "SCALE;OUT_X;OUT_Y" -SCALE = "3.0" -OUT_X = "9600.0" -OUT_Y = "4800.0" diff --git a/handheld/console-border/gba-agb001-color-motionblur-1x.slangp b/handheld/console-border/gba-agb001-color-motionblur.slangp similarity index 78% rename from handheld/console-border/gba-agb001-color-motionblur-1x.slangp rename to handheld/console-border/gba-agb001-color-motionblur.slangp index 10d1154..399b322 100644 --- a/handheld/console-border/gba-agb001-color-motionblur-1x.slangp +++ b/handheld/console-border/gba-agb001-color-motionblur.slangp @@ -15,15 +15,10 @@ filter_linear2 = false scale_type2 = source scale2 = 1.0 -shader3 = shader-files/gb-pass-5.slang +shader3 = shader-files/border-auto-scale.slang filter_linear3 = true textures = BORDER BORDER = resources/gba-border-square-4x.png BORDER_linear = true - -parameters = "SCALE;OUT_X;OUT_Y" -SCALE = "1.0" -OUT_X = "3200.0" -OUT_Y = "1600.0" diff --git a/handheld/console-border/gba-ags001-color-motionblur-1x.slangp b/handheld/console-border/gba-ags001-color-motionblur-1x.slangp deleted file mode 100644 index 298305b..0000000 --- a/handheld/console-border/gba-ags001-color-motionblur-1x.slangp +++ /dev/null @@ -1,34 +0,0 @@ -shaders = 5 - -shader0 = ../../motionblur/shaders/response-time.slang -filter_linear0 = false -scale_type0 = source -scale0 = 1.0 - -shader1 = ../shaders/mgba/ags001.slang -filter_linear1 = false -scale_type1 = source -scale1 = 4.0 - -shader2 = ../shaders/color/gba-color.slang -filter_linear2 = false -scale_type2 = source -scale2 = 1.0 - -shader3 = ../shaders/mgba/ags001-light.slang -filter_linear3 = false -scale_type3 = source -scale3 = 1.0 - -shader4 = shader-files/gb-pass-5.slang -filter_linear4 = true - -textures = BORDER - -BORDER = resources/gba-border-square-4x.png -BORDER_linear = true - -parameters = "SCALE;OUT_X;OUT_Y" -SCALE = "1.0" -OUT_X = "3200.0" -OUT_Y = "1600.0" diff --git a/handheld/console-border/gba-ags001-color-motionblur-3x.slangp b/handheld/console-border/gba-ags001-color-motionblur-3x.slangp deleted file mode 100644 index abe7dfd..0000000 --- a/handheld/console-border/gba-ags001-color-motionblur-3x.slangp +++ /dev/null @@ -1,34 +0,0 @@ -shaders = 5 - -shader0 = ../../motionblur/shaders/response-time.slang -filter_linear0 = false -scale_type0 = source -scale0 = 1.0 - -shader1 = ../shaders/mgba/ags001.slang -filter_linear1 = false -scale_type1 = source -scale1 = 4.0 - -shader2 = ../shaders/color/gba-color.slang -filter_linear2 = false -scale_type2 = source -scale2 = 1.0 - -shader3 = ../shaders/mgba/ags001-light.slang -filter_linear3 = false -scale_type3 = source -scale3 = 1.0 - -shader4 = shader-files/gb-pass-5.slang -filter_linear4 = true - -textures = BORDER - -BORDER = resources/gba-border-square-4x.png -BORDER_linear = true - -parameters = "SCALE;OUT_X;OUT_Y" -SCALE = "3.0" -OUT_X = "9600.0" -OUT_Y = "4800.0" diff --git a/handheld/console-border/gba-ags001-color-motionblur-2x.slangp b/handheld/console-border/gba-ags001-color-motionblur.slangp similarity index 81% rename from handheld/console-border/gba-ags001-color-motionblur-2x.slangp rename to handheld/console-border/gba-ags001-color-motionblur.slangp index 2548c2d..68b72fc 100644 --- a/handheld/console-border/gba-ags001-color-motionblur-2x.slangp +++ b/handheld/console-border/gba-ags001-color-motionblur.slangp @@ -20,15 +20,10 @@ filter_linear3 = false scale_type3 = source scale3 = 1.0 -shader4 = shader-files/gb-pass-5.slang +shader4 = shader-files/border-auto-scale.slang filter_linear4 = true textures = BORDER BORDER = resources/gba-border-square-4x.png BORDER_linear = true - -parameters = "SCALE;OUT_X;OUT_Y" -SCALE = "2.0" -OUT_X = "6400.0" -OUT_Y = "3200.0" diff --git a/handheld/console-border/gba-lcd-grid-v2-2x.slangp b/handheld/console-border/gba-lcd-grid-v2-2x.slangp deleted file mode 100644 index 94be66c..0000000 --- a/handheld/console-border/gba-lcd-grid-v2-2x.slangp +++ /dev/null @@ -1,43 +0,0 @@ -shaders = 4 -shader0 = ../../motionblur/shaders/response-time.slang -shader1 = ../shaders/lcd-cgwg/lcd-grid-v2.slang -shader2 = ../shaders/color/gba-color.slang -shader3 = shader-files/gb-pass-5.slang - -scale_type0 = source -scale0 = 1 - -scale_type1 = source -scale1 = 2 - -scale_type2 = source -scale2 = 1 - -filter_linear0 = false -filter_linear1 = false -filter_linear2 = false -filter_linear3 = true - -textures = BORDER - -BORDER = resources/gba-border-square-4x.png -BORDER_linear = true - -parameters = "SCALE;OUT_X;OUT_Y;RSUBPIX_R;RSUBPIX_G;RSUBPIX_B;GSUBPIX_R;GSUBPIX_G;GSUBPIX_B;BSUBPIX_R;BSUBPIX_G;BSUBPIX_B;gain;gamma;blacklevel;ambient;BGR" -SCALE = "1.0" -OUT_X = "1600.0" -OUT_Y = "800.0" -RSUBPIX_R = "0.750000" -RSUBPIX_G = "0.000000" -RSUBPIX_B = "0.000000" -GSUBPIX_R = "0.000000" -GSUBPIX_G = "0.750000" -GSUBPIX_B = "0.000000" -BSUBPIX_R = "0.000000" -BSUBPIX_G = "0.000000" -BSUBPIX_B = "0.750000" -gain = "1.500000" -gamma = "2.200000" -blacklevel = "0.000000" -ambient = "0.000000" -BGR = "1.000000" diff --git a/handheld/console-border/gba-lcd-grid-v2-3x.slangp b/handheld/console-border/gba-lcd-grid-v2-3x.slangp deleted file mode 100644 index d2a4b06..0000000 --- a/handheld/console-border/gba-lcd-grid-v2-3x.slangp +++ /dev/null @@ -1,43 +0,0 @@ -shaders = 4 -shader0 = ../../motionblur/shaders/response-time.slang -shader1 = ../shaders/lcd-cgwg/lcd-grid-v2.slang -shader2 = ../shaders/color/gba-color.slang -shader3 = shader-files/gb-pass-5.slang - -scale_type0 = source -scale0 = 1 - -scale_type1 = source -scale1 = 3 - -scale_type2 = source -scale2 = 1 - -filter_linear0 = false -filter_linear1 = false -filter_linear2 = false -filter_linear3 = true - -textures = BORDER - -BORDER = resources/gba-border-square-4x.png -BORDER_linear = true - -parameters = "SCALE;OUT_X;OUT_Y;RSUBPIX_R;RSUBPIX_G;RSUBPIX_B;GSUBPIX_R;GSUBPIX_G;GSUBPIX_B;BSUBPIX_R;BSUBPIX_G;BSUBPIX_B;gain;gamma;blacklevel;ambient;BGR" -SCALE = "1.0" -OUT_X = "2400.0" -OUT_Y = "1200.0" -RSUBPIX_R = "0.750000" -RSUBPIX_G = "0.000000" -RSUBPIX_B = "0.000000" -GSUBPIX_R = "0.000000" -GSUBPIX_G = "0.750000" -GSUBPIX_B = "0.000000" -BSUBPIX_R = "0.000000" -BSUBPIX_G = "0.000000" -BSUBPIX_B = "0.750000" -gain = "1.500000" -gamma = "2.200000" -blacklevel = "0.000000" -ambient = "0.000000" -BGR = "1.000000" diff --git a/handheld/console-border/gba-lcd-grid-v2-5x.slangp b/handheld/console-border/gba-lcd-grid-v2-5x.slangp deleted file mode 100644 index 058fd83..0000000 --- a/handheld/console-border/gba-lcd-grid-v2-5x.slangp +++ /dev/null @@ -1,43 +0,0 @@ -shaders = 4 -shader0 = ../../motionblur/shaders/response-time.slang -shader1 = ../shaders/lcd-cgwg/lcd-grid-v2.slang -shader2 = ../shaders/color/gba-color.slang -shader3 = shader-files/gb-pass-5.slang - -scale_type0 = source -scale0 = 1 - -scale_type1 = source -scale1 = 5 - -scale_type2 = source -scale2 = 1 - -filter_linear0 = false -filter_linear1 = false -filter_linear2 = false -filter_linear3 = true - -textures = BORDER - -BORDER = resources/gba-border-square-4x.png -BORDER_linear = true - -parameters = "SCALE;OUT_X;OUT_Y;RSUBPIX_R;RSUBPIX_G;RSUBPIX_B;GSUBPIX_R;GSUBPIX_G;GSUBPIX_B;BSUBPIX_R;BSUBPIX_G;BSUBPIX_B;gain;gamma;blacklevel;ambient;BGR" -SCALE = "1.0" -OUT_X = "4000.0" -OUT_Y = "2000.0" -RSUBPIX_R = "0.750000" -RSUBPIX_G = "0.000000" -RSUBPIX_B = "0.000000" -GSUBPIX_R = "0.000000" -GSUBPIX_G = "0.750000" -GSUBPIX_B = "0.000000" -BSUBPIX_R = "0.000000" -BSUBPIX_G = "0.000000" -BSUBPIX_B = "0.750000" -gain = "1.500000" -gamma = "2.200000" -blacklevel = "0.000000" -ambient = "0.000000" -BGR = "1.000000" diff --git a/handheld/console-border/gba-lcd-grid-v2-6x.slangp b/handheld/console-border/gba-lcd-grid-v2-6x.slangp deleted file mode 100644 index 3e45d3d..0000000 --- a/handheld/console-border/gba-lcd-grid-v2-6x.slangp +++ /dev/null @@ -1,43 +0,0 @@ -shaders = 4 -shader0 = ../../motionblur/shaders/response-time.slang -shader1 = ../shaders/lcd-cgwg/lcd-grid-v2.slang -shader2 = ../shaders/color/gba-color.slang -shader3 = shader-files/gb-pass-5.slang - -scale_type0 = source -scale0 = 1 - -scale_type1 = source -scale1 = 6 - -scale_type2 = source -scale2 = 1 - -filter_linear0 = false -filter_linear1 = false -filter_linear2 = false -filter_linear3 = true - -textures = BORDER - -BORDER = resources/gba-border-square-4x.png -BORDER_linear = true - -parameters = "SCALE;OUT_X;OUT_Y;RSUBPIX_R;RSUBPIX_G;RSUBPIX_B;GSUBPIX_R;GSUBPIX_G;GSUBPIX_B;BSUBPIX_R;BSUBPIX_G;BSUBPIX_B;gain;gamma;blacklevel;ambient;BGR" -SCALE = "1.0" -OUT_X = "4800.0" -OUT_Y = "2400.0" -RSUBPIX_R = "0.750000" -RSUBPIX_G = "0.000000" -RSUBPIX_B = "0.000000" -GSUBPIX_R = "0.000000" -GSUBPIX_G = "0.750000" -GSUBPIX_B = "0.000000" -BSUBPIX_R = "0.000000" -BSUBPIX_G = "0.000000" -BSUBPIX_B = "0.750000" -gain = "1.500000" -gamma = "2.200000" -blacklevel = "0.000000" -ambient = "0.000000" -BGR = "1.000000" diff --git a/handheld/console-border/gba-lcd-grid-v2-4x.slangp b/handheld/console-border/gba-lcd-grid-v2.slangp similarity index 75% rename from handheld/console-border/gba-lcd-grid-v2-4x.slangp rename to handheld/console-border/gba-lcd-grid-v2.slangp index b979d2b..725c136 100644 --- a/handheld/console-border/gba-lcd-grid-v2-4x.slangp +++ b/handheld/console-border/gba-lcd-grid-v2.slangp @@ -2,7 +2,7 @@ shaders = 4 shader0 = ../../motionblur/shaders/response-time.slang shader1 = ../shaders/lcd-cgwg/lcd-grid-v2.slang shader2 = ../shaders/color/gba-color.slang -shader3 = shader-files/gb-pass-5.slang +shader3 = shader-files/border-auto-scale.slang scale_type0 = source scale0 = 1 @@ -23,10 +23,7 @@ textures = BORDER BORDER = resources/gba-border-square-4x.png BORDER_linear = true -parameters = "SCALE;OUT_X;OUT_Y;RSUBPIX_R;RSUBPIX_G;RSUBPIX_B;GSUBPIX_R;GSUBPIX_G;GSUBPIX_B;BSUBPIX_R;BSUBPIX_G;BSUBPIX_B;gain;gamma;blacklevel;ambient;BGR" -SCALE = "1.0" -OUT_X = "3200.0" -OUT_Y = "1600.0" +parameters = "RSUBPIX_R;RSUBPIX_G;RSUBPIX_B;GSUBPIX_R;GSUBPIX_G;GSUBPIX_B;BSUBPIX_R;BSUBPIX_G;BSUBPIX_B;gain;gamma;blacklevel;ambient;BGR" RSUBPIX_R = "0.750000" RSUBPIX_G = "0.000000" RSUBPIX_B = "0.000000" diff --git a/handheld/console-border/gba-retro-v2-2x.slangp b/handheld/console-border/gba-retro-v2-2x.slangp deleted file mode 100644 index 655fd01..0000000 --- a/handheld/console-border/gba-retro-v2-2x.slangp +++ /dev/null @@ -1,30 +0,0 @@ -shaders = 4 -shader0 = ../../motionblur/shaders/response-time.slang -shader1 = ../shaders/color/gba-color.slang -shader2 = ../shaders/retro-v2.slang -shader3 = shader-files/gb-pass-5.slang - -scale_type0 = source -scale0 = 1 - -scale_type1 = source -scale1 = 1 - -scale_type2 = source -scale2 = 2 - -filter_linear0 = false -filter_linear1 = false -filter_linear2 = false -filter_linear3 = true - -textures = BORDER - -BORDER = resources/gba-border-square-4x.png -BORDER_linear = true - -parameters = "SCALE;OUT_X;OUT_Y;RETRO_PIXEL_SIZE" -SCALE = "1.0" -OUT_X = "1600.0" -OUT_Y = "800.0" -RETRO_PIXEL_SIZE = "0.55" diff --git a/handheld/console-border/gba-retro-v2-3x.slangp b/handheld/console-border/gba-retro-v2-3x.slangp deleted file mode 100644 index 7cc7f64..0000000 --- a/handheld/console-border/gba-retro-v2-3x.slangp +++ /dev/null @@ -1,30 +0,0 @@ -shaders = 4 -shader0 = ../../motionblur/shaders/response-time.slang -shader1 = ../shaders/color/gba-color.slang -shader2 = ../shaders/retro-v2.slang -shader3 = shader-files/gb-pass-5.slang - -scale_type0 = source -scale0 = 1 - -scale_type1 = source -scale1 = 1 - -scale_type2 = source -scale2 = 3 - -filter_linear0 = false -filter_linear1 = false -filter_linear2 = false -filter_linear3 = true - -textures = BORDER - -BORDER = resources/gba-border-square-4x.png -BORDER_linear = true - -parameters = "SCALE;OUT_X;OUT_Y;RETRO_PIXEL_SIZE" -SCALE = "1.0" -OUT_X = "2400.0" -OUT_Y = "1200.0" -RETRO_PIXEL_SIZE = "0.70" diff --git a/handheld/console-border/gba-retro-v2-4x.slangp b/handheld/console-border/gba-retro-v2-4x.slangp deleted file mode 100644 index dba16fc..0000000 --- a/handheld/console-border/gba-retro-v2-4x.slangp +++ /dev/null @@ -1,30 +0,0 @@ -shaders = 4 -shader0 = ../../motionblur/shaders/response-time.slang -shader1 = ../shaders/color/gba-color.slang -shader2 = ../shaders/retro-v2.slang -shader3 = shader-files/gb-pass-5.slang - -scale_type0 = source -scale0 = 1 - -scale_type1 = source -scale1 = 1 - -scale_type2 = source -scale2 = 4 - -filter_linear0 = false -filter_linear1 = false -filter_linear2 = false -filter_linear3 = true - -textures = BORDER - -BORDER = resources/gba-border-square-4x.png -BORDER_linear = true - -parameters = "SCALE;OUT_X;OUT_Y;RETRO_PIXEL_SIZE" -SCALE = "1.0" -OUT_X = "3200.0" -OUT_Y = "1600.0" -RETRO_PIXEL_SIZE = "0.75" diff --git a/handheld/console-border/gba-retro-v2-5x.slangp b/handheld/console-border/gba-retro-v2-5x.slangp deleted file mode 100644 index 812bd8b..0000000 --- a/handheld/console-border/gba-retro-v2-5x.slangp +++ /dev/null @@ -1,30 +0,0 @@ -shaders = 4 -shader0 = ../../motionblur/shaders/response-time.slang -shader1 = ../shaders/color/gba-color.slang -shader2 = ../shaders/retro-v2.slang -shader3 = shader-files/gb-pass-5.slang - -scale_type0 = source -scale0 = 1 - -scale_type1 = source -scale1 = 1 - -scale_type2 = source -scale2 = 5 - -filter_linear0 = false -filter_linear1 = false -filter_linear2 = false -filter_linear3 = true - -textures = BORDER - -BORDER = resources/gba-border-square-4x.png -BORDER_linear = true - -parameters = "SCALE;OUT_X;OUT_Y;RETRO_PIXEL_SIZE" -SCALE = "1.0" -OUT_X = "4000.0" -OUT_Y = "2000.0" -RETRO_PIXEL_SIZE = "0.80" diff --git a/handheld/console-border/gba-retro-v2-6x.slangp b/handheld/console-border/gba-retro-v2-6x.slangp deleted file mode 100644 index 7579940..0000000 --- a/handheld/console-border/gba-retro-v2-6x.slangp +++ /dev/null @@ -1,30 +0,0 @@ -shaders = 4 -shader0 = ../../motionblur/shaders/response-time.slang -shader1 = ../shaders/color/gba-color.slang -shader2 = ../shaders/retro-v2.slang -shader3 = shader-files/gb-pass-5.slang - -scale_type0 = source -scale0 = 1 - -scale_type1 = source -scale1 = 1 - -scale_type2 = source -scale2 = 6 - -filter_linear0 = false -filter_linear1 = false -filter_linear2 = false -filter_linear3 = true - -textures = BORDER - -BORDER = resources/gba-border-square-4x.png -BORDER_linear = true - -parameters = "SCALE;OUT_X;OUT_Y;RETRO_PIXEL_SIZE" -SCALE = "1.0" -OUT_X = "4800.0" -OUT_Y = "2400.0" -RETRO_PIXEL_SIZE = "0.84" diff --git a/handheld/console-border/gba-2x.slangp b/handheld/console-border/gba.slangp similarity index 69% rename from handheld/console-border/gba-2x.slangp rename to handheld/console-border/gba.slangp index 7d2ec1e..adbf78a 100644 --- a/handheld/console-border/gba-2x.slangp +++ b/handheld/console-border/gba.slangp @@ -11,20 +11,15 @@ filter_linear1 = false shader2 = "../shaders/lcd-cgwg/lcd-grid.slang" filter_linear2 = "false" wrap_mode2 = "clamp_to_border" -scale_type_x2 = "source" -scale_x2 = "2.000000" -scale_type_y2 = "source" -scale_y2 = "2.000000" +scale_type2 = "source" +scale2 = "4.0" -shader3 = "shader-files/gb-pass-5.slang" +shader3 = "shader-files/border-auto-scale.slang" filter_linear3 = "true" wrap_mode3 = "clamp_to_border" -parameters = "SCALE;OUT_X;OUT_Y;GRID_STRENGTH;mixfactor" +parameters = "GRID_STRENGTH;mixfactor" GRID_STRENGTH = "0.150000" -SCALE = "1.0" -OUT_X = "1600.0" -OUT_Y = "800.0" mixfactor = "0.50" textures = "BORDER" diff --git a/handheld/console-border/gbc-3x.slangp b/handheld/console-border/gbc-3x.slangp deleted file mode 100644 index c0a7d08..0000000 --- a/handheld/console-border/gbc-3x.slangp +++ /dev/null @@ -1,24 +0,0 @@ -shaders = "2" - -shader0 = "../shaders/lcd-cgwg/lcd-grid.slang" -filter_linear0 = "false" -wrap_mode0 = "clamp_to_border" -scale_type_x0 = "source" -scale_x0 = "3.000000" -scale_type_y0 = "source" -scale_y0 = "3.000000" - -shader1 = "shader-files/gb-pass-5.slang" -filter_linear1 = "true" -wrap_mode1 = "clamp_to_border" - -parameters = "SCALE;OUT_X;OUT_Y" -SCALE = "1.0" -OUT_X = "2400.0" -OUT_Y = "1200.0" - -textures = "BORDER" -BORDER = "resources/color-border-square-4x.png" -BORDER_linear = "true" -BORDER_wrap_mode = "clamp_to_border" -BORDER_mipmap = "false" diff --git a/handheld/console-border/gbc-4x.slangp b/handheld/console-border/gbc-4x.slangp deleted file mode 100644 index b8db36f..0000000 --- a/handheld/console-border/gbc-4x.slangp +++ /dev/null @@ -1,24 +0,0 @@ -shaders = "2" - -shader0 = "../shaders/lcd-cgwg/lcd-grid.slang" -filter_linear0 = "false" -wrap_mode0 = "clamp_to_border" -scale_type_x0 = "source" -scale_x0 = "4.000000" -scale_type_y0 = "source" -scale_y0 = "4.000000" - -shader1 = "shader-files/gb-pass-5.slang" -filter_linear1 = "true" -wrap_mode1 = "clamp_to_border" - -parameters = "SCALE;OUT_X;OUT_Y" -SCALE = "1.0" -OUT_X = "3200.0" -OUT_Y = "1600.0" - -textures = "BORDER" -BORDER = "resources/color-border-square-4x.png" -BORDER_linear = "true" -BORDER_wrap_mode = "clamp_to_border" -BORDER_mipmap = "false" diff --git a/handheld/console-border/gbc-6x.slangp b/handheld/console-border/gbc-6x.slangp deleted file mode 100644 index b73fcd2..0000000 --- a/handheld/console-border/gbc-6x.slangp +++ /dev/null @@ -1,24 +0,0 @@ -shaders = "2" - -shader0 = "../shaders/lcd-cgwg/lcd-grid.slang" -filter_linear0 = "false" -wrap_mode0 = "clamp_to_border" -scale_type_x0 = "source" -scale_x0 = "6.000000" -scale_type_y0 = "source" -scale_y0 = "6.000000" - -shader1 = "shader-files/gb-pass-5.slang" -filter_linear1 = "true" -wrap_mode1 = "clamp_to_border" - -parameters = "SCALE;OUT_X;OUT_Y" -SCALE = "1.0" -OUT_X = "4800.0" -OUT_Y = "2400.0" - -textures = "BORDER" -BORDER = "resources/color-border-square-4x.png" -BORDER_linear = "true" -BORDER_wrap_mode = "clamp_to_border" -BORDER_mipmap = "false" diff --git a/handheld/console-border/gbc-lcd-grid-v2-2x.slangp b/handheld/console-border/gbc-lcd-grid-v2-2x.slangp deleted file mode 100644 index 73a0b73..0000000 --- a/handheld/console-border/gbc-lcd-grid-v2-2x.slangp +++ /dev/null @@ -1,43 +0,0 @@ -shaders = 4 -shader0 = ../../motionblur/shaders/response-time.slang -shader1 = ../shaders/lcd-cgwg/lcd-grid-v2.slang -shader2 = ../shaders/color/gbc-color.slang -shader3 = shader-files/gb-pass-5.slang - -scale_type0 = source -scale0 = 1 - -scale_type1 = source -scale1 = 2 - -scale_type2 = source -scale2 = 1 - -filter_linear0 = false -filter_linear1 = false -filter_linear2 = false -filter_linear3 = true - -textures = BORDER - -BORDER = resources/color-border-square-4x.png -BORDER_linear = true - -parameters = "SCALE;OUT_X;OUT_Y;RSUBPIX_R;RSUBPIX_G;RSUBPIX_B;GSUBPIX_R;GSUBPIX_G;GSUBPIX_B;BSUBPIX_R;BSUBPIX_G;BSUBPIX_B;gain;gamma;blacklevel;ambient;BGR" -SCALE = "1.0" -OUT_X = "1600.0" -OUT_Y = "800.0" -RSUBPIX_R = "0.750000" -RSUBPIX_G = "0.000000" -RSUBPIX_B = "0.000000" -GSUBPIX_R = "0.000000" -GSUBPIX_G = "0.750000" -GSUBPIX_B = "0.000000" -BSUBPIX_R = "0.000000" -BSUBPIX_G = "0.000000" -BSUBPIX_B = "0.750000" -gain = "1.500000" -gamma = "2.200000" -blacklevel = "0.000000" -ambient = "0.000000" -BGR = "0.000000" diff --git a/handheld/console-border/gbc-lcd-grid-v2-3x.slangp b/handheld/console-border/gbc-lcd-grid-v2-3x.slangp deleted file mode 100644 index f5ca8cd..0000000 --- a/handheld/console-border/gbc-lcd-grid-v2-3x.slangp +++ /dev/null @@ -1,43 +0,0 @@ -shaders = 4 -shader0 = ../../motionblur/shaders/response-time.slang -shader1 = ../shaders/lcd-cgwg/lcd-grid-v2.slang -shader2 = ../shaders/color/gbc-color.slang -shader3 = shader-files/gb-pass-5.slang - -scale_type0 = source -scale0 = 1 - -scale_type1 = source -scale1 = 3 - -scale_type2 = source -scale2 = 1 - -filter_linear0 = false -filter_linear1 = false -filter_linear2 = false -filter_linear3 = true - -textures = BORDER - -BORDER = resources/color-border-square-4x.png -BORDER_linear = true - -parameters = "SCALE;OUT_X;OUT_Y;RSUBPIX_R;RSUBPIX_G;RSUBPIX_B;GSUBPIX_R;GSUBPIX_G;GSUBPIX_B;BSUBPIX_R;BSUBPIX_G;BSUBPIX_B;gain;gamma;blacklevel;ambient;BGR" -SCALE = "1.0" -OUT_X = "2400.0" -OUT_Y = "1200.0" -RSUBPIX_R = "0.750000" -RSUBPIX_G = "0.000000" -RSUBPIX_B = "0.000000" -GSUBPIX_R = "0.000000" -GSUBPIX_G = "0.750000" -GSUBPIX_B = "0.000000" -BSUBPIX_R = "0.000000" -BSUBPIX_G = "0.000000" -BSUBPIX_B = "0.750000" -gain = "1.500000" -gamma = "2.200000" -blacklevel = "0.000000" -ambient = "0.000000" -BGR = "0.000000" diff --git a/handheld/console-border/gbc-lcd-grid-v2-5x.slangp b/handheld/console-border/gbc-lcd-grid-v2-5x.slangp deleted file mode 100644 index 1d28fee..0000000 --- a/handheld/console-border/gbc-lcd-grid-v2-5x.slangp +++ /dev/null @@ -1,43 +0,0 @@ -shaders = 4 -shader0 = ../../motionblur/shaders/response-time.slang -shader1 = ../shaders/lcd-cgwg/lcd-grid-v2.slang -shader2 = ../shaders/color/gbc-color.slang -shader3 = shader-files/gb-pass-5.slang - -scale_type0 = source -scale0 = 1 - -scale_type1 = source -scale1 = 5 - -scale_type2 = source -scale2 = 1 - -filter_linear0 = false -filter_linear1 = false -filter_linear2 = false -filter_linear3 = true - -textures = BORDER - -BORDER = resources/color-border-square-4x.png -BORDER_linear = true - -parameters = "SCALE;OUT_X;OUT_Y;RSUBPIX_R;RSUBPIX_G;RSUBPIX_B;GSUBPIX_R;GSUBPIX_G;GSUBPIX_B;BSUBPIX_R;BSUBPIX_G;BSUBPIX_B;gain;gamma;blacklevel;ambient;BGR" -SCALE = "1.0" -OUT_X = "4000.0" -OUT_Y = "2000.0" -RSUBPIX_R = "0.750000" -RSUBPIX_G = "0.000000" -RSUBPIX_B = "0.000000" -GSUBPIX_R = "0.000000" -GSUBPIX_G = "0.750000" -GSUBPIX_B = "0.000000" -BSUBPIX_R = "0.000000" -BSUBPIX_G = "0.000000" -BSUBPIX_B = "0.750000" -gain = "1.500000" -gamma = "2.200000" -blacklevel = "0.000000" -ambient = "0.000000" -BGR = "0.000000" diff --git a/handheld/console-border/gbc-lcd-grid-v2-6x.slangp b/handheld/console-border/gbc-lcd-grid-v2-6x.slangp deleted file mode 100644 index 905c89a..0000000 --- a/handheld/console-border/gbc-lcd-grid-v2-6x.slangp +++ /dev/null @@ -1,43 +0,0 @@ -shaders = 4 -shader0 = ../../motionblur/shaders/response-time.slang -shader1 = ../shaders/lcd-cgwg/lcd-grid-v2.slang -shader2 = ../shaders/color/gbc-color.slang -shader3 = shader-files/gb-pass-5.slang - -scale_type0 = source -scale0 = 1 - -scale_type1 = source -scale1 = 6 - -scale_type2 = source -scale2 = 1 - -filter_linear0 = false -filter_linear1 = false -filter_linear2 = false -filter_linear3 = true - -textures = BORDER - -BORDER = resources/color-border-square-4x.png -BORDER_linear = true - -parameters = "SCALE;OUT_X;OUT_Y;RSUBPIX_R;RSUBPIX_G;RSUBPIX_B;GSUBPIX_R;GSUBPIX_G;GSUBPIX_B;BSUBPIX_R;BSUBPIX_G;BSUBPIX_B;gain;gamma;blacklevel;ambient;BGR" -SCALE = "1.0" -OUT_X = "4800.0" -OUT_Y = "2400.0" -RSUBPIX_R = "0.750000" -RSUBPIX_G = "0.000000" -RSUBPIX_B = "0.000000" -GSUBPIX_R = "0.000000" -GSUBPIX_G = "0.750000" -GSUBPIX_B = "0.000000" -BSUBPIX_R = "0.000000" -BSUBPIX_G = "0.000000" -BSUBPIX_B = "0.750000" -gain = "1.500000" -gamma = "2.200000" -blacklevel = "0.000000" -ambient = "0.000000" -BGR = "0.000000" diff --git a/handheld/console-border/gbc-lcd-grid-v2-7x.slangp b/handheld/console-border/gbc-lcd-grid-v2-7x.slangp deleted file mode 100644 index 2e550f9..0000000 --- a/handheld/console-border/gbc-lcd-grid-v2-7x.slangp +++ /dev/null @@ -1,43 +0,0 @@ -shaders = 4 -shader0 = ../../motionblur/shaders/response-time.slang -shader1 = ../shaders/lcd-cgwg/lcd-grid-v2.slang -shader2 = ../shaders/color/gbc-color.slang -shader3 = shader-files/gb-pass-5.slang - -scale_type0 = source -scale0 = 1 - -scale_type1 = source -scale1 = 7 - -scale_type2 = source -scale2 = 1 - -filter_linear0 = false -filter_linear1 = false -filter_linear2 = false -filter_linear3 = true - -textures = BORDER - -BORDER = resources/color-border-square-4x.png -BORDER_linear = true - -parameters = "SCALE;OUT_X;OUT_Y;RSUBPIX_R;RSUBPIX_G;RSUBPIX_B;GSUBPIX_R;GSUBPIX_G;GSUBPIX_B;BSUBPIX_R;BSUBPIX_G;BSUBPIX_B;gain;gamma;blacklevel;ambient;BGR" -SCALE = "1.0" -OUT_X = "5600.0" -OUT_Y = "2800.0" -RSUBPIX_R = "0.750000" -RSUBPIX_G = "0.000000" -RSUBPIX_B = "0.000000" -GSUBPIX_R = "0.000000" -GSUBPIX_G = "0.750000" -GSUBPIX_B = "0.000000" -BSUBPIX_R = "0.000000" -BSUBPIX_G = "0.000000" -BSUBPIX_B = "0.750000" -gain = "1.500000" -gamma = "2.200000" -blacklevel = "0.000000" -ambient = "0.000000" -BGR = "0.000000" diff --git a/handheld/console-border/gbc-lcd-grid-v2-4x.slangp b/handheld/console-border/gbc-lcd-grid-v2.slangp similarity index 75% rename from handheld/console-border/gbc-lcd-grid-v2-4x.slangp rename to handheld/console-border/gbc-lcd-grid-v2.slangp index 4b44de2..92b33f9 100644 --- a/handheld/console-border/gbc-lcd-grid-v2-4x.slangp +++ b/handheld/console-border/gbc-lcd-grid-v2.slangp @@ -2,7 +2,7 @@ shaders = 4 shader0 = ../../motionblur/shaders/response-time.slang shader1 = ../shaders/lcd-cgwg/lcd-grid-v2.slang shader2 = ../shaders/color/gbc-color.slang -shader3 = shader-files/gb-pass-5.slang +shader3 = shader-files/border-auto-scale.slang scale_type0 = source scale0 = 1 @@ -23,10 +23,7 @@ textures = BORDER BORDER = resources/color-border-square-4x.png BORDER_linear = true -parameters = "SCALE;OUT_X;OUT_Y;RSUBPIX_R;RSUBPIX_G;RSUBPIX_B;GSUBPIX_R;GSUBPIX_G;GSUBPIX_B;BSUBPIX_R;BSUBPIX_G;BSUBPIX_B;gain;gamma;blacklevel;ambient;BGR" -SCALE = "1.0" -OUT_X = "3200.0" -OUT_Y = "1600.0" +parameters = "RSUBPIX_R;RSUBPIX_G;RSUBPIX_B;GSUBPIX_R;GSUBPIX_G;GSUBPIX_B;BSUBPIX_R;BSUBPIX_G;BSUBPIX_B;gain;gamma;blacklevel;ambient;BGR" RSUBPIX_R = "0.750000" RSUBPIX_G = "0.000000" RSUBPIX_B = "0.000000" diff --git a/handheld/console-border/gbc-retro-v2-2x.slangp b/handheld/console-border/gbc-retro-v2-2x.slangp deleted file mode 100644 index dbf9844..0000000 --- a/handheld/console-border/gbc-retro-v2-2x.slangp +++ /dev/null @@ -1,30 +0,0 @@ -shaders = 4 -shader0 = ../../motionblur/shaders/response-time.slang -shader1 = ../shaders/color/gbc-color.slang -shader2 = ../shaders/retro-v2.slang -shader3 = shader-files/gb-pass-5.slang - -scale_type0 = source -scale0 = 1 - -scale_type1 = source -scale1 = 1 - -scale_type2 = source -scale2 = 2 - -filter_linear0 = false -filter_linear1 = false -filter_linear2 = false -filter_linear3 = true - -textures = BORDER - -BORDER = resources/color-border-square-4x.png -BORDER_linear = true - -parameters = "SCALE;OUT_X;OUT_Y;RETRO_PIXEL_SIZE" -SCALE = "1.0" -OUT_X = "1600.0" -OUT_Y = "800.0" -RETRO_PIXEL_SIZE = "0.55" diff --git a/handheld/console-border/gbc-retro-v2-3x.slangp b/handheld/console-border/gbc-retro-v2-3x.slangp deleted file mode 100644 index c685924..0000000 --- a/handheld/console-border/gbc-retro-v2-3x.slangp +++ /dev/null @@ -1,30 +0,0 @@ -shaders = 4 -shader0 = ../../motionblur/shaders/response-time.slang -shader1 = ../shaders/color/gbc-color.slang -shader2 = ../shaders/retro-v2.slang -shader3 = shader-files/gb-pass-5.slang - -scale_type0 = source -scale0 = 1 - -scale_type1 = source -scale1 = 1 - -scale_type2 = source -scale2 = 3 - -filter_linear0 = false -filter_linear1 = false -filter_linear2 = false -filter_linear3 = true - -textures = BORDER - -BORDER = resources/color-border-square-4x.png -BORDER_linear = true - -parameters = "SCALE;OUT_X;OUT_Y;RETRO_PIXEL_SIZE" -SCALE = "1.0" -OUT_X = "2400.0" -OUT_Y = "1200.0" -RETRO_PIXEL_SIZE = "0.7" diff --git a/handheld/console-border/gbc-retro-v2-4x.slangp b/handheld/console-border/gbc-retro-v2-4x.slangp deleted file mode 100644 index 65f15bc..0000000 --- a/handheld/console-border/gbc-retro-v2-4x.slangp +++ /dev/null @@ -1,30 +0,0 @@ -shaders = 4 -shader0 = ../../motionblur/shaders/response-time.slang -shader1 = ../shaders/color/gbc-color.slang -shader2 = ../shaders/retro-v2.slang -shader3 = shader-files/gb-pass-5.slang - -scale_type0 = source -scale0 = 1 - -scale_type1 = source -scale1 = 1 - -scale_type2 = source -scale2 = 4 - -filter_linear0 = false -filter_linear1 = false -filter_linear2 = false -filter_linear3 = true - -textures = BORDER - -BORDER = resources/color-border-square-4x.png -BORDER_linear = true - -parameters = "SCALE;OUT_X;OUT_Y;RETRO_PIXEL_SIZE" -SCALE = "1.0" -OUT_X = "3200.0" -OUT_Y = "1600.0" -RETRO_PIXEL_SIZE = "0.75" diff --git a/handheld/console-border/gbc-retro-v2-5x.slangp b/handheld/console-border/gbc-retro-v2-5x.slangp deleted file mode 100644 index d3203a7..0000000 --- a/handheld/console-border/gbc-retro-v2-5x.slangp +++ /dev/null @@ -1,30 +0,0 @@ -shaders = 4 -shader0 = ../../motionblur/shaders/response-time.slang -shader1 = ../shaders/color/gbc-color.slang -shader2 = ../shaders/retro-v2.slang -shader3 = shader-files/gb-pass-5.slang - -scale_type0 = source -scale0 = 1 - -scale_type1 = source -scale1 = 1 - -scale_type2 = source -scale2 = 5 - -filter_linear0 = false -filter_linear1 = false -filter_linear2 = false -filter_linear3 = true - -textures = BORDER - -BORDER = resources/color-border-square-4x.png -BORDER_linear = true - -parameters = "SCALE;OUT_X;OUT_Y;RETRO_PIXEL_SIZE" -SCALE = "1.0" -OUT_X = "4000.0" -OUT_Y = "2000.0" -RETRO_PIXEL_SIZE = "0.80" diff --git a/handheld/console-border/gbc-retro-v2-6x.slangp b/handheld/console-border/gbc-retro-v2-6x.slangp deleted file mode 100644 index f5ffc85..0000000 --- a/handheld/console-border/gbc-retro-v2-6x.slangp +++ /dev/null @@ -1,30 +0,0 @@ -shaders = 4 -shader0 = ../../motionblur/shaders/response-time.slang -shader1 = ../shaders/color/gbc-color.slang -shader2 = ../shaders/retro-v2.slang -shader3 = shader-files/gb-pass-5.slang - -scale_type0 = source -scale0 = 1 - -scale_type1 = source -scale1 = 1 - -scale_type2 = source -scale2 = 6 - -filter_linear0 = false -filter_linear1 = false -filter_linear2 = false -filter_linear3 = true - -textures = BORDER - -BORDER = resources/color-border-square-4x.png -BORDER_linear = true - -parameters = "SCALE;OUT_X;OUT_Y;RETRO_PIXEL_SIZE" -SCALE = "1.0" -OUT_X = "4800.0" -OUT_Y = "2400.0" -RETRO_PIXEL_SIZE = "0.84" diff --git a/handheld/console-border/gbc-retro-v2-7x.slangp b/handheld/console-border/gbc-retro-v2-7x.slangp deleted file mode 100644 index e4814a8..0000000 --- a/handheld/console-border/gbc-retro-v2-7x.slangp +++ /dev/null @@ -1,30 +0,0 @@ -shaders = 4 -shader0 = ../../motionblur/shaders/response-time.slang -shader1 = ../shaders/color/gbc-color.slang -shader2 = ../shaders/retro-v2.slang -shader3 = shader-files/gb-pass-5.slang - -scale_type0 = source -scale0 = 1 - -scale_type1 = source -scale1 = 1 - -scale_type2 = source -scale2 = 7 - -filter_linear0 = false -filter_linear1 = false -filter_linear2 = false -filter_linear3 = true - -textures = BORDER - -BORDER = resources/color-border-square-4x.png -BORDER_linear = true - -parameters = "SCALE;OUT_X;OUT_Y;RETRO_PIXEL_SIZE" -SCALE = "1.0" -OUT_X = "5600.0" -OUT_Y = "2800.0" -RETRO_PIXEL_SIZE = "0.84" diff --git a/handheld/console-border/gbc-2x.slangp b/handheld/console-border/gbc.slangp similarity index 60% rename from handheld/console-border/gbc-2x.slangp rename to handheld/console-border/gbc.slangp index f41deec..2ac488b 100644 --- a/handheld/console-border/gbc-2x.slangp +++ b/handheld/console-border/gbc.slangp @@ -3,20 +3,13 @@ shaders = "2" shader0 = "../shaders/lcd-cgwg/lcd-grid.slang" filter_linear0 = "false" wrap_mode0 = "clamp_to_border" -scale_type_x0 = "source" -scale_x0 = "2.000000" -scale_type_y0 = "source" -scale_y0 = "2.000000" +scale_type0 = "source" +scale0 = "4.0" -shader1 = "shader-files/gb-pass-5.slang" +shader1 = "shader-files/border-auto-scale.slang" filter_linear1 = "true" wrap_mode1 = "clamp_to_border" -parameters = "SCALE;OUT_X;OUT_Y" -SCALE = "1.0" -OUT_X = "1600.0" -OUT_Y = "800.0" - textures = "BORDER" BORDER = "resources/color-border-square-4x.png" BORDER_linear = "true" diff --git a/handheld/console-border/gg-2x.slangp b/handheld/console-border/gg-2x.slangp deleted file mode 100644 index 7d95d43..0000000 --- a/handheld/console-border/gg-2x.slangp +++ /dev/null @@ -1,25 +0,0 @@ -shaders = "2" - -shader0 = "../shaders/lcd-cgwg/lcd-grid.slang" -filter_linear0 = "false" -wrap_mode0 = "clamp_to_border" -scale_type_x0 = "source" -scale_x0 = "4.800000" -scale_type_y0 = "source" -scale_y0 = "4.000000" - -shader1 = "shader-files/gb-pass-5.slang" -filter_linear1 = "true" -wrap_mode1 = "clamp_to_border" - -parameters = "SCALE;OUT_X;OUT_Y;GRID_STRENGTH" -GRID_STRENGTH = "0.150000" -SCALE = "0.5" -OUT_X = "1600.0" -OUT_Y = "800.0" - -textures = "BORDER" -BORDER = "resources/gg-border-square-4x.png" -BORDER_linear = "true" -BORDER_wrap_mode = "clamp_to_border" -BORDER_mipmap = "false" diff --git a/handheld/console-border/gg-3x.slangp b/handheld/console-border/gg-3x.slangp deleted file mode 100644 index 5d92e33..0000000 --- a/handheld/console-border/gg-3x.slangp +++ /dev/null @@ -1,24 +0,0 @@ -shaders = "2" - -shader0 = "../shaders/lcd-cgwg/lcd-grid.slang" -filter_linear0 = "false" -wrap_mode0 = "clamp_to_border" -scale_type_x0 = "source" -scale_x0 = "3.600000" -scale_type_y0 = "source" -scale_y0 = "3.000000" - -shader1 = "shader-files/gb-pass-5.slang" -filter_linear1 = "true" -wrap_mode1 = "clamp_to_border" - -parameters = "SCALE;OUT_X;OUT_Y" -SCALE = "1.0" -OUT_X = "2400.0" -OUT_Y = "1200.0" - -textures = "BORDER" -BORDER = "resources/gg-border-square-4x.png" -BORDER_linear = "true" -BORDER_wrap_mode = "clamp_to_border" -BORDER_mipmap = "false" \ No newline at end of file diff --git a/handheld/console-border/gg-5x.slangp b/handheld/console-border/gg-5x.slangp deleted file mode 100644 index e31d046..0000000 --- a/handheld/console-border/gg-5x.slangp +++ /dev/null @@ -1,25 +0,0 @@ -shaders = "2" - -shader0 = "../shaders/lcd-cgwg/lcd-grid.slang" -filter_linear0 = "false" -wrap_mode0 = "clamp_to_border" -scale_type_x0 = "source" -scale_x0 = "6.000000" -scale_type_y0 = "source" -scale_y0 = "5.000000" - -shader1 = "shader-files/gb-pass-5.slang" -filter_linear1 = "true" -wrap_mode1 = "clamp_to_border" - -parameters = "SCALE;OUT_X;OUT_Y;GRID_STRENGTH" -GRID_STRENGTH = "0.050000" -SCALE = "1.25" -OUT_X = "5000.0" -OUT_Y = "2500.0" - -textures = "BORDER" -BORDER = "resources/gg-border-square-4x.png" -BORDER_linear = "true" -BORDER_wrap_mode = "clamp_to_border" -BORDER_mipmap = "false" diff --git a/handheld/console-border/gg-6x.slangp b/handheld/console-border/gg-6x.slangp deleted file mode 100644 index d2544a7..0000000 --- a/handheld/console-border/gg-6x.slangp +++ /dev/null @@ -1,25 +0,0 @@ -shaders = "2" - -shader0 = "../shaders/lcd-cgwg/lcd-grid.slang" -filter_linear0 = "false" -wrap_mode0 = "clamp_to_border" -scale_type_x0 = "source" -scale_x0 = "7.200000" -scale_type_y0 = "source" -scale_y0 = "6.000000" - -shader1 = "shader-files/gb-pass-5.slang" -filter_linear1 = "true" -wrap_mode1 = "clamp_to_border" - -parameters = "SCALE;OUT_X;OUT_Y;GRID_STRENGTH" -GRID_STRENGTH = "0.050000" -SCALE = "1.5" -OUT_X = "7200.0" -OUT_Y = "3600.0" - -textures = "BORDER" -BORDER = "resources/gg-border-square-4x.png" -BORDER_linear = "true" -BORDER_wrap_mode = "clamp_to_border" -BORDER_mipmap = "false" diff --git a/handheld/console-border/gg-4x.slangp b/handheld/console-border/gg.slangp similarity index 76% rename from handheld/console-border/gg-4x.slangp rename to handheld/console-border/gg.slangp index 400b0ba..3709f14 100644 --- a/handheld/console-border/gg-4x.slangp +++ b/handheld/console-border/gg.slangp @@ -8,15 +8,12 @@ scale_x0 = "4.800000" scale_type_y0 = "source" scale_y0 = "4.000000" -shader1 = "shader-files/gb-pass-5.slang" +shader1 = "shader-files/border-auto-scale.slang" filter_linear1 = "true" wrap_mode1 = "clamp_to_border" -parameters = "SCALE;OUT_X;OUT_Y;GRID_STRENGTH" +parameters = "GRID_STRENGTH" GRID_STRENGTH = "0.050000" -SCALE = "1.0" -OUT_X = "3200.0" -OUT_Y = "1600.0" textures = "BORDER" BORDER = "resources/gg-border-square-4x.png" diff --git a/handheld/console-border/ngpc-2x.slangp b/handheld/console-border/ngpc-2x.slangp deleted file mode 100644 index 494d94e..0000000 --- a/handheld/console-border/ngpc-2x.slangp +++ /dev/null @@ -1,28 +0,0 @@ -shaders = "2" - -shader0 = "../shaders/lcd-cgwg/lcd-grid.slang" -filter_linear0 = "false" -wrap_mode0 = "clamp_to_border" -scale_type_x0 = "source" -scale_x0 = "4.000000" -scale_type_y0 = "source" -scale_y0 = "4.000000" - -shader1 = "shader-files/border.slang" -filter_linear1 = "true" -wrap_mode1 = "clamp_to_border" - -parameters = "box_scale;in_res_x;in_res_y;border_on_top;border_zoom_x;border_zoom_y" -GRID_STRENGTH = "0.150000" -box_scale = "2.0" -in_res_x = "160.0" -in_res_y = "152.0" -border_on_top = "0.000000" -border_zoom_x = "1.05" -border_zoom_y = "1.18" - -textures = "BORDER" -BORDER = "resources/ngpc-border-square-4x.png" -BORDER_linear = "true" -BORDER_wrap_mode = "clamp_to_border" -BORDER_mipmap = "false" diff --git a/handheld/console-border/ngpc-3x.slangp b/handheld/console-border/ngpc-3x.slangp deleted file mode 100644 index 3841ecb..0000000 --- a/handheld/console-border/ngpc-3x.slangp +++ /dev/null @@ -1,28 +0,0 @@ -shaders = "2" - -shader0 = "../shaders/lcd-cgwg/lcd-grid.slang" -filter_linear0 = "false" -wrap_mode0 = "clamp_to_border" -scale_type_x0 = "source" -scale_x0 = "4.000000" -scale_type_y0 = "source" -scale_y0 = "4.000000" - -shader1 = "shader-files/border.slang" -filter_linear1 = "true" -wrap_mode1 = "clamp_to_border" - -parameters = "box_scale;in_res_x;in_res_y;border_on_top;border_zoom_x;border_zoom_y" -GRID_STRENGTH = "0.150000" -box_scale = "3.0" -in_res_x = "160.0" -in_res_y = "152.0" -border_on_top = "0.000000" -border_zoom_x = "0.70" -border_zoom_y = "0.79" - -textures = "BORDER" -BORDER = "resources/ngpc-border-square-4x.png" -BORDER_linear = "true" -BORDER_wrap_mode = "clamp_to_border" -BORDER_mipmap = "false" diff --git a/handheld/console-border/ngpc-4x.slangp b/handheld/console-border/ngpc-4x.slangp deleted file mode 100644 index e43b4f7..0000000 --- a/handheld/console-border/ngpc-4x.slangp +++ /dev/null @@ -1,28 +0,0 @@ -shaders = "2" - -shader0 = "../shaders/lcd-cgwg/lcd-grid.slang" -filter_linear0 = "false" -wrap_mode0 = "clamp_to_border" -scale_type_x0 = "source" -scale_x0 = "4.000000" -scale_type_y0 = "source" -scale_y0 = "4.000000" - -shader1 = "shader-files/border.slang" -filter_linear1 = "true" -wrap_mode1 = "clamp_to_border" - -parameters = "box_scale;in_res_x;in_res_y;border_on_top;border_zoom_x;border_zoom_y" -GRID_STRENGTH = "0.150000" -box_scale = "4.0" -in_res_x = "160.0" -in_res_y = "152.0" -border_on_top = "0.000000" -border_zoom_x = "0.52" -border_zoom_y = "0.59" - -textures = "BORDER" -BORDER = "resources/ngpc-border-square-4x.png" -BORDER_linear = "true" -BORDER_wrap_mode = "clamp_to_border" -BORDER_mipmap = "false" diff --git a/handheld/console-border/ngpc-5x.slangp b/handheld/console-border/ngpc-5x.slangp deleted file mode 100644 index 6e4211f..0000000 --- a/handheld/console-border/ngpc-5x.slangp +++ /dev/null @@ -1,28 +0,0 @@ -shaders = "2" - -shader0 = "../shaders/lcd-cgwg/lcd-grid.slang" -filter_linear0 = "false" -wrap_mode0 = "clamp_to_border" -scale_type_x0 = "source" -scale_x0 = "6.000000" -scale_type_y0 = "source" -scale_y0 = "6.000000" - -shader1 = "shader-files/border.slang" -filter_linear1 = "true" -wrap_mode1 = "clamp_to_border" - -parameters = "box_scale;in_res_x;in_res_y;border_on_top;border_zoom_x;border_zoom_y" -GRID_STRENGTH = "0.150000" -box_scale = "5.0" -in_res_x = "160.0" -in_res_y = "152.0" -border_on_top = "0.000000" -border_zoom_x = "0.42" -border_zoom_y = "0.47" - -textures = "BORDER" -BORDER = "resources/ngpc-border-square-4x.png" -BORDER_linear = "true" -BORDER_wrap_mode = "clamp_to_border" -BORDER_mipmap = "false" diff --git a/handheld/console-border/ngpc-6x.slangp b/handheld/console-border/ngpc-6x.slangp deleted file mode 100644 index c4cb5b0..0000000 --- a/handheld/console-border/ngpc-6x.slangp +++ /dev/null @@ -1,28 +0,0 @@ -shaders = "2" - -shader0 = "../shaders/lcd-cgwg/lcd-grid.slang" -filter_linear0 = "false" -wrap_mode0 = "clamp_to_border" -scale_type_x0 = "source" -scale_x0 = "6.000000" -scale_type_y0 = "source" -scale_y0 = "6.000000" - -shader1 = "shader-files/border.slang" -filter_linear1 = "true" -wrap_mode1 = "clamp_to_border" - -parameters = "box_scale;in_res_x;in_res_y;border_on_top;border_zoom_x;border_zoom_y" -GRID_STRENGTH = "0.150000" -box_scale = "6.0" -in_res_x = "160.0" -in_res_y = "152.0" -border_on_top = "0.000000" -border_zoom_x = "0.35" -border_zoom_y = "0.39" - -textures = "BORDER" -BORDER = "resources/ngpc-border-square-4x.png" -BORDER_linear = "true" -BORDER_wrap_mode = "clamp_to_border" -BORDER_mipmap = "false" diff --git a/handheld/console-border/gbc-5x.slangp b/handheld/console-border/ngpc.slangp similarity index 51% rename from handheld/console-border/gbc-5x.slangp rename to handheld/console-border/ngpc.slangp index 928a90e..6261871 100644 --- a/handheld/console-border/gbc-5x.slangp +++ b/handheld/console-border/ngpc.slangp @@ -3,22 +3,15 @@ shaders = "2" shader0 = "../shaders/lcd-cgwg/lcd-grid.slang" filter_linear0 = "false" wrap_mode0 = "clamp_to_border" -scale_type_x0 = "source" -scale_x0 = "5.000000" -scale_type_y0 = "source" -scale_y0 = "5.000000" +scale_type0 = "source" +scale0 = "4.0" -shader1 = "shader-files/gb-pass-5.slang" +shader1 = "shader-files/border-auto-scale.slang" filter_linear1 = "true" wrap_mode1 = "clamp_to_border" -parameters = "SCALE;OUT_X;OUT_Y" -SCALE = "1.0" -OUT_X = "4000.0" -OUT_Y = "2000.0" - textures = "BORDER" -BORDER = "resources/color-border-square-4x.png" +BORDER = "resources/ngpc-border-square-4x.png" BORDER_linear = "true" BORDER_wrap_mode = "clamp_to_border" BORDER_mipmap = "false" diff --git a/handheld/console-border/psp-2x.slangp b/handheld/console-border/psp-2x.slangp deleted file mode 100644 index 4aa4a88..0000000 --- a/handheld/console-border/psp-2x.slangp +++ /dev/null @@ -1,25 +0,0 @@ -shaders = "2" - -shader0 = "../../stock.slang" -filter_linear0 = "false" -wrap_mode0 = "clamp_to_border" -scale_type_x0 = "source" -scale_x0 = "4.000000" -scale_type_y0 = "source" -scale_y0 = "4.000000" - -shader1 = "shader-files/gb-pass-5.slang" -filter_linear1 = "true" -wrap_mode1 = "clamp_to_border" - -parameters = "SCALE;OUT_X;OUT_Y;GRID_STRENGTH" -GRID_STRENGTH = 0.2 -SCALE = "0.5" -OUT_X = "2700.0" -OUT_Y = "1350.0" - -textures = "BORDER" -BORDER = "resources/psp border.png" -BORDER_linear = "true" -BORDER_wrap_mode = "clamp_to_border" -BORDER_mipmap = "true" \ No newline at end of file diff --git a/handheld/console-border/psp-3x.slangp b/handheld/console-border/psp-3x.slangp deleted file mode 100644 index 16e2736..0000000 --- a/handheld/console-border/psp-3x.slangp +++ /dev/null @@ -1,25 +0,0 @@ -shaders = "2" - -shader0 = "../shaders/lcd-cgwg/lcd-grid.slang" -filter_linear0 = "false" -wrap_mode0 = "clamp_to_border" -scale_type_x0 = "source" -scale_x0 = "4.000000" -scale_type_y0 = "source" -scale_y0 = "4.000000" - -shader1 = "shader-files/gb-pass-5.slang" -filter_linear1 = "true" -wrap_mode1 = "clamp_to_border" - -parameters = "SCALE;OUT_X;OUT_Y;GRID_STRENGTH" -GRID_STRENGTH = 0.10 -SCALE = "0.75" -OUT_X = "4050.0" -OUT_Y = "2025.0" - -textures = "BORDER" -BORDER = "resources/psp border.png" -BORDER_linear = "true" -BORDER_wrap_mode = "clamp_to_border" -BORDER_mipmap = "true" \ No newline at end of file diff --git a/handheld/console-border/psp-4x.slangp b/handheld/console-border/psp-4x.slangp deleted file mode 100644 index f861e5a..0000000 --- a/handheld/console-border/psp-4x.slangp +++ /dev/null @@ -1,25 +0,0 @@ -shaders = "2" - -shader0 = "../shaders/lcd-cgwg/lcd-grid.slang" -filter_linear0 = "false" -wrap_mode0 = "clamp_to_border" -scale_type_x0 = "source" -scale_x0 = "4.000000" -scale_type_y0 = "source" -scale_y0 = "4.000000" - -shader1 = "shader-files/gb-pass-5.slang" -filter_linear1 = "true" -wrap_mode1 = "clamp_to_border" - -parameters = "SCALE;OUT_X;OUT_Y;GRID_STRENGTH" -GRID_STRENGTH = 0.15 -SCALE = "1.0" -OUT_X = "5400.0" -OUT_Y = "2700.0" - -textures = "BORDER" -BORDER = "resources/psp border.png" -BORDER_linear = "true" -BORDER_wrap_mode = "clamp_to_border" -BORDER_mipmap = "true" \ No newline at end of file diff --git a/handheld/console-border/psp-6x.slangp b/handheld/console-border/psp-6x.slangp deleted file mode 100644 index 7a692ac..0000000 --- a/handheld/console-border/psp-6x.slangp +++ /dev/null @@ -1,25 +0,0 @@ -shaders = "2" - -shader0 = "../shaders/lcd-cgwg/lcd-grid.slang" -filter_linear0 = "false" -wrap_mode0 = "clamp_to_border" -scale_type_x0 = "source" -scale_x0 = "6.000000" -scale_type_y0 = "source" -scale_y0 = "6.000000" - -shader1 = "shader-files/gb-pass-5.slang" -filter_linear1 = "true" -wrap_mode1 = "clamp_to_border" - -parameters = "SCALE;OUT_X;OUT_Y;GRID_STRENGTH" -GRID_STRENGTH = 0.15 -SCALE = "1.0" -OUT_X = "8100.0" -OUT_Y = "4050.0" - -textures = "BORDER" -BORDER = "resources/psp border.png" -BORDER_linear = "true" -BORDER_wrap_mode = "clamp_to_border" -BORDER_mipmap = "true" \ No newline at end of file diff --git a/handheld/console-border/psp-5x.slangp b/handheld/console-border/psp.slangp similarity index 59% rename from handheld/console-border/psp-5x.slangp rename to handheld/console-border/psp.slangp index ba19dfd..ee69754 100644 --- a/handheld/console-border/psp-5x.slangp +++ b/handheld/console-border/psp.slangp @@ -3,20 +3,16 @@ shaders = "2" shader0 = "../shaders/lcd-cgwg/lcd-grid.slang" filter_linear0 = "false" wrap_mode0 = "clamp_to_border" -scale_type_x0 = "source" -scale_x0 = "5.000000" -scale_type_y0 = "source" -scale_y0 = "5.000000" +scale_type0 = "source" +scale0 = "4.0" -shader1 = "shader-files/gb-pass-5.slang" +shader1 = "shader-files/border-auto-scale.slang" filter_linear1 = "true" wrap_mode1 = "clamp_to_border" -parameters = "SCALE;OUT_X;OUT_Y;GRID_STRENGTH" +parameters = "border_texture_scale;GRID_STRENGTH" +border_texture_scale = 2.4 GRID_STRENGTH = 0.15 -SCALE = "1.0" -OUT_X = "6750.0" -OUT_Y = "3375.0" textures = "BORDER" BORDER = "resources/psp border.png" diff --git a/handheld/console-border/shader-files/border-auto-scale.slang b/handheld/console-border/shader-files/border-auto-scale.slang new file mode 100644 index 0000000..d3e2e79 --- /dev/null +++ b/handheld/console-border/shader-files/border-auto-scale.slang @@ -0,0 +1,49 @@ +#version 450 + +layout(push_constant) uniform Push +{ + vec4 OutputSize; + vec4 SourceSize; + vec4 OriginalSize; + float border_texture_scale; +} params; + +#pragma parameter border_texture_scale "Border Scale" 4.0 1.0 20.0 0.005 + +vec2 middle = vec2(0.5, 0.5); +vec2 screen_ratio = params.OutputSize.xy * params.SourceSize.zw; +vec2 border_scale = vec2(3200, 1600) * (params.SourceSize.y / params.OriginalSize.y) / params.border_texture_scale; + +layout(std140, set = 0, binding = 0) uniform UBO +{ + mat4 MVP; +} global; + +#pragma stage vertex +layout(location = 0) in vec4 Position; +layout(location = 1) in vec2 TexCoord; +layout(location = 0) out vec2 vTexCoord; +layout(location = 1) out vec2 tex_border; + +void main() +{ + gl_Position = global.MVP * Position; + + vec2 diff = TexCoord.xy - middle; + vTexCoord = middle + diff * screen_ratio; + tex_border = middle + diff * params.OutputSize.xy / border_scale; +} + +#pragma stage fragment +layout(location = 0) in vec2 vTexCoord; +layout(location = 1) in vec2 tex_border; +layout(location = 0) out vec4 FragColor; +layout(set = 0, binding = 2) uniform sampler2D Source; +layout(set = 0, binding = 3) uniform sampler2D BORDER; + +void main() +{ + vec4 frame = texture(Source, vTexCoord).rgba; + vec4 border = texture(BORDER, tex_border).rgba; + FragColor = vec4(mix(frame, border, border.a)); +} diff --git a/handheld/console-border/shader-files/gb-pass-5.slang b/handheld/console-border/shader-files/gb-pass-5.slang index ba3ae7f..935ad29 100644 --- a/handheld/console-border/shader-files/gb-pass-5.slang +++ b/handheld/console-border/shader-files/gb-pass-5.slang @@ -4,14 +4,16 @@ layout(push_constant) uniform Push { vec4 OutputSize; vec4 SourceSize; - float SCALE; - float OUT_X; - float OUT_Y; + vec4 OriginalSize; + float video_scale; + float border_texture_scale; } params; -#pragma parameter SCALE "Box Scale" 0.6667 0.6667 1.5 0.33333 -#pragma parameter OUT_X "Out X" 1600.0 1600.0 4800.0 8000.0 -#pragma parameter OUT_Y "Out Y" 800.0 800.0 2400.0 400.0 +#pragma parameter video_scale "Video Scale" 3.0 2.0 20.0 1.0 +#pragma parameter border_texture_scale "Border Scale" 4.0 1.0 20.0 0.005 + +vec2 middle = vec2(0.5, 0.5); +vec2 border_scale = vec2(3200, 1600) * params.video_scale / params.border_texture_scale; layout(std140, set = 0, binding = 0) uniform UBO { @@ -27,14 +29,11 @@ layout(location = 1) out vec2 tex_border; void main() { gl_Position = global.MVP * Position; - vec2 scale = (params.OutputSize.xy * params.SourceSize.zw) / params.SCALE; - vec2 middle = vec2(0.5, 0.5); - vec2 diff = TexCoord.xy - middle; - vTexCoord = middle + diff * scale; - middle = vec2(0.5, 0.5); - vec2 dist = TexCoord - middle; - tex_border = middle + dist * params.OutputSize.xy / vec2(params.OUT_X, params.OUT_Y); + vTexCoord = TexCoord.xy; + + vec2 diff = TexCoord.xy - middle; + tex_border = middle + diff * params.OutputSize.xy / border_scale; } #pragma stage fragment diff --git a/handheld/console-border/shader-files/gb-pass0.slang b/handheld/console-border/shader-files/gb-pass0.slang index eaed2fe..4a18e5d 100644 --- a/handheld/console-border/shader-files/gb-pass0.slang +++ b/handheld/console-border/shader-files/gb-pass0.slang @@ -33,7 +33,7 @@ layout(std140, set = 0, binding = 0) uniform UBO #pragma parameter response_time "LCD Response Time" 0.20 0.0 0.777 0.111 // Set video scale when used in console-border shaders -#pragma parameter video_scale "Video Scale" 3.0 3.0 5.0 1.0 +#pragma parameter video_scale "Video Scale" 3.0 2.0 20.0 1.0 /////////////////////////////////////////////////////////////////////////// // // @@ -76,17 +76,14 @@ layout(location = 3) out vec2 one_texel; //#define video_scale floor(registers.OutputSize.y * registers.SourceSize.w) <- moved to parameter // Size of the scaled video -//#define scaled_video_out (registers.SourceSize.xy * vec2(video_scale)) <- moved to parameter - -//it's... half a pixel -#define half_pixel (vec2(0.5) * registers.OutputSize.zw) +//#define scaled_video_out (registers.SourceSize.xy * vec2(video_scale)) <- moved to parameter void main() { vec2 scaled_video_out = (registers.SourceSize.xy * vec2(registers.video_scale)); // Remaps position to integer scaled output gl_Position = global.MVP * Position / vec4( vec2(registers.OutputSize.xy / scaled_video_out), 1.0, 1.0 ); - vTexCoord = TexCoord + half_pixel; + vTexCoord = TexCoord; dot_size = registers.SourceSize.zw; one_texel = 1.0 / (registers.SourceSize.xy * registers.video_scale); }