[Skim-app-commit] SF.net SVN: skim-app:[12772] trunk/SkimTransitions

[hofman--- via Skim-app-commit]

Revision: 12772
          http://sourceforge.net/p/skim-app/code/12772
Author:   hofman
Date:     2022-02-09 15:35:20 +0000 (Wed, 09 Feb 2022)
Log Message:
-----------
rename input variable, use functions for cindition

Modified Paths:
--------------
    trunk/SkimTransitions/CoverTransition/SKTCoverTransition.m
    trunk/SkimTransitions/RevealTransition/SKTRevealTransition.m
    trunk/SkimTransitions/SKTTransitions.cikernel

Modified: trunk/SkimTransitions/CoverTransition/SKTCoverTransition.m
===================================================================
--- trunk/SkimTransitions/CoverTransition/SKTCoverTransition.m  2022-02-09 
14:56:26 UTC (rev 12771)
+++ trunk/SkimTransitions/CoverTransition/SKTCoverTransition.m  2022-02-09 
15:35:20 UTC (rev 12772)
@@ -64,7 +64,7 @@
 }
 
 - (CGRect)regionOf:(int)sampler destRect:(CGRect)R userInfo:(CIVector *)offset 
{
-    if (sampler == 1) {
+    if (sampler == 0) {
         R = CGRectOffset(R, -[offset X], -[offset Y]);
     }
     return R;
@@ -83,7 +83,7 @@
     NSNumber *shade = [NSNumber numberWithDouble:1.0 - 0.2 * t];
     CIVector *offset = [CIVector vectorWithX:d * c Y:d * s];
     NSArray *extent = [NSArray arrayWithObjects:[NSNumber 
numberWithDouble:[inputExtent X]], [NSNumber numberWithDouble:[inputExtent Y]], 
[NSNumber numberWithDouble:[inputExtent Z]], [NSNumber 
numberWithDouble:[inputExtent W]], nil];
-    NSArray *arguments = [NSArray arrayWithObjects:src, trgt, inputExtent, 
offset, shade, nil];
+    NSArray *arguments = [NSArray arrayWithObjects:trgt, src, inputExtent, 
offset, shade, nil];
     NSDictionary *options  = [NSDictionary 
dictionaryWithObjectsAndKeys:extent, kCIApplyOptionDefinition, extent, 
kCIApplyOptionExtent, offset, kCIApplyOptionUserInfo, nil];
     
     [_SKTCoverTransitionKernel 
setROISelector:@selector(regionOf:destRect:userInfo:)];

Modified: trunk/SkimTransitions/RevealTransition/SKTRevealTransition.m
===================================================================
--- trunk/SkimTransitions/RevealTransition/SKTRevealTransition.m        
2022-02-09 14:56:26 UTC (rev 12771)
+++ trunk/SkimTransitions/RevealTransition/SKTRevealTransition.m        
2022-02-09 15:35:20 UTC (rev 12772)
@@ -64,7 +64,7 @@
 }
 
 - (CGRect)regionOf:(int)sampler destRect:(CGRect)R userInfo:(CIVector *)offset 
{
-    if (sampler == 1) {
+    if (sampler == 0) {
         R = CGRectOffset(R, -[offset X], -[offset Y]);
     }
     return R;
@@ -83,7 +83,7 @@
     NSNumber *shade = [NSNumber numberWithDouble:0.8 + 0.2 * t];
     CIVector *offset = [CIVector vectorWithX:d * c Y:d * s];
     NSArray *extent = [NSArray arrayWithObjects:[NSNumber 
numberWithFloat:[inputExtent X]], [NSNumber numberWithFloat:[inputExtent Y]], 
[NSNumber numberWithFloat:[inputExtent Z]], [NSNumber 
numberWithFloat:[inputExtent W]], nil];
-    NSArray *arguments = [NSArray arrayWithObjects:trgt, src, inputExtent, 
offset, shade, nil];
+    NSArray *arguments = [NSArray arrayWithObjects:src, trgt, inputExtent, 
offset, shade, nil];
     NSDictionary *options  = [NSDictionary 
dictionaryWithObjectsAndKeys:extent, kCIApplyOptionDefinition, extent, 
kCIApplyOptionExtent, offset, kCIApplyOptionUserInfo, nil];
     
     [_SKTRevealTransitionKernel 
setROISelector:@selector(regionOf:destRect:userInfo:)];

Modified: trunk/SkimTransitions/SKTTransitions.cikernel
===================================================================
--- trunk/SkimTransitions/SKTTransitions.cikernel       2022-02-09 14:56:26 UTC 
(rev 12771)
+++ trunk/SkimTransitions/SKTTransitions.cikernel       2022-02-09 15:35:20 UTC 
(rev 12772)
@@ -9,22 +9,16 @@
     return d1 < width * t ? sample(trgt, samplerCoord(trgt)) : sample(src, 
samplerCoord(src));
 }
 
-kernel vec4 boxComposition(sampler src, sampler trgt, vec4 rect)
+kernel vec4 boxComposition(sampler front, sampler back, vec4 rect)
 {
-    vec2 t1, r1, r2;
-    float d1;
+    vec2 t1;
     
     t1 = destCoord();
     
-    r1 = rect.xy;
-    r2 = rect.xy + rect.zw;
-    
-    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));
+    return dot(step(rect.xy, t1), step(t1, rect.xy + rect.zw)) < 2.0 ? 
sample(back, samplerCoord(back)) : sample(front, samplerCoord(front));
 }
 
-kernel vec4 coverComposition(sampler back, sampler front, vec4 extent, vec2 
offset, float shade)
+kernel vec4 coverComposition(sampler front, sampler back, vec4 extent, vec2 
offset, float shade)
 {
     vec2 t1;
     vec4 p1, p2;

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