X-Git-Url: http://git.ithinksw.org/ITKit.git/blobdiff_plain/4701dfd179c4ea4a898bc394ddbb138a1bc4f6b4..1b4d28edd06e98cd8b06a129b4aad3e29de38938:/ITCoreImageWindowEffect.m

diff --git a/ITCoreImageWindowEffect.m b/ITCoreImageWindowEffect.m
index 1c751af..afef08f 100644
--- a/ITCoreImageWindowEffect.m
+++ b/ITCoreImageWindowEffect.m
@@ -14,11 +14,13 @@
 - (void)setupEffect;
 @end
 
+static BOOL _running = NO;
+
 @implementation ITCoreImageWindowEffect
 
 + (NSString *)effectName
 {
-    return @"Core Image - Ripple";
+    return @"Ripple";
 }
 
 + (NSDictionary *)supportedPositions
@@ -96,6 +98,7 @@
     [self setWindowVisibility:ITWindowVisibleState];
 
     __idle = YES;
+	
     if ( __shouldReleaseWhenIdle ) {
         [self release];
     }
@@ -119,10 +122,10 @@
 
 - (void)performVanish
 {
-    __idle = NO;
+	__idle = NO;
 	
-    [self setWindowVisibility:ITWindowVanishingState];
-    [self performVanishFromProgress:1.0 effectTime:_effectTime];
+	[self setWindowVisibility:ITWindowVanishingState];
+	[self performVanishFromProgress:1.0 effectTime:_effectTime];
 }
 
 - (void)performVanishFromProgress:(float)progress effectTime:(float)time
@@ -166,7 +169,7 @@
     [self setWindowVisibility:ITWindowHiddenState];
 
     __idle = YES;
-    
+	
     if ( __shouldReleaseWhenIdle ) {
         [self release];
     }
@@ -192,9 +195,17 @@
 	NSRect rippleRect = [_window frame];
 	NSRect screenRect = [[_window screen] frame];
 	
+	if (_running) {
+		//Short-circuit to avoid layering effects and crashing
+		return;
+	}
+	
+	_running = YES;
+	_ripple = YES;
+	
     rippleRect.origin.y = - (NSMaxY(rippleRect) - screenRect.size.height);
 	
-	_effectWindow = [[NSWindow alloc] initWithContentRect:NSInsetRect([_window frame], -200, -200) styleMask:NSBorderlessWindowMask backing:NSBackingStoreBuffered defer:NO];
+	_effectWindow = [[NSWindow alloc] initWithContentRect:_ripple ? NSInsetRect([_window frame], -200, -200) : [_window frame] styleMask:NSBorderlessWindowMask backing:NSBackingStoreBuffered defer:NO];
 	[_effectWindow setBackgroundColor:[NSColor clearColor]];
 	[_effectWindow setAlphaValue:1.0];
 	[_effectWindow setOpaque:NO];
@@ -205,12 +216,18 @@
 	[_effectWindow orderFrontRegardless];
     [_window orderWindow:NSWindowAbove relativeTo:[_effectWindow windowNumber]];
 	
-	_effectFilter = [[CIFilter filterWithName:@"CIShapedWaterRipple"] retain];
-    [_effectFilter setDefaults];
-    [_effectFilter setValue:[NSNumber numberWithFloat:50.0] forKey:@"inputCornerRadius"];
-    [_effectFilter setValue:[CIVector vectorWithX:rippleRect.origin.x Y:rippleRect.origin.y] forKey:@"inputPoint0"];
-    [_effectFilter setValue:[CIVector vectorWithX:(rippleRect.origin.x + rippleRect.size.width) Y:(rippleRect.origin.y + rippleRect.size.height)] forKey:@"inputPoint1"];
-    [_effectFilter setValue:[NSNumber numberWithFloat:0.0] forKey:@"inputPhase"];
+	if (_ripple) {
+		_effectFilter = [[CIFilter filterWithName:@"CIShapedWaterRipple"] retain];
+		[_effectFilter setDefaults];
+		[_effectFilter setValue:[NSNumber numberWithFloat:50.0] forKey:@"inputCornerRadius"];
+		[_effectFilter setValue:[CIVector vectorWithX:rippleRect.origin.x Y:rippleRect.origin.y] forKey:@"inputPoint0"];
+		[_effectFilter setValue:[CIVector vectorWithX:(rippleRect.origin.x + rippleRect.size.width) Y:(rippleRect.origin.y + rippleRect.size.height)] forKey:@"inputPoint1"];
+		[_effectFilter setValue:[NSNumber numberWithFloat:0.0] forKey:@"inputPhase"];
+	} else {
+		_effectFilter = [[CIFilter filterWithName:@"CIZoomBlur"] retain];
+		[_effectFilter setDefaults];
+		[_effectFilter setValue:[CIVector vectorWithX:(rippleRect.origin.x + rippleRect.size.width / 2) Y:(rippleRect.origin.y + rippleRect.size.height / 2)] forKey:@"inputCenter"];
+	}
 	
 	_windowFilter = [[CICGSFilter filterWithFilter:_effectFilter connectionID:[NSApp contextID]] retain];
 	[_windowFilter addToWindow:(CGSWindowID)[_effectWindow windowNumber] flags:1];
@@ -232,7 +249,11 @@
 	
 	while (time < (startTime + 2.5) && (time >= startTime)) {
 		oldFilter = _windowFilter;
-		[_effectFilter setValue:[NSNumber numberWithFloat:160*(time - startTime)] forKey:@"inputPhase"];
+		if (_ripple) {
+			[_effectFilter setValue:[NSNumber numberWithFloat:160*(time - startTime)] forKey:@"inputPhase"];
+		} else {
+			[_effectFilter setValue:[NSNumber numberWithFloat:5 * (time - startTime)] forKey:@"inputAmount"];
+		}
         _windowFilter = [[CICGSFilter filterWithFilter:_effectFilter connectionID:[NSApp contextID]] retain];
         [_windowFilter addToWindow:windowNumber flags:1];
 		[oldFilter removeFromWindow:windowNumber];
@@ -247,6 +268,8 @@
 	[[_effectWindow contentView] release];
     [_effectWindow release];
     [pool release];
+	
+	_running = NO;
 }
 
 @end