From 10f9dc012993535b8e4a4219514f39831243e3ed Mon Sep 17 00:00:00 2001 From: hunterk Date: Tue, 6 Sep 2016 22:55:30 -0500 Subject: [PATCH] fix gba console-borders --- handheld/console-border/gba-2x.slangp | 42 +++++++++++++++------------ handheld/console-border/gba-3x.slangp | 42 +++++++++++++++------------ handheld/console-border/gba-4x.slangp | 42 +++++++++++++++------------ handheld/console-border/gba-5x.slangp | 42 +++++++++++++++------------ handheld/console-border/gba-6x.slangp | 42 +++++++++++++++------------ 5 files changed, 120 insertions(+), 90 deletions(-) diff --git a/handheld/console-border/gba-2x.slangp b/handheld/console-border/gba-2x.slangp index b7eba7a..9641f07 100644 --- a/handheld/console-border/gba-2x.slangp +++ b/handheld/console-border/gba-2x.slangp @@ -1,25 +1,31 @@ -shaders = "2" +shaders = "4" -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" +shader0 = "../../motionblur/shaders/feedback.slang" +scale_type0 = source +scale0 = 1.0 +filter_linear0 = false -shader1 = "shader-files/border.slang" -filter_linear1 = "true" -wrap_mode1 = "clamp_to_border" +shader1 = "../shaders/color/gba-color.slang +filter_linear1 = false -parameters = "box_scale;in_res_x;in_res_y;border_on_top;border_zoom_x;border_zoom_y" +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" + +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" -box_scale = "2.0" -in_res_x = "240.0" -in_res_y = "160.0" -border_on_top = "0.000000" -border_zoom_x = "1.05" -border_zoom_y = "1.18" +SCALE = "1.0" +OUT_X = "1600.0" +OUT_Y = "800.0" +mixfactor = "0.50" textures = "BORDER" BORDER = "resources/gba-border-square-4x.png" diff --git a/handheld/console-border/gba-3x.slangp b/handheld/console-border/gba-3x.slangp index cfe57dd..974c30e 100644 --- a/handheld/console-border/gba-3x.slangp +++ b/handheld/console-border/gba-3x.slangp @@ -1,25 +1,31 @@ -shaders = "2" +shaders = "4" -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" +shader0 = "../../motionblur/shaders/feedback.slang" +scale_type0 = source +scale0 = 1.0 +filter_linear0 = false -shader1 = "shader-files/border.slang" -filter_linear1 = "true" -wrap_mode1 = "clamp_to_border" +shader1 = "../shaders/color/gba-color.slang +filter_linear1 = false -parameters = "box_scale;in_res_x;in_res_y;border_on_top;border_zoom_x;border_zoom_y" +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" -box_scale = "3.0" -in_res_x = "240.0" -in_res_y = "160.0" -border_on_top = "0.000000" -border_zoom_x = "0.70" -border_zoom_y = "0.79" +SCALE = "1.0" +OUT_X = "2400.0" +OUT_Y = "1200.0" +mixfactor = "0.50" textures = "BORDER" BORDER = "resources/gba-border-square-4x.png" diff --git a/handheld/console-border/gba-4x.slangp b/handheld/console-border/gba-4x.slangp index 5bcece5..01d3b1f 100644 --- a/handheld/console-border/gba-4x.slangp +++ b/handheld/console-border/gba-4x.slangp @@ -1,25 +1,31 @@ -shaders = "2" +shaders = "4" -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" +shader0 = "../../motionblur/shaders/feedback.slang" +scale_type0 = source +scale0 = 1.0 +filter_linear0 = false -shader1 = "shader-files/border.slang" -filter_linear1 = "true" -wrap_mode1 = "clamp_to_border" +shader1 = "../shaders/color/gba-color.slang +filter_linear1 = false -parameters = "box_scale;in_res_x;in_res_y;border_on_top;border_zoom_x;border_zoom_y" +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" -box_scale = "4.0" -in_res_x = "240.0" -in_res_y = "160.0" -border_on_top = "0.000000" -border_zoom_x = "0.52" -border_zoom_y = "0.59" +SCALE = "1.0" +OUT_X = "3200.0" +OUT_Y = "1600.0" +mixfactor = "0.50" textures = "BORDER" BORDER = "resources/gba-border-square-4x.png" diff --git a/handheld/console-border/gba-5x.slangp b/handheld/console-border/gba-5x.slangp index 5b87246..60bf9ba 100644 --- a/handheld/console-border/gba-5x.slangp +++ b/handheld/console-border/gba-5x.slangp @@ -1,25 +1,31 @@ -shaders = "2" +shaders = "4" -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" +shader0 = "../../motionblur/shaders/feedback.slang" +scale_type0 = source +scale0 = 1.0 +filter_linear0 = false -shader1 = "shader-files/border.slang" -filter_linear1 = "true" -wrap_mode1 = "clamp_to_border" +shader1 = "../shaders/color/gba-color.slang +filter_linear1 = false -parameters = "box_scale;in_res_x;in_res_y;border_on_top;border_zoom_x;border_zoom_y" +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" -box_scale = "5.0" -in_res_x = "240.0" -in_res_y = "160.0" -border_on_top = "0.000000" -border_zoom_x = "0.42" -border_zoom_y = "0.47" +SCALE = "1.25" +OUT_X = "5000.0" +OUT_Y = "2500.0" +mixfactor = "0.50" textures = "BORDER" BORDER = "resources/gba-border-square-4x.png" diff --git a/handheld/console-border/gba-6x.slangp b/handheld/console-border/gba-6x.slangp index 87f5082..7d47747 100644 --- a/handheld/console-border/gba-6x.slangp +++ b/handheld/console-border/gba-6x.slangp @@ -1,25 +1,31 @@ -shaders = "2" +shaders = "4" -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" +shader0 = "../../motionblur/shaders/feedback.slang" +scale_type0 = source +scale0 = 1.0 +filter_linear0 = false -shader1 = "shader-files/border.slang" -filter_linear1 = "true" -wrap_mode1 = "clamp_to_border" +shader1 = "../shaders/color/gba-color.slang +filter_linear1 = false -parameters = "box_scale;in_res_x;in_res_y;border_on_top;border_zoom_x;border_zoom_y" +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" -box_scale = "6.0" -in_res_x = "240.0" -in_res_y = "160.0" -border_on_top = "0.000000" -border_zoom_x = "0.35" -border_zoom_y = "0.39" +SCALE = "1.5" +OUT_X = "7200.0" +OUT_Y = "3600.0" +mixfactor = "0.50" textures = "BORDER" BORDER = "resources/gba-border-square-4x.png"