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

Make the eased value a reference and add source code doc to Easing.h

Browse Source 
This allows to apply multiple easings to the same variable.
This commit is contained in:
Tobias Loose
2013-12-07 10:05:26 +01:00
parent 2b0f50bb88
commit 4514725aba
5 changed files with 177 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3,7 +3,7 @@
const float CarouselDeckView::slide_animation_duration = 0.6f;
CarouselDeckView::CarouselDeckView() :
DeckView(10), mScrollOffset(0), mSlide(0)
DeckView(10), mScrollOffset(0), mSlideOffset(0), mScrollEasing(mScrollOffset), mSlideEasing(mSlideOffset)
{
}
@@ -12,19 +12,19 @@ CarouselDeckView::~CarouselDeckView()
void CarouselDeckView::UpdateViewState(float dt)
{
if(!mScrollOffset.finished())
if(!mScrollEasing.finished())
{
mScrollOffset.update(dt);
mScrollEasing.update(dt);
if(mScrollOffset.value <= -1.0f)
if(mScrollOffset <= -1.0f)
{
mScrollOffset.translate(1.0f);
mScrollEasing.translate(1.0f);
deck()->prev();
reloadIndexes();
}
else if(mScrollOffset.value >= 1.0f)
else if(mScrollOffset >= 1.0f)
{
mScrollOffset.translate(-1.0f);
mScrollEasing.translate(-1.0f);
deck()->next();
reloadIndexes();
}
@@ -32,25 +32,25 @@ void CarouselDeckView::UpdateViewState(float dt)
dirtyCardPos = true;
}
if(!mSlide.finished())
if(!mSlideEasing.finished())
{
mSlide.update(dt);
mSlideEasing.update(dt);
if(mSlide.value < mSlide.start_value)
if(mSlideOffset < mSlideEasing.start_value)
{
//going downwards
if(mSlide.value < -1.0f)
if(mSlideOffset < -1.0f)
{
mSlide.translate(2.0f);
mSlideEasing.translate(2.0f);
SwitchFilter(1);
}
}
else if(mSlide.value > mSlide.start_value)
else if(mSlideOffset > mSlideEasing.start_value)
{
//upwards
if(mSlide.value > 1.0f)
if(mSlideOffset > 1.0f)
{
mSlide.translate(-2.0f);
mSlideEasing.translate(-2.0f);
SwitchFilter(-1);
}
}
@@ -61,18 +61,19 @@ void CarouselDeckView::UpdateViewState(float dt)
void CarouselDeckView::UpdateCardPosition(CardRep &rep, int index)
{
float rotation = mScrollOffset.value + 8 - index;
float rotation = mScrollOffset + 8 - index;
rep.x = x_center + cos((rotation) * M_PI / 12) * (right_border - x_center);
rep.scale = max_scale / 1.12f * cos((rep.x - x_center) * 1.5f / (right_border - x_center)) + 0.2f * max_scale * cos(
cos((rep.x - x_center) * 0.15f / (right_border - x_center)));
rep.y = (SCREEN_HEIGHT_F) / 2.0f + SCREEN_HEIGHT_F * mSlide.value * (rep.scale + 0.2f);
rep.y = (SCREEN_HEIGHT_F) / 2.0f + SCREEN_HEIGHT_F * mSlideOffset * (rep.scale + 0.2f);
}
void CarouselDeckView::Reset()
{
mScrollOffset = 0;
mSlide = 0;
mSlideEasing.finish();
mScrollEasing.finish();
DeckView::Reset();
}
@@ -96,13 +97,13 @@ void CarouselDeckView::Render()
renderCard(4);
renderCard(0);
if (mScrollOffset.value < 0.5 && mScrollOffset.value > -0.5)
if (mScrollOffset < 0.5 && mScrollOffset > -0.5)
{
renderCard(1);
renderCard(3);
renderCard(2);
}
else if (mScrollOffset.value < -0.5)
else if (mScrollOffset < -0.5)
{
renderCard(3);
renderCard(2);
@@ -122,7 +123,7 @@ MTGCard * CarouselDeckView::Click(int x, int y)
last_user_activity = 0;
//clicked active card, and no animation is running
if(mSlide.finished() && mScrollOffset.finished())
if(mSlideEasing.finished() && mScrollEasing.finished())
{
if(n == 2)
{
@@ -140,7 +141,7 @@ MTGCard * CarouselDeckView::Click(int x, int y)
void CarouselDeckView::changePosition(int offset)
{
mScrollOffset.start(offset, 0.3f*abs(offset));
mScrollEasing.start(offset, 0.3f*abs(offset));
last_user_activity = 0;
}
@@ -149,11 +150,11 @@ void CarouselDeckView::changeFilter(int offset)
{
if(offset < 0)
{
mSlide.start(-2.0f, slide_animation_duration);
mSlideEasing.start(-2.0f, slide_animation_duration);
}
else if(offset > 0)
{
mSlide.start(2.0f, slide_animation_duration);
mSlideEasing.start(2.0f, slide_animation_duration);
}
last_user_activity = 0;
}