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

Rename methods for consistency and add source code doc

Browse Source 
to DeckView.h
This commit is contained in:
Tobias Loose
2013-12-08 10:48:15 +01:00
parent 12c5f31562
commit 2b9977a334
7 changed files with 243 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files
projects/mtg/src/CarouselDeckView.cpp
+22 -20
View File
@@ -21,12 +21,12 @@ void CarouselDeckView::UpdateViewState(float dt)
if(mScrollOffset <= -1.0f)
{
SwitchPosition(-1);
changePosition(-1);
mScrollEasing.translate(1.0f);
}
else if(mScrollOffset >= 1.0f)
{
SwitchPosition(1);
changePosition(1);
mScrollEasing.translate(-1.0f);
}
@@ -43,7 +43,7 @@ void CarouselDeckView::UpdateViewState(float dt)
if(mSlideOffset < -1.0f)
{
mSlideEasing.translate(2.0f);
SwitchFilter(1);
changeFilter(1);
}
}
else if(mSlideOffset > mSlideEasing.start_value)
@@ -52,7 +52,7 @@ void CarouselDeckView::UpdateViewState(float dt)
if(mSlideOffset > 1.0f)
{
mSlideEasing.translate(-2.0f);
SwitchFilter(-1);
changeFilter(-1);
}
}
@@ -60,8 +60,10 @@ void CarouselDeckView::UpdateViewState(float dt)
}
}
void CarouselDeckView::UpdateCardPosition(CardRep &rep, int index)
void CarouselDeckView::UpdateCardPosition(int index)
{
CardRep &rep = mCards[index];
float rotation = mScrollOffset + 8 - index;
rep.x = x_center + cos((rotation) * M_PI / 12) * (right_border - x_center);
@@ -84,13 +86,13 @@ void CarouselDeckView::Render()
// in a different order, ie the center card should appear first, then the adjacent ones
if (WResourceManager::Instance()->IsThreaded())
{
WResourceManager::Instance()->RetrieveCard(getCardRep(0).card);
WResourceManager::Instance()->RetrieveCard(getCardRep(3).card);
WResourceManager::Instance()->RetrieveCard(getCardRep(4).card);
WResourceManager::Instance()->RetrieveCard(getCardRep(2).card);
WResourceManager::Instance()->RetrieveCard(getCardRep(5).card);
WResourceManager::Instance()->RetrieveCard(getCardRep(1).card);
WResourceManager::Instance()->RetrieveCard(getCardRep(6).card);
WResourceManager::Instance()->RetrieveCard(mCards[0].card);
WResourceManager::Instance()->RetrieveCard(mCards[3].card);
WResourceManager::Instance()->RetrieveCard(mCards[4].card);
WResourceManager::Instance()->RetrieveCard(mCards[2].card);
WResourceManager::Instance()->RetrieveCard(mCards[5].card);
WResourceManager::Instance()->RetrieveCard(mCards[1].card);
WResourceManager::Instance()->RetrieveCard(mCards[6].card);
}
renderCard(6);
@@ -123,19 +125,19 @@ bool CarouselDeckView::ButtonPressed(Buttons button)
switch(button)
{
case JGE_BTN_LEFT:
changePosition(-1);
changePositionAnimated(-1);
last_user_activity = 0;
break;
case JGE_BTN_RIGHT:
changePosition(1);
changePositionAnimated(1);
last_user_activity = 0;
break;
case JGE_BTN_UP:
changeFilter(1);
changeFilterAnimated(1);
last_user_activity = 0;
break;
case JGE_BTN_DOWN:
changeFilter(-1);
changeFilterAnimated(-1);
last_user_activity = 0;
break;
default:
@@ -157,7 +159,7 @@ MTGCard * CarouselDeckView::Click(int x, int y)
}
else
{
changePosition(n - 2);
changePositionAnimated(n - 2);
}
}
@@ -176,14 +178,14 @@ MTGCard *CarouselDeckView::Click()
}
}
void CarouselDeckView::changePosition(int offset)
void CarouselDeckView::changePositionAnimated(int offset)
{
mScrollEasing.start((float)offset, (float)(0.3f*abs(offset)));
last_user_activity = 0;
}
void CarouselDeckView::changeFilter(int offset)
void CarouselDeckView::changeFilterAnimated(int offset)
{
if(offset < 0)
{
@@ -198,6 +200,6 @@ void CarouselDeckView::changeFilter(int offset)
MTGCard *CarouselDeckView::getActiveCard()
{
return getCardRep(2).card;
return mCards[2].card;
}
projects/mtg/src/DeckView.cpp
+5 -10
View File
@@ -35,7 +35,7 @@ void DeckView::Update(float dt)
{
for(unsigned int i = 0; i < mCards.size(); ++i)
{
UpdateCardPosition(mCards[i], i);
UpdateCardPosition(i);
}
dirtyCardPos = false;
}
@@ -54,14 +54,14 @@ DeckDataWrapper* DeckView::deck()
return mCurrentDeck;
}
void DeckView::SwitchFilter(int delta)
void DeckView::changeFilter(int delta)
{
unsigned int FilterCount = Constants::NB_Colors + 1;
mFilter = (FilterCount + mFilter + delta) % FilterCount;
dirtyFilters = true;
}
void DeckView::SwitchPosition(int delta)
void DeckView::changePosition(int delta)
{
for(int i = 0; i < delta; ++i)
{
@@ -92,16 +92,11 @@ void DeckView::reloadIndexes()
}
}
DeckView::CardRep& DeckView::getCardRep(unsigned int index)
{
return mCards[index];
}
void DeckView::renderCard(int index, int alpha, bool asThumbnail)
{
WFont * mFont = WResourceManager::Instance()->GetWFont(Fonts::MAIN_FONT);
const CardRep& cardPosition = getCardRep(index);
const CardRep& cardPosition = mCards[index];
if (!cardPosition.card) return;
@@ -187,7 +182,7 @@ int DeckView::getCardIndexNextTo(int x, int y)
for(unsigned int i = 0; i < mCards.size(); i++)
{
const CardRep& cardPosition = getCardRep(i);
const CardRep& cardPosition = mCards[i];
float dx = (x - cardPosition.x);
float dy = (y - cardPosition.y);
projects/mtg/src/GameStateDeckViewer.cpp
+2 -2
View File
@@ -1532,11 +1532,11 @@ void GameStateDeckViewer::OnScroll(int inXVelocity, int inYVelocity)
{
//FIXME: this 500 is a bit arbitrary
int numCards = (magnitude / 500) % 8;
mView->changePosition(flickRight ? numCards : - numCards);
mView->changePositionAnimated(flickRight ? numCards : - numCards);
}
}
else
mView->changeFilter(flickUp ? 1 : -1);
mView->changeFilterAnimated(flickUp ? 1 : -1);
last_user_activity = 0;
}
projects/mtg/src/GridDeckView.cpp
+19 -17
View File
@@ -37,13 +37,13 @@ void GridDeckView::UpdateViewState(float dt)
if(mScrollOffset <= -1.0f)
{
SwitchPosition(2);
changePosition(2);
moveSelection(-2, false);
mScrollEasing.translate(1.0f);
}
else if(mScrollOffset >= 1.0f)
{
SwitchPosition(-2);
changePosition(-2);
moveSelection(2, false);
mScrollEasing.translate(-1.0f);
}
@@ -58,20 +58,22 @@ void GridDeckView::UpdateViewState(float dt)
if(mSlideOffset < -1.0f)
{
mSlideEasing.translate(2.0f);
SwitchFilter(1);
changeFilter(1);
}
else if(mSlideOffset > 1.0f)
{
mSlideEasing.translate(-2.0f);
SwitchFilter(-1);
changeFilter(-1);
}
dirtyCardPos = true;
}
}
void GridDeckView::UpdateCardPosition(CardRep &rep, int index)
void GridDeckView::UpdateCardPosition(int index)
{
CardRep &rep = mCards[index];
int col = index / mRows;
int row = index % mRows;
float colWidth = SCREEN_WIDTH_F / (mCols - 3);
@@ -121,7 +123,7 @@ void GridDeckView::Render()
{
if (WResourceManager::Instance()->IsThreaded())
{
WResourceManager::Instance()->RetrieveCard(getCardRep(i).card, RETRIEVE_THUMB);
WResourceManager::Instance()->RetrieveCard(mCards[i].card, RETRIEVE_THUMB);
}
renderCard(i, 255, true);
}
@@ -129,7 +131,7 @@ void GridDeckView::Render()
{
if (WResourceManager::Instance()->IsThreaded())
{
WResourceManager::Instance()->RetrieveCard(getCardRep(i).card);
WResourceManager::Instance()->RetrieveCard(mCards[i].card);
}
}
}
@@ -146,22 +148,22 @@ bool GridDeckView::ButtonPressed(Buttons button)
{
case JGE_BTN_LEFT:
if(mButtonMode) moveSelection(-2, true);
else changePosition(-1);
else changePositionAnimated(-1);
last_user_activity = 0;
break;
case JGE_BTN_RIGHT:
if(mButtonMode) moveSelection(2, true);
else changePosition(1);
else changePositionAnimated(1);
last_user_activity = 0;
break;
case JGE_BTN_UP:
if(mButtonMode) moveSelection(-1, true);
else changeFilter(1);
else changeFilterAnimated(1);
last_user_activity = 0;
break;
case JGE_BTN_DOWN:
if(mButtonMode) moveSelection(1, true);
else changeFilter(-1);
else changeFilterAnimated(-1);
last_user_activity = 0;
break;
case JGE_BTN_CTRL:
@@ -193,11 +195,11 @@ MTGCard * GridDeckView::Click(int x, int y)
}
else if(n < 4)
{
changePosition(-1);
changePositionAnimated(-1);
}
else if(n >= 12)
{
changePosition(1);
changePositionAnimated(1);
}
else
{
@@ -229,13 +231,13 @@ MTGCard * GridDeckView::Click()
return NULL;
}
void GridDeckView::changePosition(int offset)
void GridDeckView::changePositionAnimated(int offset)
{
mScrollEasing.start(-1.0f * offset, scroll_animation_duration * abs(offset));
last_user_activity = 0;
}
void GridDeckView::changeFilter(int offset)
void GridDeckView::changeFilterAnimated(int offset)
{
if(offset < 0)
{
@@ -268,11 +270,11 @@ void GridDeckView::moveSelection(int offset, bool alignIfOutOfBounds)
{
if(mCurrentSelection < 4)
{
changePosition(-1);
changePositionAnimated(-1);
}
else if(mCurrentSelection >= 12)
{
changePosition(1);
changePositionAnimated(1);
}
}
else