New centered icons. Split backgrounds and sprites into iphone, iphone…

… hd, ipad, and ipad hd directories. Start using a FormFactor class to begin isolating iPhone vs. iPad layout dimensions.

Maestro/AppDelegate.m

@@ -79,7 +79,7 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
     // When in iPhone RetinaDisplay, iPad, iPad RetinaDisplay mode, CCFileUtils will append the "-hd", "-ipad", "-ipadhd" to all loaded files
     // If the -hd, -ipad, -ipadhd files are not found, it will load the non-suffixed version
     [CCFileUtils setiPhoneRetinaDisplaySuffix:@"-hd"];              // Default on iPhone RetinaDisplay is "-hd"
-    [CCFileUtils setiPadSuffix:@""];                                   // Default on iPad is "" (empty string)
+    [CCFileUtils setiPadSuffix:@"-ipad"];                                   // Default on iPad is "" (empty string)
     [CCFileUtils setiPadRetinaDisplaySuffix:@"-ipadhd"];    // Default on iPad RetinaDisplay is "-ipadhd"
 
 	// Assume that PVR images have premultiplied alpha

Maestro/Constants.h

@@ -8,6 +8,5 @@
 
 #import <Foundation/Foundation.h>
 
-#define FLOOR_HEIGHT 40.0
 #define SCENE_TRANSITION_TIME 0.5
 #define FONT_NAME @"Courier"

Maestro/Devil.m

@@ -12,7 +12,7 @@ @implementation Devil
 
 - (id)init
 {
-    self = [super initWithFile:@"devil_1.png" rect:CGRectMake(0, 0, 384, 384)];
+    self = [super initWithFile:@"devil_1.png"];
     if (self) {
         CCAnimation *anim = [CCAnimation animation];
         [anim addFrameWithFilename:@"devil_2.png"];

Maestro/Floor.m

@@ -11,7 +11,7 @@
 @implementation Floor
 - (id)init
 {
-    self = [super initWithFile:@"floor.png" rect:CGRectMake(0, 0, 1024, 40)];
+    self = [super initWithFile:@"floor.png"];
     if (self) {
     }
     return self;

Maestro/FormFactor.h

@@ -0,0 +1,19 @@
+//
+//  FormFactor.h
+//  Maestro
+//
+//  Created by Matthew McGlincy on 4/11/12.
+//  Copyright (c) 2012 n/a. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+@interface FormFactor : NSObject
+
++ (BOOL)isIPhone;
++ (BOOL)isIPad;
++ (CGFloat)floorHeight;
++ (CGFloat)tearPhysicsBodyDiameter;
++ (CGFloat)violinCasePositionX;
+
+@end

Maestro/FormFactor.m

@@ -0,0 +1,53 @@
+//
+//  FormFactor.m
+//  Maestro
+//
+//  Created by Matthew McGlincy on 4/11/12.
+//  Copyright (c) 2012 n/a. All rights reserved.
+//
+
+#import "FormFactor.h"
+#import "cocos2d.h"
+
+@implementation FormFactor
+
++ (BOOL)isIPhone
+{
+    return ![self isIPad];
+}
+
++ (BOOL)isIPad 
+{
+    CGSize winSize = [[CCDirector sharedDirector] winSize];
+    return winSize.width == 1024 || winSize.width == 768;
+}
+
++ (CGFloat)floorHeight
+{
+    // 40 on iPad, 20 on iPhone
+    if ([self isIPad]) {
+        return 40.0;
+    } else {
+        return 20.0;
+    }
+}
+
++ (CGFloat)tearPhysicsBodyDiameter
+{
+    if ([self isIPad]) {
+        return 100.0;
+    } else {
+        return 50.0;
+    }    
+}
+
++ (CGFloat)violinCasePositionX
+{
+    if ([self isIPad]) {
+        return 284.0;
+    } else {
+        return 100.0;
+    }    
+}
+
+@end

Maestro/GameLayer.m

@@ -18,6 +18,7 @@
 #import "GameScene.h"
 #import "GameSoundManager.h"
 #import "Floor.h"
+#import "FormFactor.h"
 #import "Maestro.h"
 #import "Person.h"
 #import "Physics.h"
@@ -80,21 +81,22 @@ - (id)initWithLevelNum:(NSInteger)levelNum
         CGSize winSize = [[CCDirector sharedDirector] winSize];
         Maestro *maestro = [Maestro node];
         maestro.position = ccp(maestro.contentSize.width / 2, 
-                               FLOOR_HEIGHT + maestro.contentSize.height / 2);
+                               [FormFactor floorHeight] + maestro.contentSize.height / 2);
         [self addChild:maestro z:1];                         
 
         Person *p1 = [Person node];
         p1.position = ccp(winSize.width - p1.contentSize.width / 2, 
-                          FLOOR_HEIGHT + p1.contentSize.height / 2);
+                          [FormFactor floorHeight] + p1.contentSize.height / 2);
         [self addChild:p1 z:1];                         
 
         Person *p2 = [Person node];
         p2.position = ccp(winSize.width - p2.contentSize.width / 2 - 100, 
-                          FLOOR_HEIGHT + p2.contentSize.height / 2);
+                          [FormFactor floorHeight] + p2.contentSize.height / 2);
         [self addChild:p2 z:1];   
 
         ViolinCase *violinCase = [ViolinCase node];
-        violinCase.position = ccp(284, FLOOR_HEIGHT + violinCase.contentSize.height / 2);
+        violinCase.position = ccp([FormFactor violinCasePositionX], 
+                                  [FormFactor floorHeight] + violinCase.contentSize.height / 2);
         [self addChild:violinCase z:1];
         [violinCase addToPhysics];
 

Maestro/Maestro.m

@@ -12,7 +12,7 @@ @implementation Maestro
 
 - (id)init
 {
-    self = [super initWithFile:@"maestro_0.png" rect:CGRectMake(0, 0, 384, 384)];
+    self = [super initWithFile:@"maestro_0.png"];
     if (self) {
         CCAnimation *anim = [CCAnimation animation];
         [anim addFrameWithFilename:@"maestro_1.png"];

Maestro/Note.m

@@ -12,7 +12,7 @@ @implementation Note
 
 - (id)init
 {
-    self = [super initWithFile:@"gray_note.png" rect:CGRectMake(0, 0, 68, 84)];
+    self = [super initWithFile:@"gray_note.png"];
     if (self) {
     }
     return self;

Maestro/Person.m

@@ -21,7 +21,7 @@ @implementation Person
 
 - (id)init
 {
-    self = [super initWithFile:@"person_0.png" rect:CGRectMake(0, 0, 384, 384)];
+    self = [super initWithFile:@"person_0.png"];
     if (self) {
         CCAnimation *anim = [CCAnimation animation];
         [anim addFrameWithFilename:@"person_1.png"];

Maestro/Physics.m

@@ -7,6 +7,7 @@
 //
 
 #import "Constants.h"
+#import "FormFactor.h"
 #import "Physics.h"
 #import "PhysicsSprite.h"
 #import "Tear.h"
@@ -55,6 +56,7 @@ - (cpSpace *)space
 - (void)initPhysics
 {
 	CGSize s = [[CCDirector sharedDirector] winSize];
+    NSLog(@"size %@", NSStringFromCGSize(s));
 
 	// init chipmunk
 	cpInitChipmunk();
@@ -67,7 +69,7 @@ - (void)initPhysics
 	// We have to free them manually
 	//
 	// bottom
-	walls_[0] = cpSegmentShapeNew( space_->staticBody, ccp(0,FLOOR_HEIGHT), ccp(s.width,0), 0.0f);
+	walls_[0] = cpSegmentShapeNew( space_->staticBody, ccp(0, [FormFactor floorHeight]), ccp(s.width,0), 0.0f);
 
 	// top
 	walls_[1] = cpSegmentShapeNew( space_->staticBody, ccp(0,s.height), ccp(s.width,s.height), 0.0f);

Maestro/Resources/Info.plist

@@ -41,13 +41,15 @@
 		</dict>
 	</dict>
 	<key>CFBundleIdentifier</key>
-	<string>com.yourcompany.${PRODUCT_NAME:rfc1034identifier}</string>
+	<string>com.molyjam.${PRODUCT_NAME:rfc1034identifier}</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
 	<string>${PRODUCT_NAME}</string>
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

Maestro/ShopSign.m

@@ -12,7 +12,7 @@ @implementation ShopSign
 
 - (id)init
 {
-    self = [super initWithFile:@"shop_sign_0.png" rect:CGRectMake(0, 0, 256, 256)];
+    self = [super initWithFile:@"shop_sign_0.png"];
     if (self) {
         CCAnimation *anim = [CCAnimation animation];
         [anim addFrameWithFilename:@"shop_sign_1.png"];

Maestro/Tear.m

@@ -6,6 +6,7 @@
 //  Copyright (c) 2012 n/a. All rights reserved.
 //
 
+#import "FormFactor.h"
 #import "GameClock.h"
 #import "GameManager.h"
 #import "GameUtils.h"
@@ -30,7 +31,7 @@ @implementation Tear
 
 - (id)init
 {
-    self = [super initWithFile:@"tear_0.png" rect:CGRectMake(0, 0, 32, 32)];
+    self = [super initWithFile:@"tear_0.png"];
     if (self) {
         self.timeToDie = [[GameClock sharedInstance] currentTime] + [GameUtils randomTimeBetweenMin:MIN_LIFE max:MAX_LIFE];
 
@@ -60,7 +61,7 @@ - (id)init
 
 - (void)addToPhysics
 {
-    cpBody *body = cpBodyNew(1.0f, cpMomentForCircle(1.0f, 0, 100.0f, cpvzero)); //Tear diameter = 100. Using defines was causing compiler errors here :(
+    cpBody *body = cpBodyNew(1.0f, cpMomentForCircle(1.0f, 0, [FormFactor tearPhysicsBodyDiameter], cpvzero)); //Tear diameter = 100. Using defines was causing compiler errors here :(
 
     body->p = self.position;
     Physics *physics = [Physics sharedInstance];

Maestro/VictoryMaestro.m

@@ -12,7 +12,7 @@ @implementation VictoryMaestro
 
 - (id)init
 {
-    self = [super initWithFile:@"victory_maestro_0.png" rect:CGRectMake(0, 0, 512, 384)];
+    self = [super initWithFile:@"victory_maestro_0.png"];
     if (self) {
         CCAnimation *anim = [CCAnimation animation];
         [anim addFrameWithFilename:@"victory_maestro_1.png"];

Maestro/ViolinCase.m

@@ -13,7 +13,7 @@ @implementation ViolinCase
 
 - (id)init
 {
-    self = [super initWithFile:@"violin_case.png" rect:CGRectMake(0, 0, 128, 128)];
+    self = [super initWithFile:@"violin_case.png"];
     if (self) {
     }
     return self;