Revision: 12768
http://sourceforge.net/p/skim-app/code/12768
Author: hofman
Date: 2022-02-07 10:21:31 +0000 (Mon, 07 Feb 2022)
Log Message:
-----------
Only use coordinates we use
Modified Paths:
--------------
trunk/SkimTransitions/BoxInTransition/SKTBoxInTransitionKernel.cikernel
trunk/SkimTransitions/BoxOutTransition/SKTBoxOutTransitionKernel.cikernel
trunk/SkimTransitions/SplitInTransition/SKTSplitInTransitionKernel.cikernel
trunk/SkimTransitions/SplitOutTransition/SKTSplitOutTransitionKernel.cikernel
Modified:
trunk/SkimTransitions/BoxInTransition/SKTBoxInTransitionKernel.cikernel
===================================================================
--- trunk/SkimTransitions/BoxInTransition/SKTBoxInTransitionKernel.cikernel
2022-02-06 15:29:42 UTC (rev 12767)
+++ trunk/SkimTransitions/BoxInTransition/SKTBoxInTransitionKernel.cikernel
2022-02-07 10:21:31 UTC (rev 12768)
@@ -1,15 +1,14 @@
kernel vec4 boxInTransition(sampler src, sampler trgt, vec4 extent, vec2
center, float t)
{
- vec2 t1;
- vec4 r;
+ vec2 t1, r1, r2;
float d1;
t1 = destCoord();
- r.xy = t * center + (1.0 - t) * extent.xy;
- r.zw = t * center + (1.0 - t) * (extent.xy + extent.zw);
+ r1 = t * center + (1.0 - t) * extent.xy;
+ r2 = t * center + (1.0 - t) * (extent.xy + extent.zw);
- d1 = step(r.x, t1.x) * step(t1.x, r.z) * step(r.y, t1.y) * step(t1.y, r.w);
+ d1 = step(r1.x, t1.x) * step(t1.x, r2.x) * step(r1.y, t1.y) * step(t1.y,
r2.y);
return d1 < 0.5 ? sample(trgt, samplerCoord(trgt)) : sample(src,
samplerCoord(src));
}
Modified:
trunk/SkimTransitions/BoxOutTransition/SKTBoxOutTransitionKernel.cikernel
===================================================================
--- trunk/SkimTransitions/BoxOutTransition/SKTBoxOutTransitionKernel.cikernel
2022-02-06 15:29:42 UTC (rev 12767)
+++ trunk/SkimTransitions/BoxOutTransition/SKTBoxOutTransitionKernel.cikernel
2022-02-07 10:21:31 UTC (rev 12768)
@@ -1,15 +1,14 @@
kernel vec4 boxOutTransition(sampler src, sampler trgt, vec4 extent, vec2
center, float t)
{
- vec2 t1;
- vec4 r;
+ vec2 t1, r1, r2;
float d1;
t1 = destCoord();
- r.xy = (1.0 - t) * center + t * extent.xy;
- r.zw = (1.0 - t) * center + t * (extent.xy + extent.zw);
+ r1 = (1.0 - t) * center + t * extent.xy;
+ r2 = (1.0 - t) * center + t * (extent.xy + extent.zw);
- d1 = step(r.x, t1.x) * step(t1.x, r.z) * step(r.y, t1.y) * step(t1.y, r.w);
+ d1 = step(r1.x, t1.x) * step(t1.x, r2.x) * step(r1.y, t1.y) * step(t1.y,
r2.y);
return d1 > 0.5 ? sample(trgt, samplerCoord(trgt)) : sample(src,
samplerCoord(src));
}
Modified:
trunk/SkimTransitions/SplitInTransition/SKTSplitInTransitionKernel.cikernel
===================================================================
--- trunk/SkimTransitions/SplitInTransition/SKTSplitInTransitionKernel.cikernel
2022-02-06 15:29:42 UTC (rev 12767)
+++ trunk/SkimTransitions/SplitInTransition/SKTSplitInTransitionKernel.cikernel
2022-02-07 10:21:31 UTC (rev 12768)
@@ -1,15 +1,13 @@
kernel vec4 splitInTransition(sampler src, sampler trgt, vec4 extent, vec2
center, float t)
{
- vec2 t1;
- vec4 r;
- float d1;
+ float x, l, r, d1;
- t1 = destCoord();
+ x = destCoord().x;
- r.xy = t * center + (1.0 - t) * extent.xy;
- r.zw = t * center + (1.0 - t) * (extent.xy + extent.zw);
+ l = t * center.x + (1.0 - t) * extent.x;
+ r = t * center.x + (1.0 - t) * (extent.x + extent.z);
- d1 = step(r.x, t1.x) * step(t1.x, r.z);
+ d1 = step(l, x) * step(x, r);
return d1 < 0.5 ? sample(trgt, samplerCoord(trgt)) : sample(src,
samplerCoord(src));
}
Modified:
trunk/SkimTransitions/SplitOutTransition/SKTSplitOutTransitionKernel.cikernel
===================================================================
---
trunk/SkimTransitions/SplitOutTransition/SKTSplitOutTransitionKernel.cikernel
2022-02-06 15:29:42 UTC (rev 12767)
+++
trunk/SkimTransitions/SplitOutTransition/SKTSplitOutTransitionKernel.cikernel
2022-02-07 10:21:31 UTC (rev 12768)
@@ -1,15 +1,13 @@
kernel vec4 splitOutTransition(sampler src, sampler trgt, vec4 extent, vec2
center, float t)
{
- vec2 t1;
- vec4 r;
- float d1;
+ float x, l, r, d1;
- t1 = destCoord();
+ x = destCoord().x;
- r.xy = (1.0 - t) * center + t * extent.xy;
- r.zw = (1.0 - t) * center + t * (extent.xy + extent.zw);
+ l = (1.0 - t) * center.x + t * extent.x;
+ r = (1.0 - t) * center.x + t * (extent.x + extent.z);
- d1 = step(r.x, t1.x) * step(t1.x, r.z);
+ d1 = step(l, x) * step(x, r);
return d1 > 0.5 ? sample(trgt, samplerCoord(trgt)) : sample(src,
samplerCoord(src));
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
Skim-app-commit mailing list
Skim-app-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
