Feature- Pixelate Tessellation options and Hot Keys (#96)

* Working tessellation origin and rotation.
* Working smoothing values for pixelate
* Sets default pixelate origin to center of frame.
* Working hotkeys.

data/locale/de-DE.ini

@@ -1,4 +1,6 @@
 CompositeBlurFilter="Zusammengesetzter Weichzeichner"
+CompositeBlurFilter.Enable="Aktivieren"
+CompositeBlurFilter.Disable="Deaktivieren"
 CompositeBlurFilter.Channel.Alpha="Alpha"
 CompositeBlurFilter.Channel.Red="Rot"
 CompositeBlurFilter.Channel.Green="Grün"
@@ -28,11 +30,15 @@ CompositeBlurFilter.Type.Motion="Bewegung"
 CompositeBlurFilter.Type.TiltShift="Tilt-Shift"
 CompositeBlurFilter.PixelateType="Verpixelungs-Typ"
 CompositeBlurFilter.Pixelate.PixelSize="Pixel-Größe"
+CompositeBlurFilter.Pixelate.Smoothing="Smoothing"
 CompositeBlurFilter.Pixelate.Square="Quadrat"
 CompositeBlurFilter.Pixelate.Hexagonal="Hexagonal"
 CompositeBlurFilter.Pixelate.Triakis="Triakis"
 CompositeBlurFilter.Pixelate.Circle="Kreis"
 CompositeBlurFilter.Pixelate.Triangle="Dreieck"
+CompositeBlurFilter.Pixelate.Center_X="Origin x"
+CompositeBlurFilter.Pixelate.Center_Y="Origin y"
+CompositeBlurFilter.Pixelate.Rotation="Rotation"
 CompositeBlurFilter.DualKawase.Passes="Zweifach-Kawase Durchgänge"
 CompositeBlurFilter.EffectMask="Effekt-Maske"
 CompositeBlurFilter.EffectMask.CropParameters="Schnittmaskenparameter"

data/locale/en-US.ini

@@ -1,4 +1,6 @@
 CompositeBlurFilter="Composite Blur"
+CompositeBlurFilter.Enable="Enable"
+CompositeBlurFilter.Disable="Disable"
 CompositeBlurFilter.Channel.Alpha="Alpha"
 CompositeBlurFilter.Channel.Red="Red"
 CompositeBlurFilter.Channel.Green="Green"
@@ -28,6 +30,10 @@ CompositeBlurFilter.Type.Motion="Motion"
 CompositeBlurFilter.Type.TiltShift="Tilt-Shift"
 CompositeBlurFilter.PixelateType="Pixelate Type"
 CompositeBlurFilter.Pixelate.PixelSize="Pixel Size"
+CompositeBlurFilter.Pixelate.Smoothing="Smoothing"
+CompositeBlurFilter.Pixelate.Origin_X="Origin x"
+CompositeBlurFilter.Pixelate.Origin_Y="Origin y"
+CompositeBlurFilter.Pixelate.Rotation="Rotation"
 CompositeBlurFilter.Pixelate.Square="Square"
 CompositeBlurFilter.Pixelate.Hexagonal="Hexagonal"
 CompositeBlurFilter.Pixelate.Triakis="Triakis"

data/locale/es-ES.ini

@@ -1,4 +1,6 @@
 CompositeBlurFilter="Desenfoque compuesto"
+CompositeBlurFilter.Enable="Activar"
+CompositeBlurFilter.Disable="Desactivar"
 CompositeBlurFilter.Channel.Alpha="Alfa"
 CompositeBlurFilter.Channel.Red="Rojo"
 CompositeBlurFilter.Channel.Green="Verde"
@@ -28,11 +30,15 @@ CompositeBlurFilter.Type.Motion="Movimiento"
 CompositeBlurFilter.Type.TiltShift="Desplazamiento de inclinación"
 CompositeBlurFilter.PixelateType="Tipo de pixelación"
 CompositeBlurFilter.Pixelate.PixelSize="Tamaño de pixel"
+CompositeBlurFilter.Pixelate.Smoothing="Smoothing"
 CompositeBlurFilter.Pixelate.Square="Cuadrado"
 CompositeBlurFilter.Pixelate.Hexagonal="Hexagonal"
 CompositeBlurFilter.Pixelate.Triakis="Triakis"
 CompositeBlurFilter.Pixelate.Circle="Círculo"
 CompositeBlurFilter.Pixelate.Triangle="Triángulo"
+CompositeBlurFilter.Pixelate.Center_X="Origin x"
+CompositeBlurFilter.Pixelate.Center_Y="Origin y"
+CompositeBlurFilter.Pixelate.Rotation="Rotation"
 CompositeBlurFilter.DualKawase.Passes="Radio de desenfoque"
 CompositeBlurFilter.EffectMask="Máscara de efecto"
 CompositeBlurFilter.EffectMask.CropParameters="Parámetros de recorte de la máscara"

data/locale/fi-FI.ini

@@ -1,4 +1,6 @@
 CompositeBlurFilter="Komposiittisumennus"
+CompositeBlurFilter.Enable="Aktivoida"
+CompositeBlurFilter.Disable="Poista käytöstä"
 CompositeBlurFilter.Channel.Alpha="Alpha"
 CompositeBlurFilter.Channel.Red="Punainen"
 CompositeBlurFilter.Channel.Green="Vihreä"
@@ -28,11 +30,15 @@ CompositeBlurFilter.Type.Motion="Liike"
 CompositeBlurFilter.Type.TiltShift="Tilt-Shift"
 CompositeBlurFilter.PixelateType="Pikselityyppi"
 CompositeBlurFilter.Pixelate.PixelSize="Pikselikoko"
+CompositeBlurFilter.Pixelate.Smoothing="Smoothing"
 CompositeBlurFilter.Pixelate.Square="Neliö"
 CompositeBlurFilter.Pixelate.Hexagonal="Kuusikulmainen"
 CompositeBlurFilter.Pixelate.Triakis="Triakis"
 CompositeBlurFilter.Pixelate.Circle="Ympyrä"
 CompositeBlurFilter.Pixelate.Triangle="Kolmio"
+CompositeBlurFilter.Pixelate.Center_X="Origin x"
+CompositeBlurFilter.Pixelate.Center_Y="Origin y"
+CompositeBlurFilter.Pixelate.Rotation="Rotation"
 CompositeBlurFilter.DualKawase.Passes="Sumennus-säde"
 CompositeBlurFilter.EffectMask="Efektimaski"
 CompositeBlurFilter.EffectMask.CropParameters="Rajausmaskin Parametrit"

data/shaders/pixelate_circle.effect

@@ -3,6 +3,11 @@ uniform texture2d image;
 
 uniform float2 uv_size;
 uniform float pixel_size;
+uniform float2 tess_origin;
+uniform float sin_theta;
+uniform float cos_theta;
+uniform float sin_rtheta;
+uniform float cos_rtheta;
 
 sampler_state textureSampler{
     Filter = Linear;
@@ -27,10 +32,13 @@ float4 mainImage(VertData v_in) : TARGET
 {
     // 1. Sample incoming pixel
     float2 coord = v_in.uv * uv_size;
-    float2 coord_prime = (coord - fmod(coord, pixel_size)) + pixel_size/2.0f;
-    float2 uv_prime = coord_prime / uv_size;
-
-    return distance(coord, coord_prime) <= pixel_size/2.0f ? image.Sample(textureSampler, uv_prime) : float4(0.0, 0.0, 0.0, 0.0);
+    float2 coord_p = coord - tess_origin; // Shifted box coordinate
+    coord_p = float2(coord_p.x * cos_theta - coord_p.y * sin_theta, coord_p.x * sin_theta + coord_p.y * cos_theta);
+    float2 coord_grid = (coord_p - fmod(coord_p, pixel_size)) + sign(coord_p) *
+                           float2(pixel_size, pixel_size) / 2.0f;
+
+    float2 uv_prime = (float2(coord_grid.x * cos_rtheta - coord_grid.y * sin_rtheta, coord_grid.x * sin_rtheta + coord_grid.y * cos_rtheta) + tess_origin) / uv_size;
+    return distance(coord_grid, coord_p) <= pixel_size/2.0f ? image.Sample(textureSampler, uv_prime) : float4(0.0, 0.0, 0.0, 0.0);
 }
 
 technique Draw
@@ -40,4 +48,4 @@ technique Draw
         vertex_shader = mainTransform(v_in);
         pixel_shader = mainImage(v_in);
     }
-}
+}

data/shaders/pixelate_hexagonal.effect

@@ -9,6 +9,11 @@ uniform texture2d image;
 
 uniform float2 uv_size;
 uniform float pixel_size;
+uniform float2 tess_origin;
+uniform float sin_theta;
+uniform float cos_theta;
+uniform float sin_rtheta;
+uniform float cos_rtheta;
 
 sampler_state textureSampler{
     Filter = Linear;
@@ -75,8 +80,9 @@ float4 mainImage(VertData v_in) : TARGET
     // // 1. Sample incoming pixel
     float2 coord = v_in.uv * uv_size;
     // float2 uv_prime = (coord - fmod(coord, pixel_size)) / uv_size;
-
-    float2 local_coord = coord;
+
+    float2 local_coord = coord - tess_origin; // Shifted box coordinate
+	local_coord = float2(local_coord.x * cos_theta - local_coord.y * sin_theta, local_coord.x * sin_theta + local_coord.y * cos_theta);
 	if(orientation == FLAT) {
 		local_coord = reverseCoords(coord);
 	}
@@ -87,7 +93,7 @@ float4 mainImage(VertData v_in) : TARGET
 		frame_nearest = reverseCoords(local_nearest);
 	}
 
-    float2 uv_prime = (local_nearest) / uv_size;
+	float2 uv_prime = (float2(frame_nearest.x * cos_rtheta - frame_nearest.y * sin_rtheta, frame_nearest.x * sin_rtheta + frame_nearest.y * cos_rtheta) + tess_origin) / uv_size;
 
     return image.Sample(textureSampler, uv_prime);
 }
@@ -99,4 +105,4 @@ technique Draw
         vertex_shader = mainTransform(v_in);
         pixel_shader = mainImage(v_in);
     }
-}
+}

data/shaders/pixelate_square.effect

@@ -3,6 +3,11 @@ uniform texture2d image;
 
 uniform float2 uv_size;
 uniform float pixel_size;
+uniform float2 tess_origin;
+uniform float sin_theta;
+uniform float cos_theta;
+uniform float sin_rtheta;
+uniform float cos_rtheta;
 
 sampler_state textureSampler{
     Filter = Linear;
@@ -27,7 +32,12 @@ float4 mainImage(VertData v_in) : TARGET
 {
     // 1. Sample incoming pixel
     float2 coord = v_in.uv * uv_size;
-    float2 uv_prime = (coord - fmod(coord, pixel_size) + pixel_size/2.0f) / uv_size;
+    float2 coord_p = coord - tess_origin; // Shifted box coordinate
+    coord_p = float2(coord_p.x * cos_theta - coord_p.y * sin_theta, coord_p.x * sin_theta + coord_p.y * cos_theta);
+    float2 coord_grid = (coord_p - fmod(coord_p, pixel_size) + sign(coord_p) *
+                           float2(pixel_size, pixel_size) / 2.0f);
+    //float2 uv_prime = (coord_grid + tess_origin) / uv_size;
+    float2 uv_prime = (float2(coord_grid.x * cos_rtheta - coord_grid.y * sin_rtheta, coord_grid.x * sin_rtheta + coord_grid.y * cos_rtheta) + tess_origin)/uv_size;
     return image.Sample(textureSampler, uv_prime);
 }
 
@@ -38,4 +48,4 @@ technique Draw
         vertex_shader = mainTransform(v_in);
         pixel_shader = mainImage(v_in);
     }
-}
+}

data/shaders/pixelate_triangle.effect

@@ -5,6 +5,11 @@ uniform texture2d image;
 
 uniform float2 uv_size;
 uniform float pixel_size;
+uniform float2 tess_origin;
+uniform float sin_theta;
+uniform float cos_theta;
+uniform float sin_rtheta;
+uniform float cos_rtheta;
 
 sampler_state textureSampler{
     Filter = Linear;
@@ -44,8 +49,10 @@ float4 mainImage(VertData v_in) : TARGET
 {
     // 1. Sample incoming pixel
     float2 coord = v_in.uv * uv_size;
-    float2 sample_coord = triangleCenter(getTriangle(coord));
-    float2 uv_prime = sample_coord/uv_size;
+    float2 coord_p = coord - tess_origin; // Shifted box coordinate
+    coord_p = float2(coord_p.x * cos_theta - coord_p.y * sin_theta, coord_p.x * sin_theta + coord_p.y * cos_theta);
+    float2 sample_coord = triangleCenter(getTriangle(coord_p));
+    float2 uv_prime = (float2(sample_coord.x * cos_rtheta - sample_coord.y * sin_rtheta, sample_coord.x * sin_rtheta + sample_coord.y * cos_rtheta) + tess_origin) / uv_size;
     return image.Sample(textureSampler, uv_prime);
 }
 
@@ -56,4 +63,4 @@ technique Draw
         vertex_shader = mainTransform(v_in);
         pixel_shader = mainImage(v_in);
     }
-}
+}

src/blur/box.c

@@ -389,6 +389,13 @@ static void box_tilt_shift_blur(composite_blur_filter_data_t *data)
 
 static void load_1d_box_effect(composite_blur_filter_data_t *filter)
 {
+	if (filter->effect != NULL) {
+		obs_enter_graphics();
+		gs_effect_destroy(filter->effect);
+		filter->effect = NULL;
+		obs_leave_graphics();
+	}
+
 	const char *effect_file_path = "/shaders/box_1d.effect";
 	filter->effect = load_shader_effect(filter->effect, effect_file_path);
 	if (filter->effect) {
@@ -410,6 +417,13 @@ static void load_1d_box_effect(composite_blur_filter_data_t *filter)
 
 static void load_tiltshift_box_effect(composite_blur_filter_data_t *filter)
 {
+	if (filter->effect != NULL) {
+		obs_enter_graphics();
+		gs_effect_destroy(filter->effect);
+		filter->effect = NULL;
+		obs_leave_graphics();
+	}
+
 	const char *effect_file_path = "/shaders/box_tiltshift.effect";
 	filter->effect = load_shader_effect(filter->effect, effect_file_path);
 	if (filter->effect) {
@@ -439,6 +453,13 @@ static void load_tiltshift_box_effect(composite_blur_filter_data_t *filter)
 
 static void load_radial_box_effect(composite_blur_filter_data_t *filter)
 {
+	if (filter->effect != NULL) {
+		obs_enter_graphics();
+		gs_effect_destroy(filter->effect);
+		filter->effect = NULL;
+		obs_leave_graphics();
+	}
+
 	const char *effect_file_path = "/shaders/box_radial.effect";
 	filter->effect = load_shader_effect(filter->effect, effect_file_path);
 	if (filter->effect) {

src/blur/dual_kawase.c

@@ -190,6 +190,12 @@ static void dual_kawase_blur(composite_blur_filter_data_t *data)
 static void
 load_dual_kawase_down_sample_effect(composite_blur_filter_data_t *filter)
 {
+	if (filter->effect_2 != NULL) {
+		obs_enter_graphics();
+		gs_effect_destroy(filter->effect_2);
+		filter->effect_2 = NULL;
+		obs_leave_graphics();
+	}
 	const char *effect_file_path =
 		"/shaders/dual_kawase_down_sample.effect";
 	filter->effect_2 =
@@ -213,6 +219,13 @@ load_dual_kawase_down_sample_effect(composite_blur_filter_data_t *filter)
 static void
 load_dual_kawase_up_sample_effect(composite_blur_filter_data_t *filter)
 {
+	if (filter->effect != NULL) {
+		obs_enter_graphics();
+		gs_effect_destroy(filter->effect);
+		filter->effect = NULL;
+		obs_leave_graphics();
+	}
+
 	const char *effect_file_path = "/shaders/dual_kawase_up_sample.effect";
 	filter->effect = load_shader_effect(filter->effect, effect_file_path);
 	if (filter->effect) {

src/blur/gaussian.c

@@ -419,6 +419,13 @@ static void gaussian_zoom_blur(composite_blur_filter_data_t *data)
 
 static void load_1d_gaussian_effect(composite_blur_filter_data_t *filter)
 {
+	if (filter->effect != NULL) {
+		obs_enter_graphics();
+		gs_effect_destroy(filter->effect);
+		filter->effect = NULL;
+		obs_leave_graphics();
+	}
+
 	const char *effect_file_path =
 		filter->device_type == GS_DEVICE_DIRECT3D_11
 			? "/shaders/gaussian_1d.effect"
@@ -453,10 +460,18 @@ static void load_1d_gaussian_effect(composite_blur_filter_data_t *filter)
 static void load_motion_gaussian_effect(composite_blur_filter_data_t *filter)
 {
 
+	if (filter->effect != NULL) {
+		obs_enter_graphics();
+		gs_effect_destroy(filter->effect);
+		filter->effect = NULL;
+		obs_leave_graphics();
+	}
+
 	const char *effect_file_path =
 		filter->device_type == GS_DEVICE_DIRECT3D_11
 			? "/shaders/gaussian_motion.effect"
 			: "/shaders/gaussian_motion_texture.effect";
+
 	filter->effect = load_shader_effect(filter->effect, effect_file_path);
 	if (filter->effect) {
 		size_t effect_count = gs_effect_get_num_params(filter->effect);
@@ -485,10 +500,18 @@ static void load_motion_gaussian_effect(composite_blur_filter_data_t *filter)
 
 static void load_radial_gaussian_effect(composite_blur_filter_data_t *filter)
 {
+	if (filter->effect != NULL) {
+		obs_enter_graphics();
+		gs_effect_destroy(filter->effect);
+		filter->effect = NULL;
+		obs_leave_graphics();
+	}
+
 	const char *effect_file_path =
 		filter->device_type == GS_DEVICE_DIRECT3D_11
 			? "/shaders/gaussian_radial.effect"
 			: "/shaders/gaussian_radial_texture.effect";
+
 	filter->effect = load_shader_effect(filter->effect, effect_file_path);
 	if (filter->effect) {
 		size_t effect_count = gs_effect_get_num_params(filter->effect);