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 the itemAxisHorizontal carousel property did not work correctly.

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

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

@ -748,16 +748,13 @@ template <typename T> void CarouselComponent<T>::render(const glm::mat4& parentT
if (mType == CarouselType::VERTICAL_WHEEL || mType == CarouselType::HORIZONTAL_WHEEL) { if (mType == CarouselType::VERTICAL_WHEEL || mType == CarouselType::HORIZONTAL_WHEEL) {
if (mItemAxisHorizontal) { if (mItemAxisHorizontal) {
glm::mat4 positionCalc {renderItem.trans}; glm::mat4 positionCalc {renderItem.trans};
const glm::vec2 rotationSize {comp->getSize()}; const float xOff {(GuiComponent::mOrigin.x - mItemRotationOrigin.x) * mItemSize.x};
const float xOff {(GuiComponent::mOrigin.x - mItemRotationOrigin.x) * const float yOff {(GuiComponent::mOrigin.y - mItemRotationOrigin.y) * mItemSize.y};
rotationSize.x};
const float yOff {(GuiComponent::mOrigin.y - mItemRotationOrigin.y) *
rotationSize.y};
// Transform to offset point. // Transform to offset point.
if (xOff != 0.0f || yOff != 0.0f) if (xOff != 0.0f || yOff != 0.0f)
positionCalc = positionCalc =
glm::translate(positionCalc, glm::vec3 {xOff * -1.0f, yOff * -1.0f, 0.0f}); glm::translate(positionCalc, glm::vec3 {xOff * -1.0f, 0.0f * -1.0f, 0.0f});
// Apply rotation transform. // Apply rotation transform.
positionCalc = positionCalc =
@ -766,8 +763,7 @@ template <typename T> void CarouselComponent<T>::render(const glm::mat4& parentT
// Transform back to original point. // Transform back to original point.
if (xOff != 0.0f || yOff != 0.0f) if (xOff != 0.0f || yOff != 0.0f)
positionCalc = glm::translate(positionCalc, glm::vec3 {xOff, yOff, 0.0f}); positionCalc = glm::translate(positionCalc, glm::vec3 {xOff, 0.0f, 0.0f});
// Only keep position and discard the rotation data. // Only keep position and discard the rotation data.
renderItem.trans[3].x = positionCalc[3].x; renderItem.trans[3].x = positionCalc[3].x;
renderItem.trans[3].y = positionCalc[3].y; renderItem.trans[3].y = positionCalc[3].y;