Pulled in trunk changes because the iOS 6 bug was making it impossible to test

7 files changed, 119 insertions, 44 deletions

@@ -26,6 +26,6 @@
 @property (assign) BOOL boundedByScreen;
 - (id)initWithSprite:(CCSprite*)sprite;
 - (void)tick;
-- (void)accelerometer:(UIAccelerometer*)accelerometer didAccelerate:(UIAcceleration*)acceleration;
+- (void)deviceDidRotate:(double)pitch;
 
 @end
@@ -54,7 +54,7 @@
             if ((delegate != nil) && ([delegate respondsToSelector:@selector(cartShouldFall:)]))
             {
                 int bottom = [delegate cartShouldFall:self];
-                sprite.position = ccp(sprite.position.x, MAX(bottom, sprite.position.y-6));
+                sprite.position = ccp(sprite.position.x, MAX(bottom, sprite.position.y-8));
             } else {
                 NSLog(@"Falling is set on a cart without a compatible game mode.");
             }
@@ -62,15 +62,14 @@
     }
 }
 
-- (void)accelerometer:(UIAccelerometer*)accelerometer didAccelerate:(UIAcceleration*)acceleration
+#define kFilterFactor 0.05f
+
+- (void)deviceDidRotate:(double)pitch
 {
     static float prevY=0;
-        
-#define kFilterFactor 0.05f
-        
-        float accelY = -((float) acceleration.y * kFilterFactor + (1- kFilterFactor)*prevY);
-        
-        prevY = accelY;
+    float accelY = -((float) pitch * kFilterFactor + (1- kFilterFactor)*prevY);
+    
+    prevY = accelY;
         accelX = accelY * 750;
 }
 
@@ -114,7 +114,8 @@
         [viewController setView:glView];
         
         // make the View Controller a child of the main window
-        [window addSubview: viewController.view];
+    [window setRootViewController:viewController];
+        //[window addSubview: viewController.view];
         
         [window makeKeyAndVisible];
         
@@ -10,6 +10,7 @@
 #import "Cart.h"
 #import "FallingObjectFactory.h"
 #import "GameModeInfo.h"
+#import <CoreMotion/CoreMotion.h>
 
 #define GAME_SCENE 436
 #define GAME_LAYER 437
@@ -31,6 +32,10 @@
     void (^delayedAction)(void);
     
     BOOL isPaused;
+    
+    BOOL hasGyroscope;
+    double pitch;
+    CMMotionManager* motionManager;
 }
 
 @property (readonly) Cart* cart;
@@ -46,5 +51,6 @@
 - (void)scheduleDelayedAction:(void(^)(void))delayedAction delay:(float)delay;
 - (void)runDelayedAction;
 + (GameModeInfo*)info;
+- (void)setPitch:(double)m_pitch;
 
 @end
@@ -20,8 +20,6 @@
     
     if (nil != self)
     {
-        isAccelerometerEnabled_ = YES;
-        
         objects = [[NSMutableSet alloc] init];
         
         cart = [[Cart alloc] initWithSprite:[CCSprite spriteWithFile:@"cart.png"]];
@@ -53,6 +51,26 @@
         }
         
         isPaused = NO;
+
+        Class cmClass = (NSClassFromString(@"CMMotionManager"));
+        if (cmClass)
+        {
+            motionManager = [[CMMotionManager alloc] init];
+            
+            if (motionManager.gyroAvailable)
+            {
+                [motionManager setDeviceMotionUpdateInterval:1.0f/60.0f];
+                isAccelerometerEnabled_ = NO;
+                hasGyroscope = YES;
+            } else {
+                isAccelerometerEnabled_ = YES;
+                motionManager = nil;
+                hasGyroscope = NO;
+            }
+        } else {
+            isAccelerometerEnabled_ = YES;
+            hasGyroscope = NO;
+        }
     }
     
     return self;
@@ -60,19 +78,39 @@
 
 - (void)accelerometer:(UIAccelerometer*)accelerometer didAccelerate:(UIAcceleration*)acceleration
 {       
-        [cart accelerometer:accelerometer didAccelerate:acceleration];
+    self.pitch = acceleration.y;
 }
 
 - (void)onEnterTransitionDidFinish
 {
     [super onEnterTransitionDidFinish];
     
-    [[UIAccelerometer sharedAccelerometer] setUpdateInterval:(1.0 / 60)];
+    if (hasGyroscope)
+    {
+        [motionManager startDeviceMotionUpdates];
+    } else {
+        [[UIAccelerometer sharedAccelerometer] setUpdateInterval:(1.0 / 60)];
+    }
+    
     [self schedule:@selector(tick:) interval:1.0f/60.0f];
 }
 
+- (void)onExit
+{
+    if (hasGyroscope)
+    {
+        [motionManager stopDeviceMotionUpdates];
+    }
+}
+
 - (void)tick:(ccTime)dt
 {
+    if (hasGyroscope)
+    {
+        CMDeviceMotion* motion = [motionManager deviceMotion];
+        self.pitch = -motion.attitude.pitch;
+    }
+    
     [cart tick];
     
     NSMutableSet* discardedObjects = [NSMutableSet set];
@@ -100,6 +138,11 @@
         
         [self pauseSchedulerAndActions];
         
+        if (hasGyroscope)
+        {
+            [motionManager stopDeviceMotionUpdates];
+        }
+        
         shadedLayer = [CCLayerColor layerWithColor:ccc4(0, 0, 0, 127)];
         [[[CCDirector sharedDirector] runningScene] addChild:shadedLayer];
         
@@ -132,6 +175,11 @@
         shadedLayer = nil;
         pauseLayer = nil;
         
+        if (hasGyroscope)
+        {
+            [motionManager startDeviceMotionUpdates];
+        }
+        
         [self resumeSchedulerAndActions];
         
         isPaused = NO;
@@ -202,9 +250,16 @@
 
 + (GameModeInfo*)info
 {
-    [NSException raise:@"Unimplemented method" format:@"Method -info of GameMode subclasses must be overridden"];
-    
-    return nil;
+  [NSException raise:@"Unimplemented method" format:@"Method -info of GameMode subclasses must be overridden"];
+  
+  return nil;
+}
+
+- (void)setPitch:(double)m_pitch
+{
+    pitch = m_pitch;
+
+    [cart deviceDidRotate:pitch];
 }
 
 - (void)dealloc
@@ -24,7 +24,7 @@
     if (self) {
                 localHighscores = [[Highscore localHighscoreListForGameMode:@"Collect"] retain];
                 
-                navigationBar = [[UINavigationBar alloc] initWithFrame:CGRectMake(0, 0, 320, 44)];
+                navigationBar = [[UINavigationBar alloc] initWithFrame:CGRectMake(0, 0, 480, 44)];
                 myNavigationItem = [[UINavigationItem alloc] initWithTitle:@"Highscores"];
                 UIBarButtonItem* barButton = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemDone target:self action:@selector(back)];
                 myNavigationItem.leftBarButtonItem = barButton;
@@ -45,7 +45,7 @@
                 [modeControl addTarget:self action:@selector(switchGameMode:) forControlEvents:UIControlEventValueChanged];
         UIBarButtonItem* barButton3 = [[UIBarButtonItem alloc] initWithCustomView:modeControl];
         
-        toolbar = [[UIToolbar alloc] initWithFrame:CGRectMake(0, 480-44, 320, 44)];
+        toolbar = [[UIToolbar alloc] initWithFrame:CGRectMake(0, 320-44, 480, 44)];
         [toolbar setItems:[NSArray arrayWithObjects:barButton3, btnSpace, barButton2, nil] animated:NO];
         [barButton2 release];
         [btnSpace release];
@@ -55,8 +55,8 @@
                 loadingGlobal = NO;
                 
                 tableView = [(UITableView*)self.view retain];
-                UIView* parentView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 320, 480)];
-                [tableView setFrame:CGRectMake(0, 44, 320, 480-44-44)];
+                UIView* parentView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 480, 320)];
+                [tableView setFrame:CGRectMake(0, 44, 480, 320-44-44)];
                 [parentView addSubview:navigationBar];
                 [parentView addSubview:tableView];
         [parentView addSubview:toolbar];
@@ -101,9 +101,9 @@
 */
 /*
 // Override to allow orientations other than the default portrait orientation.
-- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation {
-    // Return YES for supported orientations.
-    return YES;
+- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation
+{
+    return ( interfaceOrientation == UIInterfaceOrientationLandscapeRight );
 }
 */
 
@@ -183,7 +183,7 @@
         UILabel* scoreLabel = [[UILabel alloc] init];
         scoreLabel.text = [NSString stringWithFormat:@"%d", highscore.score];
         CGSize labelSize = [scoreLabel.text sizeWithFont:scoreLabel.font constrainedToSize:CGSizeMake(160, 44) lineBreakMode:UILineBreakModeClip];
-        scoreLabel.frame = CGRectMake(320-10-labelSize.width, 22-labelSize.height/2, labelSize.width, labelSize.height);
+        scoreLabel.frame = CGRectMake(480-10-labelSize.width, 22-labelSize.height/2, labelSize.width, labelSize.height);
         [cell addSubview:scoreLabel];
     [scoreLabel release];
         
@@ -293,10 +293,10 @@
                 {
                         loadingGlobal = YES;
                         
-                        loadingView = [[UIView alloc] initWithFrame:CGRectMake(0, 44, 320, 480-44-44)];
-                        activity = [[UIActivityIndicatorView alloc] initWithFrame:CGRectMake(150, 228-44, 20, 20)];
+                        loadingView = [[UIView alloc] initWithFrame:CGRectMake(0, 44, 480, 320-44-44)];
+                        activity = [[UIActivityIndicatorView alloc] initWithFrame:CGRectMake(230, 148-44, 20, 20)];
                         activity.activityIndicatorViewStyle = UIActivityIndicatorViewStyleGray;
-                        statusText = [[UILabel alloc] initWithFrame:CGRectMake(0, 256-44, 320, 21)];
+                        statusText = [[UILabel alloc] initWithFrame:CGRectMake(80, 150, 320, 21)];
                         statusText.text = @"Downloading highscores...";
                         statusText.textAlignment = UITextAlignmentCenter;
 
@@ -25,7 +25,19 @@
 
 @end
 
-// FallingObject flag 0 is whether the object is floating in water
+@implementation FallingObject (Flags)
+
+- (BOOL)fellDuringWave
+{
+    return flags[0];
+}
+
+- (void)setFellDuringWave:(BOOL)value
+{
+    flags[0] = value;
+}
+
+@end
 
 @implementation JumpGameMode
 
@@ -141,10 +153,12 @@ static GameModeInfo* info;
         }
     }
     
+    [ledges minusSet:discardedSet];
+    
     NSMutableSet* discardedObjects = [NSMutableSet set];
     for (FallingObject* object in objects)
     {
-        if ((object.sprite.position.y < 86) && (![object flag:0]))
+        if (object.sprite.position.y < (64+object.sprite.boundingBox.size.height/2))
         {
             for (CCSprite* ledge in ledges)
             {
@@ -167,20 +181,14 @@ static GameModeInfo* info;
             }
         }
         
-        if ((waterTick >= 180) || ((waterTick > 0) && ([object flag:0])))
+        if (object.fellDuringWave)
         {
             object.sprite.position = ccp(object.sprite.position.x, MAX(object.sprite.position.y, water.position.y+80+11));
         } else {
             object.sprite.position = ccp(object.sprite.position.x-ledgeScrollSpeed, object.sprite.position.y);
         }
-        
-        if ((waterTick > 0) && (object.sprite.position.y <= (water.position.y+80+11)))
-        {
-            [object setFlag:0 withValue:YES];
-        }
     }
     
-    [ledges minusSet:discardedSet];
     [objects minusSet:discardedObjects];
     
     if (rightmost <= 480)
@@ -205,6 +213,9 @@ static GameModeInfo* info;
     if ((cart.sprite.position.y < 86) && (cart.boundedByScreen))
     {
         cart.boundedByScreen = NO;
+    } else if ((cart.sprite.position.y >= 86) && (!cart.boundedByScreen))
+    {
+        cart.boundedByScreen = YES;
     }
     
     if (cart.sprite.position.y == (0-cart.sprite.boundingBox.size.height/2))
@@ -300,13 +311,6 @@ static GameModeInfo* info;
     isGesturing = NO;
 }
 
-- (void)accelerometer:(UIAccelerometer *)accelerometer didAccelerate:(UIAcceleration *)acceleration
-{
-    [super accelerometer:accelerometer didAccelerate:acceleration];
-    
-    expectedAngle = acceleration.y*M_PI_2;
-}
-
 - (int)cartShouldFall:(Cart *)m_cart
 {
     int bottom = 0-m_cart.sprite.boundingBox.size.height/2;
@@ -416,6 +420,7 @@ static GameModeInfo* info;
     object.delegate = self;
         object.sprite.position = ccp(objectX, 360);
         object.sprite.scale = 1;
+    object.fellDuringWave = waterTick > 0;
         [self addChild:object.sprite];
         
         [objects addObject:object];
@@ -450,6 +455,7 @@ static GameModeInfo* info;
             object.delegate = self;
                         object.sprite.position = ccp(objectX, 360);
                         object.sprite.scale = 1;
+            object.fellDuringWave = waterTick > 0;
                         [self addChild:object.sprite];
                         
                         [objects addObject:object];
@@ -486,6 +492,7 @@ static GameModeInfo* info;
             object.delegate = self;
                         object.sprite.position = ccp(objectX, 360);
                         object.sprite.scale = 1;
+            object.fellDuringWave = waterTick > 0;
                         [self addChild:object.sprite];
                         
                         [objects addObject:object];
@@ -528,6 +535,13 @@ static GameModeInfo* info;
     }
 }
 
+- (void)setPitch:(double)m_pitch
+{
+  [super setPitch:m_pitch];
+  
+  expectedAngle = pitch*M_PI_2;
+}
+
 @end
 
 @implementation LedgeFactory