Mahtan/wagic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sync swipe motion in deck viewer act accordingly to a swipe/pan on corresponding platform (iOS vs everything else)

Browse Source
This commit is contained in:
techdragon.nguyen@gmail.com
2012-01-30 10:23:40 +00:00
parent b44f3088c2
commit fb43b9012b
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
JGE/src/iOS/EAGLView.m
+1 -1
View File
@@ -419,7 +419,7 @@ static NSString *_MY_AD_WHIRL_APPLICATION_KEY_IPAD = @"2e70e3f3da40408588b9a3170
else else
{ {
CGPoint v2 = [panGesture velocityInView: self]; CGPoint v2 = [panGesture velocityInView: self];
g_engine->Scroll( 0 - static_cast<int>(v2.x), 0 - static_cast<int>(v2.y)); g_engine->Scroll( static_cast<int>(v2.x), static_cast<int>(v2.y));
[self performSelector: @selector(resetInput) withObject: nil afterDelay: 0.5]; [self performSelector: @selector(resetInput) withObject: nil afterDelay: 0.5];
} }
projects/mtg/src/GameStateDeckViewer.cpp
+10
View File
@@ -1769,13 +1769,23 @@ void GameStateDeckViewer::ButtonPressed(int controllerId, int controlId)
} }
} }
/*
to keep actions consistent across the different platforms, we need to branch the way swipes are interpreted. iOS5 changes
the way a swipe moves a document on the page. swipe down is to simulate dragging the page down instead of moving down
on a page.
*/
void GameStateDeckViewer::OnScroll(int inXVelocity, int inYVelocity) void GameStateDeckViewer::OnScroll(int inXVelocity, int inYVelocity)
{ {
int magnitude = static_cast<int>( sqrtf( (float )( (inXVelocity * inXVelocity) + (inXVelocity * inXVelocity)))); int magnitude = static_cast<int>( sqrtf( (float )( (inXVelocity * inXVelocity) + (inXVelocity * inXVelocity))));
bool flickHorizontal = (abs(inXVelocity) > abs(inYVelocity)); bool flickHorizontal = (abs(inXVelocity) > abs(inYVelocity));
#ifdef IOS
bool flickUp = !flickHorizontal && (inYVelocity > 0) ? true : false;
bool flickRight = flickHorizontal && (inXVelocity < 0) ? true : false;
#else
bool flickUp = !flickHorizontal && (inYVelocity < 0) ? true : false; bool flickUp = !flickHorizontal && (inYVelocity < 0) ? true : false;
bool flickRight = flickHorizontal && (inXVelocity > 0) ? true : false; bool flickRight = flickHorizontal && (inXVelocity > 0) ? true : false;
#endif
if (mStage == STAGE_FILTERS) if (mStage == STAGE_FILTERS)
{ {