From 05a12bf533b6eb32e69fd7590e61be8c9ca8c428 Mon Sep 17 00:00:00 2001 From: hunterk Date: Wed, 31 May 2017 10:49:34 -0500 Subject: [PATCH] update artifact-colors shaders and preset --- ntsc/shaders/artifact-colors/artifact-colors0.slang | 2 +- ntsc/shaders/artifact-colors/artifact-colors1.slang | 2 +- ntsc/shaders/artifact-colors/artifact-colors2.slang | 2 +- presets/c64-monitor.slangp | 6 +----- 4 files changed, 4 insertions(+), 8 deletions(-) diff --git a/ntsc/shaders/artifact-colors/artifact-colors0.slang b/ntsc/shaders/artifact-colors/artifact-colors0.slang index f2031cb..bd6e38c 100644 --- a/ntsc/shaders/artifact-colors/artifact-colors0.slang +++ b/ntsc/shaders/artifact-colors/artifact-colors0.slang @@ -16,7 +16,7 @@ layout(push_constant) uniform Push float F_COL; } params; -#pragma parameter F_COL "F Col" 0.25 0.25 1.5 0.25 +#pragma parameter F_COL "F Col" 0.25 0.25 0.5 0.25 layout(std140, set = 0, binding = 0) uniform UBO { diff --git a/ntsc/shaders/artifact-colors/artifact-colors1.slang b/ntsc/shaders/artifact-colors/artifact-colors1.slang index 33f4d14..0e95388 100644 --- a/ntsc/shaders/artifact-colors/artifact-colors1.slang +++ b/ntsc/shaders/artifact-colors/artifact-colors1.slang @@ -20,7 +20,7 @@ layout(push_constant) uniform Push } params; #pragma parameter FIR_SIZE "FIR Size" 29.0 1.0 50.0 1.0 -#pragma parameter F_COL "F Col" 0.25 0.25 1.5 0.25 +#pragma parameter F_COL "F Col" 0.25 0.25 0.5 0.25 #pragma parameter F_LUMA_LP "F Luma LP" 0.16667 0.0001 0.333333 0.02 #pragma parameter F_COL_BW "F Col BW" 50.0 10.0 200.0 1.0 diff --git a/ntsc/shaders/artifact-colors/artifact-colors2.slang b/ntsc/shaders/artifact-colors/artifact-colors2.slang index 01052d2..30f3c9b 100644 --- a/ntsc/shaders/artifact-colors/artifact-colors2.slang +++ b/ntsc/shaders/artifact-colors/artifact-colors2.slang @@ -22,7 +22,7 @@ layout(push_constant) uniform Push } params; #pragma parameter FIR_SIZE "FIR Size" 29.0 1.0 50.0 1.0 -#pragma parameter F_COL "F Col" 0.25 0.25 1.5 0.25 +#pragma parameter F_COL "F Col" 0.25 0.25 0.5 0.25 #pragma parameter SATURATION "Saturation" 30.0 0.0 100.0 1.0 #pragma parameter BRIGHTNESS "Brightness" 1.0 0.0 2.0 0.01 #pragma parameter F_LUMA_LP "F Luma LP" 0.16667 0.0001 0.333333 0.02 diff --git a/presets/c64-monitor.slangp b/presets/c64-monitor.slangp index b8fde5e..14423b6 100644 --- a/presets/c64-monitor.slangp +++ b/presets/c64-monitor.slangp @@ -17,8 +17,4 @@ scale2 = 1.0 scale_type2 = source filter_linear2 = false -shader3 = ../crt/shaders/crt-geom.slang - -parameters = "F_COL;FIR_SIZE" -F_COL = 0.25 -FIR_SIZE = 29.00 \ No newline at end of file +shader3 = ../crt/shaders/crt-lottes.slang \ No newline at end of file