From 51d187387236bec97c30e2075b844d28fffb58cb Mon Sep 17 00:00:00 2001 From: "techdragon.nguyen@gmail.com" Date: Tue, 3 Jan 2012 14:29:46 +0000 Subject: [PATCH] removed nonstandard handling to use JGE::Scroll method. This removes the filter screen support that was added as part of the previous check in. --- JGE/src/iOS/EAGLView.m | 24 ++++-------------------- 1 file changed, 4 insertions(+), 20 deletions(-) diff --git a/JGE/src/iOS/EAGLView.m b/JGE/src/iOS/EAGLView.m index ffef6f9f0..62e9c4ac7 100755 --- a/JGE/src/iOS/EAGLView.m +++ b/JGE/src/iOS/EAGLView.m @@ -404,29 +404,13 @@ static NSString *_MY_AD_WHIRL_APPLICATION_KEY_IPAD = @"2e70e3f3da40408588b9a3170 CGPoint velocity = [panGesture velocityInView:panGesture.view.superview]; // we want to differentiate between a pan motion vs a flick gesture. if (!(( ((int)abs( (int) velocity.x)) > 300) || ((int) (abs( (int) velocity.y)) > 300))) + { g_engine->HoldKey_NoRepeat( JGE_BTN_OK ); + } else { - CGPoint v2 = [panGesture velocityInView: self]; - BOOL isVerticalSwipe = (fabsf(v2.x) > fabsf( v2.y)) ? NO : YES; - g_engine->LeftClicked(-1, -1); - - if ( !isVerticalSwipe ) - { - if (v2.x > 0) // swipe right - g_engine->HoldKey_NoRepeat( JGE_BTN_RIGHT ); - else - g_engine->HoldKey_NoRepeat( JGE_BTN_LEFT ); - } - else - { - if (v2.y > 0) // swipe up - g_engine->HoldKey_NoRepeat( JGE_BTN_UP ); - else - g_engine->HoldKey_NoRepeat( JGE_BTN_DOWN ); - } - [self performSelector: @selector(resetInput) withObject: nil afterDelay: 0.1]; - + CGPoint v2 = [panGesture velocityInView: self]; + g_engine->Scroll( static_cast(v2.x), static_cast(v2.y)); } } }