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

Changed the media viewer to using linear interpolation scaling for the box cover, box back cover and fan art images

Browse source
This commit is contained in:
Leon Styhre 2023-07-11 15:06:46 +02:00
parent d8d9c94037
commit 41ab5a9b34
2 changed files with 23 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
es-app/src/MediaViewer.cpp
View file

@ -61,7 +61,7 @@ bool MediaViewer::startMediaViewer(FileData* game)
mEntryCount = std::to_string(mImages.size() + (mVideo == nullptr ? 0 : 1)); mEntryCount = std::to_string(mImages.size() + (mVideo == nullptr ? 0 : 1));
mMediaType = mMediaType =
std::make_unique<TextComponent>((mHasVideo ? "VIDEO" : mImageFiles[0].second), std::make_unique<TextComponent>((mHasVideo ? "VIDEO" : mImageFiles[0].second.mediaType),
Font::get(FONT_SIZE_MINI, FONT_PATH_REGULAR), 0xAAAAAAFF); Font::get(FONT_SIZE_MINI, FONT_PATH_REGULAR), 0xAAAAAAFF);
mMediaType->setOrigin(0.0f, 0.5f); mMediaType->setOrigin(0.0f, 0.5f);
@ -216,31 +216,31 @@ void MediaViewer::findMedia()
} }
if (!mHasVideo && (mediaFile = mGame->getScreenshotPath()) != "") { if (!mHasVideo && (mediaFile = mGame->getScreenshotPath()) != "") {
mImageFiles.push_back(std::make_pair(mediaFile, "SCREENSHOT")); mImageFiles.push_back(std::make_pair(mediaFile, ImageInfo("SCREENSHOT", false)));
mScreenshotIndex = 0; mScreenshotIndex = 0;
} }
if ((mediaFile = mGame->getCoverPath()) != "") if ((mediaFile = mGame->getCoverPath()) != "")
mImageFiles.push_back(std::make_pair(mediaFile, "BOX COVER")); mImageFiles.push_back(std::make_pair(mediaFile, ImageInfo("BOX COVER", true)));
if ((mediaFile = mGame->getBackCoverPath()) != "") if ((mediaFile = mGame->getBackCoverPath()) != "")
mImageFiles.push_back(std::make_pair(mediaFile, "BOX BACK COVER")); mImageFiles.push_back(std::make_pair(mediaFile, ImageInfo("BOX BACK COVER", true)));
if ((mediaFile = mGame->getTitleScreenPath()) != "") { if ((mediaFile = mGame->getTitleScreenPath()) != "") {
mImageFiles.push_back(std::make_pair(mediaFile, "TITLE SCREEN")); mImageFiles.push_back(std::make_pair(mediaFile, ImageInfo("TITLE SCREEN", false)));
mTitleScreenIndex = static_cast<int>(mImageFiles.size() - 1); mTitleScreenIndex = static_cast<int>(mImageFiles.size() - 1);
} }
if (mHasVideo && (mediaFile = mGame->getScreenshotPath()) != "") { if (mHasVideo && (mediaFile = mGame->getScreenshotPath()) != "") {
mImageFiles.push_back(std::make_pair(mediaFile, "SCREENSHOT")); mImageFiles.push_back(std::make_pair(mediaFile, ImageInfo("SCREENSHOT", false)));
mScreenshotIndex = static_cast<int>(mImageFiles.size() - 1); mScreenshotIndex = static_cast<int>(mImageFiles.size() - 1);
} }
if ((mediaFile = mGame->getFanArtPath()) != "") if ((mediaFile = mGame->getFanArtPath()) != "")
mImageFiles.push_back(std::make_pair(mediaFile, "FAN ART")); mImageFiles.push_back(std::make_pair(mediaFile, ImageInfo("FAN ART", true)));
if ((mediaFile = mGame->getMiximagePath()) != "") if ((mediaFile = mGame->getMiximagePath()) != "")
mImageFiles.push_back(std::make_pair(mediaFile, "MIXIMAGE")); mImageFiles.push_back(std::make_pair(mediaFile, ImageInfo("MIXIMAGE", false)));
if (!mImageFiles.empty()) if (!mImageFiles.empty())
mHasImages = true; mHasImages = true;
@ -265,6 +265,7 @@ void MediaViewer::loadImages()
mImages.back()->setPosition(Renderer::getScreenWidth() / 2.0f, mImages.back()->setPosition(Renderer::getScreenWidth() / 2.0f,
Renderer::getScreenHeight() / 2.0f); Renderer::getScreenHeight() / 2.0f);
} }
mImages.back()->setLinearInterpolation(file.second.linearInterpolation);
mImages.back()->setMaxSize(Renderer::getScreenWidth(), mImages.back()->setMaxSize(Renderer::getScreenWidth(),
Renderer::getScreenHeight() - mFrameHeight); Renderer::getScreenHeight() - mFrameHeight);
mImages.back()->setImage(file.first); mImages.back()->setImage(file.first);
@ -326,7 +327,7 @@ void MediaViewer::showNext()
++mCurrentImageIndex; ++mCurrentImageIndex;
mDisplayingImage = true; mDisplayingImage = true;
mMediaType->setText(mImageFiles[mCurrentImageIndex].second); mMediaType->setText(mImageFiles[mCurrentImageIndex].second.mediaType);
} }
void MediaViewer::showPrevious() void MediaViewer::showPrevious()
@ -344,7 +345,7 @@ void MediaViewer::showPrevious()
return; return;
} }
mMediaType->setText(mImageFiles[mCurrentImageIndex - 1].second); mMediaType->setText(mImageFiles[mCurrentImageIndex - 1].second.mediaType);
--mCurrentImageIndex; --mCurrentImageIndex;
} }
@ -358,7 +359,7 @@ void MediaViewer::showFirst()
return; return;
mCurrentImageIndex = 0; mCurrentImageIndex = 0;
mMediaType->setText((mHasVideo ? "VIDEO" : mImageFiles[mCurrentImageIndex].second)); mMediaType->setText((mHasVideo ? "VIDEO" : mImageFiles[mCurrentImageIndex].second.mediaType));
if (mHasVideo) { if (mHasVideo) {
mDisplayingImage = false; mDisplayingImage = false;
@ -376,7 +377,7 @@ void MediaViewer::showLast()
return; return;
mCurrentImageIndex = static_cast<int>(mImages.size()) - 1; mCurrentImageIndex = static_cast<int>(mImages.size()) - 1;
mMediaType->setText(mImageFiles[mCurrentImageIndex].second); mMediaType->setText(mImageFiles[mCurrentImageIndex].second.mediaType);
mDisplayingImage = true; mDisplayingImage = true;
if (mVideo && !Settings::getInstance()->getBool("MediaViewerKeepVideoRunning")) if (mVideo && !Settings::getInstance()->getBool("MediaViewerKeepVideoRunning"))

11
es-app/src/MediaViewer.h
View file

@ -61,9 +61,18 @@ private:
int mScreenshotIndex; int mScreenshotIndex;
int mTitleScreenIndex; int mTitleScreenIndex;
struct ImageInfo {
std::string mediaType;
bool linearInterpolation;
ImageInfo(const std::string& mediaTypeArg, const bool interpolationArg)
: mediaType {mediaTypeArg}
, linearInterpolation {interpolationArg} {};
};
std::string mVideoFile; std::string mVideoFile;
std::unique_ptr<VideoComponent> mVideo; std::unique_ptr<VideoComponent> mVideo;
std::vector<std::pair<std::string, std::string>> mImageFiles; std::vector<std::pair<std::string, ImageInfo>> mImageFiles;
std::vector<std::unique_ptr<ImageComponent>> mImages; std::vector<std::unique_ptr<ImageComponent>> mImages;
std::unique_ptr<HelpComponent> mHelp; std::unique_ptr<HelpComponent> mHelp;