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

changed vertical scroller as per wololo's suggestion. Scroll speed is a function of the

Browse Source 
dt value gathered from Update() instead of ticks.
This commit is contained in:
techdragon.nguyen@gmail.com
2010-11-25 16:39:22 +00:00
parent 22b743ccdf
commit 29805852c8
2 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
projects/mtg/src/TextScroller.cpp
View File

@@ -90,9 +90,9 @@ TextScroller( fontId, x, y, width, scrollSpeed)
{
mHeight = height;
mNbItemsShown = numItemsShown;
marginX = 0;
marginY = 215;
mVerticalScrollSpeed = 10.0f;
mMarginX = 0;
mMarginY = 215;
mScrollerInitialized = false;
}
@@ -102,13 +102,16 @@ void VerticalTextScroller::Update(float dt)
if (!strings.size()) return;
WFont * mFont = resources.GetWFont(fontId);
ostringstream scrollerText;
if ( mScrollerInitialized && timer % 10 == 0 )
// update the veritcal scrolling
if ( mScrollerInitialized )
{
mY -= 1;
if ( mY < marginY )
mY = marginY + 20;
mY -= mVerticalScrollSpeed * dt;
if ( mY < mMarginY )
mY = mMarginY + 20;
}
// update the text
if (timer == 0)
{
mScrollerInitialized = false;
@@ -122,7 +125,7 @@ void VerticalTextScroller::Update(float dt)
if (currentId >= strings.size())
currentId = 0;
mText = wordWrap(scrollerText.str(), mWidth);
mY = marginY + 20;
mY = mMarginY + 20;
}
timer = ++timer % ((int) mScrollSpeed);