Xargon/ES-DE
1
0
Fork 0
mirror of https://github.com/RetroDECK/ES-DE.git synced 2024-11-25 15:45:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed an issue where horizontally scrolling game names would sometimes flicker.

Browse source 
Also cleaned up some code.
This commit is contained in:
Leon Styhre 2021-06-28 20:45:52 +02:00
parent a07e8a28fc
commit 817ee4122a
1 changed files with 31 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

57
es-core/src/components/TextListComponent.h
View file

@ -105,6 +105,7 @@ private:
int mMarqueeOffset; int mMarqueeOffset;
int mMarqueeOffset2; int mMarqueeOffset2;
int mMarqueeTime; int mMarqueeTime;
bool mMarqueeScroll;
Alignment mAlignment; Alignment mAlignment;
float mHorizontalMargin; float mHorizontalMargin;
@ -133,8 +134,9 @@ TextListComponent<T>::TextListComponent(Window* window) :
mMarqueeOffset = 0; mMarqueeOffset = 0;
mMarqueeOffset2 = 0; mMarqueeOffset2 = 0;
mMarqueeTime = 0; mMarqueeTime = 0;
mMarqueeScroll = false;
mHorizontalMargin = 0; mHorizontalMargin = 0.0f;
mAlignment = ALIGN_CENTER; mAlignment = ALIGN_CENTER;
mFont = Font::get(FONT_SIZE_MEDIUM); mFont = Font::get(FONT_SIZE_MEDIUM);
@ -153,17 +155,17 @@ TextListComponent<T>::TextListComponent(Window* window) :
template <typename T> template <typename T>
void TextListComponent<T>::render(const Transform4x4f& parentTrans) void TextListComponent<T>::render(const Transform4x4f& parentTrans)
{ {
Transform4x4f trans = parentTrans * getTransform();
std::shared_ptr<Font>& font = mFont;
if (size() == 0) if (size() == 0)
return; return;
const float entrySize = std::max(font->getHeight(1.0), Transform4x4f trans = parentTrans * getTransform();
static_cast<float>(font->getSize())) * mLineSpacing; std::shared_ptr<Font>& font = mFont;
int startEntry = 0; int startEntry = 0;
float y = 0;
const float entrySize = std::max(font->getHeight(1.0),
static_cast<float>(font->getSize())) * mLineSpacing;
// Number of entries that can fit on the screen simultaneously. // Number of entries that can fit on the screen simultaneously.
int screenCount = static_cast<int>(mSize.y() / entrySize + 0.5f); int screenCount = static_cast<int>(mSize.y() / entrySize + 0.5f);
@ -176,8 +178,6 @@ void TextListComponent<T>::render(const Transform4x4f& parentTrans)
startEntry = size() - screenCount; startEntry = size() - screenCount;
} }
float y = 0;
int listCutoff = startEntry + screenCount; int listCutoff = startEntry + screenCount;
if (listCutoff > size()) if (listCutoff > size())
listCutoff = size(); listCutoff = size();
@ -185,16 +185,15 @@ void TextListComponent<T>::render(const Transform4x4f& parentTrans)
// Draw selector bar. // Draw selector bar.
if (startEntry < listCutoff) { if (startEntry < listCutoff) {
if (mSelectorImage.hasImage()) { if (mSelectorImage.hasImage()) {
mSelectorImage.setPosition(0.f, mSelectorImage.setPosition(0.0f, (mCursor - startEntry) *
(mCursor - startEntry)*entrySize + mSelectorOffsetY, 0.f); entrySize + mSelectorOffsetY, 0.0f);
mSelectorImage.render(trans); mSelectorImage.render(trans);
} }
else { else {
Renderer::setMatrix(trans); Renderer::setMatrix(trans);
Renderer::drawRect( Renderer::drawRect(
0.0f, 0.0f,
(mCursor - startEntry)*entrySize + (mCursor - startEntry) * entrySize + mSelectorOffsetY,
mSelectorOffsetY,
mSize.x(), mSize.x(),
mSelectorHeight, mSelectorHeight,
mSelectorColor, mSelectorColor,
@ -210,7 +209,7 @@ void TextListComponent<T>::render(const Transform4x4f& parentTrans)
} }
// Clip to inside margins. // Clip to inside margins.
Vector3f dim(mSize.x(), mSize.y(), 0); Vector3f dim(mSize.x(), mSize.y(), 0.0f);
dim = trans * dim - trans.translation(); dim = trans * dim - trans.translation();
Renderer::pushClipRect(Vector2i(static_cast<int>(trans.translation().x() + Renderer::pushClipRect(Vector2i(static_cast<int>(trans.translation().x() +
mHorizontalMargin), static_cast<int>(trans.translation().y())), mHorizontalMargin), static_cast<int>(trans.translation().y())),
@ -240,7 +239,7 @@ void TextListComponent<T>::render(const Transform4x4f& parentTrans)
else else
entry.data.textCache->setColor(color); entry.data.textCache->setColor(color);
Vector3f offset(0, y, 0); Vector3f offset(0.0f, y, 0.0f);
switch (mAlignment) { switch (mAlignment) {
case ALIGN_LEFT: case ALIGN_LEFT:
@ -248,7 +247,7 @@ void TextListComponent<T>::render(const Transform4x4f& parentTrans)
break; break;
case ALIGN_CENTER: case ALIGN_CENTER:
offset[0] = static_cast<float>((mSize.x() - offset[0] = static_cast<float>((mSize.x() -
entry.data.textCache->metrics.size.x()) / 2); entry.data.textCache->metrics.size.x()) / 2.0f);
if (offset[0] < mHorizontalMargin) if (offset[0] < mHorizontalMargin)
offset[0] = mHorizontalMargin; offset[0] = mHorizontalMargin;
break; break;
@ -264,19 +263,23 @@ void TextListComponent<T>::render(const Transform4x4f& parentTrans)
Transform4x4f drawTrans = trans; Transform4x4f drawTrans = trans;
// Currently selected item text might be scrolling. // Currently selected item text might be scrolling.
if ((mCursor == i) && (mMarqueeOffset > 0)) if (mCursor == i && mMarqueeOffset > 0)
drawTrans.translate(offset - Vector3f(static_cast<float>(mMarqueeOffset), 0, 0)); drawTrans.translate(offset - Vector3f(static_cast<float>(mMarqueeOffset), 0.0f, 0.0f));
else else
drawTrans.translate(offset); drawTrans.translate(offset);
// Needed to avoid flickering when returning to the start position.
if (mMarqueeOffset == 0 && mMarqueeOffset2 == 0)
mMarqueeScroll = false;
Renderer::setMatrix(drawTrans); Renderer::setMatrix(drawTrans);
font->renderTextCache(entry.data.textCache.get()); font->renderTextCache(entry.data.textCache.get());
// Render currently selected item text again if marquee is // Render currently selected row again if marquee is scrolled far enough for it to repeat.
// scrolled far enough for it to repeat. if ((mCursor == i && mMarqueeOffset2 < 0) || (mCursor == i && mMarqueeScroll)) {
if ((mCursor == i) && (mMarqueeOffset2 < 0)) { mMarqueeScroll = true;
drawTrans = trans; drawTrans = trans;
drawTrans.translate(offset - Vector3f(static_cast<float>(mMarqueeOffset2), 0, 0)); drawTrans.translate(offset - Vector3f(static_cast<float>(mMarqueeOffset2), 0.0f, 0.0f));
Renderer::setMatrix(drawTrans); Renderer::setMatrix(drawTrans);
font->renderTextCache(entry.data.textCache.get()); font->renderTextCache(entry.data.textCache.get());
} }
@ -347,20 +350,20 @@ void TextListComponent<T>::update(int deltaTime)
mMarqueeOffset = 0; mMarqueeOffset = 0;
mMarqueeOffset2 = 0; mMarqueeOffset2 = 0;
// If we're not scrolling and this object's text goes outside our size, marquee it! // If we're not scrolling and this object's text exceeds our size, then marquee it.
const float textLength = mFont->sizeText(Utils::String::toUpper( const float textLength = mFont->sizeText(Utils::String::toUpper(
mEntries.at(static_cast<unsigned int>(mCursor)).name)).x(); mEntries.at(static_cast<unsigned int>(mCursor)).name)).x();
const float limit = mSize.x() - mHorizontalMargin * 2; const float limit = mSize.x() - mHorizontalMargin * 2.0f;
if (textLength > limit) { if (textLength > limit) {
// Loop. // Loop.
// Pixels per second (based on nes-mini font at 1920x1080 to produce a speed of 200). // Pixels per second (based on nes-mini font at 1920x1080 to produce a speed of 200).
const float speed = mFont->sizeText("ABCDEFGHIJKLMNOPQRSTUVWXYZ").x() * 0.247f; const float speed = mFont->sizeText("ABCDEFGHIJKLMNOPQRSTUVWXYZ").x() * 0.247f;
const float delay = 3000; const float delay = 3000.0f;
const float scrollLength = textLength; const float scrollLength = textLength;
const float returnLength = speed * 1.5f; const float returnLength = speed * 1.5f;
const float scrollTime = (scrollLength * 1000) / speed; const float scrollTime = (scrollLength * 1000.0f) / speed;
const float returnTime = (returnLength * 1000) / speed; const float returnTime = (returnLength * 1000.0f) / speed;
const int maxTime = static_cast<int>(delay + scrollTime + returnTime); const int maxTime = static_cast<int>(delay + scrollTime + returnTime);
mMarqueeTime += deltaTime; mMarqueeTime += deltaTime;