obs-transitions: Add 'slide' transition

Closes jp9000/obs-studio#516
This commit is contained in:
hwdro
2016-03-08 23:16:17 +02:00
committed by jp9000
parent 58b108b261
commit e3a9f395a6
7 changed files with 229 additions and 13 deletions

View File

@@ -1,6 +1,7 @@
FadeTransition="Fade"
CutTransition="Cut"
SwipeTransition="Swipe"
SlideTransition="Slide"
Direction="Direction"
Direction.Left="Left"
Direction.Right="Right"

View File

@@ -0,0 +1,45 @@
uniform float4x4 ViewProj;
uniform texture2d tex_a;
uniform texture2d tex_b;
uniform float2 tex_a_dir;
uniform float2 tex_b_dir;
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 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;
return (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);
}
technique Slide
{
pass
{
vertex_shader = VSDefault(v_in);
pixel_shader = PSSlide(v_in);
}
}