1 files changed, 5 insertions, 6 deletions

@@ -8,8 +8,7 @@
 
 #import "JumpGameMode.h"
 
-#define kMinimumGestureLength  25
-#define kMaximumVariance   5
+#define kMinimumGestureLength  50
 
 @implementation JumpGameMode
 
@@ -91,10 +90,10 @@
 {
     UITouch* touch = [touches anyObject];
     CGPoint gestureCurrentPosition = [touch locationInView:nil];
-    CGFloat deltaX = fabsf(gestureStartPoint.x - gestureCurrentPosition.x);
-    CGFloat deltaY = fabsf(gestureStartPoint.y - gestureCurrentPosition.y);
+    CGFloat angle = atan2f(gestureCurrentPosition.y - gestureStartPoint.y, gestureCurrentPosition.x - gestureStartPoint.x);
+    CGFloat distance = sqrt(powf((gestureCurrentPosition.x - gestureStartPoint.x),2) + powf((gestureCurrentPosition.y - gestureStartPoint.y),2));
     
-    if ((deltaX >= kMinimumGestureLength) && (deltaY <= kMaximumVariance*swipeVarianceModifer) && (cart.sprite.position.y == 22))
+    if ((distance >= kMinimumGestureLength) && (angle >= expectedAngle - M_PI_4) && (angle <= expectedAngle + M_PI_4) && (cart.sprite.position.y == 22))
     {
         jump = YES;
     }
@@ -104,7 +103,7 @@
 {
     [super accelerometer:accelerometer didAccelerate:acceleration];
     
-    swipeVarianceModifer = MAX(1,(fabsf(acceleration.y) * 480)/kMaximumVariance);
+    expectedAngle = acceleration.y*M_PI_2;
 }
 
 @end