New upstream version 0.15.4+dfsg1

plugins/obs-transitions/data/locale/en-US.ini

@@ -11,3 +11,41 @@ Direction.Down="Down"
 SwipeIn="Swipe In"
 Color="Color"
 SwitchPoint="Peak Color Point (percentage)"
+LumaWipeTransition="Luma Wipe"
+LumaWipe.Image="Image"
+LumaWipe.Invert="Invert"
+LumaWipe.Softness="Softness"
+LumaWipe.Type.BarndoorBottomLeft="Barndoor Bottom Left"
+LumaWipe.Type.BarndoorHorizontal="Barndoor Horizontal"
+LumaWipe.Type.BarndoorTopLeft="Barndoor Top Left"
+LumaWipe.Type.BarndoorVertical="Barndoor Vertical"
+LumaWipe.Type.BlindsHorizontal="Blinds Horizontal"
+LumaWipe.Type.BoxBottomLeft="Box Bottom Left"
+LumaWipe.Type.BoxBottomRight="Box Bottom Right"
+LumaWipe.Type.BoxTopLeft="Box Top Left"
+LumaWipe.Type.BoxTopRight="Box Top Right"
+LumaWipe.Type.Burst="Burst"
+LumaWipe.Type.CheckerboardSmall="Checkerboard Small"
+LumaWipe.Type.Circles="Circles"
+LumaWipe.Type.Clock="Clock"
+LumaWipe.Type.Cloud="Cloud"
+LumaWipe.Type.Curtain="Curtain"
+LumaWipe.Type.Fan="Fan"
+LumaWipe.Type.Fractal="Fractal"
+LumaWipe.Type.Iris="Iris"
+LumaWipe.Type.LinearHorizontal="Linear Horizontal"
+LumaWipe.Type.LinearTopLeft="Linear Top Left"
+LumaWipe.Type.LinearTopRight="Linear Top Right"
+LumaWipe.Type.LinearVertical="Linear Vertical"
+LumaWipe.Type.ParallelZigzagHorizontal="Parallel Zigzag Horizontal"
+LumaWipe.Type.ParallelZigzagVertical="Parallel Zigzag Vertical"
+LumaWipe.Type.Sinus9="Sinus 9"
+LumaWipe.Type.Spiral="Spiral"
+LumaWipe.Type.Square="Square"
+LumaWipe.Type.Squares="Squares"
+LumaWipe.Type.Stripes="Stripes"
+LumaWipe.Type.StripsHorizontal="Strips Horizontal"
+LumaWipe.Type.StripsVertical="Strips Vertical"
+LumaWipe.Type.Watercolor="Watercolor"
+LumaWipe.Type.ZigzagHorizontal="Zigzag Horizontal"
+LumaWipe.Type.ZigzagVertical="Zigzag Vertical"

plugins/obs-transitions/data/locale/it-IT.ini

@@ -0,0 +1,14 @@
+FadeTransition="Dissolvenza"
+CutTransition="Taglio"
+SwipeTransition="Scorri"
+SlideTransition="Scivola"
+FadeToColorTransition="Dissolvenza a colore"
+Direction="Direzione"
+Direction.Left="Sinistra"
+Direction.Right="Destra"
+Direction.Up="Sù"
+Direction.Down="Giù"
+SwipeIn="Scorri verso l'alto"
+Color="Colore"
+SwitchPoint="Picco Punto Colore (percentuale)"
+

plugins/obs-transitions/data/locale/nb-NO.ini

@@ -0,0 +1,14 @@
+FadeTransition="Forløpning"
+CutTransition="Kutt"
+SwipeTransition="Sveip"
+SlideTransition="Skyv"
+FadeToColorTransition="Forløpning til farge"
+Direction="Retning"
+Direction.Left="Venstre"
+Direction.Right="Høyre"
+Direction.Up="Opp"
+Direction.Down="Ned"
+SwipeIn="Sveip inn"
+Color="Farge"
+SwitchPoint="Farge ved høydepunkt (prosent)"
+

plugins/obs-transitions/data/locale/nl-NL.ini

@@ -1,6 +1,6 @@
 FadeTransition="Vervagen"
 CutTransition="Knippen"
-SwipeTransition="Swipe"
+SwipeTransition="Vegen"
 SlideTransition="Slide"
 FadeToColorTransition="Vervagen naar Kleur"
 Direction="Richting"

plugins/obs-transitions/data/locale/pt-BR.ini

@@ -1,5 +1,6 @@
 FadeTransition="Esmaecer"
 CutTransition="Cortar"
+SwipeTransition="Deslizar"
 SlideTransition="Deslizar"
 FadeToColorTransition="Esmaecer para a Cor"
 Direction="Direção"

plugins/obs-transitions/data/locale/pt-PT.ini

@@ -0,0 +1,14 @@
+FadeTransition="Desvanecer"
+CutTransition="Cortar"
+SwipeTransition="Deslizar"
+SlideTransition="Deslizar"
+FadeToColorTransition="Desvanecer para Cor"
+Direction="Direção"
+Direction.Left="Esquerda"
+Direction.Right="Direita"
+Direction.Up="Cima"
+Direction.Down="Baixo"
+SwipeIn="Deslizar para dentro"
+Color="Cor"
+SwitchPoint="Ponto de pico de Cor (percentagem)"
+

plugins/obs-transitions/data/locale/zh-TW.ini

@@ -1,7 +1,14 @@
-Direction="方向："
+FadeTransition="淡入淡出"
+CutTransition="直接轉場"
+SwipeTransition="滑出"
+SlideTransition="推出"
+FadeToColorTransition="淡出至指定色彩"
+Direction="方向"
 Direction.Left="左"
 Direction.Right="右"
-Direction.Up="上："
+Direction.Up="上"
 Direction.Down="下"
+SwipeIn="滑入"
 Color="顏色"
+SwitchPoint="顏色峰值點 (百分比)"
 

plugins/obs-transitions/data/luma_wipe_transition.effect

@@ -0,0 +1,61 @@
+// Based rendermix wipe shader
+// https://github.com/rectalogic/rendermix-basic-effects/blob/master/assets/com/rendermix/Wipe/Wipe.frag
+
+uniform float4x4  ViewProj;
+uniform texture2d a_tex;
+uniform texture2d b_tex;
+uniform texture2d l_tex;
+uniform float progress;
+uniform bool  invert;
+uniform float softness;
+
+sampler_state textureSampler {
+	Filter    = Linear;
+	AddressU  = Clamp;
+	AddressV  = Clamp;
+};
+
+struct VertData {
+	float4 pos : POSITION;
+	float2 uv  : TEXCOORD0;
+};
+
+VertData VSDefault(VertData v_in)
+{
+	VertData vert_out;
+	vert_out.pos = mul(float4(v_in.pos.xyz, 1.0), ViewProj);
+	vert_out.uv  = v_in.uv;
+	return vert_out;
+}
+
+float4 PSLumaWipe(VertData v_in) : TARGET
+{
+	float2 uv = v_in.uv;
+	float4 a_color = a_tex.Sample(textureSampler, uv);
+	float4 b_color = b_tex.Sample(textureSampler, uv);
+	float luma     = l_tex.Sample(textureSampler, uv).x;
+
+	if (invert)
+		luma = 1.0f - luma;
+
+	float time = lerp(0.0f, 1.0f + softness, progress);
+
+	if (luma <= time - softness)
+		return b_color;
+
+	if (luma >= time)
+		return a_color;
+
+	float alpha = (time - luma) / softness;
+
+	return lerp(a_color, b_color, alpha);
+}
+
+technique LumaWipe
+{
+	pass
+	{
+		vertex_shader = VSDefault(v_in);
+		pixel_shader = PSLumaWipe(v_in);
+	}
+}

plugins/obs-transitions/data/luma_wipes/wipes.json

@@ -0,0 +1,36 @@
+{
+	"LumaWipe.Type.BarndoorBottomLeft": "barndoor-botleft.png",
+	"LumaWipe.Type.BarndoorHorizontal": "barndoor-h.png",
+	"LumaWipe.Type.BarndoorTopLeft": "barndoor-topleft.png",
+	"LumaWipe.Type.BarndoorVertical": "barndoor-v.png",
+	"LumaWipe.Type.BlindsHorizontal": "blinds-h.png",
+	"LumaWipe.Type.BoxBottomLeft": "box-botleft.png",
+	"LumaWipe.Type.BoxBottomRight": "box-botright.png",
+	"LumaWipe.Type.BoxTopLeft": "box-topleft.png",
+	"LumaWipe.Type.BoxTopRight": "box-topright.png",
+	"LumaWipe.Type.Burst": "burst.png",
+	"LumaWipe.Type.CheckerboardSmall": "checkerboard-small.png",
+	"LumaWipe.Type.Circles": "circles.png",
+	"LumaWipe.Type.Clock": "clock.png",
+	"LumaWipe.Type.Cloud": "cloud.png",
+	"LumaWipe.Type.Curtain": "curtain.png",
+	"LumaWipe.Type.Fan": "fan.png",
+	"LumaWipe.Type.Fractal": "fractal.png",
+	"LumaWipe.Type.Iris": "iris.png",
+	"LumaWipe.Type.LinearHorizontal": "linear-h.png",
+	"LumaWipe.Type.LinearTopLeft": "linear-topleft.png",
+	"LumaWipe.Type.LinearTopRight": "linear-topright.png",
+	"LumaWipe.Type.LinearVertical": "linear-v.png",
+	"LumaWipe.Type.ParallelZigzagHorizontal": "parallel-zigzag-h.png",
+	"LumaWipe.Type.ParallelZigzagVertical": "parallel-zigzag-v.png",
+	"LumaWipe.Type.Sinus9": "sinus9.png",
+	"LumaWipe.Type.Spiral": "spiral.png",
+	"LumaWipe.Type.Square": "square.png",
+	"LumaWipe.Type.Squares": "squares.png",
+	"LumaWipe.Type.Stripes": "stripes.png",
+	"LumaWipe.Type.StripsHorizontal": "strips-h.png",
+	"LumaWipe.Type.StripsVertical": "strips-v.png",
+	"LumaWipe.Type.Watercolor": "watercolor.png",
+	"LumaWipe.Type.ZigzagHorizontal": "zigzag-h.png",
+	"LumaWipe.Type.ZigzagVertical": "zigzag-v.png"
+}