diff --git a/reshade/retro-v2-softlight-subtle.glslp b/reshade/retro-v2-softlight-subtle.glslp index ab6cbdc4..9a69487b 100644 --- a/reshade/retro-v2-softlight-subtle.glslp +++ b/reshade/retro-v2-softlight-subtle.glslp @@ -4,10 +4,16 @@ shader1 = shaders/blendsoftlight/blendsoftlight.glsl -textures = "overlay;BORDER" +textures = "overlay;overlay2;BORDER;BORDERTHICK;BORDERTHIN" # change this path to point to your overlay image -overlay = shaders/blendsoftlight/shine_subtle.png +overlay = shaders/blendsoftlight/shine720_subtle.png +overlay2 = shaders/blendsoftlight/shineblack720.png BORDER = shaders/blendsoftlight/border.png +BORDERTHICK = shaders/blendsoftlight/borderthick.png +BORDERTHIN = shaders/blendsoftlight/borderthin.png +BorderBool = 0.0 +ThickBool = 0.0 +ThinBool = 0.0 OverlayMix = 1.0 ASPECTRATIO = "43.0" diff --git a/reshade/retro-v2-softlight.glslp b/reshade/retro-v2-softlight.glslp index e6e6d39d..c22c64f8 100644 --- a/reshade/retro-v2-softlight.glslp +++ b/reshade/retro-v2-softlight.glslp @@ -4,10 +4,16 @@ shader1 = shaders/blendsoftlight/blendsoftlight.glsl -textures = "overlay;BORDER" +textures = "overlay;overlay2;BORDER;BORDERTHICK;BORDERTHIN" # change this path to point to your overlay image -overlay = shaders/blendsoftlight/shine.png +overlay = shaders/blendsoftlight/shine720.png +overlay2 = shaders/blendsoftlight/shineblack720.png BORDER = shaders/blendsoftlight/border.png +BORDERTHICK = shaders/blendsoftlight/borderthick.png +BORDERTHIN = shaders/blendsoftlight/borderthin.png +BorderBool = 0.0 +ThickBool = 0.0 +ThinBool = 0.0 OverlayMix = 1.0 ASPECTRATIO = "43.0" diff --git a/reshade/shaders/blendsoftlight/blendsoftlight.glsl b/reshade/shaders/blendsoftlight/blendsoftlight.glsl index 7532484a..4ccb02b4 100644 --- a/reshade/shaders/blendsoftlight/blendsoftlight.glsl +++ b/reshade/shaders/blendsoftlight/blendsoftlight.glsl @@ -15,6 +15,9 @@ #pragma parameter OverlayMix "Overlay Mix" 1.0 0.0 1.0 0.05 #pragma parameter SCALE "Box Scale" 4.0 0.25 4.0 0.05 #pragma parameter ASPECTRATIO "Aspect Ratio" 87.0 43.0 87.0 44.0 +#pragma parameter BorderBool "Normal Borders" 0.0 0.0 1.0 1.0 +#pragma parameter ThickBool "Thick Borders" 0.0 0.0 1.0 1.0 +#pragma parameter ThinBool "Thin Borders" 0.0 0.0 1.0 1.0 #if defined(VERTEX) @@ -110,7 +113,10 @@ uniform COMPAT_PRECISION vec2 TextureSize; uniform COMPAT_PRECISION vec2 InputSize; uniform sampler2D Texture; uniform sampler2D BORDER; +uniform sampler2D BORDERTHICK; +uniform sampler2D BORDERTHIN; uniform sampler2D overlay; +uniform sampler2D overlay2; COMPAT_VARYING vec4 TEX0; // compatibility #defines @@ -123,9 +129,15 @@ COMPAT_VARYING vec4 TEX0; #ifdef PARAMETER_UNIFORM uniform COMPAT_PRECISION float OverlayMix; uniform COMPAT_PRECISION float ASPECTRATIO; +uniform COMPAT_PRECISION float BorderBool; +uniform COMPAT_PRECISION float ThickBool; +uniform COMPAT_PRECISION float ThinBool; #else #define OverlayMix 1.0 #define ASPECTRATIO 43.0 +#define BorderBool 0.0 +#define ThickBool 0.0 +#define ThinBool 0.0 #endif float blendSoftlight(float base, float blend) { @@ -135,8 +147,12 @@ float blendSoftlight(float base, float blend) { void main() { - vec4 frame = COMPAT_TEXTURE(Source, vTexCoord).rgba; - vec4 softlight = COMPAT_TEXTURE(overlay, vTexCoord).rgba; + vec4 frame = COMPAT_TEXTURE(Source, vTexCoord).rgba; + vec4 softlight = COMPAT_TEXTURE(overlay, vTexCoord).rgba; + if ( OverlayMix < 1.0 ){ + softlight = COMPAT_TEXTURE(overlay2, vTexCoord).rgba; + softlight.a = OverlayMix; + } vec4 ImageFinal = frame; @@ -144,11 +160,19 @@ void main() ImageFinal.g = blendSoftlight(frame.g,softlight.g); ImageFinal.b = blendSoftlight(frame.b,softlight.b); ImageFinal.a = blendSoftlight(frame.a,softlight.a); - ImageFinal = mix(frame,clamp(ImageFinal,0.0,OverlayMix),softlight.a); + ImageFinal = mix(frame,ImageFinal,softlight.a); + // ImageFinal = mix(frame,clamp(ImageFinal,0.0,OverlayMix),softlight.a); - if (ASPECTRATIO == 87.0) { + // Aspect ratio 8:7 will always have a normal border applied + // otherwise glitching will occur on the edges + if (ASPECTRATIO == 87.0 || BorderBool == 1.0 || ThickBool == 1.0 || ThinBool == 1.0) { vec4 background = COMPAT_TEXTURE(BORDER, vTexCoord); - + if(ThickBool == 1.0){ + background = COMPAT_TEXTURE(BORDERTHICK, vTexCoord); + } + if(ThinBool == 1.0){ + background = COMPAT_TEXTURE(BORDERTHIN, vTexCoord); + } FragColor = vec4(mix(ImageFinal, background, background.a)); } else{ diff --git a/reshade/shaders/blendsoftlight/border.png b/reshade/shaders/blendsoftlight/border.png index cd3a2440..f7b3e5c2 100644 Binary files a/reshade/shaders/blendsoftlight/border.png and b/reshade/shaders/blendsoftlight/border.png differ diff --git a/reshade/shaders/blendsoftlight/borderthick.png b/reshade/shaders/blendsoftlight/borderthick.png new file mode 100644 index 00000000..6cdefc56 Binary files /dev/null and b/reshade/shaders/blendsoftlight/borderthick.png differ diff --git a/reshade/shaders/blendsoftlight/borderthin.png b/reshade/shaders/blendsoftlight/borderthin.png new file mode 100644 index 00000000..a0c2e842 Binary files /dev/null and b/reshade/shaders/blendsoftlight/borderthin.png differ diff --git a/reshade/shaders/blendsoftlight/shine.png b/reshade/shaders/blendsoftlight/shine.png deleted file mode 100644 index 69367935..00000000 Binary files a/reshade/shaders/blendsoftlight/shine.png and /dev/null differ diff --git a/reshade/shaders/blendsoftlight/shine720.png b/reshade/shaders/blendsoftlight/shine720.png new file mode 100644 index 00000000..a17d83ae Binary files /dev/null and b/reshade/shaders/blendsoftlight/shine720.png differ diff --git a/reshade/shaders/blendsoftlight/shine720_subtle.png b/reshade/shaders/blendsoftlight/shine720_subtle.png new file mode 100644 index 00000000..919ae1d0 Binary files /dev/null and b/reshade/shaders/blendsoftlight/shine720_subtle.png differ diff --git a/reshade/shaders/blendsoftlight/shineblack720.png b/reshade/shaders/blendsoftlight/shineblack720.png new file mode 100644 index 00000000..8c26b411 Binary files /dev/null and b/reshade/shaders/blendsoftlight/shineblack720.png differ