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

reverted changes to the Scroll/OnScroll method signatures.

Browse Source
This commit is contained in:
techdragon.nguyen@gmail.com
2012-01-27 23:47:02 +00:00
parent 3079faeedd
commit 9faf2ffc72
16 changed files with 20 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
projects/mtg/src/GameApp.cpp
+2 -2
View File
@@ -445,11 +445,11 @@ void GameApp::Render()
}
void GameApp::OnScroll(int inXVelocity, int inYVelocity, int magnitude)
void GameApp::OnScroll(int inXVelocity, int inYVelocity)
{
if (mCurrentState != NULL)
{
mCurrentState->OnScroll(inXVelocity, inYVelocity, magnitude);
mCurrentState->OnScroll(inXVelocity, inYVelocity);
}
}
projects/mtg/src/GameStateAwards.cpp
+1 -1
View File
@@ -389,7 +389,7 @@ void GameStateAwards::ButtonPressed(int controllerId, int controlId)
}
}
void GameStateAwards::OnScroll(int inXVelocity, int inYVelocity, int magnitude)
void GameStateAwards::OnScroll(int inXVelocity, int inYVelocity)
{
if (abs(inYVelocity) > 300)
{
projects/mtg/src/GameStateDeckViewer.cpp
+3 -1
View File
@@ -1734,8 +1734,10 @@ void GameStateDeckViewer::ButtonPressed(int controllerId, int controlId)
}
}
void GameStateDeckViewer::OnScroll(int inXVelocity, int inYVelocity, int magnitude)
void GameStateDeckViewer::OnScroll(int inXVelocity, int inYVelocity)
{
int magnitude = static_cast<int>( sqrtf( (float )( (inXVelocity * inXVelocity) + (inXVelocity * inXVelocity))));
bool flickHorizontal = (abs(inXVelocity) > abs(inYVelocity));
bool flickUp = !flickHorizontal && (inYVelocity < 0) ? true : false;
bool flickRight = flickHorizontal && (inXVelocity > 0) ? true : false;
projects/mtg/src/GameStateDuel.cpp
+1 -1
View File
@@ -931,7 +931,7 @@ void GameStateDuel::ButtonPressed(int controllerId, int controlId)
}
}
void GameStateDuel::OnScroll(int inXVelocity, int inYVelocity, int magnitude)
void GameStateDuel::OnScroll(int inXVelocity, int inYVelocity)
{
// ignore magnitude for now, since no action requires scrolling
if (abs(inYVelocity) > 300)
projects/mtg/src/GameStateShop.cpp
+1 -1
View File
@@ -808,7 +808,7 @@ void GameStateShop::ButtonPressed(int controllerId, int controlId)
menu->Close();
}
void GameStateShop::OnScroll(int inXVelocity, int inYVelocity, int magnitude)
void GameStateShop::OnScroll(int inXVelocity, int inYVelocity)
{
// we ignore magnitude since there isn't any scrolling in the shop
if (abs(inXVelocity) > 200)