Xargon/ES-DE
1
0
Fork 0
mirror of https://github.com/RetroDECK/ES-DE.git synced 2025-02-18 04:45:39 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fixed an issue where raster graphic images could get scaled incorrectly.

Browse source
This commit is contained in:
Leon Styhre 2022-08-16 21:04:39 +02:00
parent ea8aac03f0
commit 967b98008b
3 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
es-core/src/resources/TextureData.h
View file

@ -65,8 +65,9 @@ public:
void setForceRasterization(bool setting) { mForceRasterization = setting; } void setForceRasterization(bool setting) { mForceRasterization = setting; }
// Has the image been loaded but not yet been rasterized as the size was not known? // Has the image been loaded but not yet been rasterized as the size was not known?
bool getPendingRasterization() { return mPendingRasterization; } const bool getPendingRasterization() { return mPendingRasterization; }
const bool getScalable() { return mScalable; }
std::vector<unsigned char>& getRawRGBAData() { return mDataRGBA; } std::vector<unsigned char>& getRawRGBAData() { return mDataRGBA; }
std::string getTextureFilePath() { return mPath; } std::string getTextureFilePath() { return mPath; }
bool tiled() { return mTile; } bool tiled() { return mTile; }

2
es-core/src/resources/TextureResource.cpp
View file

@ -200,6 +200,8 @@ void TextureResource::rasterizeAt(float width, float height)
data = mTextureData; data = mTextureData;
else else
data = sTextureDataManager.get(this); data = sTextureDataManager.get(this);
if (mTextureData && mTextureData.get()->getScalable())
mSourceSize = glm::vec2 {static_cast<float>(width), static_cast<float>(height)}; mSourceSize = glm::vec2 {static_cast<float>(width), static_cast<float>(height)};
data->setSourceSize(static_cast<float>(width), static_cast<float>(height)); data->setSourceSize(static_cast<float>(width), static_cast<float>(height));
if (mForceLoad || mTextureData != nullptr) if (mForceLoad || mTextureData != nullptr)

7
es-core/src/resources/TextureResource.h
View file

@ -41,11 +41,16 @@ public:
std::vector<unsigned char> getRawRGBAData(); std::vector<unsigned char> getRawRGBAData();
// Has the image been loaded but not yet been rasterized as the size was not known? // Has the image been loaded but not yet been rasterized as the size was not known?
bool getPendingRasterization() const const bool getPendingRasterization() const
{ {
return (mTextureData != nullptr ? mTextureData->getPendingRasterization() : false); return (mTextureData != nullptr ? mTextureData->getPendingRasterization() : false);
} }
const bool getScalable() const
{
return (mTextureData != nullptr ? mTextureData->getScalable() : false);
}
void setLinearMagnify(bool setting) { mTextureData->setLinearMagnify(setting); } void setLinearMagnify(bool setting) { mTextureData->setLinearMagnify(setting); }
std::string getTextureFilePath(); std::string getTextureFilePath();