New upstream version 18.0.1+dfsg1
This commit is contained in:
parent
6efda2859e
commit
f2cf6cce50
1337 changed files with 41178 additions and 84670 deletions
|
|
@ -14,6 +14,8 @@ struct VertData {
|
|||
float2 uv : TEXCOORD0;
|
||||
};
|
||||
|
||||
#include "premultiplied.inc"
|
||||
|
||||
VertData VSDefault(VertData v_in)
|
||||
{
|
||||
VertData vert_out;
|
||||
|
|
@ -24,7 +26,7 @@ VertData VSDefault(VertData v_in)
|
|||
|
||||
float4 PSFadeToColor(VertData v_in) : TARGET
|
||||
{
|
||||
return lerp(tex.Sample(textureSampler, v_in.uv), color, swp);
|
||||
return lerp(convert_pmalpha(tex.Sample(textureSampler, v_in.uv)), color, swp);
|
||||
}
|
||||
|
||||
technique FadeToColor
|
||||
|
|
|
|||
|
|
@ -14,6 +14,8 @@ struct VertData {
|
|||
float2 uv : TEXCOORD0;
|
||||
};
|
||||
|
||||
#include "premultiplied.inc"
|
||||
|
||||
VertData VSDefault(VertData v_in)
|
||||
{
|
||||
VertData vert_out;
|
||||
|
|
@ -24,8 +26,8 @@ VertData VSDefault(VertData v_in)
|
|||
|
||||
float4 PSFade(VertData v_in) : TARGET
|
||||
{
|
||||
float4 a_val = tex_a.Sample(textureSampler, v_in.uv);
|
||||
float4 b_val = tex_b.Sample(textureSampler, v_in.uv);
|
||||
float4 a_val = convert_pmalpha(tex_a.Sample(textureSampler, v_in.uv));
|
||||
float4 b_val = convert_pmalpha(tex_b.Sample(textureSampler, v_in.uv));
|
||||
return lerp(a_val, b_val, fade_val);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -11,4 +11,42 @@ Direction.Down="Ned"
|
|||
SwipeIn="Swipe ind"
|
||||
Color="Farve"
|
||||
SwitchPoint="Farvepeakpunkt (procent)"
|
||||
LumaWipeTransition="Luma overgang"
|
||||
LumaWipe.Image="Billede"
|
||||
LumaWipe.Invert="Inverter"
|
||||
LumaWipe.Softness="Blødhed"
|
||||
LumaWipe.Type.BarndoorBottomLeft="Stalddør nederst til venstre"
|
||||
LumaWipe.Type.BarndoorHorizontal="Stalddør horisontal"
|
||||
LumaWipe.Type.BarndoorTopLeft="Stalddør øverst til venstre"
|
||||
LumaWipe.Type.BarndoorVertical="Stalddør vertikal"
|
||||
LumaWipe.Type.BlindsHorizontal="Persienne horisontal"
|
||||
LumaWipe.Type.BoxBottomLeft="Boks nederst til venstre"
|
||||
LumaWipe.Type.BoxBottomRight="Boks nederst til højre"
|
||||
LumaWipe.Type.BoxTopLeft="Boks øverst til venstre"
|
||||
LumaWipe.Type.BoxTopRight="Boks øverst til højre"
|
||||
LumaWipe.Type.Burst="Sprængning"
|
||||
LumaWipe.Type.CheckerboardSmall="Små skaktern"
|
||||
LumaWipe.Type.Circles="Cirkler"
|
||||
LumaWipe.Type.Clock="Ur"
|
||||
LumaWipe.Type.Cloud="Sky"
|
||||
LumaWipe.Type.Curtain="Gardin"
|
||||
LumaWipe.Type.Fan="Vifte"
|
||||
LumaWipe.Type.Fractal="Fraktal"
|
||||
LumaWipe.Type.Iris="Iris"
|
||||
LumaWipe.Type.LinearHorizontal="Lineær horisontal"
|
||||
LumaWipe.Type.LinearTopLeft="Lineær øverst til venstre"
|
||||
LumaWipe.Type.LinearTopRight="Lineær øverst til højre"
|
||||
LumaWipe.Type.LinearVertical="Lineær vertikal"
|
||||
LumaWipe.Type.ParallelZigzagHorizontal="Parallel zigzag horisontal"
|
||||
LumaWipe.Type.ParallelZigzagVertical="Parallel zigzag vertikal"
|
||||
LumaWipe.Type.Sinus9="Sinus 9"
|
||||
LumaWipe.Type.Spiral="Spiral"
|
||||
LumaWipe.Type.Square="Firkant"
|
||||
LumaWipe.Type.Squares="Firkanter"
|
||||
LumaWipe.Type.Stripes="Striber"
|
||||
LumaWipe.Type.StripsHorizontal="Strimmel horisontal"
|
||||
LumaWipe.Type.StripsVertical="Strimmel vertikal"
|
||||
LumaWipe.Type.Watercolor="Vandfarve"
|
||||
LumaWipe.Type.ZigzagHorizontal="Zigzag horisontal"
|
||||
LumaWipe.Type.ZigzagVertical="Zigzag vertical"
|
||||
|
||||
|
|
|
|||
|
|
@ -1,3 +1,6 @@
|
|||
FadeTransition="Ξεθώριασμα"
|
||||
CutTransition="Αποκοπή"
|
||||
Direction.Left="Αριστερά"
|
||||
Direction.Right="Δεξιά"
|
||||
Color="Χρώμα"
|
||||
|
||||
|
|
|
|||
23
plugins/obs-transitions/data/locale/et-EE.ini
Normal file
23
plugins/obs-transitions/data/locale/et-EE.ini
Normal file
|
|
@ -0,0 +1,23 @@
|
|||
FadeTransition="Hajuv"
|
||||
CutTransition="Lõika"
|
||||
SwipeTransition="Pühkiv"
|
||||
SlideTransition="Lenda sisse"
|
||||
FadeToColorTransition="Haju värvi"
|
||||
Direction="Suunas"
|
||||
Direction.Left="Vasakule"
|
||||
Direction.Right="Paremale"
|
||||
Direction.Up="Üles"
|
||||
Direction.Down="Alla"
|
||||
SwipeIn="Pühi sisse"
|
||||
Color="Värv"
|
||||
LumaWipe.Image="Pilt"
|
||||
LumaWipe.Invert="Teistpidi"
|
||||
LumaWipe.Softness="Pehmus"
|
||||
LumaWipe.Type.BoxTopLeft="Kast üleval vasakul"
|
||||
LumaWipe.Type.BoxTopRight="Kast üleval paremal"
|
||||
LumaWipe.Type.Burst="Plahvatuse"
|
||||
LumaWipe.Type.Clock="Kell"
|
||||
LumaWipe.Type.Cloud="Pilv"
|
||||
LumaWipe.Type.Curtain="Kardin"
|
||||
LumaWipe.Type.Fan="Ventilaator"
|
||||
|
||||
|
|
@ -11,4 +11,7 @@ Direction.Down="Ned"
|
|||
SwipeIn="Sveip inn"
|
||||
Color="Farge"
|
||||
SwitchPoint="Farge ved høydepunkt (prosent)"
|
||||
LumaWipe.Image="Bilde"
|
||||
LumaWipe.Invert="Inverter"
|
||||
LumaWipe.Softness="Mykhet"
|
||||
|
||||
|
|
|
|||
|
|
@ -20,4 +20,24 @@ LumaWipe.Type.BarndoorHorizontal="Barndoor Horizontal"
|
|||
LumaWipe.Type.BarndoorTopLeft="Barndoor inferior esquerdo"
|
||||
LumaWipe.Type.BarndoorVertical="Barndoor Vertical"
|
||||
LumaWipe.Type.BlindsHorizontal="Persianas horizontais"
|
||||
LumaWipe.Type.Circles="Círculos"
|
||||
LumaWipe.Type.Clock="Relógio"
|
||||
LumaWipe.Type.Cloud="Nuvem"
|
||||
LumaWipe.Type.Curtain="Cortina"
|
||||
LumaWipe.Type.Fan="Ventilar"
|
||||
LumaWipe.Type.Fractal="Fractal"
|
||||
LumaWipe.Type.Iris="Iris"
|
||||
LumaWipe.Type.LinearHorizontal="Linear Horizontal"
|
||||
LumaWipe.Type.LinearTopLeft="Linear superior esquerdo"
|
||||
LumaWipe.Type.LinearTopRight="Linear superior direito"
|
||||
LumaWipe.Type.LinearVertical="Linear Vertical"
|
||||
LumaWipe.Type.Spiral="Espiral"
|
||||
LumaWipe.Type.Square="Quadrado"
|
||||
LumaWipe.Type.Squares="Quadrados"
|
||||
LumaWipe.Type.Stripes="Listras"
|
||||
LumaWipe.Type.StripsHorizontal="Listras horizontais"
|
||||
LumaWipe.Type.StripsVertical="Listras Verticais"
|
||||
LumaWipe.Type.Watercolor="Aquarela"
|
||||
LumaWipe.Type.ZigzagHorizontal="Zigue-zague Horizontal"
|
||||
LumaWipe.Type.ZigzagVertical="Zigue-zague Vertical"
|
||||
|
||||
|
|
|
|||
|
|
@ -11,4 +11,8 @@ Direction.Down="Jos"
|
|||
SwipeIn="Glisați înauntru"
|
||||
Color="Culoare"
|
||||
SwitchPoint="Punctul de vârf al culorii (procent)"
|
||||
LumaWipe.Image="Imagine"
|
||||
LumaWipe.Type.Cloud="Cloud"
|
||||
LumaWipe.Type.ZigzagHorizontal="Zigzag orizontal"
|
||||
LumaWipe.Type.ZigzagVertical="Zigzag Vertical"
|
||||
|
||||
|
|
|
|||
|
|
@ -10,6 +10,7 @@ Direction.Up="Upp"
|
|||
Direction.Down="Ned"
|
||||
SwipeIn="Svep in"
|
||||
Color="Färg"
|
||||
SwitchPoint="Maxpunkt för färg (procent)"
|
||||
LumaWipeTransition="Luma Wipe"
|
||||
LumaWipe.Image="Bild"
|
||||
LumaWipe.Invert="Invertera"
|
||||
|
|
|
|||
|
|
@ -2,10 +2,51 @@ FadeTransition="Soldur"
|
|||
CutTransition="Kes"
|
||||
SwipeTransition="Kaydır"
|
||||
SlideTransition="Kaydır"
|
||||
FadeToColorTransition="Fade to Color"
|
||||
Direction="Yönlendir"
|
||||
Direction.Left="Sol"
|
||||
Direction.Right="Sağ"
|
||||
Direction.Up="Yukarı"
|
||||
Direction.Down="Aşağı"
|
||||
SwipeIn="İçeri Kaydır"
|
||||
Color="Renk"
|
||||
SwitchPoint="En yüksek Renk Noktası (yüzde)"
|
||||
LumaWipeTransition="Luma Wipe"
|
||||
LumaWipe.Image="Görüntü"
|
||||
LumaWipe.Invert="Ters Çevir"
|
||||
LumaWipe.Softness="Yumuşaklık"
|
||||
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"
|
||||
|
||||
|
|
|
|||
|
|
@ -20,6 +20,8 @@ struct VertData {
|
|||
float2 uv : TEXCOORD0;
|
||||
};
|
||||
|
||||
#include "premultiplied.inc"
|
||||
|
||||
VertData VSDefault(VertData v_in)
|
||||
{
|
||||
VertData vert_out;
|
||||
|
|
@ -31,8 +33,8 @@ VertData VSDefault(VertData v_in)
|
|||
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);
|
||||
float4 a_color = convert_pmalpha(a_tex.Sample(textureSampler, uv));
|
||||
float4 b_color = convert_pmalpha(b_tex.Sample(textureSampler, uv));
|
||||
float luma = l_tex.Sample(textureSampler, uv).x;
|
||||
|
||||
if (invert)
|
||||
|
|
|
|||
9
plugins/obs-transitions/data/premultiplied.inc
Normal file
9
plugins/obs-transitions/data/premultiplied.inc
Normal file
|
|
@ -0,0 +1,9 @@
|
|||
float4 convert_pmalpha(float4 color)
|
||||
{
|
||||
float4 ret = color;
|
||||
if (color.a >= 0.001)
|
||||
ret.xyz /= color.a;
|
||||
else
|
||||
ret = float4(0.0, 0.0, 0.0, 0.0);
|
||||
return ret;
|
||||
}
|
||||
|
|
@ -16,6 +16,8 @@ struct VertData {
|
|||
float2 uv : TEXCOORD0;
|
||||
};
|
||||
|
||||
#include "premultiplied.inc"
|
||||
|
||||
VertData VSDefault(VertData v_in)
|
||||
{
|
||||
VertData vert_out;
|
||||
|
|
@ -28,11 +30,14 @@ float4 PSSlide(VertData v_in) : TARGET
|
|||
{
|
||||
float2 tex_a_uv = v_in.uv + tex_a_dir;
|
||||
float2 tex_b_uv = v_in.uv - tex_b_dir;
|
||||
float4 outc;
|
||||
|
||||
return (tex_a_uv.x - saturate(tex_a_uv.x) != 0.0) ||
|
||||
outc = (tex_a_uv.x - saturate(tex_a_uv.x) != 0.0) ||
|
||||
(tex_a_uv.y - saturate(tex_a_uv.y) != 0.0)
|
||||
? tex_b.Sample(textureSampler, tex_b_uv)
|
||||
: tex_a.Sample(textureSampler, tex_a_uv);
|
||||
|
||||
return convert_pmalpha(outc);
|
||||
}
|
||||
|
||||
technique Slide
|
||||
|
|
|
|||
|
|
@ -14,6 +14,8 @@ struct VertData {
|
|||
float2 uv : TEXCOORD0;
|
||||
};
|
||||
|
||||
#include "premultiplied.inc"
|
||||
|
||||
VertData VSDefault(VertData v_in)
|
||||
{
|
||||
VertData vert_out;
|
||||
|
|
@ -25,11 +27,14 @@ VertData VSDefault(VertData v_in)
|
|||
float4 PSSwipe(VertData v_in) : TARGET
|
||||
{
|
||||
float2 swipe_uv = v_in.uv + swipe_val;
|
||||
float4 outc;
|
||||
|
||||
return (swipe_uv.x - saturate(swipe_uv.x) != 0.0) ||
|
||||
outc = (swipe_uv.x - saturate(swipe_uv.x) != 0.0) ||
|
||||
(swipe_uv.y - saturate(swipe_uv.y) != 0.0)
|
||||
? tex_b.Sample(textureSampler, v_in.uv)
|
||||
: tex_a.Sample(textureSampler, swipe_uv);
|
||||
|
||||
return convert_pmalpha(outc);
|
||||
}
|
||||
|
||||
technique Swipe
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue