Changeset 367
- Timestamp:
- 04/09/07 03:26:57 (1 year ago)
- Files:
-
- trunk/LaserLine_2.0/English.lproj/MainMenu.nib/classes.nib (modified) (1 diff)
- trunk/LaserLine_2.0/English.lproj/MainMenu.nib/keyedobjects.nib (modified) (previous)
- trunk/LaserLine_2.0/Src/MainController.h (modified) (1 diff)
- trunk/LaserLine_2.0/Src/MainController.m (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/LaserLine_2.0/English.lproj/MainMenu.nib/classes.nib
r366 r367 23 23 { 24 24 ACTIONS = { 25 add3DTorus = id; 26 addAntiClock = id; 27 addBeamEffect = id; 28 addLissajous = id; 29 addSpirograph = id; 25 30 importFlash = id; 26 31 importILDA = id; trunk/LaserLine_2.0/Src/MainController.h
r365 r367 28 28 - (void)addSequence:(LZSequenceableElement *)sequenceElement withLength:(NSTimeInterval)time; 29 29 30 //Temporary debug code31 30 - (IBAction)importILDA:(id)sender; 32 31 - (IBAction)importFlash:(id)sender; 33 - (IBAction)playButtonPressed:(id)sender;34 - (IBAction)pointSliderDidChange:(id)sender;35 - (IBAction)stop:(id)sender;36 32 37 33 @end trunk/LaserLine_2.0/Src/MainController.m
r362 r367 47 47 //[self addBeamEffect:self]; 48 48 //[self addAntiClock:self]; 49 [self add3DTorus:self];50 [self addLissajous:self];51 [self addSpirograph:self];49 //[self add3DTorus:self]; 50 //[self addLissajous:self]; 51 //[self addSpirograph:self]; 52 52 53 53 [[output frameNotificationCenter] addObserver:[[[LZDisplayDevice alloc] initWithView:renderView] autorelease]]; … … 116 116 - (void)addSequence:(LZSequenceableElement *)sequenceElement withLength:(NSTimeInterval)time 117 117 { 118 if([layer count] > 0) 119 [layer removeElement:[layer elementAtIndex:0]]; 120 118 121 [layer appendElement:sequenceElement withLength:time]; 119 122 } 120 123 121 122 123 - (IBAction)stop:(id)sender {124 [output stopDevice];125 }126 127 124 @end
