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

Added an itemAxisRotation carousel property for rotating items around their own axis.

Browse source
This commit is contained in:
Leon Styhre 2023-01-11 23:33:50 +01:00
parent f9779ded9a
commit 78a9bac280
2 changed files with 21 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
es-core/src/ThemeData.cpp
View file

@ -146,6 +146,7 @@ std::map<std::string, std::map<std::string, ThemeData::ElementPropertyType>>
{"itemRotation", FLOAT},
{"itemRotationOrigin", NORMALIZED_PAIR},
{"itemAxisHorizontal", BOOLEAN},
{"itemAxisRotation", FLOAT},
{"imageInterpolation", STRING},
{"imageColor", COLOR},
{"imageColorEnd", COLOR},

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

@ -145,6 +145,7 @@ private:
float mItemRotation;
glm::vec2 mItemRotationOrigin;
bool mItemAxisHorizontal;
float mItemAxisRotation;
bool mLinearInterpolation;
unsigned int mImageColorShift;
unsigned int mImageColorShiftEnd;
@ -201,6 +202,7 @@ CarouselComponent<T>::CarouselComponent()
, mItemRotation {7.5f}
, mItemRotationOrigin {-3.0f, 0.5f}
, mItemAxisHorizontal {false}
, mItemAxisRotation {0.0f}
, mLinearInterpolation {false}
, mImageColorShift {0xFFFFFFFF}
, mImageColorShiftEnd {0xFFFFFFFF}
@ -1049,6 +1051,21 @@ template <typename T> void CarouselComponent<T>::render(const glm::mat4& parentT
renderItem.trans = positionCalc;
}
}
else if (mItemAxisRotation != 0.0f) {
// Rotate items around their own axis.
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(mItemAxisRotation),
glm::vec3 {0.0f, 0.0f, 1.0f});
renderItem.trans = glm::translate(renderItem.trans,
glm::vec3 {xOffTransRotate, yOffTransRotate, 0.0f});
}
float metadataOpacity {1.0f};
@ -1318,6 +1335,9 @@ void CarouselComponent<T>::applyTheme(const std::shared_ptr<ThemeData>& theme,
mItemAxisHorizontal =
(elem->has("itemAxisHorizontal") && elem->get<bool>("itemAxisHorizontal"));
if (elem->has("itemAxisRotation"))
mItemAxisRotation = elem->get<float>("itemAxisRotation");
if (elem->has("imageColor")) {
mImageColorShift = elem->get<unsigned int>("imageColor");
mImageColorShiftEnd = mImageColorShift;