Changeset 346

Timestamp:

03/23/07 23:25:47 (2 years ago)

Author:

hagedorn

Message:

Added LaserLine2.0 random Beam Effect, of which there is a great photograph

Files:

• trunk/LaserLine_2.0/LaserLine_2.0.xcodeproj/project.pbxproj (modified) (5 diffs)
• trunk/LaserLine_2.0/Src/MainController.m (modified) (3 diffs)
• trunk/LaserLine_2.0/Src/Sequencing/Generators/LZBeamEffect.h (added)
• trunk/LaserLine_2.0/Src/Sequencing/Generators/LZBeamEffect.m (added)

trunk/LaserLine_2.0/LaserLine_2.0.xcodeproj/project.pbxproj

@@ -46 +46 @@
-                D42887120BAE259300F4F72D /* LZ3DTorus.m in Sources */ = {isa = PBXBuildFile; fileRef = D42887100BAE259300F4F72D /* LZ3DTorus.m */; };
-                D45F3CB80BAA71F80076788A /* QTKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D45F3CB70BAA71F80076788A /* QTKit.framework */; };
+                D461AECA0BB4C74900EEF5FB /* LZBeamEffect.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = D461AEC80BB4C74900EEF5FB /* LZBeamEffect.h */; };
+                D461AECB0BB4C74900EEF5FB /* LZBeamEffect.m in Sources */ = {isa = PBXBuildFile; fileRef = D461AEC90BB4C74900EEF5FB /* LZBeamEffect.m */; };
-                D4C76FBF0BA12EBB00418A28 /* LZAnticlock.m in Sources */ = {isa = PBXBuildFile; fileRef = D4C76FBD0BA12EBB00418A28 /* LZAnticlock.m */; };
-                D4D748AD0B9A91C0008E17D1 /* FlashImport.m in Sources */ = {isa = PBXBuildFile; fileRef = D4D748AB0B9A91C0008E17D1 /* FlashImport.m */; };
@@ -164 +166 @@
-                                A87BE5520BA4B8A8002DEDDF /* LZDisplayDevice.h in CopyFiles */,
-                                D42887110BAE259300F4F72D /* LZ3DTorus.h in CopyFiles */,
+                                D461AECA0BB4C74900EEF5FB /* LZBeamEffect.h in CopyFiles */,
-                        );
-                        runOnlyForDeploymentPostprocessing = 0;
@@ -215 +218 @@
-                D42887100BAE259300F4F72D /* LZ3DTorus.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LZ3DTorus.m; sourceTree = "<group>"; };
-                D45F3CB70BAA71F80076788A /* QTKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QTKit.framework; path = /System/Library/Frameworks/QTKit.framework; sourceTree = "<absolute>"; };
+                D461AEC80BB4C74900EEF5FB /* LZBeamEffect.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LZBeamEffect.h; sourceTree = "<group>"; };
+                D461AEC90BB4C74900EEF5FB /* LZBeamEffect.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LZBeamEffect.m; sourceTree = "<group>"; };
-                D4C76FBC0BA12EBB00418A28 /* LZAnticlock.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LZAnticlock.h; sourceTree = "<group>"; };
-                D4C76FBD0BA12EBB00418A28 /* LZAnticlock.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LZAnticlock.m; sourceTree = "<group>"; };
@@ -515 +520 @@
-                                D428870F0BAE259300F4F72D /* LZ3DTorus.h */,
-                                D42887100BAE259300F4F72D /* LZ3DTorus.m */,
+                                D461AEC80BB4C74900EEF5FB /* LZBeamEffect.h */,
+                                D461AEC90BB4C74900EEF5FB /* LZBeamEffect.m */,
-                        );
-                        path = Generators;
@@ -724 +731 @@
-                                A87BE5510BA4B8A8002DEDDF /* LZDisplayDevice.m in Sources */,
-                                D42887120BAE259300F4F72D /* LZ3DTorus.m in Sources */,
+                                D461AECB0BB4C74900EEF5FB /* LZBeamEffect.m in Sources */,
-                        );
-                        runOnlyForDeploymentPostprocessing = 0;

trunk/LaserLine_2.0/Src/MainController.m

@@ -8 +8 @@
-#import "LZAnticlock.h"
-#import "LZ3DTorus.h"
+#import "LZBeamEffect.h"
-#import "LZSpirograph.h"
-#import "LZSinewave.h"
@@ -39 +40 @@
-        //[self addAntiClock:self];
-        [self add3DTorus:self];
+        //[self addBeamEffect:self];
+
-}
-
@@ -126 +129 @@
-}
-
+- (IBAction)addBeamEffect:(id)sender {
+        LZLayer *newLayer = [[LZLayer alloc] initWithDuration:60];
+        [newLayer insertElement:[[[LZBeamEffect alloc] init] autorelease] inTimeRange:LZMakeTimeRange(0,60)];
+        [[[timeline tracks] objectAtIndex:0] addLayer:newLayer];
+        
+        [output setupDeviceWithTrack:newLayer frequency:1/24.];
+        [[output frameNotificationCenter] addObserver:[[[LZDisplayDevice alloc] initWithView:renderView] autorelease]];
+}
+
+
-- (IBAction)playButtonPressed:(id)sender
-{