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

Added two new properties tileHorizontalAlignment and tileVerticalAlignment to the image element.

Browse source
This commit is contained in:
Leon Styhre 2022-09-07 20:18:15 +02:00
parent d362f62b45
commit 406aecc6a9
3 changed files with 76 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -98,6 +98,8 @@ std::map<std::string, std::map<std::string, ThemeData::ElementPropertyType>>
{"gameselector", STRING},
{"tile", BOOLEAN},
{"tileSize", NORMALIZED_PAIR},
{"tileHorizontalAlignment", STRING},
{"tileVerticalAlignment", STRING},
{"interpolation", STRING},
{"color", COLOR},
{"colorEnd", COLOR},

79
es-core/src/components/ImageComponent.cpp
View file

@ -49,6 +49,8 @@ ImageComponent::ImageComponent(bool forceLoad, bool dynamic)
, mRotateByTargetSize {false}
, mLinearInterpolation {false}
, mMipmapping {false}
, mTileHorizontalAlignment {ALIGN_LEFT}
, mTileVerticalAlignment {ALIGN_TOP}
, mTopLeftCrop {0.0f, 0.0f}
, mBottomRightCrop {1.0f, 1.0f}
, mClipRegion {0.0f, 0.0f, 0.0f, 0.0f}
@ -414,14 +416,35 @@ void ImageComponent::updateVertices()
// clang-format on
}
else {
// Adjust the texture size as needed for tiled textures.
float px {mSize.x / mTileWidth};
float py {mSize.y / mTileHeight};
// Resize and align tiled textures.
glm::vec2 topLeftAlign {mTopLeftCrop};
glm::vec2 bottomRightAlign {mBottomRightCrop};
const float pxA {mSize.x / mTileWidth};
const float pyA {mSize.y / mTileHeight};
if (mTileHorizontalAlignment == Alignment::ALIGN_RIGHT) {
float offsetX {pxA - std::floor(pxA)};
if (offsetX != 0.0f) {
const float moveX {(mTileWidth * offsetX) / mSize.x};
topLeftAlign.x -= moveX * pxA;
bottomRightAlign.x -= moveX;
}
}
if (mTileVerticalAlignment == Alignment::ALIGN_TOP) {
float offsetY {pyA - std::floor(pyA)};
if (offsetY != 0.0f) {
const float moveY {(mTileHeight * offsetY) / mSize.y};
topLeftAlign.y += moveY * pyA;
bottomRightAlign.y += moveY * pyA;
}
}
// clang-format off
mVertices[0] = {{topLeft.x, topLeft.y }, {mTopLeftCrop.x, py - mTopLeftCrop.y }, 0};
mVertices[1] = {{topLeft.x, bottomRight.y}, {mTopLeftCrop.x, 1.0f - mBottomRightCrop.y}, 0};
mVertices[2] = {{bottomRight.x, topLeft.y }, {mBottomRightCrop.x * px, py - mTopLeftCrop.y }, 0};
mVertices[3] = {{bottomRight.x, bottomRight.y}, {mBottomRightCrop.x * px, 1.0f - mBottomRightCrop.y}, 0};
mVertices[0] = {{topLeft.x, topLeft.y }, {topLeftAlign.x, pyA - topLeftAlign.y }, 0};
mVertices[1] = {{topLeft.x, bottomRight.y}, {topLeftAlign.x, 1.0f - bottomRightAlign.y}, 0};
mVertices[2] = {{bottomRight.x, topLeft.y }, {bottomRightAlign.x * pxA, pyA - topLeftAlign.y }, 0};
mVertices[3] = {{bottomRight.x, bottomRight.y}, {bottomRightAlign.x * pxA, 1.0f - bottomRightAlign.y}, 0};
// clang-format on
}
@ -614,8 +637,9 @@ void ImageComponent::applyTheme(const std::shared_ptr<ThemeData>& theme,
if (elem->has("default"))
setDefaultImage(elem->get<std::string>("default"));
if (properties & PATH && elem->has("path")) {
bool tile {elem->has("tile") && elem->get<bool>("tile")};
if (properties & PATH && elem->has("path")) {
const std::string path {elem->get<std::string>("path")};
if (!tile && !theme->isLegacyTheme() && noMax && path.length() > 4 &&
@ -645,6 +669,45 @@ void ImageComponent::applyTheme(const std::shared_ptr<ThemeData>& theme,
setImage(path, tile);
}
bool updateAlignment {false};
if (elem->has("tileHorizontalAlignment")) {
const std::string alignment {elem->get<std::string>("tileHorizontalAlignment")};
updateAlignment = true;
if (alignment == "left") {
mTileHorizontalAlignment = ALIGN_LEFT;
}
else if (alignment == "right") {
mTileHorizontalAlignment = ALIGN_RIGHT;
}
else {
LOG(LogWarning) << "ImageComponent: Invalid theme configuration, property "
"<tileHorizontalAlignment> for element \""
<< element.substr(6) << "\" defined as \"" << alignment << "\"";
mTileHorizontalAlignment = ALIGN_LEFT;
}
}
if (elem->has("tileVerticalAlignment")) {
const std::string alignment {elem->get<std::string>("tileVerticalAlignment")};
updateAlignment = true;
if (alignment == "top") {
mTileVerticalAlignment = ALIGN_TOP;
}
else if (alignment == "bottom") {
mTileVerticalAlignment = ALIGN_BOTTOM;
}
else {
LOG(LogWarning) << "ImageComponent: Invalid theme configuration, property "
"<tileVerticalAlignment> for element \""
<< element.substr(6) << "\" defined as \"" << alignment << "\"";
mTileVerticalAlignment = ALIGN_TOP;
}
}
if (tile && updateAlignment)
updateVertices();
if (properties && elem->has("imageType")) {
std::string imageTypes {elem->get<std::string>("imageType")};
for (auto& character : imageTypes) {

3
es-core/src/components/ImageComponent.h
View file

@ -157,6 +157,9 @@ private:
bool mLinearInterpolation;
bool mMipmapping;
Alignment mTileHorizontalAlignment;
Alignment mTileVerticalAlignment;
glm::vec2 mTopLeftCrop;
glm::vec2 mBottomRightCrop;
glm::vec4 mClipRegion;