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

42
projects/mtg/src/CarouselDeckView.cpp
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;
}