Xargon/ES-DE
1
0
Fork 0
mirror of https://github.com/RetroDECK/ES-DE.git synced 2025-04-10 19:15:13 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Added 'rotation' and 'rotationOrigin' properties to the systemstatus element

Browse source
This commit is contained in:
Leon Styhre 2025-02-27 12:41:08 +01:00
parent 872318914b
commit ff6fd30757
2 changed files with 33 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -583,6 +583,8 @@ std::map<std::string, std::map<std::string, ThemeData::ElementPropertyType>>
{{"pos", NORMALIZED_PAIR},
{"height", FLOAT},
{"origin", NORMALIZED_PAIR},
{"rotation", FLOAT},
{"rotationOrigin", NORMALIZED_PAIR},
{"fontPath", PATH},
{"textRelativeScale", FLOAT},
{"color", COLOR},

48
es-core/src/components/SystemStatusComponent.cpp
View file

@ -386,23 +386,6 @@ void SystemStatusComponent::render(const glm::mat4& parentTrans)
if (mDisplayEntries.empty())
return;
if (mBackgroundColor != 0x00000000) {
const glm::vec3 positionTemp {mPosition};
mPosition.x -= mBackgroundPadding.x / 2.0f;
mPosition.y -= mBackgroundPadding.y / 2.0f;
const glm::mat4 trans {parentTrans * getTransform()};
mRenderer->setMatrix(trans);
mRenderer->drawRect(0.0f, 0.0f, mSize.x + mBackgroundPadding.x,
mSize.y + mBackgroundPadding.y, mBackgroundColor, mBackgroundColorEnd,
mColorGradientHorizontal, mThemeOpacity, 1.0f,
Renderer::BlendFactor::SRC_ALPHA,
Renderer::BlendFactor::ONE_MINUS_SRC_ALPHA, mBackgroundCornerRadius);
mPosition = positionTemp;
}
if (mGrid) {
mGrid->setPosition(mPosition);
mGrid->setRotationOrigin(mRotationOrigin);
@ -414,6 +397,37 @@ void SystemStatusComponent::render(const glm::mat4& parentTrans)
mRenderer->drawRect(0.0f, 0.0f, mSize.x, mSize.y, 0xFF000033, 0xFF000033);
}
if (mBackgroundColor != 0x00000000) {
glm::vec3 positionTemp {mPosition};
glm::vec2 sizeTemp {mSize};
glm::vec2 originTemp {mOrigin};
float rotationTemp {mRotation};
glm::vec2 rotationOriginTemp {mRotationOrigin};
mPosition = mGrid->getPosition();
mSize = mGrid->getSize();
mOrigin = mGrid->getOrigin();
mRotation = mRotation;
mRotationOrigin = mRotationOrigin;
glm::mat4 trans {parentTrans * getTransform()};
trans = glm::translate(trans, glm::vec3 {-mBackgroundPadding.x / 2.0f,
-mBackgroundPadding.y / 2.0f, 0.0f});
mRenderer->setMatrix(trans);
mRenderer->drawRect(
0.0f, 0.0f, mSize.x + mBackgroundPadding.x, mSize.y + mBackgroundPadding.y,
mBackgroundColor, mBackgroundColorEnd, mColorGradientHorizontal, mThemeOpacity,
1.0f, Renderer::BlendFactor::SRC_ALPHA, Renderer::BlendFactor::ONE_MINUS_SRC_ALPHA,
mBackgroundCornerRadius);
mPosition = positionTemp;
mSize = sizeTemp;
mOrigin = originTemp;
mRotation = rotationTemp;
mRotationOrigin = rotationOriginTemp;
}
mGrid->render(parentTrans);
}
}