Added option for rectangular face

Author: steventroughtonsmith

SpriteKitWatchFace WatchKit App/Info.plist

@@ -19,7 +19,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>1.0</string>
 	<key>CFBundleVersion</key>
-	<string>55</string>
+	<string>56</string>
 	<key>UISupportedInterfaceOrientations</key>
 	<array>
 		<string>UIInterfaceOrientationPortrait</string>

SpriteKitWatchFace WatchKit Extension/FaceScene.h

@@ -16,7 +16,10 @@ typedef enum : NSUInteger {
 	ThemeNavy,
 	ThemeTidepod,
 	ThemeBretonnia,
-	ThemeNoir
+	ThemeNoir,
+	ThemeContrast,
+	ThemeVictoire,
+	ThemeLiquid
 } Theme;
 
 @interface FaceScene : SKScene <SKSceneDelegate>
@@ -30,6 +33,9 @@ typedef enum : NSUInteger {
 @property SKColor *markColor;
 @property SKColor *textColor;
 
+@property BOOL useProgrammaticLayout;
+@property BOOL useRoundFace;
+
 @end
 
 

SpriteKitWatchFace WatchKit Extension/FaceScene.m

@@ -12,18 +12,54 @@
 #define NSFont UIFont
 #endif
 
-@implementation FaceScene
-
-BOOL vectorDisplay = YES;
+CGFloat workingRadiusForFaceOfSizeWithAngle(CGSize faceSize, CGFloat angle)
+{
+	CGFloat faceHeight = faceSize.height;
+	CGFloat faceWidth = faceSize.width;
+	
+	CGFloat workingRadius = 0;
+	
+	double vx = cos(angle);
+	double vy = sin(angle);
+	
+	double x1 = 0;
+	double y1 = 0;
+	double x2 = faceHeight;
+	double y2 = faceWidth;
+	double px = faceHeight/2;
+	double py = faceWidth/2;
+	
+	double t[4];
+	double smallestT = 1000;
+	
+	t[0]=(x1-px)/vx;
+	t[1]=(x2-px)/vx;
+	t[2]=(y1-py)/vy;
+	t[3]=(y2-py)/vy;
+	
+	for (int m = 0; m < 4; m++)
+	{
+		double currentT = t[m];
+		
+		if (currentT > 0 && currentT < smallestT)
+			smallestT = currentT;
+	}
+	
+	workingRadius = smallestT;
+	
+	return workingRadius;
+}
 
-// 184 x 224
+@implementation FaceScene
 
 - (instancetype)initWithCoder:(NSCoder *)coder
 {
 	self = [super initWithCoder:coder];
 	if (self) {
 
 		self.theme = ThemeHermesPink;
+		self.useProgrammaticLayout = YES;
+		self.useRoundFace = YES;
 
 		[self setupColors];
 		[self setupScene];
@@ -33,21 +69,21 @@ - (instancetype)initWithCoder:(NSCoder *)coder
 	return self;
 }
 
--(void)setupTickmarks
+-(void)setupTickmarksForRoundFace
 {
 	CGFloat margin = 4.0;
 	CGFloat labelMargin = 26.0;
 
 	SKNode *faceMarkings = [SKNode node];
 
 	/* Hardcoded for 44mm Apple Watch */
-	CGFloat faceWidth = 184;
-	CGFloat faceHeight = 224;
-
+	
+	CGSize faceSize = (CGSize){184, 224};
+	
 	for (int i = 0; i < 12; i++)
 	{
 		CGFloat angle = -(2*M_PI)/12.0 * i;
-		CGFloat workingRadius = faceWidth/2;
+		CGFloat workingRadius = faceSize.width/2;
 		CGFloat longTickHeight = workingRadius/15;
 
 		SKSpriteNode *tick = [SKSpriteNode spriteNodeWithColor:self.markColor size:CGSizeMake(2, longTickHeight)];
@@ -73,7 +109,7 @@ -(void)setupTickmarks
 	for (int i = 0; i < 60; i++)
 	{
 		CGFloat angle = - (2*M_PI)/60.0 * i;
-		CGFloat workingRadius = faceWidth/2;
+		CGFloat workingRadius = faceSize.width/2;
 		CGFloat shortTickHeight = workingRadius/20;
 		SKSpriteNode *tick = [SKSpriteNode spriteNodeWithColor:self.markColor size:CGSizeMake(1, shortTickHeight)];
 
@@ -87,10 +123,81 @@ -(void)setupTickmarks
 	}
 
 	[self addChild:faceMarkings];
+}
+
+-(void)setupTickmarksForRectangularFace
+{
+	CGFloat margin = 5.0;
+	CGFloat labelYMargin = 30.0;
+	CGFloat labelXMargin = 24.0;
+
+	CGSize faceSize = (CGSize){184, 224};
 
-	SKNode *face = [self childNodeWithName:@"Face"];
-	SKSpriteNode *numbersLayer = (SKSpriteNode *)[face childNodeWithName:@"Numbers"];
-	numbersLayer.alpha = 0;
+	/* Major */
+	for (int i = 0; i < 12; i++)
+	{
+		CGFloat angle = -(2*M_PI)/12.0 * i;
+		CGFloat workingRadius = workingRadiusForFaceOfSizeWithAngle(faceSize, angle);
+		CGFloat longTickHeight = workingRadius/10.0;
+		
+		SKSpriteNode *tick = [SKSpriteNode spriteNodeWithColor:self.markColor size:CGSizeMake(2, longTickHeight)];
+		
+		tick.position = CGPointZero;
+		tick.anchorPoint = CGPointMake(0.5, (workingRadius-margin)/longTickHeight);
+		tick.zRotation = angle;
+		
+		tick.zPosition = 0;
+		
+		[self addChild:tick];
+	}
+	
+	/* Minor */
+	for (int i = 0; i < 60; i++)
+	{
+		
+		CGFloat angle = - (2*M_PI)/60.0 * i;
+		CGFloat workingRadius = workingRadiusForFaceOfSizeWithAngle(faceSize, angle);
+		CGFloat shortTickHeight = workingRadius/20;
+		SKSpriteNode *tick = [SKSpriteNode spriteNodeWithColor:self.markColor size:CGSizeMake(1, shortTickHeight)];
+		
+		tick.position = CGPointZero;
+		tick.anchorPoint = CGPointMake(0.5, (workingRadius-margin)/shortTickHeight);
+		tick.zRotation = angle;
+		
+		tick.zPosition = 0;
+		if (i % 5 != 0)
+			[self addChild:tick];
+	}
+	
+	/* Numerals */
+	for (int i = 1; i <= 12; i++)
+	{
+		CGFloat fontSize = 25;
+		
+		SKSpriteNode *labelNode = [SKSpriteNode spriteNodeWithColor:[SKColor clearColor] size:CGSizeMake(fontSize, fontSize)];
+		labelNode.anchorPoint = CGPointMake(0.5,0.5);
+		
+		if (i == 1 || i == 11 || i == 12)
+			labelNode.position = CGPointMake(labelXMargin-faceSize.width/2 + ((i+1)%3) * (faceSize.width-labelXMargin*2)/3.0 + (faceSize.width-labelXMargin*2)/6.0, faceSize.height/2-labelYMargin);
+		else if (i == 5 || i == 6 || i == 7)
+			labelNode.position = CGPointMake(labelXMargin-faceSize.width/2 + (2-((i+1)%3)) * (faceSize.width-labelXMargin*2)/3.0 + (faceSize.width-labelXMargin*2)/6.0, -faceSize.height/2+labelYMargin);
+		else if (i == 2 || i == 3 || i == 4)
+			labelNode.position = CGPointMake(faceSize.height/2-fontSize-labelXMargin, -(faceSize.width-labelXMargin*2)/2 + (2-((i+1)%3)) * (faceSize.width-labelXMargin*2)/3.0 + (faceSize.width-labelYMargin*2)/6.0);
+		else if (i == 8 || i == 9 || i == 10)
+			labelNode.position = CGPointMake(-faceSize.height/2+fontSize+labelXMargin, -(faceSize.width-labelXMargin*2)/2 + ((i+1)%3) * (faceSize.width-labelXMargin*2)/3.0 + (faceSize.width-labelYMargin*2)/6.0);
+		
+		[self addChild:labelNode];
+		
+		NSDictionary *attribs = @{NSFontAttributeName : [NSFont fontWithName:@"Futura-Medium" size:fontSize], NSForegroundColorAttributeName : self.textColor};
+		
+		NSAttributedString *labelText = [[NSAttributedString alloc] initWithString:[NSString stringWithFormat:@"%i", i] attributes:attribs];
+		
+		SKLabelNode *numberLabel = [SKLabelNode labelNodeWithAttributedText:labelText];
+		
+		numberLabel.position = CGPointMake(0, -9);
+		
+		[labelNode addChild:numberLabel];
+	}
 }
 
 -(void)setupColors
@@ -163,6 +270,36 @@ -(void)setupColors
 			textColor = [SKColor whiteColor];
 			break;
 		}
+		case ThemeContrast:
+		{
+			lightColor = [SKColor whiteColor];
+			darkColor = [SKColor whiteColor];
+			inlayColor = [SKColor whiteColor];
+			markColor = [SKColor blackColor];
+			handColor = [SKColor blackColor];
+			textColor = [SKColor blackColor];
+			break;
+		}
+		case ThemeVictoire:
+		{
+			lightColor = [SKColor colorWithRed:0.937 green:0.925 blue:0.871 alpha:1.000];
+			darkColor = [SKColor colorWithRed:0.737 green:0.725 blue:0.671 alpha:1.000];
+			inlayColor = lightColor;
+			markColor = [SKColor colorWithRed:0.337 green:0.325 blue:0.271 alpha:1.000];
+			handColor = [SKColor blackColor];
+			textColor = [SKColor colorWithRed:0.137 green:0.125 blue:0.071 alpha:1.000];
+			break;
+		}
+		case ThemeLiquid:
+		{
+			lightColor = [SKColor colorWithWhite:0.2 alpha:1.0];
+			darkColor = lightColor;
+			inlayColor = [SKColor colorWithWhite:0.3 alpha:1.0];
+			markColor = [SKColor colorWithWhite:0.5 alpha:1.0];
+			handColor = [SKColor whiteColor];
+			textColor = [SKColor whiteColor];
+			break;
+		}
 
 		default:
 			break;
@@ -213,8 +350,21 @@ -(void)setupScene
 	minuteHandInlay.color = self.inlayColor;
 	minuteHandInlay.colorBlendFactor = 1.0;
 
-	if (vectorDisplay)
-		[self setupTickmarks];
+	if (self.useProgrammaticLayout)
+	{
+		SKNode *face = [self childNodeWithName:@"Face"];
+		SKSpriteNode *numbersLayer = (SKSpriteNode *)[face childNodeWithName:@"Numbers"];
+		numbersLayer.alpha = 0;
+		
+		if (self.useRoundFace)
+		{
+			[self setupTickmarksForRoundFace];
+		}
+		else
+		{
+			[self setupTickmarksForRectangularFace];
+		}
+	}
 }
 
 - (void)update:(NSTimeInterval)currentTime forScene:(SKScene *)scene

SpriteKitWatchFace WatchKit Extension/Info.plist

@@ -19,7 +19,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>1.0</string>
 	<key>CFBundleVersion</key>
-	<string>55</string>
+	<string>56</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionAttributes</key>

SpriteKitWatchFace WatchKit Extension/InterfaceController.m

@@ -28,7 +28,7 @@ @implementation InterfaceController
 - (void)awakeWithContext:(id)context {
     [super awakeWithContext:context];
 
-	FaceScene *scene = (SKScene *)[FaceScene nodeWithFileNamed:@"FaceScene"];
+	FaceScene *scene = [FaceScene nodeWithFileNamed:@"FaceScene"];
 
 	[self.scene presentScene:scene];
 }

SpriteKitWatchFace/Info.plist

@@ -17,7 +17,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>1.0</string>
 	<key>CFBundleVersion</key>
-	<string>55</string>
+	<string>56</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>UILaunchStoryboardName</key>