-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Added converter for CGImageRef to CVPixelBufferRef and CMSampleBuffer…
…Ref conversion Implemented Animator for Video Creation: -Create Animations of the Mandelbrot Set -Animate all parameters -Export as Quicktime Movie Renamed ViewController to MandelbrotRenderViewController Created CLMandelbrotViewDelegate for Render Feedback for Animation Moved Setup for CLMandelbrotView in new method Optimized Start Parameters Now, the device pixel ratio is determined once for performance reasons The device pixel ratio is now determined by the screen of the window and not the main screen textures are now initialized empty for performance reasons Optimized preview mode: Main texture gets used as long as only shift and zoom change for better image quality, Pixels which are inside the mandelbrot set are now black instead of transparent Added option to turn off automatic updates Bug fixes
- Loading branch information
Palle Klewitz
authored and
Palle Klewitz
committed
Aug 10, 2015
1 parent
fd8cc9e
commit 27da291
Showing
20 changed files
with
2,236 additions
and
205 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,35 @@ | ||
| // | ||
| // AnimationSetupViewController.h | ||
| // Mandelbrot2 | ||
| // | ||
| // Created by Palle Klewitz on 07.08.15. | ||
| // Copyright © 2015 Palle Klewitz. All rights reserved. | ||
| // | ||
|
|
||
| @import Cocoa; | ||
| #import "MandelbrotRenderer.h" | ||
|
|
||
| @interface AnimationSetupViewController : NSViewController <MandelbrotRendererDelegate> | ||
|
|
||
| @property (weak) IBOutlet NSTextField *txtStartPositionX; | ||
| @property (weak) IBOutlet NSTextField *txtStartPositionY; | ||
| @property (weak) IBOutlet NSTextField *txtStartZoom; | ||
| @property (weak) IBOutlet NSTextField *txtStartIterations; | ||
| @property (weak) IBOutlet NSTextField *txtStartColorFactor; | ||
| @property (weak) IBOutlet NSTextField *txtStartColorShift; | ||
|
|
||
| @property (weak) IBOutlet NSTextField *txtEndPositionX; | ||
| @property (weak) IBOutlet NSTextField *txtEndPositionY; | ||
| @property (weak) IBOutlet NSTextField *txtEndZoom; | ||
| @property (weak) IBOutlet NSTextField *txtEndIterations; | ||
| @property (weak) IBOutlet NSTextField *txtEndColorFactor; | ||
| @property (weak) IBOutlet NSTextField *txtEndColorShift; | ||
|
|
||
| @property (weak) IBOutlet NSTextField *txtVideoFramesPerSecond; | ||
| @property (weak) IBOutlet NSTextField *txtVideoLength; | ||
|
|
||
| @property (weak) IBOutlet NSProgressIndicator *piRenderProgress; | ||
|
|
||
| - (IBAction)renderButtonClicked:(id)sender; | ||
|
|
||
| @end |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,124 @@ | ||
| // | ||
| // AnimationSetupViewController.m | ||
| // Mandelbrot2 | ||
| // | ||
| // Created by Palle Klewitz on 07.08.15. | ||
| // Copyright © 2015 Palle Klewitz. All rights reserved. | ||
| // | ||
|
|
||
| #import "AnimationSetupViewController.h" | ||
| #import "MandelbrotRenderer.h" | ||
| #import "AppDelegate.h" | ||
| #import "MandelbrotRenderViewController.h" | ||
|
|
||
| @interface AnimationSetupViewController () | ||
|
|
||
| @property (nonatomic, strong) MandelbrotRenderer *renderer; | ||
|
|
||
| @end | ||
|
|
||
| @implementation AnimationSetupViewController | ||
|
|
||
| - (void)viewDidLoad | ||
| { | ||
| [super viewDidLoad]; | ||
|
|
||
| _piRenderProgress.hidden = YES; | ||
|
|
||
| AppDelegate *del = (AppDelegate *)([NSApplication sharedApplication].delegate); | ||
| CLMandelbrotView *mandelbrotView = del.mainViewController.mandelbrotView; | ||
| del = nil; | ||
|
|
||
| _txtStartPositionX.doubleValue = mandelbrotView.shift.x; | ||
| _txtStartPositionY.doubleValue = mandelbrotView.shift.y; | ||
| _txtStartZoom.doubleValue = mandelbrotView.zoom; | ||
| _txtStartIterations.integerValue = mandelbrotView.iterations; | ||
| _txtStartColorFactor.doubleValue = mandelbrotView.color_factor; | ||
| _txtStartColorShift.doubleValue = mandelbrotView.color_shift; | ||
|
|
||
| _txtEndPositionX.doubleValue = mandelbrotView.shift.x; | ||
| _txtEndPositionY.doubleValue = mandelbrotView.shift.y; | ||
| _txtEndZoom.doubleValue = mandelbrotView.zoom; | ||
| _txtEndIterations.integerValue = mandelbrotView.iterations; | ||
| _txtEndColorFactor.doubleValue = mandelbrotView.color_factor; | ||
| _txtEndColorShift.doubleValue = mandelbrotView.color_shift; | ||
| } | ||
|
|
||
| - (IBAction)renderButtonClicked:(id)sender | ||
| { | ||
| /*NSSavePanel *savePanel = [[NSSavePanel alloc] init]; | ||
| savePanel.title = @"Save Animation"; | ||
| savePanel.showsHiddenFiles = NO; | ||
| savePanel.canCreateDirectories = YES; | ||
| savePanel.nameFieldStringValue = @"MandelbrotAnimation.mov"; | ||
| savePanel.allowedFileTypes = @[@"mov"]; | ||
| [savePanel beginSheetModalForWindow:self.view.window completionHandler: | ||
| ^(NSInteger result) | ||
| { | ||
| if (result == NSModalResponseOK) | ||
| { | ||
| } | ||
| }];*/ | ||
| _renderer = [[MandelbrotRenderer alloc] init]; | ||
| _renderer.delegate = self; | ||
| _renderer.targetFile = [NSURL URLWithString:@"file:///Users/Palle/Desktop/mandelbrotanim.mov"]; | ||
| [self startRendering]; | ||
| } | ||
|
|
||
| - (void) startRendering | ||
| { | ||
| _piRenderProgress.hidden = NO; | ||
|
|
||
| AppDelegate *del = (AppDelegate *)([NSApplication sharedApplication].delegate); | ||
| _renderer.mandelbrotView = del.mainViewController.mandelbrotView; | ||
| del = nil; | ||
|
|
||
| NSNumberFormatter *formatter = [[NSNumberFormatter alloc] init]; | ||
| formatter.numberStyle = NSNumberFormatterDecimalStyle; | ||
|
|
||
| NSLog(@"startX: %f", [formatter numberFromString:_txtStartPositionX.stringValue].doubleValue); | ||
|
|
||
| _renderer.startX = [formatter numberFromString:_txtStartPositionX.stringValue].doubleValue; | ||
| _renderer.startY = [formatter numberFromString:_txtStartPositionY.stringValue].doubleValue; | ||
| _renderer.startZoom = [formatter numberFromString:_txtStartZoom.stringValue].doubleValue; | ||
| _renderer.startIterations = (unsigned int)[formatter numberFromString:_txtStartIterations.stringValue].integerValue; | ||
| _renderer.startColorFactor = [formatter numberFromString:_txtStartColorFactor.stringValue].doubleValue;; | ||
| _renderer.startColorShift = [formatter numberFromString:_txtStartColorShift.stringValue].doubleValue; | ||
|
|
||
| _renderer.endX = [formatter numberFromString:_txtEndPositionX.stringValue].doubleValue; | ||
| _renderer.endY = [formatter numberFromString:_txtEndPositionY.stringValue].doubleValue; | ||
| _renderer.endZoom = [formatter numberFromString:_txtEndZoom.stringValue].doubleValue; | ||
| _renderer.endIterations = (unsigned int)[formatter numberFromString:_txtEndIterations.stringValue].integerValue; | ||
| _renderer.endColorFactor = [formatter numberFromString:_txtEndColorFactor.stringValue].doubleValue;; | ||
| _renderer.endColorShift = [formatter numberFromString:_txtEndColorShift.stringValue].doubleValue; | ||
|
|
||
| _renderer.frames_per_second = _txtVideoFramesPerSecond.doubleValue; | ||
| _renderer.video_length = _txtVideoLength.doubleValue; | ||
|
|
||
| [_renderer startRendering]; | ||
| } | ||
|
|
||
| - (void)didUpdateProgress | ||
| { | ||
| dispatch_async(dispatch_get_main_queue(), | ||
| ^{ | ||
| _piRenderProgress.doubleValue = (double)_renderer.frame / (double) (_renderer.frames_per_second * _renderer.video_length) * 100; | ||
| }); | ||
|
|
||
| } | ||
|
|
||
| - (void)didFinishRendering | ||
| { | ||
| dispatch_async(dispatch_get_main_queue(), | ||
| ^{ | ||
| _piRenderProgress.hidden = YES; | ||
| }); | ||
| } | ||
|
|
||
| - (void)mandelbrotRenderer:(MandelbrotRenderer *)renderer didFailWithError:(NSError *)error | ||
| { | ||
|
|
||
| } | ||
|
|
||
| @end |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.