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

Put easing code into Easing.h. Add easing to sliding

Browse Source
This commit is contained in:
Tobias Loose
2013-12-05 21:46:12 +01:00
parent 334454655d
commit 8de50532f2
5 changed files with 53 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2,83 +2,11 @@
#define _GRID_DECK_VIEW_H
#include "DeckView.h"
class Easing
{
public:
float start_value;
float delta_value;
float value;
float duration;
float time_acc;
Easing(float val): start_value(val), delta_value(0), value(val), duration(0), time_acc(0)
{}
void reset(){ value = start_value; time_acc = 0;}
void finish(){ value = start_value + delta_value; time_acc = 0; duration = 0;}
virtual void update(float dt) = 0;
void start(float targetValue, float _duration){
start_value = value;
delta_value = targetValue - start_value;
time_acc = 0;
duration = _duration;
}
void transpose(float delta_value){
start_value += delta_value;
value += delta_value;
}
bool finished()
{
return time_acc >= duration;
}
};
class InOutQuadEasing : public Easing
{
public:
InOutQuadEasing(float val): Easing(val) {}
void update(float dt){
if(duration > 0){
time_acc += dt;
if(time_acc > duration)
{
time_acc = duration;
value = start_value + delta_value;
}
else
{
float time_tmp = time_acc * 2 / duration;
if (time_tmp < 1)
{
value = delta_value/2*time_tmp*time_tmp + start_value;
}
else
{
time_tmp -= 1;
value = -delta_value/2 * (time_tmp*(time_tmp-2) - 1) + start_value;
}
}
}
}
};
#include "Easing.h"
class GridDeckView : public DeckView
{
private:
enum AnimationStage{
NONE = 0,
SLIDE_UP,
SLIDE_DOWN//,
//SCROLL_TO_SELECTED
};
static const float scroll_speed;
static const float card_scale_small;
static const float card_scale_big;
@@ -97,11 +25,9 @@ public:
private:
int mCols;
int mRows;
float mSlide; //[-1,1]. defines, the y-offset of the cards
InOutQuadEasing mScrollOffset;
int mCurrentSelection; //0 <= mCurrentSelection < mCards.size(). defines the current selected and thus upscaled card
//int mColsToScroll; //the number of cols we need to scroll
AnimationStage mStage; // state machine state. for animation purposes
InOutQuadEasing mSlide; //[-1,1]. defines the y-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
};
#endif //_GRID_DECK_VIEW_H

1
projects/mtg/src/DeckView.cpp
View File

@@ -57,6 +57,7 @@ void DeckView::SwitchFilter(int delta)
{
unsigned int FilterCount = Constants::NB_Colors + 1;
mFilter = (FilterCount + mFilter + delta) % FilterCount;
dirtyFilters = true;
}
int DeckView::filter(){

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

@@ -5,7 +5,7 @@ const float GridDeckView::card_scale_small = 0.48f;
const float GridDeckView::card_scale_big = 0.7f;
GridDeckView::GridDeckView()
: DeckView(16), mCols(8), mRows(2), mSlide(0), mScrollOffset(0), mCurrentSelection(-1)/*, mColsToScroll(0)*/, mStage(NONE)
: DeckView(16), mCols(8), mRows(2), mSlide(0), mScrollOffset(0), mCurrentSelection(-1)
{
}
@@ -17,11 +17,10 @@ GridDeckView::~GridDeckView()
void GridDeckView::Reset()
{
mSlide = 0;
mScrollOffset = 0;
mSlide.finish();
mScrollOffset.finish();
mCurrentSelection = 0;
//mColsToScroll = 0;
mStage = NONE;
}
void GridDeckView::UpdateViewState(float dt)
@@ -51,39 +50,25 @@ void GridDeckView::UpdateViewState(float dt)
dirtyCardPos = true;
}
switch(mStage)
if(!mSlide.finished())
{
case SLIDE_DOWN:
mSlide -= 0.05f;
if (mSlide < -1.0f)
{
dirtyFilters = true;
mSlide = 1;
}
else if (mSlide > 0 && mSlide < 0.05)
{
mStage = NONE;
mSlide = 0;
mSlide.update(dt);
if(mSlide.value < mSlide.start_value){
//going downwards
if(mSlide.value < -1.0f){
mSlide.translate(2.0f);
SwitchFilter(1);
}
} else if(mSlide.value > mSlide.start_value){
//upwards
if(mSlide.value > 1.0f){
mSlide.translate(-2.0f);
SwitchFilter(-1);
}
}
dirtyCardPos = true;
break;
case SLIDE_UP:
mSlide += 0.05f;
if (mSlide > 1.0f)
{
dirtyFilters = true;
mSlide = -1;
}
else if (mSlide < 0 && mSlide > -0.05)
{
mStage = NONE;
mSlide = 0;
}
dirtyCardPos = true;
break;
default:
mStage = NONE;
break;
}
}
@@ -95,7 +80,7 @@ void GridDeckView::UpdateCardPosition(CardRep &rep, int index)
float rowHeight = SCREEN_HEIGHT_F / mRows;
rep.x = (col + mScrollOffset.value) * colWidth - colWidth;
rep.y = row * rowHeight + mSlide*SCREEN_HEIGHT + rowHeight/2;
rep.y = row * rowHeight + mSlide.value*SCREEN_HEIGHT + rowHeight/2;
if(mCurrentSelection == index)
{
@@ -130,26 +115,27 @@ void GridDeckView::Render()
MTGCard * GridDeckView::Click(int x, int y)
{
int n = getCardIndexNextTo(x, y);
DebugTrace("Clicked: " << n);
last_user_activity = 0;
//clicked active card, and no animation is running
if(n == mCurrentSelection && mStage == NONE)
{
return getActiveCard();
}
else if(n < 4 && mStage == NONE)
{
mScrollOffset.start(1.0f, 0.3f);
}
else if(n >= 12 && mStage == NONE)
{
mScrollOffset.start(-1.0f, 0.3f);
}
else
{
mCurrentSelection = n;
dirtyCardPos = true;
if(mScrollOffset.finished() && mSlide.finished())
{ //clicked and no animations running
if(n == mCurrentSelection)
{
return getActiveCard();
}
else if(n < 4)
{
mScrollOffset.start(1.0f, 0.3f);
}
else if(n >= 12)
{
mScrollOffset.start(-1.0f, 0.3f);
}
else
{
mCurrentSelection = n;
dirtyCardPos = true;
}
}
return NULL;
@@ -159,22 +145,20 @@ bool GridDeckView::Button(Buttons button)
{
switch(button)
{
case JGE_BTN_LEFT:
case JGE_BTN_RIGHT:
mScrollOffset.start(-1.0f, 0.3f);
last_user_activity = 0;
break;
case JGE_BTN_RIGHT:
case JGE_BTN_LEFT:
mScrollOffset.start( 1.0f, 0.3f);
last_user_activity = 0;
break;
case JGE_BTN_UP:
mStage = SLIDE_UP;
SwitchFilter(1);
mSlide.start(2.0f, 0.3f);
last_user_activity = 0;
break;
case JGE_BTN_DOWN:
mStage = SLIDE_DOWN;
SwitchFilter(-1);
mSlide.start(-2.0f, 0.3f);
last_user_activity = 0;
break;
default:

3
projects/mtg/wagic-SDL.pro
View File

@@ -271,7 +271,8 @@ HEADERS += \
include/AIHints.h\
include/DeckView.h\
include/CarouselDeckView.h\
include/GridDeckView.h
include/GridDeckView.h\
include/Easing.h
# JGE, could probably be moved outside
SOURCES += \

3
projects/mtg/wagic-qt.pro
View File

@@ -307,7 +307,8 @@ HEADERS += \
include/ObjectAnalytics.h\
include/DeckView.h\
include/CarouselDeckView.h\
include/GridDeckView.h
include/GridDeckView.h\
include/Easing.h
# JGE, could probably be moved outside
SOURCES += \