update shaders for opengl

Author: exeldro

CMakeLists.txt

@@ -6,7 +6,7 @@ else()
   cmake_minimum_required(VERSION 3.18)
 endif()
 
-project(obs-shaderfilter VERSION 1.21.2)
+project(obs-shaderfilter VERSION 1.21.3)
 set(PROJECT_FULL_NAME "OBS Shaderfilter")
 
 # Set new UUIDs when you start to create a new plugin.

buildspec.json

@@ -79,5 +79,5 @@
         }
     },
     "name": "obs-shaderfilter",
-    "version": "1.21.2"
+    "version": "1.21.3"
 }

data/examples/Luminance.shader

@@ -1,3 +1,4 @@
+//Converted to OpenGL by Exeldro February 22, 2022
 uniform float4 color;
 uniform float level = 10;
 uniform bool invertImageColor;
@@ -25,7 +26,7 @@ float4 mainImage(VertData v_in) : TARGET
     {
         rgba = InvertColor(rgba);
     }
-    float intensity = dot(rgba * color, float3(0.299, 0.587, 0.114));
+    float intensity = rgba.r * color.r * 0.299 + rgba.g * color.g * 0.587 + rgba.b * color.b * 0.114;
 
     //intensity = min(max(intensity,minIntensity),maxIntensity);
 

data/examples/VCR.shader

@@ -1,4 +1,5 @@
 //based on https://www.shadertoy.com/view/ldjGzV
+//Converted to OpenGL by Exeldro February 19, 2022
 uniform float vertical_shift = 0.4;
 uniform float distort = 1.2;
 uniform float vignet = 1.0;
@@ -19,19 +20,24 @@ float ramp(float y, float start, float end)
 
 }
 
+float modu(float x, float y)
+{
+	return (x / y) - floor(x / y);
+}
+
 float stripes(float2 uv)
 {
-	return ramp((uv.y*4. + elapsed_time/2.+sin(elapsed_time + sin(elapsed_time*0.63))%1.),0.5,0.6)*stripe;
+	return ramp(modu(uv.y*4. + elapsed_time/2.+sin(elapsed_time + sin(elapsed_time*0.63)),1.),0.5,0.6)*stripe;
 }
 
 float4 getVideo(float2 uv)
 {
 	float2 look = uv;
-	float window = 1./(1.+20.*(look.y-((elapsed_time/4.)%1.))*(look.y-((elapsed_time/4.)%1.)));
+	float window = 1./(1.+20.*(look.y-modu(elapsed_time/4.,1.))*(look.y-modu(elapsed_time/4.,1.)));
 	look.x = look.x + sin(look.y*10. + elapsed_time)/50.*onOff(4.,4.,.3)*(1.+cos(elapsed_time*80.))*window;
 	float vShift = vertical_shift*onOff(2.,3.,.9)*(sin(elapsed_time)*sin(elapsed_time*20.) + 
 										 (0.5 + 0.1*sin(elapsed_time*200.)*cos(elapsed_time)));
-	look.y = ((look.y + vShift) % 1.);
+	look.y = modu((look.y + vShift) , 1.);
     return image.Sample(textureSampler, look);
 }
 
@@ -52,6 +58,6 @@ float4 mainImage(VertData v_in) : TARGET
 	float vignette = ((1.-vigAmt*(uv.y-.5)*(uv.y-.5))*(1.-vigAmt*(uv.x-.5)*(uv.x-.5))-1.)*vignet+1.;
     video += stripes(uv);
     video *= vignette;
-	video *= (((12.+((uv.y*vertical_height+elapsed_time)%1.))/13.)-1.)*vertical_factor+1.;
+	video *= (((12.+modu((uv.y*vertical_height+elapsed_time),1.))/13.)-1.)*vertical_factor+1.;
     return float4(video.r, video.g, video.b ,1.0);
 }

data/examples/VHS.shader

@@ -1,9 +1,22 @@
-//based on https://www.shadertoy.com/view/Ms3XWH
+//based on https://www.shadertoy.com/view/Ms3XWH converted by Exeldro  v 1.0
+//updated by Charles 'Surn' Fettinger for obs-shaderfilter 9/2020
+//Converted to OpenGL by Exeldro February 19, 2022
 uniform float range = 0.05;
 uniform float noiseQuality = 250.0;
 uniform float noiseIntensity = 0.88;
 uniform float offsetIntensity = 0.02;
 uniform float colorOffsetIntensity = 1.3;
+uniform float lumaMin = 0.01;
+uniform float lumaMinSmooth = 0.04;
+uniform float Alpha_Percentage = 100; //<Range(0.0,100.0)>
+uniform bool Apply_To_Image;
+uniform bool Replace_Image_Color;
+uniform float4 Color_To_Replace;
+uniform bool Apply_To_Specific_Color;
+
+float dot(float2 a,float2 b){
+    return a.x*b.x+a.y*b.y;
+}
 
 float rand(float2 co)
 {
@@ -20,12 +33,21 @@ float verticalBar(float pos, float uvY, float offset)
     return x;
 }
 
+float modu(float x, float y)
+{
+	return (x / y) - floor(x / y);
+}
+
+float dot(float4 a,float4 b){
+    return a.r*b.r+a.g*b.g+a.b*b.b+a.a*b.a;
+}
+
 float4 mainImage(VertData v_in) : TARGET
 {
     float2 uv = v_in.uv;
     for (float i = 0.0; i < 0.71; i += 0.1313)
     {
-        float d = (elapsed_time * i) % 1.7;
+        float d = modu(elapsed_time * i, 1.7);
         float o = sin(1.0 - tan(elapsed_time * 0.24 * i));
     	o *= offsetIntensity;
         uv.x += verticalBar(d, uv.y, o);
@@ -43,6 +65,27 @@ float4 mainImage(VertData v_in) : TARGET
     float g = image.Sample(textureSampler, uv + offsetG).g;
     float b = image.Sample(textureSampler, uv).b;
 
-    float4 output = float4(r, g, b, 1.0);
-    return output;
+    float4 rgba = float4(r, g, b, 1.0);
+    
+    float4 color;
+    float4 original_color;
+    if (Apply_To_Image)
+    {
+        color = image.Sample(textureSampler, v_in.uv);
+        original_color = color;
+        float luma = dot(color, float4(0.30, 0.59, 0.11, 1.0));
+        if (Replace_Image_Color)
+            color = float4(luma,luma,luma,luma);
+        rgba = lerp(original_color, rgba * color, clamp(Alpha_Percentage * .01, 0, 1.0));
+		
+    }
+    if (Apply_To_Specific_Color)
+    {
+        color = image.Sample(textureSampler, v_in.uv);
+        original_color = color;
+        color = (distance(color.rgb, Color_To_Replace.rgb) <= 0.075) ? rgba : color;
+        rgba = lerp(original_color, color, clamp(Alpha_Percentage * .01, 0, 1.0));
+    }
+
+    return rgba;
 }

data/examples/animated_path.effect

@@ -1,4 +1,5 @@
 // Path effect By Charles Fettinger (https://github.com/Oncorporation)  3/2019
+//Converted to OpenGL by Q-mii & Exeldro February 24, 2022
 uniform float4x4 ViewProj;
 uniform texture2d image;
 
@@ -24,11 +25,11 @@ struct VertData {
 	float2 uv  : TEXCOORD0;
 };
 
-float4 convert_pmalpha(float4 color)
+float4 convert_pmalpha(float4 c)
 {
-	float4 ret = color;
-	if (color.a >= 0.001)
-		ret.xyz /= color.a;
+	float4 ret = c;
+	if (c.a >= 0.001)
+		ret.xyz /= c.a;
 	else
 		ret = float4(0.0, 0.0, 0.0, 0.0);
 	return ret;
@@ -39,7 +40,7 @@ VertData mainTransform(VertData v_in)
 	VertData vert_out;
 	float3 pos = v_in.pos.xyz;
 	float3 current_pos;
-	float speed = (float)speed_percent * 0.01;
+	float speed = speed_percent * 0.01;
 	//vert_out.pos = mul(float4(v_in.pos.xyz, 1.0), ViewProj);
 	float t = 1.0 + sin(elapsed_time * speed) ;
 	// combine luma texture and user defined shine color
@@ -60,7 +61,7 @@ VertData mainTransform(VertData v_in)
 	if (speed == 0.0f)
 	{
 		offset.x = 0.0f;
-		offset.y = 0.0f
+		offset.y = 0.0f;
 	}
 	else
 	{

data/examples/animated_texture.effect

@@ -1,7 +1,7 @@
 // Animated Texture By Charles Fettinger (https://github.com/Oncorporation)  3/2020
 // Animates a texture with polar sizing and color options
 // for use with obs-shaderfilter 1.0
-
+//Converted to OpenGL by Q-mii & Exeldro February 24, 2022
 uniform float4x4 ViewProj;
 uniform texture2d image;
 
@@ -101,7 +101,7 @@ float4 mainImage(VertData v_in) : TARGET
 	float2 tint_speed_dir = float2(tint_speed_horizontal_percent * 0.01, tint_speed_vertical_percent * 0.01);
 
 	//compensate for background vertex shader values
-	float2 background_offset = -.5f;
+	float2 background_offset = float2(-.5,-.5);
 	if (!center_animation)
 		background_offset = time(speed_dir);
 	float4 rgba =  image.Sample(textureSampler, v_in.uv - background_offset); //float4(0.0,0.0,0.0,0.01);

data/examples/aspect_ratio.shader

@@ -1,3 +1,4 @@
+//Converted to OpenGL by Q-mii & Exeldro March 8, 2022 - DO NOT USE THIS IT WAS NEVER COMPLETED
 uniform float4x4 ViewProj;
 uniform texture2d image;
 
@@ -10,7 +11,7 @@ uniform float2 uv_size;
 
 
 // variables
-uniform float4 borderColor = 00000000;
+uniform float4 borderColor = {0,0,0,0};
 float targetaspect = 16.0f / 9.0f;
 uniform string notes;
 
@@ -35,7 +36,7 @@ VertData mainTransform(VertData v_in)
 
 	float2 hw = uv_scale;
 	// determine the game window's current aspect ratio
-	float windowaspect = hw.h / hw.w;
+	float windowaspect = hw.x / hw.y;
 
 	// current viewport height should be scaled by this amount
 	float scaleheight = windowaspect / targetaspect;

data/examples/background_removal.effect

@@ -1,4 +1,5 @@
 // background removal effect By Charles Fettinger (https://github.com/Oncorporation)  4/2019
+//Converted to OpenGL by Exeldro February 19, 2022
 uniform float4x4 ViewProj;
 uniform texture2d image;
 
@@ -35,6 +36,10 @@ struct VertDataOut {
 	float2 uv2 : TEXCOORD1;
 };
 
+float dot(float3 a,float3 b){
+	return a.x*b.x+a.y*b.y+a.z*b.z;
+}
+
 //BT.601 to BT.709
 // Correct video colorspace BT.601 [SD] to BT.709 [HD] for HD video input
 // Use this shader only if BT.709 [HD] encoded video is incorrectly matrixed to full range RGB with the BT.601 [SD] colorspace.
@@ -56,7 +61,7 @@ float4 Convert709to601(float4 rgba)
 VertDataOut VSDefault(VertDataIn v_in)
 {
 	VertDataOut vert_out;
-	vert_out.pos = mul(float4(v_in.pos.xyz, 1.0), ViewProj);
+	vert_out.pos = mul(float4(v_in.pos.x, v_in.pos.y, v_in.pos.z, 1.0), ViewProj);
 	vert_out.uv  = v_in.uv;
 	vert_out.uv2 = v_in.uv * uv_scale + uv_offset;
 	return vert_out;
@@ -73,14 +78,14 @@ float4 PSColorMaskRGBA(VertDataOut v_in) : TARGET
 	}
 	if (Convert_709to601)
 	{
-		rgba.rgb = Convert709to601(rgba);
-		targetRGB.rgb = Convert709to601(targetRGB);
+		rgba.rgb = Convert709to601(rgba).rgb;
+		targetRGB.rgb = Convert709to601(targetRGB).rgb;
 	}
 
 	if (Convert_601to709)
 	{
-		rgba.rgb = Convert601to709(rgba);
-		targetRGB.rbg = Convert601to709(targetRGB);
+		rgba.rgb = Convert601to709(rgba).rgb;
+		targetRGB.rbg = Convert601to709(targetRGB).rgb;
 	}	
 
 	float4 shadowRGB = targetRGB * targetRGB;
@@ -92,7 +97,7 @@ float4 PSColorMaskRGBA(VertDataOut v_in) : TARGET
 			abs(shadowRGB.g - rgba.g) <= Tolerance &&
 			abs(shadowRGB.b - rgba.b) <= Tolerance))
 	{
-		rgba.rgba = 0;
+		rgba.rgba = float4(0,0,0,0);
 	}
 	return rgba;
 }

data/examples/blend_opacity.shader

@@ -1,5 +1,6 @@
-// opaicty blend shader by Charles Fettinger for obs-shaderfilter plugin 3/2019
+// opacity blend shader by Charles Fettinger for obs-shaderfilter plugin 3/2019
 //https://github.com/Oncorporation/obs-shaderfilter
+//Converted to OpenGL by Exeldro February 14, 2022
 uniform bool Vertical;
 uniform bool Rotational;
 uniform float Rotation_Offset = 0.0; //<Range(0.0, 6.28318531)>
@@ -12,18 +13,15 @@ uniform string Notes = "Spread is wideness of opacity blend and is limited betwe
 
 float4 mainImage(VertData v_in) : TARGET
 {
-	const float PI = 3.14159265f;//acos(-1);
-
-
-	float4 color = image.Sample(textureSampler, v_in.uv);
-	float luminance = dot(color, float3(0.299, 0.587, 0.114));
-	float4 gray = {luminance,luminance,luminance, 1};
+	float4 point_color = image.Sample(textureSampler, v_in.uv);
+	float luminance = 0.299*point_color.r+0.587*point_color.g+0.114*point_color.b;
+	float4 gray = float4(luminance,luminance,luminance, 1);
 
 	float2 lPos = (v_in.uv * uv_scale + uv_offset) / clamp(Spread, 0.25, 10.0);
 	float time = (elapsed_time * clamp(Speed, -5.0, 5.0)) / clamp(Spread, 0.25, 10.0);
 	float dist = distance(v_in.uv , (float2(0.99, 0.99) * uv_scale + uv_offset));
 
-	if (color.a > 0.0 || Apply_To_Alpha_Layer == false)
+	if (point_color.a > 0.0 || Apply_To_Alpha_Layer == false)
 	{
 		//set opacity and direction
 		float opacity = (-1 * lPos.x) * 0.5;
@@ -43,9 +41,9 @@ float4 mainImage(VertData v_in) : TARGET
 
 		opacity += time;
 		opacity = frac(opacity);
-		color.a = lerp(Opacity_Start_Percent * 0.01, Opacity_End_Percent * 0.01, clamp(opacity, 0.0, 1.0));
+		point_color.a = lerp(Opacity_Start_Percent * 0.01, Opacity_End_Percent * 0.01, clamp(opacity, 0.0, 1.0));
 	}
-	return color;
+	return point_color;
 }
 
 

data/examples/bloom.shader

@@ -1,42 +1,41 @@
-
 // Bloom shader by Charles Fettinger for obs-shaderfilter plugin 3/2019
-//https://github.com/Oncorporation/obs-shaderfilter
-
+//https://github.com/Oncorporation/obs-shaderfilter
+//Converted to OpenGL by Exeldro February 15, 2022
 uniform int Angle_Steps = 5; //<range 1 - 20>
 uniform int Radius_Steps = 9; //<range 0 - 20>
 uniform float ampFactor = 2.0;
 uniform string notes = "Steps limited in range from 0 to 20. Edit bloom.shader to remove limits at your own risk.";
 
 float4 mainImage(VertData v_in) : TARGET
 {
-	float radiusSteps = clamp(Radius_Steps, 0, 20);
-	float angleSteps = clamp(Angle_Steps, 1, 20);
+	int radiusSteps = clamp(Radius_Steps, 0, 20);
+	int angleSteps = clamp(Angle_Steps, 1, 20);
 	float PI = 3.1415926535897932384626433832795;//acos(-1);
 	float minRadius = (0.0 * uv_pixel_interval.y);
 	float maxRadius = (10.0 * uv_pixel_interval.y);
 
 	float4 c0 = image.Sample(textureSampler, v_in.uv);
 	float4 outputPixel = c0;
-	float4 accumulatedColor = {0,0,0,0};
+	float4 accumulatedColor = float4(0,0,0,0);
 
 	int totalSteps = radiusSteps * angleSteps;
-	float angleDelta = (2 * PI) / angleSteps;
-	float radiusDelta = (maxRadius - minRadius) / radiusSteps;
+	float angleDelta = (2.0 * PI) / float(angleSteps);
+	float radiusDelta = (maxRadius - minRadius) / float(radiusSteps);
 
 	for (int radiusStep = 0; radiusStep < radiusSteps; radiusStep++) {
-		float radius = minRadius + radiusStep * radiusDelta;
+		float radius = minRadius + float(radiusStep) * radiusDelta;
 
-		for (float angle=0; angle <(2*PI); angle += angleDelta) {
+		for (float angle=0.0; angle <(2.0*PI); angle += angleDelta) {
 			float2 currentCoord;
 
 			float xDiff = radius * cos(angle);
 			float yDiff = radius * sin(angle);
 
 			currentCoord = v_in.uv + float2(xDiff, yDiff);
 			float4 currentColor =image.Sample(textureSampler, currentCoord);
-			float currentFraction = ((float)(radiusSteps+1 - radiusStep)) / (radiusSteps + 1);
+			float currentFraction = float(radiusSteps+1 - radiusStep) / float(radiusSteps + 1);
 
-			accumulatedColor +=   currentFraction * currentColor / totalSteps;
+			accumulatedColor +=   currentFraction * currentColor / float(totalSteps);
 
 		}
 	}