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

Fixed multiple issues with the horizontal wheel carousel.

Browse source
This commit is contained in:
Leon Styhre 2023-02-26 00:28:28 +01:00
parent a5a4b96476
commit 7ca5e56b46
1 changed files with 34 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -380,21 +380,12 @@ void CarouselComponent<T>::addEntry(Entry& entry, const std::shared_ptr<ThemeDat
else else
entry.data.item->setOrigin(0.5f, 0.5f); entry.data.item->setOrigin(0.5f, 0.5f);
if (mItemVerticalAlignment == ALIGN_TOP) { if (mItemVerticalAlignment == ALIGN_TOP)
if (mType == CarouselType::HORIZONTAL_WHEEL) entry.data.item->setOrigin(entry.data.item->getOrigin().x, 0.0f);
entry.data.item->setOrigin(1.0f, entry.data.item->getOrigin().y); else if (mItemVerticalAlignment == ALIGN_BOTTOM)
else entry.data.item->setOrigin(entry.data.item->getOrigin().x, 1.0f);
entry.data.item->setOrigin(entry.data.item->getOrigin().x, 0.0f); else
}
else if (mItemVerticalAlignment == ALIGN_BOTTOM) {
if (mType == CarouselType::HORIZONTAL_WHEEL)
entry.data.item->setOrigin(0.0f, entry.data.item->getOrigin().y);
else
entry.data.item->setOrigin(entry.data.item->getOrigin().x, 1.0f);
}
else {
entry.data.item->setOrigin(entry.data.item->getOrigin().x, 0.5f); entry.data.item->setOrigin(entry.data.item->getOrigin().x, 0.5f);
}
glm::vec2 denormalized {glm::round(mItemSize * entry.data.item->getOrigin())}; glm::vec2 denormalized {glm::round(mItemSize * entry.data.item->getOrigin())};
entry.data.item->setPosition(glm::vec3 {denormalized.x, denormalized.y, 0.0f}); entry.data.item->setPosition(glm::vec3 {denormalized.x, denormalized.y, 0.0f});
@ -437,21 +428,12 @@ void CarouselComponent<T>::updateEntry(Entry& entry, const std::shared_ptr<Theme
else else
entry.data.item->setOrigin(0.5f, 0.5f); entry.data.item->setOrigin(0.5f, 0.5f);
if (mItemVerticalAlignment == ALIGN_TOP) { if (mItemVerticalAlignment == ALIGN_TOP)
if (mType == CarouselType::HORIZONTAL_WHEEL) entry.data.item->setOrigin(entry.data.item->getOrigin().x, 0.0f);
entry.data.item->setOrigin(1.0f, entry.data.item->getOrigin().y); else if (mItemVerticalAlignment == ALIGN_BOTTOM)
else entry.data.item->setOrigin(entry.data.item->getOrigin().x, 1.0f);
entry.data.item->setOrigin(entry.data.item->getOrigin().x, 0.0f); else
}
else if (mItemVerticalAlignment == ALIGN_BOTTOM) {
if (mType == CarouselType::HORIZONTAL_WHEEL)
entry.data.item->setOrigin(0.0f, entry.data.item->getOrigin().y);
else
entry.data.item->setOrigin(entry.data.item->getOrigin().x, 1.0f);
}
else {
entry.data.item->setOrigin(entry.data.item->getOrigin().x, 0.5f); entry.data.item->setOrigin(entry.data.item->getOrigin().x, 0.5f);
}
glm::vec2 denormalized {glm::round(mItemSize * entry.data.item->getOrigin())}; glm::vec2 denormalized {glm::round(mItemSize * entry.data.item->getOrigin())};
entry.data.item->setPosition(glm::vec3 {denormalized.x, denormalized.y, 0.0f}); entry.data.item->setPosition(glm::vec3 {denormalized.x, denormalized.y, 0.0f});
@ -723,7 +705,12 @@ template <typename T> void CarouselComponent<T>::render(const glm::mat4& parentT
glm::vec2 itemSpacing {0.0f, 0.0f}; glm::vec2 itemSpacing {0.0f, 0.0f};
float xOff {0.0f}; float xOff {0.0f};
float yOff {0.0f}; float yOff {0.0f};
float scaleSize {mItemSize.x * mItemScale - mItemSize.x}; float scaleSize {0.0f};
if (mType == CarouselType::HORIZONTAL_WHEEL)
scaleSize = mItemSize.y * mItemScale - mItemSize.y;
else
scaleSize = mItemSize.x * mItemScale - mItemSize.x;
if (isWheel) { if (isWheel) {
// Alignment of the actual carousel inside to the overall component area. // Alignment of the actual carousel inside to the overall component area.
@ -747,14 +734,14 @@ template <typename T> void CarouselComponent<T>::render(const glm::mat4& parentT
yOff += scaleSize / 2.0f; yOff += scaleSize / 2.0f;
} }
else if (mWheelVerticalAlignment == ALIGN_TOP) { else if (mWheelVerticalAlignment == ALIGN_TOP) {
yOff = mItemSize.x; yOff = mItemSize.x - ((mItemSize.x - mItemSize.y) / 2.0f);
if (mItemVerticalAlignment == ALIGN_CENTER) if (mItemVerticalAlignment == ALIGN_CENTER)
yOff += scaleSize / 2.0f; yOff += scaleSize / 2.0f;
else if (mItemVerticalAlignment == ALIGN_BOTTOM) else if (mItemVerticalAlignment == ALIGN_BOTTOM)
yOff += scaleSize; yOff += scaleSize;
} }
else if (mWheelVerticalAlignment == ALIGN_BOTTOM) { else if (mWheelVerticalAlignment == ALIGN_BOTTOM) {
yOff = mSize.y; yOff = mSize.y + ((mItemSize.x - mItemSize.y) / 2.0f);
if (mItemVerticalAlignment == ALIGN_CENTER) if (mItemVerticalAlignment == ALIGN_CENTER)
yOff -= scaleSize / 2.0f; yOff -= scaleSize / 2.0f;
else if (mItemVerticalAlignment == ALIGN_TOP) else if (mItemVerticalAlignment == ALIGN_TOP)
@ -1066,8 +1053,6 @@ template <typename T> void CarouselComponent<T>::render(const glm::mat4& parentT
if (mType == CarouselType::HORIZONTAL_WHEEL) { if (mType == CarouselType::HORIZONTAL_WHEEL) {
// For horizontal wheels we need to rotate all items 90 degrees around their // For horizontal wheels we need to rotate all items 90 degrees around their
// own axis. // own axis.
renderItem.trans[3].x = positionCalc[3].x;
renderItem.trans[3].y = positionCalc[3].y;
const float xOffTransRotate {-(mItemSize.x / 2.0f)}; const float xOffTransRotate {-(mItemSize.x / 2.0f)};
const float yOffTransRotate {-(mItemSize.y / 2.0f)}; const float yOffTransRotate {-(mItemSize.y / 2.0f)};
@ -1082,6 +1067,22 @@ template <typename T> void CarouselComponent<T>::render(const glm::mat4& parentT
renderItem.trans, glm::vec3 {xOffTransRotate, yOffTransRotate, 0.0f}); renderItem.trans, glm::vec3 {xOffTransRotate, yOffTransRotate, 0.0f});
} }
} }
else if (mType == CarouselType::HORIZONTAL_WHEEL) {
renderItem.trans = positionCalc;
renderItem.trans = positionCalc;
const float xOffTransRotate {-(mItemSize.x / 2.0f)};
const float yOffTransRotate {-(mItemSize.y / 2.0f)};
renderItem.trans =
glm::translate(renderItem.trans, glm::vec3 {xOffTransRotate * -1.0f,
yOffTransRotate * -1.0f, 0.0f});
renderItem.trans = glm::rotate(renderItem.trans, glm::radians(90.0f),
glm::vec3 {0.0f, 0.0f, 1.0f});
renderItem.trans = glm::translate(
renderItem.trans, glm::vec3 {xOffTransRotate, yOffTransRotate, 0.0f});
}
else { else {
renderItem.trans = positionCalc; renderItem.trans = positionCalc;
renderItem.trans = positionCalc; renderItem.trans = positionCalc;