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

Fixed an issue where overlapping wheel carousel items were not rendered in the correct order.

Browse source
This commit is contained in:
Leon Styhre 2022-09-21 22:03:03 +02:00
parent 5f864d0b96
commit 7b7a99dbe2
1 changed files with 17 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
es-core/src/components/primary/CarouselComponent.h
View file

@ -548,6 +548,8 @@ template <typename T> void CarouselComponent<T>::render(const glm::mat4& parentT
mRenderer->drawRect(0.0f, 0.0f, mSize.x, mSize.y, mCarouselColor, mCarouselColorEnd, mRenderer->drawRect(0.0f, 0.0f, mSize.x, mSize.y, mCarouselColor, mCarouselColorEnd,
mColorGradientHorizontal); mColorGradientHorizontal);
bool isWheel {mType == CarouselType::VERTICAL_WHEEL || mType == CarouselType::HORIZONTAL_WHEEL};
// Draw the items. // Draw the items.
// itemSpacing will also include the size of the item itself. // itemSpacing will also include the size of the item itself.
glm::vec2 itemSpacing {0.0f, 0.0f}; glm::vec2 itemSpacing {0.0f, 0.0f};
@ -555,7 +557,7 @@ template <typename T> void CarouselComponent<T>::render(const glm::mat4& parentT
float yOff {0.0f}; float yOff {0.0f};
float scaleSize {mItemSize.x * mItemScale - mItemSize.x}; float scaleSize {mItemSize.x * mItemScale - mItemSize.x};
if (mType == CarouselType::HORIZONTAL_WHEEL || mType == CarouselType::VERTICAL_WHEEL) { if (isWheel) {
xOff = (mSize.x - mItemSize.x) / 2.0f - (camOffset * itemSpacing.y); xOff = (mSize.x - mItemSize.x) / 2.0f - (camOffset * itemSpacing.y);
yOff = (mSize.y - mItemSize.y) / 2.0f; yOff = (mSize.y - mItemSize.y) / 2.0f;
// Alignment of the actual carousel inside to the overall component area. // Alignment of the actual carousel inside to the overall component area.
@ -732,20 +734,31 @@ template <typename T> void CarouselComponent<T>::render(const glm::mat4& parentT
} }
else { else {
// Make sure that overlapping items are rendered in the correct order. // Make sure that overlapping items are rendered in the correct order.
for (int i = 0; i < belowCenter - 0; ++i) size_t zeroDistanceEntry {0};
for (int i = 0; i < belowCenter; ++i)
renderItemsSorted.emplace_back(renderItems[i]); renderItemsSorted.emplace_back(renderItems[i]);
for (int i = static_cast<int>(renderItems.size()) - 1; i > belowCenter - 1; --i) for (int i = static_cast<int>(renderItems.size()) - 1; i > belowCenter - 1; --i) {
if (isWheel && (mPositiveDirection ? std::ceil(renderItems[i].distance) :
std::floor(renderItems[i].distance)) == 0) {
zeroDistanceEntry = i;
continue;
}
renderItemsSorted.emplace_back(renderItems[i]); renderItemsSorted.emplace_back(renderItems[i]);
} }
if (isWheel)
renderItemsSorted.emplace_back(renderItems[zeroDistanceEntry]);
}
for (auto& renderItem : renderItemsSorted) { for (auto& renderItem : renderItemsSorted) {
const std::shared_ptr<GuiComponent>& comp {mEntries.at(renderItem.index).data.item}; const std::shared_ptr<GuiComponent>& comp {mEntries.at(renderItem.index).data.item};
if (comp == nullptr) if (comp == nullptr)
continue; continue;
if (mType == CarouselType::VERTICAL_WHEEL || mType == CarouselType::HORIZONTAL_WHEEL) { if (isWheel) {
if (mItemAxisHorizontal) { if (mItemAxisHorizontal) {
glm::mat4 positionCalc {renderItem.trans}; glm::mat4 positionCalc {renderItem.trans};
const float xOff {(GuiComponent::mOrigin.x - mItemRotationOrigin.x) * mItemSize.x}; const float xOff {(GuiComponent::mOrigin.x - mItemRotationOrigin.x) * mItemSize.x};