diff --git a/cvarinfo.txt b/cvarinfo.txt index 80c2c1d..efdf289 100644 --- a/cvarinfo.txt +++ b/cvarinfo.txt @@ -1,94 +1,102 @@ -user bool mfx_lsharpenable = false; -user float mfx_lsharpradius = 0.8; -user float mfx_lsharpclamp = 0.05; -user float mfx_lsharpblend = 6.0; +nosave bool mfx_lsharpenable = false; +nosave float mfx_lsharpradius = .8; +nosave float mfx_lsharpclamp = .05; +nosave float mfx_lsharpblend = 6.; -user bool mfx_ne = false; -user float mfx_ni = 0.05; -user float mfx_ns = 0.0; -user float mfx_np = 4.0; -user float mfx_bnp = 1.5; -user int mfx_nb = 2; +nosave bool mfx_ne = false; +nosave float mfx_ni = .05; +nosave float mfx_ns = 0.; +nosave float mfx_np = 4.; +nosave float mfx_bnp = 1.5; +nosave int mfx_nb = 2; -user bool mfx_dirtenable = false; -user float mfx_dirtcfactor = 0.05; -user float mfx_dirtmc = 4.0; +nosave bool mfx_dirtenable = false; +nosave float mfx_dirtcfactor = .05; +nosave float mfx_dirtmc = 4.; -user bool mfx_gradeenable = false; -user float mfx_grademul_r = 1.0; -user float mfx_grademul_g = 1.0; -user float mfx_grademul_b = 1.0; -user float mfx_gradepow_r = 1.0; -user float mfx_gradepow_g = 1.0; -user float mfx_gradepow_b = 1.0; -user float mfx_gradecol_r = 1.0; -user float mfx_gradecol_g = 1.0; -user float mfx_gradecol_b = 1.0; -user float mfx_gradecolfact = 0.0; -user float mfx_gradesatmul = 1.0; -user float mfx_gradesatpow = 1.0; -user float mfx_gradevalmul = 1.0; -user float mfx_gradevalpow = 1.0; +nosave bool mfx_gradeenable = false; +nosave float mfx_grademul_r = 1.; +nosave float mfx_grademul_g = 1.; +nosave float mfx_grademul_b = 1.; +nosave float mfx_gradepow_r = 1.; +nosave float mfx_gradepow_g = 1.; +nosave float mfx_gradepow_b = 1.; +nosave float mfx_gradecol_r = 1.; +nosave float mfx_gradecol_g = 1.; +nosave float mfx_gradecol_b = 1.; +nosave float mfx_gradecolfact = 0.; +nosave float mfx_gradesatmul = 1.; +nosave float mfx_gradesatpow = 1.; +nosave float mfx_gradevalmul = 1.; +nosave float mfx_gradevalpow = 1.; -user bool mfx_cmatenable = false; -user float mfx_cmat_rr = 1.0; -user float mfx_cmat_rg = 0.0; -user float mfx_cmat_rb = 0.0; -user float mfx_cmat_gr = 0.0; -user float mfx_cmat_gg = 1.0; -user float mfx_cmat_gb = 0.0; -user float mfx_cmat_br = 0.0; -user float mfx_cmat_bg = 0.0; -user float mfx_cmat_bb = 1.0; +nosave bool mfx_cmatenable = false; +nosave float mfx_cmat_rr = 1.; +nosave float mfx_cmat_rg = 0.; +nosave float mfx_cmat_rb = 0.; +nosave float mfx_cmat_gr = 0.; +nosave float mfx_cmat_gg = 1.; +nosave float mfx_cmat_gb = 0.; +nosave float mfx_cmat_br = 0.; +nosave float mfx_cmat_bg = 0.; +nosave float mfx_cmat_bb = 1.; -user bool mfx_hsenable = false; -user float mfx_hsover = 0.0; -user float mfx_hshue_a = 0.0; -user float mfx_hssat_a = 0.0; -user float mfx_hsval_a = 0.0; -user float mfx_hshue_r = 0.0; -user float mfx_hssat_r = 0.0; -user float mfx_hsval_r = 0.0; -user float mfx_hshue_y = 0.0; -user float mfx_hssat_y = 0.0; -user float mfx_hsval_y = 0.0; -user float mfx_hshue_g = 0.0; -user float mfx_hssat_g = 0.0; -user float mfx_hsval_g = 0.0; -user float mfx_hshue_c = 0.0; -user float mfx_hssat_c = 0.0; -user float mfx_hsval_c = 0.0; -user float mfx_hshue_b = 0.0; -user float mfx_hssat_b = 0.0; -user float mfx_hsval_b = 0.0; -user float mfx_hshue_m = 0.0; -user float mfx_hssat_m = 0.0; -user float mfx_hsval_m = 0.0; +nosave bool mfx_hsenable = false; +nosave float mfx_hsover = 0.; +nosave float mfx_hshue_a = 0.; +nosave float mfx_hssat_a = 0.; +nosave float mfx_hsval_a = 0.; +nosave float mfx_hshue_r = 0.; +nosave float mfx_hssat_r = 0.; +nosave float mfx_hsval_r = 0.; +nosave float mfx_hshue_y = 0.; +nosave float mfx_hssat_y = 0.; +nosave float mfx_hsval_y = 0.; +nosave float mfx_hshue_g = 0.; +nosave float mfx_hssat_g = 0.; +nosave float mfx_hsval_g = 0.; +nosave float mfx_hshue_c = 0.; +nosave float mfx_hssat_c = 0.; +nosave float mfx_hsval_c = 0.; +nosave float mfx_hshue_b = 0.; +nosave float mfx_hssat_b = 0.; +nosave float mfx_hsval_b = 0.; +nosave float mfx_hshue_m = 0.; +nosave float mfx_hssat_m = 0.; +nosave float mfx_hsval_m = 0.; -user bool mfx_bssblurenable = false; -user float mfx_bssblurradius = 0.15; -user bool mfx_bsssharpenable = false; -user float mfx_bsssharpradius = 1.0; -user float mfx_bsssharpamount = 2.0; -user bool mfx_bssshiftenable = false; -user float mfx_bssshiftradius = 0.75; +nosave bool mfx_bssblurenable = false; +nosave float mfx_bssblurradius = .15; +nosave bool mfx_bsssharpenable = false; +nosave float mfx_bsssharpradius = 1.; +nosave float mfx_bsssharpamount = 2.; +nosave bool mfx_bssshiftenable = false; +nosave float mfx_bssshiftradius = .75; -user bool mfx_bblurenable = false; -user float mfx_bblurpow = 1.0; -user float mfx_bblurmul = 1.0; -user float mfx_bblurbump = 0.0; -user float mfx_bblurradius = 1.0; +nosave bool mfx_bblurenable = false; +nosave float mfx_bblurpow = 1.; +nosave float mfx_bblurmul = 1.; +nosave float mfx_bblurbump = 0.; +nosave float mfx_bblurradius = 1.; -user bool mfx_vigenable = false; -user float mfx_vigcolor_r = 0.0; -user float mfx_vigcolor_g = 0.0; -user float mfx_vigcolor_b = 0.0; -user float mfx_vigpow = 4.0; -user float mfx_vigmul = 0.75; -user float mfx_vigbump = 0.0; -user int mfx_vigshape = 1; -user int mfx_vigmode = 0; +nosave bool mfx_vigenable = false; +nosave float mfx_vigcolor_r = 0.; +nosave float mfx_vigcolor_g = 0.; +nosave float mfx_vigcolor_b = 0.; +nosave float mfx_vigpow = 4.; +nosave float mfx_vigmul = .75; +nosave float mfx_vigbump = 0.; +nosave int mfx_vigshape = 1; +nosave int mfx_vigmode = 0; -user bool mfx_palenable = false; -user int mfx_palnum = 0; -user float mfx_paldither = 0.05; +nosave bool mfx_retroenable = false; +nosave int mfx_retroscalemode = 0; +nosave int mfx_bres_x = 640; +nosave int mfx_bres_y = 480; +nosave float mfx_bscl_x = .5; +nosave float mfx_bscl_y = .5; +nosave bool mfx_palenable = false; +nosave int mfx_palnum = 0; +nosave float mfx_palsat = 1.; +nosave float mfx_palpow = 1.; +nosave float mfx_paldither = .05; diff --git a/gldefs.txt b/gldefs.txt index 977e478..1fc3b39 100644 --- a/gldefs.txt +++ b/gldefs.txt @@ -128,11 +128,21 @@ HardwareShader postprocess scene Texture VignetteTexture "textures/mfxvig.png" } +HardwareShader postprocess scene +{ + Name "mfx_retrofx" + Shader "shaders/glsl/mfx_retrofx.fp" 330 + Uniform vec2 bresl +} + HardwareShader postprocess scene { Name "mfx_palette" Shader "shaders/glsl/mfx_palette.fp" 330 Texture PalLUTTexture "textures/mfxpal.png" + Uniform vec2 sfact + Uniform float palsat + Uniform float palpow Uniform float paldither Uniform int palnum } diff --git a/language.txt b/language.txt index d946947..52a17c0 100644 --- a/language.txt +++ b/language.txt @@ -9,6 +9,10 @@ MFX_VIGSHAPE3="Texture"; MFX_VIGMODE1="Translucent"; MFX_VIGMODE2="Add"; MFX_VIGMODE3="Multiply"; +MFX_SCLMODE1="Clean Scale"; +MFX_SCLMODE2="OptClean Scale"; +MFX_SCLMODE3="Scale Factor"; +MFX_SCLMODE4="Resolution"; MFX_PALETTE1="Doom"; MFX_PALETTE2="Heretic"; MFX_PALETTE3="Hexen"; @@ -44,11 +48,132 @@ MFX_PALETTE32="Web Palette"; MFX_PALETTE33="Unreal"; MFX_PALETTE34="Unreal (Purple)"; MFX_PALETTE35="Unreal (Tinted)"; +MFX_PALETTE36="SWWM GZ"; +MFX_PALETTE37="UNDEATH"; +MFX_PALETTE38="NES"; +MFX_PALETTE39="Atari 2600"; +MFX_PALETTE40="Ice Tea (RGB)"; +MFX_PALETTE41="Ice Tea (sRGB)"; +MFX_PALETTE42="Ice Tea (LXN)"; +MFX_PALETTE43="Rainbow #1"; +MFX_PALETTE44="Rainbow #2"; +MFX_PALETTE45="Rainbow #3"; +MFX_PALETTE46="Rainbow #4"; +MFX_PALETTE47="Rainbow #5"; +MFX_PALETTE48="Rainbow #6"; +MFX_PALETTE49="Rainbow #7"; +MFX_PALETTE50="Rainbow #8"; +MFX_PALETTE51="Gradient #1"; +MFX_PALETTE52="Gradient #2"; +MFX_PALETTE53="Gradient #3"; +MFX_PALETTE54="Gradient #4"; +MFX_PALETTE55="Gradient #5"; +MFX_PALETTE56="Gradient #6"; +MFX_PALETTE57="Gradient #7"; +MFX_PALETTE58="Gradient #8"; +MFX_PALETTE59="RGB1"; +MFX_PALETTE60="RGB2"; +MFX_PALETTE61="RGB3"; +MFX_PALETTE62="RGB4"; +MFX_PALETTE63="RGB5"; +MFX_PALETTE64="RGB6"; MFX_ENABLE="Enable"; MFX_RESET="Reset to Default"; MFX_LUMASHARPEN="Luma Sharpen"; MFX_LSHARPRADIUS="Sharpen Radius"; MFX_LSHARPTRESHOLD="Sharpen Threshold"; MFX_LSHARPSTRENGTH="Sharpen Strength"; - -[es] +MFX_GRAIN="Film Grain"; +MFX_NI="Grain Intensity"; +MFX_NS="Grain Saturation"; +MFX_NP="Grain Contrast"; +MFX_NB="Grain Blend Mode"; +MFX_BNP="Grain Dark Mask Contrast"; +MFX_DIRT="Screen Dirt"; +MFX_DIRTMC="Dirt Scale"; +MFX_DIRTCFACTOR="Dirt Intensity"; +MFX_GRADE="Color Grading"; +MFX_GRADEMUL_R="Red Intensity"; +MFX_GRADEMUL_G="Green Intensity"; +MFX_GRADEMUL_B="Blue Intensity"; +MFX_GRADEPOW_R="Red Gamma"; +MFX_GRADEPOW_G="Green Gamma"; +MFX_GRADEPOW_B="Blue Gamma"; +MFX_GRADECOL_R="Red Tint"; +MFX_GRADECOL_G="Green Tint"; +MFX_GRADECOL_B="Blue Tint"; +MFX_GRADECOLFACT="Tint Factor"; +MFX_GRADESATMUL="Saturation Intensity"; +MFX_GRADESATPOW="Saturation Gamma"; +MFX_GRADEVALMUL="Value Intensity"; +MFX_GRADEVALPOW="Value Gamma"; +MFX_CMAT="Color Matrix"; +MFX_CMAT_RR="Red→Red"; +MFX_CMAT_RG="Red→Green"; +MFX_CMAT_RB="Red→Blue"; +MFX_CMAT_GR="Green→Red"; +MFX_CMAT_GG="Green→Green"; +MFX_CMAT_GB="Green→Blue"; +MFX_CMAT_BR="Blue→Red"; +MFX_CMAT_BG="Blue→Green"; +MFX_CMAT_BB="Blue→Blue"; +MFX_HUESAT="Hue-Saturation"; +MFX_HSOVER="Overlap"; +MFX_HSHUE_A="Master Hue"; +MFX_HSSAT_A="Master Saturation"; +MFX_HSVAL_A="Master Value"; +MFX_HSHUE_R="Red Hue"; +MFX_HSSAT_R="Red Saturation"; +MFX_HSVAL_R="Red Value"; +MFX_HSHUE_Y="Yellow Hue"; +MFX_HSSAT_Y="Yellow Saturation"; +MFX_HSVAL_Y="Yellow Value"; +MFX_HSHUE_G="Green Hue"; +MFX_HSSAT_G="Green Saturation"; +MFX_HSVAL_G="Green Value"; +MFX_HSHUE_C="Cyan Hue"; +MFX_HSSAT_C="Cyan Saturation"; +MFX_HSVAL_C="Cyan Value"; +MFX_HSHUE_B="Blue Hue"; +MFX_HSSAT_B="Blue Saturation"; +MFX_HSVAL_B="Blue Value"; +MFX_HSHUE_M="Magenta Hue"; +MFX_HSSAT_M="Magenta Saturation"; +MFX_HSVAL_M="Magenta Value"; +MFX_BSS="BlurSharpShift"; +MFX_BSS_1="(Some pretentious schmucks"; +MFX_BSS_2="claim this \"enhances\" the visuals)"; +MFX_BSSBLURENABLE="Blur Enable"; +MFX_BSSBLURRADIUS="BlurRadius"; +MFX_BSSSHARPENABLE="Sharp Enable"; +MFX_BSSSHARPRADIUS="Sharp Radius"; +MFX_BSSSHARPAMOUNT="Sharp Amount"; +MFX_BSSSHIFTENABLE="Shift Enable"; +MFX_BSSSHIFTRADIUS="Shift Radius"; +MFX_VIGBBLUR="Vignette / Border Blur"; +MFX_VIGENABLE="Enable Vignette"; +MFX_VIGCOLOR_R="Vignette Red"; +MFX_VIGCOLOR_G="Vignette Green"; +MFX_VIGCOLOR_B="Vignette Blue"; +MFX_VIGPOW="Vignette Gamma"; +MFX_VIGMUL="Vignette Intensity"; +MFX_VIGBUMP="Vignette Offset"; +MFX_VIGSHAPE="Vignette Shape"; +MFX_VIGMODE="Vignette Mode"; +MFX_BBLURENABLE="Enable Blur"; +MFX_BBLURPOW="Blur Gamma"; +MFX_BBLURMUL="Blur Intensity"; +MFX_BBLURBUMP="Blur Offset"; +MFX_BBLURRADIUS="Blur Radius"; +MFX_RETROFX="Retro FX"; +MFX_RETROENABLE="Enable Downscale"; +MFX_RETROSCALEMODE="Scaling Mode"; +MFX_BRESX="Horizontal Resolution"; +MFX_BRESY="Vertical Resolution"; +MFX_BSCLX="Horizontal Scale"; +MFX_BSCLY="Vertical Scale"; +MFX_PALENABLE="Enable Palette"; +MFX_PALNUM="Palette"; +MFX_PALSAT="Saturation"; +MFX_PALPOW="Gamma"; +MFX_PALDITHER="Dithering"; diff --git a/menudef.txt b/menudef.txt index 4617f40..7781f6a 100644 --- a/menudef.txt +++ b/menudef.txt @@ -1,6 +1,9 @@ AddOptionMenu "OptionsMenu" { - StaticText " " + SubMenu "$MFX_TITLE", "MFXOptionsMenu" +} +AddOptionMenu "OptionsMenuSimple" +{ SubMenu "$MFX_TITLE", "MFXOptionsMenu" } @@ -25,6 +28,14 @@ OptionValue "MFXVigMode" 2, "$MFX_VIGMODE3" } +OptionValue "MFXScaleMode" +{ + 0, "$MFX_SCLMODE1" + 1, "$MFX_SCLMODE2" + 2, "$MFX_SCLMODE3" + 3, "$MFX_SCLMODE4" +} + OptionValue "MFXPalette" { 0, "$MFX_PALETTE1" @@ -62,133 +73,171 @@ OptionValue "MFXPalette" 32, "$MFX_PALETTE33" 33, "$MFX_PALETTE34" 34, "$MFX_PALETTE35" + 35, "$MFX_PALETTE36" + 36, "$MFX_PALETTE37" + 37, "$MFX_PALETTE38" + 38, "$MFX_PALETTE39" + 39, "$MFX_PALETTE40" + 40, "$MFX_PALETTE41" + 41, "$MFX_PALETTE42" + 42, "$MFX_PALETTE43" + 43, "$MFX_PALETTE44" + 44, "$MFX_PALETTE45" + 45, "$MFX_PALETTE46" + 46, "$MFX_PALETTE47" + 47, "$MFX_PALETTE48" + 48, "$MFX_PALETTE49" + 49, "$MFX_PALETTE50" + 50, "$MFX_PALETTE51" + 51, "$MFX_PALETTE52" + 52, "$MFX_PALETTE53" + 53, "$MFX_PALETTE54" + 54, "$MFX_PALETTE55" + 55, "$MFX_PALETTE56" + 56, "$MFX_PALETTE57" + 57, "$MFX_PALETTE58" + 58, "$MFX_PALETTE59" + 59, "$MFX_PALETTE60" + 60, "$MFX_PALETTE61" + 61, "$MFX_PALETTE62" + 62, "$MFX_PALETTE63" + 63, "$MFX_PALETTE64" } OptionMenu "MFXOptionsMenu" { + Class MFXOptionMenu Title "$MFX_TITLE" StaticText " " - StaticText "Luma Sharpen", "Gold" + StaticText "$MFX_LUMASHARPEN", "Gold" StaticText " " - Option "Enable", "mfx_lsharpenable", "YesNo" - Slider "Sharpen Radius", "mfx_lsharpradius", 0, 1, 0.01, 2 - Slider "Sharpen Threshold", "mfx_lsharpclamp", 0, 1, 0.01, 2 - Slider "Sharpen Strength", "mfx_lsharpblend", 0, 10, 0.1, 1 - SafeCommand "Reset to Default", "event resetmfxvars 8" + Option "$MFX_ENABLE", "mfx_lsharpenable", "YesNo" + MFXSlider "$MFX_LSHARPRADIUS", "mfx_lsharpradius", 0, 1, 0.01, 2 + MFXSlider "$MFX_LSHARPTRESHOLD", "mfx_lsharpclamp", 0, 1, 0.01, 2 + MFXSlider "$MFX_LSHARPSTRENGTH", "mfx_lsharpblend", 0, 10, 0.1, 1 + SafeCommand "$MFX_RESET", "event resetmfxvars 8" StaticText " " - StaticText "Film Grain", "Gold" + StaticText "$MFX_GRAIN", "Gold" StaticText " " - Option "Enable", "mfx_ne", "YesNo" - Slider "Grain Intensity", "mfx_ni", 0, 1, 0.01, 2 - Slider "Grain Saturation", "mfx_ns", -1, 1, 0.01, 2 - Slider "Grain Contrast", "mfx_np", 0.5, 8, 0.01, 2 - Option "Grain Blend Mode", "mfx_nb", "MFXGrainBlend" - Slider "Grain Dark Mask Contrast", "mfx_bnp", 0.5, 10, 0.01, 2 - SafeCommand "Reset to Default", "event resetmfxvars 0" + Option "$MFX_ENABLE", "mfx_ne", "YesNo" + MFXSlider "$MFX_NI", "mfx_ni", 0, 1, 0.01, 2 + MFXSlider "$MFX_NS", "mfx_ns", -1, 1, 0.01, 2 + MFXSlider "$MFX_NP", "mfx_np", 0.5, 8, 0.01, 2 + Option "$MFX_NB", "mfx_nb", "MFXGrainBlend" + MFXSlider "$MFX_BNP", "mfx_bnp", 0.5, 10, 0.01, 2 + SafeCommand "$MFX_RESET", "event resetmfxvars 0" StaticText " " - StaticText "Screen Dirt", "Gold" + StaticText "$MFX_DIRT", "Gold" StaticText " " - Option "Enable", "mfx_dirtenable", "YesNo" - Slider "Dirt Scale", "mfx_dirtmc", 1, 8, 1, 0 - Slider "Dirt Intensity", "mfx_dirtcfactor", 0, 1, 0.01, 2 - SafeCommand "Reset to Default", "event resetmfxvars 1" + Option "$MFX_ENABLE", "mfx_dirtenable", "YesNo" + MFXSlider "$MFX_DIRTMC", "mfx_dirtmc", 1, 8, 1, 0 + MFXSlider "$MFX_DIRTCFACTOR", "mfx_dirtcfactor", 0, 1, 0.01, 2 + SafeCommand "$MFX_RESET", "event resetmfxvars 1" StaticText " " - StaticText "Color Grading", "Gold" + StaticText "$MFX_GRADE", "Gold" StaticText " " - Option "Enable", "mfx_gradeenable", "YesNo" - Slider "Red Intensity", "mfx_grademul_r", 0, 2, 0.01, 2 - Slider "Green Intensity", "mfx_grademul_g", 0, 2, 0.01, 2 - Slider "Blue Intensity", "mfx_grademul_b", 0, 2, 0.01, 2 - Slider "Red Gamma", "mfx_gradepow_r", 0, 2, 0.01, 2 - Slider "Green Gamma", "mfx_gradepow_g", 0, 2, 0.01, 2 - Slider "Blue Gamma", "mfx_gradepow_b", 0, 2, 0.01, 2 - Slider "Red Tint", "mfx_gradecol_r", -1, 1, 0.01, 2 - Slider "Green Tint", "mfx_gradecol_g", -1, 1, 0.01, 2 - Slider "Blue Tint", "mfx_gradecol_b", -1, 1, 0.01, 2 - Slider "Tint Factor", "mfx_gradecolfact", -1, 1, 0.01, 2 - Slider "Saturation Intensity", "mfx_gradesatmul", 0, 2, 0.01, 2 - Slider "Saturation Gamma", "mfx_gradesatpow", 0, 2, 0.01, 2 - Slider "Value Intensity", "mfx_gradevalmul", 0, 2, 0.01, 2 - Slider "Value Gamma", "mfx_gradevalpow", 0, 2, 0.01, 2 - SafeCommand "Reset to Default", "event resetmfxvars 2" + Option "$MFX_ENABLE", "mfx_gradeenable", "YesNo" + MFXSlider "$MFX_GRADEMUL_R", "mfx_grademul_r", 0, 2, 0.01, 2 + MFXSlider "$MFX_GRADEMUL_G", "mfx_grademul_g", 0, 2, 0.01, 2 + MFXSlider "$MFX_GRADEMUL_B", "mfx_grademul_b", 0, 2, 0.01, 2 + MFXSlider "$MFX_GRADEPOW_R", "mfx_gradepow_r", 0, 2, 0.01, 2 + MFXSlider "$MFX_GRADEPOW_G", "mfx_gradepow_g", 0, 2, 0.01, 2 + MFXSlider "$MFX_GRADEPOW_B", "mfx_gradepow_b", 0, 2, 0.01, 2 + MFXSlider "$MFX_GRADECOL_R", "mfx_gradecol_r", -1, 1, 0.01, 2 + MFXSlider "$MFX_GRADECOL_G", "mfx_gradecol_g", -1, 1, 0.01, 2 + MFXSlider "$MFX_GRADECOL_B", "mfx_gradecol_b", -1, 1, 0.01, 2 + MFXSlider "$MFX_GRADECOLFACT", "mfx_gradecolfact", -1, 1, 0.01, 2 + MFXSlider "$MFX_GRADESATMUL", "mfx_gradesatmul", 0, 2, 0.01, 2 + MFXSlider "$MFX_GRADESATPOW", "mfx_gradesatpow", 0, 2, 0.01, 2 + MFXSlider "$MFX_GRADEVALMUL", "mfx_gradevalmul", 0, 2, 0.01, 2 + MFXSlider "$MFX_GRADEVALPOW", "mfx_gradevalpow", 0, 2, 0.01, 2 + SafeCommand "$MFX_RESET", "event resetmfxvars 2" StaticText " " - StaticText "Color Matrix", "Gold" + StaticText "$MFX_CMAT", "Gold" StaticText " " - Option "Enable", "mfx_cmatenable", "YesNo" - Slider "Red->Red", "mfx_cmat_rr", -2, 2, 0.01, 2 - Slider "Red->Green", "mfx_cmat_rg", -2, 2, 0.01, 2 - Slider "Red->Blue", "mfx_cmat_rb", -2, 2, 0.01, 2 - Slider "Green->Red", "mfx_cmat_gr", -2, 2, 0.01, 2 - Slider "Green->Green", "mfx_cmat_gg", -2, 2, 0.01, 2 - Slider "Green->Blue", "mfx_cmat_gb", -2, 2, 0.01, 2 - Slider "Blue->Red", "mfx_cmat_br", -2, 2, 0.01, 2 - Slider "Blue->Green", "mfx_cmat_bg", -2, 2, 0.01, 2 - Slider "Blue->Blue", "mfx_cmat_bb", -2, 2, 0.01, 2 - SafeCommand "Reset to Default", "event resetmfxvars 3" + Option "$MFX_ENABLE", "mfx_cmatenable", "YesNo" + MFXSlider "$MFX_CMAT_RR", "mfx_cmat_rr", -2, 2, 0.01, 2 + MFXSlider "$MFX_CMAT_RG", "mfx_cmat_rg", -2, 2, 0.01, 2 + MFXSlider "$MFX_CMAT_RB", "mfx_cmat_rb", -2, 2, 0.01, 2 + MFXSlider "$MFX_CMAT_GR", "mfx_cmat_gr", -2, 2, 0.01, 2 + MFXSlider "$MFX_CMAT_GG", "mfx_cmat_gg", -2, 2, 0.01, 2 + MFXSlider "$MFX_CMAT_GB", "mfx_cmat_gb", -2, 2, 0.01, 2 + MFXSlider "$MFX_CMAT_BR", "mfx_cmat_br", -2, 2, 0.01, 2 + MFXSlider "$MFX_CMAT_BG", "mfx_cmat_bg", -2, 2, 0.01, 2 + MFXSlider "$MFX_CMAT_BB", "mfx_cmat_bb", -2, 2, 0.01, 2 + SafeCommand "$MFX_RESET", "event resetmfxvars 3" StaticText " " - StaticText "Hue-Saturation", "Gold" + StaticText "$MFX_HUESAT", "Gold" StaticText " " - Option "Enable", "mfx_hsenable", "YesNo" - Slider "Overlap", "mfx_hsover", 0, 0.5, 0.01, 2 - Slider "Master Hue", "mfx_hshue_a", -1, 1, 0.01, 2 - Slider "Master Saturation", "mfx_hssat_a", -1, 1, 0.01, 2 - Slider "Master Value", "mfx_hsval_a", -1, 1, 0.01, 2 - Slider "Red Hue", "mfx_hshue_r", -1, 1, 0.01, 2 - Slider "Red Saturation", "mfx_hssat_r", -1, 1, 0.01, 2 - Slider "Red Value", "mfx_hsval_r", -1, 1, 0.01, 2 - Slider "Yellow Hue", "mfx_hshue_y", -1, 1, 0.01, 2 - Slider "Yellow Saturation", "mfx_hssat_y", -1, 1, 0.01, 2 - Slider "Yellow Value", "mfx_hsval_y", -1, 1, 0.01, 2 - Slider "Green Hue", "mfx_hshue_g", -1, 1, 0.01, 2 - Slider "Green Saturation", "mfx_hssat_g", -1, 1, 0.01, 2 - Slider "Green Value", "mfx_hsval_g", -1, 1, 0.01, 2 - Slider "Cyan Hue", "mfx_hshue_c", -1, 1, 0.01, 2 - Slider "Cyan Saturation", "mfx_hssat_c", -1, 1, 0.01, 2 - Slider "Cyan Value", "mfx_hsval_c", -1, 1, 0.01, 2 - Slider "Blue Hue", "mfx_hshue_b", -1, 1, 0.01, 2 - Slider "Blue Saturation", "mfx_hssat_b", -1, 1, 0.01, 2 - Slider "Blue Value", "mfx_hsval_b", -1, 1, 0.01, 2 - Slider "Magenta Hue", "mfx_hshue_m", -1, 1, 0.01, 2 - Slider "Magenta Saturation", "mfx_hssat_m", -1, 1, 0.01, 2 - Slider "Magenta Value", "mfx_hsval_m", -1, 1, 0.01, 2 - SafeCommand "Reset to Default", "event resetmfxvars 4" + Option "$MFX_ENABLE", "mfx_hsenable", "YesNo" + MFXSlider "$MFX_HSOVER", "mfx_hsover", 0, 0.5, 0.01, 2 + MFXSlider "$MFX_HSHUE_A", "mfx_hshue_a", -1, 1, 0.01, 2 + MFXSlider "$MFX_HSSAT_A", "mfx_hssat_a", -1, 1, 0.01, 2 + MFXSlider "$MFX_HSVAL_A", "mfx_hsval_a", -1, 1, 0.01, 2 + MFXSlider "$MFX_HSHUE_R", "mfx_hshue_r", -1, 1, 0.01, 2 + MFXSlider "$MFX_HSSAT_R", "mfx_hssat_r", -1, 1, 0.01, 2 + MFXSlider "$MFX_HSVAL_R", "mfx_hsval_r", -1, 1, 0.01, 2 + MFXSlider "$MFX_HSHUE_Y", "mfx_hshue_y", -1, 1, 0.01, 2 + MFXSlider "$MFX_HSSAT_Y", "mfx_hssat_y", -1, 1, 0.01, 2 + MFXSlider "$MFX_HSVAL_Y", "mfx_hsval_y", -1, 1, 0.01, 2 + MFXSlider "$MFX_HSHUE_G", "mfx_hshue_g", -1, 1, 0.01, 2 + MFXSlider "$MFX_HSSAT_G", "mfx_hssat_g", -1, 1, 0.01, 2 + MFXSlider "$MFX_HSVAL_G", "mfx_hsval_g", -1, 1, 0.01, 2 + MFXSlider "$MFX_HSHUE_C", "mfx_hshue_c", -1, 1, 0.01, 2 + MFXSlider "$MFX_HSSAT_C", "mfx_hssat_c", -1, 1, 0.01, 2 + MFXSlider "$MFX_HSVAL_C", "mfx_hsval_c", -1, 1, 0.01, 2 + MFXSlider "$MFX_HSHUE_B", "mfx_hshue_b", -1, 1, 0.01, 2 + MFXSlider "$MFX_HSSAT_B", "mfx_hssat_b", -1, 1, 0.01, 2 + MFXSlider "$MFX_HSVAL_B", "mfx_hsval_b", -1, 1, 0.01, 2 + MFXSlider "$MFX_HSHUE_M", "mfx_hshue_m", -1, 1, 0.01, 2 + MFXSlider "$MFX_HSSAT_M", "mfx_hssat_m", -1, 1, 0.01, 2 + MFXSlider "$MFX_HSVAL_M", "mfx_hsval_m", -1, 1, 0.01, 2 + SafeCommand "$MFX_RESET", "event resetmfxvars 4" StaticText " " - StaticText "BlurSharpShift", "Gold" + StaticText "$MFX_BSS", "Gold" StaticText " " - StaticText "(Some pretentious schmucks", "Brown" - StaticText "claim this \"enhances\" the visuals)", "Brown" + StaticText "$MFX_BSS_1", "Brown" + StaticText "$MFX_BSS_2", "Brown" StaticText " " - Option "Blur Enable", "mfx_bssblurenable", "YesNo" - Slider "Blur Radius", "mfx_bssblurradius", 0, 1, 0.05, 2 - Option "Sharp Enable", "mfx_bsssharpenable", "YesNo" - Slider "Sharp Radius", "mfx_bsssharpradius", 0, 1, 0.05, 2 - Slider "Sharp Amount", "mfx_bsssharpamount", 0, 8, 0.1, 1 - Option "Shift Enable", "mfx_bssshiftenable", "YesNo" - Slider "Shift Radius", "mfx_bssshiftradius", 0, 1, 0.05, 2 - SafeCommand "Reset to Default", "event resetmfxvars 5" + Option "$MFX_BSSBLURENABLE", "mfx_bssblurenable", "YesNo" + MFXSlider "$MFX_BSSBLURRADIUS", "mfx_bssblurradius", 0, 1, 0.05, 2 + Option "$MFX_BSSSHARPENABLE", "mfx_bsssharpenable", "YesNo" + MFXSlider "$MFX_BSSSHARPRADIUS", "mfx_bsssharpradius", 0, 1, 0.05, 2 + MFXSlider "$MFX_BSSSHARPAMOUNT", "mfx_bsssharpamount", 0, 8, 0.1, 1 + Option "$MFX_BSSSHIFTENABLE", "mfx_bssshiftenable", "YesNo" + MFXSlider "$MFX_BSSSHIFTRADIUS", "mfx_bssshiftradius", 0, 1, 0.05, 2 + SafeCommand "$MFX_RESET", "event resetmfxvars 5" StaticText " " - StaticText "Vignette / Border Blur", "Gold" + StaticText "$MFX_VIGBBLUR", "Gold" StaticText " " - Option "Enable Vignette", "mfx_vigenable", "YesNo" - Slider "Vignette Red", "mfx_vigcolor_r", -1, 1, 0.01, 2 - Slider "Vignette Green", "mfx_vigcolor_g", -1, 1, 0.01, 2 - Slider "Vignette Blue", "mfx_vigcolor_b", -1, 1, 0.01, 2 - Slider "Vignette Gamma", "mfx_vigpow", 0, 16, 0.01, 2 - Slider "Vignette Intensity", "mfx_vigmul", 0, 2, 0.01, 2 - Slider "Vignette Offset", "mfx_vigbump", -1, 1, 0.01, 2 - Option "Vignette Shape", "mfx_vigshape", "MFXVigShape" - Option "Vignette Mode", "mfx_vigmode", "MFXVigMode" - Option "Enable Blur", "mfx_bblurenable", "YesNo" - Slider "Blur Gamma", "mfx_bblurpow", 0, 16, 0.01, 2 - Slider "Blur Intensity", "mfx_bblurmul", 0, 2, 0.01, 2 - Slider "Blur Offset", "mfx_bblurbump", -1, 1, 0.01, 2 - Slider "Blur Radius", "mfx_bblurradius", 0, 4, 0.01, 2 - SafeCommand "Reset to Default", "event resetmfxvars 6" + Option "$MFX_VIGENABLE", "mfx_vigenable", "YesNo" + MFXSlider "$MFX_VIGCOLOR_R", "mfx_vigcolor_r", -1, 1, 0.01, 2 + MFXSlider "$MFX_VIGCOLOR_G", "mfx_vigcolor_g", -1, 1, 0.01, 2 + MFXSlider "$MFX_VIGCOLOR_B", "mfx_vigcolor_b", -1, 1, 0.01, 2 + MFXSlider "$MFX_VIGPOW", "mfx_vigpow", 0, 16, 0.01, 2 + MFXSlider "$MFX_VIGMUL", "mfx_vigmul", 0, 2, 0.01, 2 + MFXSlider "$MFX_VIGBUMP", "mfx_vigbump", -1, 1, 0.01, 2 + Option "$MFX_VIGSHAPE", "mfx_vigshape", "MFXVigShape" + Option "$MFX_VIGMODE", "mfx_vigmode", "MFXVigMode" + Option "$MFX_BBLURENABLE", "mfx_bblurenable", "YesNo" + MFXSlider "$MFX_BBLURPOW", "mfx_bblurpow", 0, 16, 0.01, 2 + MFXSlider "$MFX_BBLURMUL", "mfx_bblurmul", 0, 2, 0.01, 2 + MFXSlider "$MFX_BBLURBUMP", "mfx_bblurbump", -1, 1, 0.01, 2 + MFXSlider "$MFX_BBLURRADIUS", "mfx_bblurradius", 0, 4, 0.01, 2 + SafeCommand "$MFX_RESET", "event resetmfxvars 6" StaticText " " - StaticText "Palette", "Gold" + StaticText "$MFX_RETROFX", "Gold" StaticText " " - Option "Enable", "mfx_palenable", "YesNo" - Option "Palette", "mfx_palnum", "MFXPalette" - Slider "Dithering", "mfx_paldither", 0, 1, 0.01, 2 - SafeCommand "Reset to Default", "event resetmfxvars 7" + Option "$MFX_RETROENABLE", "mfx_retroenable", "YesNo" + Option "$MFX_RETROSCALEMODE", "mfx_retroscalemode", "MFXScaleMode" + TextField "$MFX_BRESX", "mfx_bres_x" + TextField "$MFX_BRESY", "mfx_bres_y" + MFXSlider "$MFX_BSCLX", "mfx_bscl_x", 0, 1, 0.01, 2 + MFXSlider "$MFX_BSCLY", "mfx_bscl_y", 0, 1, 0.01, 2 + Option "$MFX_PALENABLE", "mfx_palenable", "YesNo" + Option "$MFX_PALNUM", "mfx_palnum", "MFXPalette" + MFXSlider "$MFX_PALSAT", "mfx_palsat", 0, 2, 0.01, 2 + MFXSlider "$MFX_PALPOW", "mfx_palpow", 0, 2, 0.01, 2 + MFXSlider "$MFX_PALDITHER", "mfx_paldither", 0, 1, 0.01, 2 + SafeCommand "$MFX_RESET", "event resetmfxvars 7" } diff --git a/shaders/glsl/mfx_borderblur.fp b/shaders/glsl/mfx_borderblur.fp index 843fa9f..3590b21 100644 --- a/shaders/glsl/mfx_borderblur.fp +++ b/shaders/glsl/mfx_borderblur.fp @@ -1,6 +1,6 @@ /* Border blur from MariENB - (C)2012-2019 Marisa Kirisame + (C)2012-2021 Marisa Kirisame */ void main() { diff --git a/shaders/glsl/mfx_bss_blur.fp b/shaders/glsl/mfx_bss_blur.fp index 75309ae..086b676 100644 --- a/shaders/glsl/mfx_bss_blur.fp +++ b/shaders/glsl/mfx_bss_blur.fp @@ -1,6 +1,6 @@ /* BlurSharpShift blur from MariENB - (C)2012-2019 Marisa Kirisame + (C)2012-2021 Marisa Kirisame */ void main() { diff --git a/shaders/glsl/mfx_bss_sharp.fp b/shaders/glsl/mfx_bss_sharp.fp index 210c0ec..4dea57f 100644 --- a/shaders/glsl/mfx_bss_sharp.fp +++ b/shaders/glsl/mfx_bss_sharp.fp @@ -1,6 +1,6 @@ /* BlurSharpShift sharpen from MariENB - (C)2012-2019 Marisa Kirisame + (C)2012-2021 Marisa Kirisame */ void main() { diff --git a/shaders/glsl/mfx_bss_shift.fp b/shaders/glsl/mfx_bss_shift.fp index 31fcf39..d5ef441 100644 --- a/shaders/glsl/mfx_bss_shift.fp +++ b/shaders/glsl/mfx_bss_shift.fp @@ -1,6 +1,6 @@ /* BlurSharpShift shift from MariENB - (C)2012-2019 Marisa Kirisame + (C)2012-2021 Marisa Kirisame */ void main() { diff --git a/shaders/glsl/mfx_colormatrix.fp b/shaders/glsl/mfx_colormatrix.fp index 840cefb..6c5e6bc 100644 --- a/shaders/glsl/mfx_colormatrix.fp +++ b/shaders/glsl/mfx_colormatrix.fp @@ -1,6 +1,6 @@ /* Simple color matrix from MariENB - (C)2012-2019 Marisa Kirisame + (C)2012-2021 Marisa Kirisame */ void main() { diff --git a/shaders/glsl/mfx_dirt.fp b/shaders/glsl/mfx_dirt.fp index 9d548f3..b65c2cf 100644 --- a/shaders/glsl/mfx_dirt.fp +++ b/shaders/glsl/mfx_dirt.fp @@ -1,6 +1,6 @@ /* Dirty camera effect from MariENB - (C)2012-2019 Marisa Kirisame + (C)2012-2021 Marisa Kirisame */ vec3 lensdirt( in vec3 res, in vec2 coord ) { diff --git a/shaders/glsl/mfx_grading.fp b/shaders/glsl/mfx_grading.fp index d1733d3..8e9b82a 100644 --- a/shaders/glsl/mfx_grading.fp +++ b/shaders/glsl/mfx_grading.fp @@ -1,6 +1,6 @@ /* Math color grading from MariENB - (C)2012-2019 Marisa Kirisame + (C)2012-2021 Marisa Kirisame */ #define luminance(x) dot(x,vec3(0.2126,0.7152,0.0722)) diff --git a/shaders/glsl/mfx_grain.fp b/shaders/glsl/mfx_grain.fp index 0ee22e4..4fcf6fd 100644 --- a/shaders/glsl/mfx_grain.fp +++ b/shaders/glsl/mfx_grain.fp @@ -1,6 +1,6 @@ /* Complex grain shader ported over from MariENB - (C)2012-2019 Marisa Kirisame + (C)2012-2021 Marisa Kirisame */ const float nf = 0.0005; const vec3 nm1 = vec3(2.05,3.11,2.22); diff --git a/shaders/glsl/mfx_huesaturation.fp b/shaders/glsl/mfx_huesaturation.fp index d90c2af..33b12ee 100644 --- a/shaders/glsl/mfx_huesaturation.fp +++ b/shaders/glsl/mfx_huesaturation.fp @@ -1,7 +1,7 @@ /* Hue-Saturation filter from MariENB, ported over from GIMP (C)2007 Michael Natterer - (C)2012-2019 Marisa Kirisame + (C)2012-2021 Marisa Kirisame */ vec3 rgb2hsv( vec3 c ) { diff --git a/shaders/glsl/mfx_lumasharp.fp b/shaders/glsl/mfx_lumasharp.fp index 5c4a326..de0ae6a 100644 --- a/shaders/glsl/mfx_lumasharp.fp +++ b/shaders/glsl/mfx_lumasharp.fp @@ -1,6 +1,6 @@ /* LumaSharpen from MariENB - (C)2012-2019 Marisa Kirisame + (C)2012-2021 Marisa Kirisame */ #define luminance(x) dot(x,vec3(0.2126,0.7152,0.0722)) @@ -19,4 +19,4 @@ void main() thesewounds = clamp(thesewounds,-sharpclamp*0.01,sharpclamp*0.01); vec4 theywillnotheal = res+thesewounds*sharpblend; FragColor = theywillnotheal; -} \ No newline at end of file +} diff --git a/shaders/glsl/mfx_palette.fp b/shaders/glsl/mfx_palette.fp index d590b68..4b5daaf 100644 --- a/shaders/glsl/mfx_palette.fp +++ b/shaders/glsl/mfx_palette.fp @@ -1,7 +1,23 @@ /* RetroFX palette reduction from MariENB - (C)2012-2019 Marisa Kirisame + (C)2012-2021 Marisa Kirisame */ +vec3 rgb2hsv( vec3 c ) +{ + vec4 K = vec4(0.0,-1.0/3.0,2.0/3.0,-1.0); + vec4 p = (c.g