From 89d64d789685897c3dbada6a0772fb7d774b6ad4 Mon Sep 17 00:00:00 2001 From: hunterk Date: Tue, 6 Nov 2018 11:21:14 -0600 Subject: [PATCH] fix gg console-borders --- handheld/console-border/gg-2x.slangp | 15 ++++++--------- handheld/console-border/gg-3x.slangp | 20 ++++++++------------ handheld/console-border/gg-4x.slangp | 19 ++++++++----------- handheld/console-border/gg-5x.slangp | 17 +++++++---------- handheld/console-border/gg-6x.slangp | 17 +++++++---------- 5 files changed, 36 insertions(+), 52 deletions(-) diff --git a/handheld/console-border/gg-2x.slangp b/handheld/console-border/gg-2x.slangp index 6015e69..7d95d43 100644 --- a/handheld/console-border/gg-2x.slangp +++ b/handheld/console-border/gg-2x.slangp @@ -4,22 +4,19 @@ shader0 = "../shaders/lcd-cgwg/lcd-grid.slang" filter_linear0 = "false" wrap_mode0 = "clamp_to_border" scale_type_x0 = "source" -scale_x0 = "4.000000" +scale_x0 = "4.800000" scale_type_y0 = "source" scale_y0 = "4.000000" -shader1 = "shader-files/border.slang" +shader1 = "shader-files/gb-pass-5.slang" filter_linear1 = "true" wrap_mode1 = "clamp_to_border" -parameters = "GRID_STRENGTH;box_scale;in_res_x;in_res_y;border_on_top;border_zoom_x;border_zoom_y" +parameters = "SCALE;OUT_X;OUT_Y;GRID_STRENGTH" GRID_STRENGTH = "0.150000" -box_scale = "2.0" -in_res_x = "191.0" -in_res_y = "144.0" -border_on_top = "0.000000" -border_zoom_x = "1.05" -border_zoom_y = "1.18" +SCALE = "0.5" +OUT_X = "1600.0" +OUT_Y = "800.0" textures = "BORDER" BORDER = "resources/gg-border-square-4x.png" diff --git a/handheld/console-border/gg-3x.slangp b/handheld/console-border/gg-3x.slangp index 21455ae..5d92e33 100644 --- a/handheld/console-border/gg-3x.slangp +++ b/handheld/console-border/gg-3x.slangp @@ -4,25 +4,21 @@ shader0 = "../shaders/lcd-cgwg/lcd-grid.slang" filter_linear0 = "false" wrap_mode0 = "clamp_to_border" scale_type_x0 = "source" -scale_x0 = "4.000000" +scale_x0 = "3.600000" scale_type_y0 = "source" -scale_y0 = "4.000000" +scale_y0 = "3.000000" -shader1 = "shader-files/border.slang" +shader1 = "shader-files/gb-pass-5.slang" filter_linear1 = "true" wrap_mode1 = "clamp_to_border" -parameters = "GRID_STRENGTH;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 = "192.0" -in_res_y = "144.0" -border_on_top = "0.000000" -border_zoom_x = "0.70" -border_zoom_y = "0.79" +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" +BORDER_mipmap = "false" \ No newline at end of file diff --git a/handheld/console-border/gg-4x.slangp b/handheld/console-border/gg-4x.slangp index b9e3286..400b0ba 100644 --- a/handheld/console-border/gg-4x.slangp +++ b/handheld/console-border/gg-4x.slangp @@ -4,25 +4,22 @@ shader0 = "../shaders/lcd-cgwg/lcd-grid.slang" filter_linear0 = "false" wrap_mode0 = "clamp_to_border" scale_type_x0 = "source" -scale_x0 = "4.000000" +scale_x0 = "4.800000" scale_type_y0 = "source" scale_y0 = "4.000000" -shader1 = "shader-files/border.slang" +shader1 = "shader-files/gb-pass-5.slang" filter_linear1 = "true" wrap_mode1 = "clamp_to_border" -parameters = "GRID_STRENGTH;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 = "193.0" -in_res_y = "144.0" -border_on_top = "0.000000" -border_zoom_x = "0.52" -border_zoom_y = "0.59" +parameters = "SCALE;OUT_X;OUT_Y;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" BORDER_linear = "true" BORDER_wrap_mode = "clamp_to_border" -BORDER_mipmap = "false" +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 index 2627a62..e31d046 100644 --- a/handheld/console-border/gg-5x.slangp +++ b/handheld/console-border/gg-5x.slangp @@ -6,20 +6,17 @@ wrap_mode0 = "clamp_to_border" scale_type_x0 = "source" scale_x0 = "6.000000" scale_type_y0 = "source" -scale_y0 = "6.000000" +scale_y0 = "5.000000" -shader1 = "shader-files/border.slang" +shader1 = "shader-files/gb-pass-5.slang" filter_linear1 = "true" wrap_mode1 = "clamp_to_border" -parameters = "GRID_STRENGTH;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 = "191.0" -in_res_y = "144.0" -border_on_top = "0.000000" -border_zoom_x = "0.42" -border_zoom_y = "0.47" +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" diff --git a/handheld/console-border/gg-6x.slangp b/handheld/console-border/gg-6x.slangp index 8dfce5e..d2544a7 100644 --- a/handheld/console-border/gg-6x.slangp +++ b/handheld/console-border/gg-6x.slangp @@ -4,22 +4,19 @@ shader0 = "../shaders/lcd-cgwg/lcd-grid.slang" filter_linear0 = "false" wrap_mode0 = "clamp_to_border" scale_type_x0 = "source" -scale_x0 = "6.000000" +scale_x0 = "7.200000" scale_type_y0 = "source" scale_y0 = "6.000000" -shader1 = "shader-files/border.slang" +shader1 = "shader-files/gb-pass-5.slang" filter_linear1 = "true" wrap_mode1 = "clamp_to_border" -parameters = "GRID_STRENGTH;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 = "191.0" -in_res_y = "144.0" -border_on_top = "0.000000" -border_zoom_x = "0.35" -border_zoom_y = "0.39" +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"