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

Parameterize animations in grid deck view

Browse Source
This commit is contained in:
Tobias Loose
2013-12-05 23:02:31 +01:00
parent 77eb7f2777
commit cbe6c0c842
3 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
projects/mtg/include/GridDeckView.h
View File

@@ -7,7 +7,8 @@
class GridDeckView : public DeckView class GridDeckView : public DeckView
{ {
private: private:
static const float scroll_speed; static const float scroll_animation_duration;
static const float slide_animation_duration;
static const float card_scale_small; static const float card_scale_small;
static const float card_scale_big; static const float card_scale_big;
public: public:
@@ -26,8 +27,8 @@ public:
MTGCard *getActiveCard(); MTGCard *getActiveCard();
private: private:
int mCols; int mCols; //the number of cols. there is a hidden col to the left and right for prefetching
int mRows; int mRows; //the number of rows.
InOutQuadEasing mSlide; //[-1,1]. defines the y-offset of the cards InOutQuadEasing mSlide; //[-1,1]. defines the y-offset of the cards
InOutQuadEasing mScrollOffset; //[-1,1]. defines the x-offset of the cards InOutQuadEasing mScrollOffset; //[-1,1]. defines the x-offset of the cards
int mCurrentSelection; //0 <= mCurrentSelection < mCards.size(). defines the current selected and thus upscaled card int mCurrentSelection; //0 <= mCurrentSelection < mCards.size(). defines the current selected and thus upscaled card

6
projects/mtg/src/CarouselDeckView.cpp
View File

@@ -124,6 +124,12 @@ void CarouselDeckView::Render()
renderCard(2); renderCard(2);
renderCard(1); renderCard(1);
} }
else
{
renderCard(1);
renderCard(2);
renderCard(3);
}
} }
MTGCard * CarouselDeckView::Click(int x, int y) MTGCard * CarouselDeckView::Click(int x, int y)

15
projects/mtg/src/GridDeckView.cpp
View File

@@ -1,6 +1,7 @@
#include "GridDeckView.h" #include "GridDeckView.h"
const float GridDeckView::scroll_speed = 5.0f; const float GridDeckView::scroll_animation_duration = 0.3f;
const float GridDeckView::slide_animation_duration = 0.4f;
const float GridDeckView::card_scale_small = 0.48f; const float GridDeckView::card_scale_small = 0.48f;
const float GridDeckView::card_scale_big = 0.7f; const float GridDeckView::card_scale_big = 0.7f;
@@ -125,11 +126,11 @@ MTGCard * GridDeckView::Click(int x, int y)
} }
else if(n < 4) else if(n < 4)
{ {
mScrollOffset.start(1.0f, 0.3f); changePosition(-1);
} }
else if(n >= 12) else if(n >= 12)
{ {
mScrollOffset.start(-1.0f, 0.3f); changePosition(1);
} }
else else
{ {
@@ -144,9 +145,9 @@ MTGCard * GridDeckView::Click(int x, int y)
void GridDeckView::changePosition(int offset) void GridDeckView::changePosition(int offset)
{ {
if(offset < 0){ if(offset < 0){
mScrollOffset.start( 1.0f, 0.3f); mScrollOffset.start( 1.0f, scroll_animation_duration);
}else if(offset > 0){ }else if(offset > 0){
mScrollOffset.start(-1.0f, 0.3f); mScrollOffset.start(-1.0f, scroll_animation_duration);
} }
last_user_activity = 0; last_user_activity = 0;
} }
@@ -154,9 +155,9 @@ void GridDeckView::changePosition(int offset)
void GridDeckView::changeFilter(int offset) void GridDeckView::changeFilter(int offset)
{ {
if(offset < 0){ if(offset < 0){
mSlide.start(-2.0f, 0.3f); mSlide.start(-2.0f, slide_animation_duration);
}else if(offset > 0){ }else if(offset > 0){
mSlide.start(2.0f, 0.3f); mSlide.start(2.0f, slide_animation_duration);
} }
last_user_activity = 0; last_user_activity = 0;
} }