Revision: 4725
http://skim-app.svn.sourceforge.net/skim-app/?rev=4725&view=rev
Author: hofman
Date: 2008-10-02 12:07:27 +0000 (Thu, 02 Oct 2008)
Log Message:
-----------
move interface of transition animation to header
Modified Paths:
--------------
trunk/SKTransitionController.h
trunk/SKTransitionController.m
Modified: trunk/SKTransitionController.h
===================================================================
--- trunk/SKTransitionController.h 2008-10-01 18:31:56 UTC (rev 4724)
+++ trunk/SKTransitionController.h 2008-10-02 12:07:27 UTC (rev 4725)
@@ -38,6 +38,7 @@
#import <Cocoa/Cocoa.h>
#import <Carbon/Carbon.h>
+#import <Quartz/Quartz.h>
#pragma mark SKTransitionController
@@ -97,8 +98,15 @@
#pragma mark -
[EMAIL PROTECTED] SKTransitionAnimation, CIImage, CIContext;
[EMAIL PROTECTED] SKTransitionAnimation : NSAnimation {
+ CIFilter *filter;
+}
+- (id)initWithFilter:(CIFilter *)aFilter duration:(NSTimeInterval)duration;
+- (CIImage *)currentImage;
[EMAIL PROTECTED]
+#pragma mark -
+
@interface SKTransitionView : NSOpenGLView {
SKTransitionAnimation *animation;
CIImage *image;
Modified: trunk/SKTransitionController.m
===================================================================
--- trunk/SKTransitionController.m 2008-10-01 18:31:56 UTC (rev 4724)
+++ trunk/SKTransitionController.m 2008-10-02 12:07:27 UTC (rev 4725)
@@ -42,12 +42,10 @@
*/
#import "SKTransitionController.h"
-#import <Quartz/Quartz.h>
#import "NSBitmapImageRep_SKExtensions.h"
#include <unistd.h>
#import <OpenGL/OpenGL.h>
#import <OpenGL/gl.h>
-#import "SKFullScreenWindow.h"
#pragma mark Private Core Graphics types and functions
@@ -111,17 +109,6 @@
#pragma mark -
[EMAIL PROTECTED] SKTransitionAnimation : NSAnimation {
- CIFilter *filter;
-}
-
-- (id)initWithFilter:(CIFilter *)aFilter duration:(NSTimeInterval)duration
animationCurve:(NSAnimationCurve)animationCurve;
-- (CIImage *)currentImage;
-
[EMAIL PROTECTED]
-
-#pragma mark -
-
@implementation SKTransitionController
+ (NSArray *)transitionFilterNames {
@@ -421,7 +408,7 @@
NSRect frame = [view convertRect:[view frame] toView:nil];
frame.origin = [[view window] convertBaseToScreen:frame.origin];
- SKTransitionAnimation *animation = [[SKTransitionAnimation alloc]
initWithFilter:transitionFilter duration:duration
animationCurve:NSAnimationEaseInOut];
+ SKTransitionAnimation *animation = [[SKTransitionAnimation alloc]
initWithFilter:transitionFilter duration:duration];
[[self transitionView] setAnimation:animation];
[animation release];
@@ -450,8 +437,8 @@
@implementation SKTransitionAnimation
-- (id)initWithFilter:(CIFilter *)aFilter duration:(NSTimeInterval)duration
animationCurve:(NSAnimationCurve)animationCurve {
- if (self = [super initWithDuration:duration
animationCurve:animationCurve]) {
+- (id)initWithFilter:(CIFilter *)aFilter duration:(NSTimeInterval)duration {
+ if (self = [super initWithDuration:duration
animationCurve:NSAnimationEaseInOut]) {
filter = [aFilter retain];
}
return self;
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
