5 files changed, 79 insertions, 19 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
@@ -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;
 }
 
@@ -8,6 +8,7 @@
 
 #import "CCLayer.h"
 #import "Cart.h"
+#import <CoreMotion/CoreMotion.h>
 
 #define GAME_SCENE 436
 #define GAME_LAYER 437
@@ -28,6 +29,10 @@
     void (^delayedAction)(void);
     
     BOOL isPaused;
+    
+    BOOL hasGyroscope;
+    double pitch;
+    CMMotionManager* motionManager;
 }
 
 @property (readonly) Cart* cart;
@@ -43,5 +48,6 @@
 - (void)mainmenu;
 - (void)scheduleDelayedAction:(void(^)(void))delayedAction delay:(float)delay;
 - (void)runDelayedAction;
+- (void)setPitch:(double)m_pitch;
 
 @end
@@ -33,8 +33,6 @@
     
     if (nil != self)
     {
-        isAccelerometerEnabled_ = YES;
-        
         objects = [[NSMutableSet alloc] init];
         
         cart = [[Cart alloc] initWithSprite:[CCSprite spriteWithFile:@"cart.png"]];
@@ -64,6 +62,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;
@@ -71,19 +89,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];
@@ -111,6 +149,11 @@
         
         [self pauseSchedulerAndActions];
         
+        if (hasGyroscope)
+        {
+            [motionManager stopDeviceMotionUpdates];
+        }
+        
         shadedLayer = [CCLayerColor layerWithColor:ccc4(0, 0, 0, 127)];
         [[[CCDirector sharedDirector] runningScene] addChild:shadedLayer];
         
@@ -143,6 +186,11 @@
         shadedLayer = nil;
         pauseLayer = nil;
         
+        if (hasGyroscope)
+        {
+            [motionManager startDeviceMotionUpdates];
+        }
+        
         [self resumeSchedulerAndActions];
         
         isPaused = NO;
@@ -211,6 +259,13 @@
     }
 }
 
+- (void)setPitch:(double)m_pitch
+{
+    pitch = m_pitch;
+    
+    [cart deviceDidRotate:pitch];
+}
+
 - (void)dealloc
 {
     [objects release];
@@ -288,13 +288,6 @@
     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;
@@ -500,6 +493,13 @@
     }
 }
 
+- (void)setPitch:(double)m_pitch
+{
+    [super setPitch:m_pitch];
+    
+    expectedAngle = pitch*M_PI_2;
+}
+
 @end
 
 @implementation LedgeFactory