Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Changed the marker to a square texture
- Loading branch information
Showing
4 changed files
with
124 additions
and
3 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| // | ||
| // SquareBrushTexture.h | ||
| // JotUI | ||
| // | ||
| // Created by Adam Wulf on 2/29/16. | ||
| // Copyright © 2016 Milestone Made. All rights reserved. | ||
| // | ||
|
|
||
| #import <JotUI/JotUI.h> | ||
|
|
||
|
|
||
| @interface SquareBrushTexture : JotBrushTexture | ||
|
|
||
| + (JotBrushTexture*)sharedInstance; | ||
|
|
||
| @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,98 @@ | ||
| // | ||
| // SquareBrushTexture.m | ||
| // JotUI | ||
| // | ||
| // Created by Adam Wulf on 2/29/16. | ||
| // Copyright © 2016 Milestone Made. All rights reserved. | ||
| // | ||
|
|
||
| #import "SquareBrushTexture.h" | ||
| #import "JotSharedBrushTexture.h" | ||
| #import "UIImage+BrushTextures.h" | ||
|
|
||
|
|
||
| @implementation SquareBrushTexture | ||
|
|
||
| #pragma mark - PlistSaving | ||
|
|
||
| - (NSDictionary*)asDictionary { | ||
| return [NSDictionary dictionaryWithObject:NSStringFromClass([self class]) forKey:@"class"]; | ||
| } | ||
|
|
||
| - (id)initFromDictionary:(NSDictionary*)dictionary { | ||
| NSString* className = [dictionary objectForKey:@"class"]; | ||
| Class clz = NSClassFromString(className); | ||
| return [[clz alloc] init]; | ||
| } | ||
|
|
||
|
|
||
| #pragma mark - Singleton | ||
|
|
||
| - (UIImage*)texture { | ||
| return [[self brushTexture] texture]; | ||
| } | ||
|
|
||
| - (NSString*)name { | ||
| return [[self brushTexture] name]; | ||
| } | ||
|
|
||
| - (BOOL)bind { | ||
| return [[self brushTexture] bind]; | ||
| } | ||
|
|
||
| - (void)unbind { | ||
| JotGLContext* currContext = (JotGLContext*)[JotGLContext currentContext]; | ||
| if (!currContext) { | ||
| @throw [NSException exceptionWithName:@"NilGLContextException" reason:@"Cannot bind texture to nil gl context" userInfo:nil]; | ||
| } | ||
| if (![currContext isKindOfClass:[JotGLContext class]]) { | ||
| @throw [NSException exceptionWithName:@"JotGLContextException" reason:@"Current GL Context must be JotGLContext" userInfo:nil]; | ||
| } | ||
| JotBrushTexture* texture = [currContext.contextProperties objectForKey:@"arrowTexture"]; | ||
| if (!texture) { | ||
| @throw [NSException exceptionWithName:@"JotGLContextException" reason:@"Cannot unbind unbuilt brush texture" userInfo:nil]; | ||
| } | ||
| [texture unbind]; | ||
| } | ||
|
|
||
| #pragma mark - Singleton | ||
|
|
||
| static SquareBrushTexture* _instance = nil; | ||
|
|
||
| - (id)init { | ||
| if (_instance) | ||
| return _instance; | ||
| if ((_instance = [super init])) { | ||
| // noop | ||
| } | ||
| return _instance; | ||
| } | ||
|
|
||
| + (JotBrushTexture*)sharedInstance { | ||
| if (!_instance) { | ||
| _instance = [[SquareBrushTexture alloc] init]; | ||
| } | ||
| return _instance; | ||
| } | ||
|
|
||
|
|
||
| #pragma mark - Private | ||
|
|
||
| - (JotSharedBrushTexture*)brushTexture { | ||
| JotGLContext* currContext = (JotGLContext*)[JotGLContext currentContext]; | ||
| if (!currContext) { | ||
| @throw [NSException exceptionWithName:@"NilGLContextException" reason:@"Cannot bind texture to nil gl context" userInfo:nil]; | ||
| } | ||
| if (![currContext isKindOfClass:[JotGLContext class]]) { | ||
| @throw [NSException exceptionWithName:@"JotGLContextException" reason:@"Current GL Context must be JotGLContext" userInfo:nil]; | ||
| } | ||
| JotSharedBrushTexture* texture = [currContext.contextProperties objectForKey:@"arrowTexture"]; | ||
| if (!texture) { | ||
| UIImage* arrow = [UIImage imageWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"Square" ofType:@"png"]]; | ||
| texture = [[JotSharedBrushTexture alloc] initWithImage:arrow]; | ||
| [currContext.contextProperties setObject:texture forKey:@"arrowTexture"]; | ||
| } | ||
| return texture; | ||
| } | ||
|
|
||
| @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