Features- Dithering and CRT Filters (#6)

* Adds CRT and Dithering filters.

Author: FiniteSingularity

CMakeLists.txt

@@ -9,7 +9,7 @@ else()
   cmake_minimum_required(VERSION 3.18)
 endif()
 
-project(obs-retro-effects VERSION 0.0.3)
+project(obs-retro-effects VERSION 0.0.4)
 set(PROJECT_FULL_NAME "Retro Effects")
 
 # Set new UUIDs when you start to create a new plugin.
@@ -28,8 +28,16 @@ target_sources(${PROJECT_NAME} PRIVATE
 	src/obs-retro-effects.h
 	src/obs-utils.c
 	src/obs-utils.h
+	src/blur/blur.c
+	src/blur/blur.h
+	src/blur/gaussian-kernel.c
+	src/blur/gaussian-kernel.h
 	src/filters/chromatic-aberration.c
 	src/filters/chromatic-aberration.h
+	src/filters/crt.c
+	src/filters/crt.h
+	src/filters/dither.c
+	src/filters/dither.h
 	src/filters/frame-skip.c
 	src/filters/frame-skip.h
 	src/filters/interlace.c

buildspec.json

@@ -79,5 +79,5 @@
     }
   },
   "name": "obs-retro-effects",
-  "version": "0.0.3"
+  "version": "0.0.4"
 }

data/images/crt-phosphers-light.png

@@ -8,6 +8,9 @@ RetroEffects.Posterize.Color2="Color 2"
 RetroEffects.Posterize.Technique="Color Handling"
 RetroEffects.Posterize.Passthrough="Passthrough Colors"
 RetroEffects.Posterize.ColorMap="Map Colors"
+RetroEffects.Posterize.SourceColorMap="Source Map Colors"
+RetroEffects.Posterize.MapSource="Source"
+RetroEffects.Posterize.MapSource.None="None"
 RetroEffects.FrameSkip.NumFrames="Frames To Skip"
 RetroEffects.ChromaticAberration="Chromatic Aberration"
 RetroEffects.CA.Type="Type"
@@ -19,3 +22,30 @@ RetroEffects.CA.GreenOffset="Green Offset"
 RetroEffects.CA.GreenOffsetAngle="Green Offset Angle"
 RetroEffects.CA.BlueOffset="Blue Offset"
 RetroEffects.CA.BlueOffsetAngle="Blue Offset Angle"
+RetroEffects.Dither="Dither"
+RetroEffects.Dither.Size="Dither Size"
+RetroEffects.Dither.Contrast="Contrast Adjustment"
+RetroEffects.Dither.Gamma="Gamma Adjustment"
+RetroEffects.Dither.OffsetX="Offset X"
+RetroEffects.Dither.OffsetY="Offset Y"
+RetroEffects.Dither.ColorSteps="Colors Per Channel"
+RetroEffects.Dither.Monochromatic="Monochromatic?"
+RetroEffects.Dither.Type="Dither Type"
+RetroEffects.Dither.Ordered="Ordered"
+RetroEffects.Dither.Unordered="Unordered"
+RetroEffects.Dither.BayerSize="Bayer Matrix Size"
+RetroEffects.CRT="CRT"
+RetroEffects.CRT.PhosphorBloom="Phosphor Bloom"
+RetroEffects.CRT.BloomSize="Bloom Size"
+RetroEffects.CRT.BloomThreshold="Threshold"
+RetroEffects.CRT.BloomIntensity="Intensity"
+RetroEffects.CRT.PhosphorMask="Phosphor Mask"
+RetroEffects.CRT.PhosphorLayout="Phosphor Layout"
+RetroEffects.CRT.PhoshporMaskIntensity="Intesity"
+RetroEffects.CRT.CornerRadius="Corner Radius"
+RetroEffects.CRT.BarrelDistortion="Barrel Distortion"
+RetroEffects.CRT.Vignette="Vignette Amount"
+RetroEffects.CRT.Geometry="CRT Geometry"
+RetroEffects.CRT.ColorCorrection="Color Correction"
+RetroEffects.CRT.BlackLevel="Black Level"
+RetroEffects.CRT.WhiteLevel="White Level"

data/images/crt-phosphers.png

@@ -40,7 +40,7 @@ float4 mainImage(VertData v_in) : TARGET
 float4 mainImageLens(VertData v_in) : TARGET
 {
 	float2 coord = v_in.uv * uv_size;
-	float dist = abs((coord - uv_size * 0.5) * scale);
+	float2 dist = abs((coord - uv_size * 0.5) * scale);
 
 	float2 diff = dist * normalize(v_in.uv - float2(0.5, 0.5));
 

data/locale/en-US.ini

@@ -0,0 +1,66 @@
+uniform float4x4 ViewProj;
+uniform texture2d image;
+uniform texture2d blur_image;
+uniform float brightness;
+uniform float black_level;
+uniform float white_level;
+uniform float dist;
+
+#define EPS 1.e-8
+
+sampler_state textureSampler{
+    Filter = Linear;
+    AddressU = Clamp;
+    AddressV = Clamp;
+    MinLOD = 0;
+    MaxLOD = 0;
+};
+
+struct VertData
+{
+	float4 pos : POSITION;
+	float2 uv : TEXCOORD0;
+};
+
+VertData mainTransform(VertData v_in)
+{
+	v_in.pos = mul(float4(v_in.pos.xyz, 1.0), ViewProj);
+	return v_in;
+}
+
+float4 mainImage(VertData v_in) : TARGET
+{
+	// Barrel Distortion
+	float2 uv = v_in.uv * 2. - 1.;
+	float r_pixel_2 = uv.x * uv.x + uv.y * uv.y;
+	float barrel = r_pixel_2 * dist;
+	uv = (barrel > EPS) ? 0.5 * ((uv / barrel * (1. - sqrt(1. - 2. * barrel))) + 1.) : v_in.uv;
+
+	// Anti-alias barrel distortion edges
+	float d = min(min(uv.x, 1. - uv.x), min(uv.y, 1. - uv.y));	
+	float w = length(float2(ddx(d), ddy(d)));
+	float aa_mask = smoothstep(-0.7, 0.7, (abs(frac(d - 0.25) - 0.5) - 0.25) / w);
+
+	float4 color = image.Sample(textureSampler, uv);
+	float4 blur_color = blur_image.Sample(textureSampler, uv);
+	// Brightness correction on bloom/blur layer
+	//blur_color.rgb *= brightness;
+	float threshold = brightness;
+	float4 highlight = saturate(blur_color - threshold) * 1.0 / (1.0 - threshold);
+	// Screen Blending between main color layer and bloom/blur layer
+	color.rgb = 1.0 - (1.0 - color.rgb) * (1.0 - highlight.rgb);
+	// Apply black/white levels correction
+	color.rgb = saturate((color.rgb - black_level) / (white_level - black_level));
+	// Apply barrel disortion anti-alias mask to alpha channel
+	color.a *= aa_mask;
+	return color;
+}
+
+technique Draw
+{
+	pass
+	{
+		vertex_shader = mainTransform(v_in);
+		pixel_shader = mainImage(v_in);
+	}
+}