Xargon/ES-DE
1
0
Fork 0
mirror of https://github.com/RetroDECK/ES-DE.git synced 2025-01-30 03:55:40 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #134 from jrassa/system-view-vertical-slide

Browse source 
slide transition will slide vertically for vertical carousel
This commit is contained in:
Jools Wills 2017-05-20 21:09:11 +01:00 committed by GitHub
parent 6de94ecbfb 2b907b8674
commit 3a49f6abe5
1 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
es-app/src/views/SystemView.cpp
View file

@ -434,12 +434,13 @@ void SystemView::renderInfoBar(const Eigen::Affine3f& trans)
// Draw background extras // Draw background extras
void SystemView::renderExtras(const Eigen::Affine3f& trans, float lower, float upper) void SystemView::renderExtras(const Eigen::Affine3f& trans, float lower, float upper)
{ {
Eigen::Affine3f extrasTrans = trans;
int extrasCenter = (int)mExtrasCamOffset; int extrasCenter = (int)mExtrasCamOffset;
// Adding texture loading buffers depending on scrolling speed and status // Adding texture loading buffers depending on scrolling speed and status
int bufferIndex = getScrollingVelocity() + 1; int bufferIndex = getScrollingVelocity() + 1;
Renderer::pushClipRect(Eigen::Vector2i(0, 0), mSize.cast<int>());
for (int i = extrasCenter + logoBuffersLeft[bufferIndex]; i <= extrasCenter + logoBuffersRight[bufferIndex]; i++) for (int i = extrasCenter + logoBuffersLeft[bufferIndex]; i <= extrasCenter + logoBuffersRight[bufferIndex]; i++)
{ {
int index = i; int index = i;
@ -448,10 +449,11 @@ void SystemView::renderExtras(const Eigen::Affine3f& trans, float lower, float u
while (index >= (int)mEntries.size()) while (index >= (int)mEntries.size())
index -= mEntries.size(); index -= mEntries.size();
extrasTrans.translation() = trans.translation() + Eigen::Vector3f((i - mExtrasCamOffset) * mSize.x(), 0, 0); Eigen::Affine3f extrasTrans = trans;
if (mCarousel.type == HORIZONTAL)
Eigen::Vector2i clipRect = Eigen::Vector2i((int)((i - mExtrasCamOffset) * mSize.x()), 0); extrasTrans.translate(Eigen::Vector3f((i - mExtrasCamOffset) * mSize.x(), 0, 0));
Renderer::pushClipRect(clipRect, mSize.cast<int>()); else
extrasTrans.translate(Eigen::Vector3f(0, (i - mExtrasCamOffset) * mSize.y(), 0));
SystemViewData data = mEntries.at(index).data; SystemViewData data = mEntries.at(index).data;
for(unsigned int j = 0; j < data.backgroundExtras.size(); j++) for(unsigned int j = 0; j < data.backgroundExtras.size(); j++)
@ -461,9 +463,8 @@ void SystemView::renderExtras(const Eigen::Affine3f& trans, float lower, float u
extra->render(extrasTrans); extra->render(extrasTrans);
} }
} }
Renderer::popClipRect();
} }
Renderer::popClipRect();
} }
void SystemView::renderFade(const Eigen::Affine3f& trans) void SystemView::renderFade(const Eigen::Affine3f& trans)