From 573badab105d8aa6cf0109b74b542aa9ad4e8420 Mon Sep 17 00:00:00 2001 From: hunterk Date: Wed, 17 Aug 2016 13:30:10 -0500 Subject: [PATCH] fix dmg and gb-pocket console-borders --- handheld/console-border/dmg-2x.slangp | 19 +++++++++-------- handheld/console-border/dmg-3x.slangp | 21 +++++++++---------- handheld/console-border/dmg-4x.slangp | 21 +++++++++---------- handheld/console-border/dmg-5x.slangp | 23 ++++++++++----------- handheld/console-border/dmg-6x.slangp | 21 +++++++++---------- handheld/console-border/gb-pocket-2x.slangp | 19 +++++++++-------- handheld/console-border/gb-pocket-3x.slangp | 23 ++++++++++----------- handheld/console-border/gb-pocket-4x.slangp | 21 +++++++++---------- handheld/console-border/gb-pocket-5x.slangp | 21 +++++++++---------- handheld/console-border/gb-pocket-6x.slangp | 21 +++++++++---------- 10 files changed, 102 insertions(+), 108 deletions(-) diff --git a/handheld/console-border/dmg-2x.slangp b/handheld/console-border/dmg-2x.slangp index 12af47a..fab24e4 100644 --- a/handheld/console-border/dmg-2x.slangp +++ b/handheld/console-border/dmg-2x.slangp @@ -30,18 +30,19 @@ scale_type4 = source scale4 = 1.0 alias4 = "PASS4" -shader5 = shader-files/border.slang +shader5 = shader-files/gb-pass-5.slang +scale_type5 = source +scale5 = 1.0 -parameters = "border_on_top;box_scale;in_res_x;in_res_y;border_zoom_x;border_zoom_y;adjacent_texel_alpha_blending;pixel_opacity;shadow_opacity" -box_scale = "2.0" -in_res_x = "279.0" -in_res_y = "158.0" -border_zoom_x = "1.05" -border_zoom_y = "1.18" -adjacent_texel_alpha_blending = "0.38" +parameters = "video_scale;SCALE;OUT_X;OUT_Y;adjacent_texel_alpha_blending;pixel_opacity;shadow_opacity;console_border_enable" +video_scale = "3.0" +SCALE = "0.6667" +OUT_X = "1600.0" +OUT_Y = "800.0" +adjacent_texel_alpha_blending = "0.18" pixel_opacity = "0.90" shadow_opacity = "0.90" -border_on_top = "0.0" +console_border_enable = "1.0" textures = COLOR_PALETTE;BACKGROUND;BORDER COLOR_PALETTE = resources/dmg-palette.png diff --git a/handheld/console-border/dmg-3x.slangp b/handheld/console-border/dmg-3x.slangp index c5cda2b..d867729 100644 --- a/handheld/console-border/dmg-3x.slangp +++ b/handheld/console-border/dmg-3x.slangp @@ -30,18 +30,17 @@ scale_type4 = source scale4 = 1.0 alias4 = "PASS4" -shader5 = shader-files/border.slang +shader5 = shader-files/gb-pass-5.slang -parameters = "border_on_top;box_scale;in_res_x;in_res_y;border_zoom_x;border_zoom_y;adjacent_texel_alpha_blending;pixel_opacity;shadow_opacity" -box_scale = "3.0" -in_res_x = "279.0" -in_res_y = "158.0" -border_zoom_x = "0.7" -border_zoom_y = "0.79" -adjacent_texel_alpha_blending = "0.38" -pixel_opacity = "0.90" -shadow_opacity = "0.90" -border_on_top = "0.0" +parameters = "video_scale;SCALE;OUT_X;OUT_Y;adjacent_texel_alpha_blending;pixel_opacity;shadow_opacity;console_border_enable" +video_scale = "3.0" +SCALE = "1.0" +OUT_X = "2400.0" +OUT_Y = "1200.0" +adjacent_texel_alpha_blending = "0.15" +pixel_opacity = "0.80" +shadow_opacity = "0.80" +console_border_enable = "1.0" textures = COLOR_PALETTE;BACKGROUND;BORDER COLOR_PALETTE = resources/dmg-palette.png diff --git a/handheld/console-border/dmg-4x.slangp b/handheld/console-border/dmg-4x.slangp index 6bfb3c5..e7e03ef 100644 --- a/handheld/console-border/dmg-4x.slangp +++ b/handheld/console-border/dmg-4x.slangp @@ -30,18 +30,17 @@ scale_type4 = source scale4 = 1.0 alias4 = "PASS4" -shader5 = shader-files/border.slang +shader5 = shader-files/gb-pass-5.slang -parameters = "border_on_top;box_scale;in_res_x;in_res_y;border_zoom_x;border_zoom_y;adjacent_texel_alpha_blending;pixel_opacity;shadow_opacity" -box_scale = "4.0" -in_res_x = "279.0" -in_res_y = "158.0" -border_zoom_x = "0.53" -border_zoom_y = "0.60" -adjacent_texel_alpha_blending = "0.38" -pixel_opacity = "0.90" -shadow_opacity = "0.90" -border_on_top = "0.0" +parameters = "video_scale;SCALE;OUT_X;OUT_Y;adjacent_texel_alpha_blending;pixel_opacity;shadow_opacity;console_border_enable" +video_scale = "4.0" +SCALE = "1.0" +OUT_X = "3200.0" +OUT_Y = "1600.0" +adjacent_texel_alpha_blending = "0.14" +pixel_opacity = "0.80" +shadow_opacity = "0.80" +console_border_enable = "1.0" textures = COLOR_PALETTE;BACKGROUND;BORDER COLOR_PALETTE = resources/dmg-palette.png diff --git a/handheld/console-border/dmg-5x.slangp b/handheld/console-border/dmg-5x.slangp index fac8ac5..f6c4bd2 100644 --- a/handheld/console-border/dmg-5x.slangp +++ b/handheld/console-border/dmg-5x.slangp @@ -26,22 +26,21 @@ alias3 = "PASS3" shader4 = ../shaders/gameboy/shader-files/gb-pass4.slang filter_linear4 = false -scale_type4 = source +scale_type4 = viewport scale4 = 1.0 alias4 = "PASS4" -shader5 = shader-files/border.slang +shader5 = shader-files/gb-pass-5.slang -parameters = "border_on_top;box_scale;in_res_x;in_res_y;border_zoom_x;border_zoom_y;adjacent_texel_alpha_blending;pixel_opacity;shadow_opacity" -box_scale = "5.0" -in_res_x = "279.0" -in_res_y = "158.0" -border_zoom_x = "0.42" -border_zoom_y = "0.48" -adjacent_texel_alpha_blending = "0.38" -pixel_opacity = "0.90" -shadow_opacity = "0.90" -border_on_top = "0.0" +parameters = "video_scale;SCALE;OUT_X;OUT_Y;adjacent_texel_alpha_blending;pixel_opacity;shadow_opacity;console_border_enable" +video_scale = "4.0" +SCALE = "1.25" +OUT_X = "4000.0" +OUT_Y = "2000.0" +adjacent_texel_alpha_blending = "0.14" +pixel_opacity = "0.80" +shadow_opacity = "0.80" +console_border_enable = "1.0" textures = COLOR_PALETTE;BACKGROUND;BORDER COLOR_PALETTE = resources/dmg-palette.png diff --git a/handheld/console-border/dmg-6x.slangp b/handheld/console-border/dmg-6x.slangp index cc0016e..5ca1af8 100644 --- a/handheld/console-border/dmg-6x.slangp +++ b/handheld/console-border/dmg-6x.slangp @@ -30,18 +30,17 @@ scale_type4 = source scale4 = 1.0 alias4 = "PASS4" -shader5 = shader-files/border.slang +shader5 = shader-files/gb-pass-5.slang -parameters = "border_on_top;box_scale;in_res_x;in_res_y;border_zoom_x;border_zoom_y;adjacent_texel_alpha_blending;pixel_opacity;shadow_opacity" -box_scale = "6.0" -in_res_x = "279.0" -in_res_y = "158.0" -border_zoom_x = "0.35" -border_zoom_y = "0.40" -adjacent_texel_alpha_blending = "0.38" -pixel_opacity = "0.90" -shadow_opacity = "0.90" -border_on_top = "0.0" +parameters = "video_scale;SCALE;OUT_X;OUT_Y;adjacent_texel_alpha_blending;pixel_opacity;shadow_opacity;console_border_enable" +video_scale = "4.0" +SCALE = "1.5" +OUT_X = "4800.0" +OUT_Y = "2400.0" +adjacent_texel_alpha_blending = "0.14" +pixel_opacity = "0.80" +shadow_opacity = "0.80" +console_border_enable = "1.0" textures = COLOR_PALETTE;BACKGROUND;BORDER COLOR_PALETTE = resources/dmg-palette.png diff --git a/handheld/console-border/gb-pocket-2x.slangp b/handheld/console-border/gb-pocket-2x.slangp index 7fbec53..0f171b8 100644 --- a/handheld/console-border/gb-pocket-2x.slangp +++ b/handheld/console-border/gb-pocket-2x.slangp @@ -30,18 +30,19 @@ scale_type4 = source scale4 = 1.0 alias4 = "PASS4" -shader5 = shader-files/border.slang +shader5 = shader-files/gb-pass-5.slang +scale_type5 = source +scale5 = 1.0 -parameters = "border_on_top;box_scale;in_res_x;in_res_y;border_zoom_x;border_zoom_y;adjacent_texel_alpha_blending;pixel_opacity;shadow_opacity" -box_scale = "2.0" -in_res_x = "279.0" -in_res_y = "158.0" -border_zoom_x = "1.05" -border_zoom_y = "1.18" -adjacent_texel_alpha_blending = "0.38" +parameters = "video_scale;SCALE;OUT_X;OUT_Y;adjacent_texel_alpha_blending;pixel_opacity;shadow_opacity;console_border_enable" +video_scale = "3.0" +SCALE = "0.6667" +OUT_X = "1600.0" +OUT_Y = "800.0" +adjacent_texel_alpha_blending = "0.18" pixel_opacity = "0.90" shadow_opacity = "0.90" -border_on_top = "0.0" +console_border_enable = "1.0" textures = COLOR_PALETTE;BACKGROUND;BORDER COLOR_PALETTE = resources/pocket-palette.png diff --git a/handheld/console-border/gb-pocket-3x.slangp b/handheld/console-border/gb-pocket-3x.slangp index 900d638..568724b 100644 --- a/handheld/console-border/gb-pocket-3x.slangp +++ b/handheld/console-border/gb-pocket-3x.slangp @@ -25,23 +25,22 @@ scale3 = 1.0 alias3 = "PASS3" shader4 = ../shaders/gameboy/shader-files/gb-pass4.slang -filter_linear4 = false +filter_linear4 = true scale_type4 = source scale4 = 1.0 alias4 = "PASS4" -shader5 = shader-files/border.slang +shader5 = shader-files/gb-pass-5.slang -parameters = "border_on_top;box_scale;in_res_x;in_res_y;border_zoom_x;border_zoom_y;adjacent_texel_alpha_blending;pixel_opacity;shadow_opacity" -box_scale = "3.0" -in_res_x = "279.0" -in_res_y = "158.0" -border_zoom_x = "0.7" -border_zoom_y = "0.79" -adjacent_texel_alpha_blending = "0.38" -pixel_opacity = "0.90" -shadow_opacity = "0.90" -border_on_top = "0.0" +parameters = "video_scale;SCALE;OUT_X;OUT_Y;adjacent_texel_alpha_blending;pixel_opacity;shadow_opacity;console_border_enable" +video_scale = "3.0" +SCALE = "1.0" +OUT_X = "2400.0" +OUT_Y = "1200.0" +adjacent_texel_alpha_blending = "0.15" +pixel_opacity = "0.80" +shadow_opacity = "0.80" +console_border_enable = "1.0" textures = COLOR_PALETTE;BACKGROUND;BORDER COLOR_PALETTE = resources/pocket-palette.png diff --git a/handheld/console-border/gb-pocket-4x.slangp b/handheld/console-border/gb-pocket-4x.slangp index 16cf7ae..3465042 100644 --- a/handheld/console-border/gb-pocket-4x.slangp +++ b/handheld/console-border/gb-pocket-4x.slangp @@ -30,18 +30,17 @@ scale_type4 = source scale4 = 1.0 alias4 = "PASS4" -shader5 = shader-files/border.slang +shader5 = shader-files/gb-pass-5.slang -parameters = "border_on_top;box_scale;in_res_x;in_res_y;border_zoom_x;border_zoom_y;adjacent_texel_alpha_blending;pixel_opacity;shadow_opacity" -box_scale = "4.0" -in_res_x = "279.0" -in_res_y = "158.0" -border_zoom_x = "0.53" -border_zoom_y = "0.60" -adjacent_texel_alpha_blending = "0.38" -pixel_opacity = "0.90" -shadow_opacity = "0.90" -border_on_top = "0.0" +parameters = "video_scale;SCALE;OUT_X;OUT_Y;adjacent_texel_alpha_blending;pixel_opacity;shadow_opacity;console_border_enable" +video_scale = "4.0" +SCALE = "1.0" +OUT_X = "3200.0" +OUT_Y = "1600.0" +adjacent_texel_alpha_blending = "0.14" +pixel_opacity = "0.80" +shadow_opacity = "0.80" +console_border_enable = "1.0" textures = COLOR_PALETTE;BACKGROUND;BORDER COLOR_PALETTE = resources/pocket-palette.png diff --git a/handheld/console-border/gb-pocket-5x.slangp b/handheld/console-border/gb-pocket-5x.slangp index 50d16fb..e1648ab 100644 --- a/handheld/console-border/gb-pocket-5x.slangp +++ b/handheld/console-border/gb-pocket-5x.slangp @@ -30,18 +30,17 @@ scale_type4 = source scale4 = 1.0 alias4 = "PASS4" -shader5 = shader-files/border.slang +shader5 = shader-files/gb-pass-5.slang -parameters = "border_on_top;box_scale;in_res_x;in_res_y;border_zoom_x;border_zoom_y;adjacent_texel_alpha_blending;pixel_opacity;shadow_opacity" -box_scale = "5.0" -in_res_x = "279.0" -in_res_y = "158.0" -border_zoom_x = "0.42" -border_zoom_y = "0.48" -adjacent_texel_alpha_blending = "0.38" -pixel_opacity = "0.90" -shadow_opacity = "0.90" -border_on_top = "0.0" +parameters = "video_scale;SCALE;OUT_X;OUT_Y;adjacent_texel_alpha_blending;pixel_opacity;shadow_opacity;console_border_enable" +video_scale = "4.0" +SCALE = "1.25" +OUT_X = "4000.0" +OUT_Y = "2000.0" +adjacent_texel_alpha_blending = "0.14" +pixel_opacity = "0.80" +shadow_opacity = "0.80" +console_border_enable = "1.0" textures = COLOR_PALETTE;BACKGROUND;BORDER COLOR_PALETTE = resources/pocket-palette.png diff --git a/handheld/console-border/gb-pocket-6x.slangp b/handheld/console-border/gb-pocket-6x.slangp index 42a0a99..ff5b272 100644 --- a/handheld/console-border/gb-pocket-6x.slangp +++ b/handheld/console-border/gb-pocket-6x.slangp @@ -30,18 +30,17 @@ scale_type4 = source scale4 = 1.0 alias4 = "PASS4" -shader5 = shader-files/border.slang +shader5 = shader-files/gb-pass-5.slang -parameters = "border_on_top;box_scale;in_res_x;in_res_y;border_zoom_x;border_zoom_y;adjacent_texel_alpha_blending;pixel_opacity;shadow_opacity" -box_scale = "6.0" -in_res_x = "279.0" -in_res_y = "158.0" -border_zoom_x = "0.35" -border_zoom_y = "0.40" -adjacent_texel_alpha_blending = "0.38" -pixel_opacity = "0.90" -shadow_opacity = "0.90" -border_on_top = "0.0" +parameters = "video_scale;SCALE;OUT_X;OUT_Y;adjacent_texel_alpha_blending;pixel_opacity;shadow_opacity;console_border_enable" +video_scale = "4.0" +SCALE = "1.5" +OUT_X = "4800.0" +OUT_Y = "2400.0" +adjacent_texel_alpha_blending = "0.14" +pixel_opacity = "0.80" +shadow_opacity = "0.80" +console_border_enable = "1.0" textures = COLOR_PALETTE;BACKGROUND;BORDER COLOR_PALETTE = resources/pocket-palette.png