artemist/yuzu
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #2038 from jroweboy/loading-progress-bar

Browse source 
Loading progress bar upgrades
This commit is contained in:
bunnei 2019-01-21 14:12:47 -05:00 committed by GitHub
parent 1c733bf175 3049ea45d3
commit 125599c2d5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 316 additions and 57 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/video_core/rasterizer_interface.h
View file

@ -4,6 +4,7 @@
#pragma once #pragma once
#include <functional>
#include "common/common_types.h" #include "common/common_types.h"
#include "video_core/engines/fermi_2d.h" #include "video_core/engines/fermi_2d.h"
#include "video_core/gpu.h" #include "video_core/gpu.h"
@ -11,6 +12,14 @@
namespace VideoCore { namespace VideoCore {
enum class LoadCallbackStage {
Prepare,
Decompile,
Build,
Complete,
};
using DiskResourceLoadCallback = std::function<void(LoadCallbackStage, std::size_t, std::size_t)>;
class RasterizerInterface { class RasterizerInterface {
public: public:
virtual ~RasterizerInterface() {} virtual ~RasterizerInterface() {}

157
src/yuzu/loading_screen.cpp
View file

@ -2,8 +2,10 @@
// Licensed under GPLv2 or any later version // Licensed under GPLv2 or any later version
// Refer to the license.txt file included. // Refer to the license.txt file included.
#include <unordered_map>
#include <QBuffer> #include <QBuffer>
#include <QByteArray> #include <QByteArray>
#include <QGraphicsOpacityEffect>
#include <QHBoxLayout> #include <QHBoxLayout>
#include <QIODevice> #include <QIODevice>
#include <QImage> #include <QImage>
@ -12,11 +14,14 @@
#include <QPalette> #include <QPalette>
#include <QPixmap> #include <QPixmap>
#include <QProgressBar> #include <QProgressBar>
#include <QPropertyAnimation>
#include <QStyleOption> #include <QStyleOption>
#include <QWindow> #include <QTime>
#include <QtConcurrent/QtConcurrentRun>
#include "common/logging/log.h" #include "common/logging/log.h"
#include "core/loader/loader.h" #include "core/loader/loader.h"
#include "ui_loading_screen.h" #include "ui_loading_screen.h"
#include "video_core/rasterizer_interface.h"
#include "yuzu/loading_screen.h" #include "yuzu/loading_screen.h"
// Mingw seems to not have QMovie at all. If QMovie is missing then use a single frame instead of an // Mingw seems to not have QMovie at all. If QMovie is missing then use a single frame instead of an
@ -25,11 +30,84 @@
#include <QMovie> #include <QMovie>
#endif #endif
constexpr const char PROGRESSBAR_STYLE_PREPARE[] = R"(
QProgressBar {}
QProgressBar::chunk {})";
constexpr const char PROGRESSBAR_STYLE_DECOMPILE[] = R"(
QProgressBar {
background-color: black;
border: 2px solid white;
border-radius: 4px;
padding: 2px;
}
QProgressBar::chunk {
background-color: #0ab9e6;
})";
constexpr const char PROGRESSBAR_STYLE_BUILD[] = R"(
QProgressBar {
background-color: black;
border: 2px solid white;
border-radius: 4px;
padding: 2px;
}
QProgressBar::chunk {
background-color: #ff3c28;
})";
constexpr const char PROGRESSBAR_STYLE_COMPLETE[] = R"(
QProgressBar {
background-color: #0ab9e6;
border: 2px solid white;
border-radius: 4px;
padding: 2px;
}
QProgressBar::chunk {
background-color: #ff3c28;
})";
LoadingScreen::LoadingScreen(QWidget* parent) LoadingScreen::LoadingScreen(QWidget* parent)
: QWidget(parent), ui(std::make_unique<Ui::LoadingScreen>()) { : QWidget(parent), ui(std::make_unique<Ui::LoadingScreen>()),
previous_stage(VideoCore::LoadCallbackStage::Complete) {
ui->setupUi(this); ui->setupUi(this);
// Progress bar is hidden until we have a use for it. setMinimumSize(1280, 720);
ui->progress_bar->hide();
// Create a fade out effect to hide this loading screen widget.
// When fading opacity, it will fade to the parent widgets background color, which is why we
// create an internal widget named fade_widget that we use the effect on, while keeping the
// loading screen widget's background color black. This way we can create a fade to black effect
opacity_effect = new QGraphicsOpacityEffect(this);
opacity_effect->setOpacity(1);
ui->fade_parent->setGraphicsEffect(opacity_effect);
fadeout_animation = std::make_unique<QPropertyAnimation>(opacity_effect, "opacity");
fadeout_animation->setDuration(500);
fadeout_animation->setStartValue(1);
fadeout_animation->setEndValue(0);
fadeout_animation->setEasingCurve(QEasingCurve::OutBack);
// After the fade completes, hide the widget and reset the opacity
connect(fadeout_animation.get(), &QPropertyAnimation::finished, [this] {
hide();
opacity_effect->setOpacity(1);
emit Hidden();
});
connect(this, &LoadingScreen::LoadProgress, this, &LoadingScreen::OnLoadProgress,
Qt::QueuedConnection);
qRegisterMetaType<VideoCore::LoadCallbackStage>();
stage_translations = {
{VideoCore::LoadCallbackStage::Prepare, tr("Loading...")},
{VideoCore::LoadCallbackStage::Decompile, tr("Preparing Shaders %1 / %2")},
{VideoCore::LoadCallbackStage::Build, tr("Loading Shaders %1 / %2")},
{VideoCore::LoadCallbackStage::Complete, tr("Launching...")},
};
progressbar_style = {
{VideoCore::LoadCallbackStage::Prepare, PROGRESSBAR_STYLE_PREPARE},
{VideoCore::LoadCallbackStage::Decompile, PROGRESSBAR_STYLE_DECOMPILE},
{VideoCore::LoadCallbackStage::Build, PROGRESSBAR_STYLE_BUILD},
{VideoCore::LoadCallbackStage::Complete, PROGRESSBAR_STYLE_COMPLETE},
};
} }
LoadingScreen::~LoadingScreen() = default; LoadingScreen::~LoadingScreen() = default;
@ -42,11 +120,11 @@ void LoadingScreen::Prepare(Loader::AppLoader& loader) {
map.loadFromData(buffer.data(), buffer.size()); map.loadFromData(buffer.data(), buffer.size());
ui->banner->setPixmap(map); ui->banner->setPixmap(map);
#else #else
backing_mem = backing_mem = std::make_unique<QByteArray>(reinterpret_cast<char*>(buffer.data()),
std::make_unique<QByteArray>(reinterpret_cast<char*>(buffer.data()), buffer.size()); static_cast<int>(buffer.size()));
backing_buf = std::make_unique<QBuffer>(backing_mem.get()); backing_buf = std::make_unique<QBuffer>(backing_mem.get());
backing_buf->open(QIODevice::ReadOnly); backing_buf->open(QIODevice::ReadOnly);
animation = std::make_unique<QMovie>(backing_buf.get(), QByteArray("GIF")); animation = std::make_unique<QMovie>(backing_buf.get(), QByteArray());
animation->start(); animation->start();
ui->banner->setMovie(animation.get()); ui->banner->setMovie(animation.get());
#endif #endif
@ -54,17 +132,68 @@ void LoadingScreen::Prepare(Loader::AppLoader& loader) {
} }
if (loader.ReadLogo(buffer) == Loader::ResultStatus::Success) { if (loader.ReadLogo(buffer) == Loader::ResultStatus::Success) {
QPixmap map; QPixmap map;
map.loadFromData(buffer.data(), buffer.size()); map.loadFromData(buffer.data(), static_cast<uint>(buffer.size()));
ui->logo->setPixmap(map); ui->logo->setPixmap(map);
} }
slow_shader_compile_start = false;
OnLoadProgress(VideoCore::LoadCallbackStage::Prepare, 0, 0);
}
void LoadingScreen::OnLoadComplete() {
fadeout_animation->start(QPropertyAnimation::KeepWhenStopped);
}
void LoadingScreen::OnLoadProgress(VideoCore::LoadCallbackStage stage, std::size_t value,
std::size_t total) {
using namespace std::chrono;
auto now = high_resolution_clock::now();
// reset the timer if the stage changes
if (stage != previous_stage) {
ui->progress_bar->setStyleSheet(progressbar_style[stage]);
// Hide the progress bar during the prepare stage
if (stage == VideoCore::LoadCallbackStage::Prepare) {
ui->progress_bar->hide();
} else {
ui->progress_bar->show();
}
previous_stage = stage;
// reset back to fast shader compiling since the stage changed
slow_shader_compile_start = false;
}
// update the max of the progress bar if the number of shaders change
if (total != previous_total) {
ui->progress_bar->setMaximum(static_cast<int>(total));
previous_total = total;
}
QString estimate;
// If theres a drastic slowdown in the rate, then display an estimate
if (now - previous_time > milliseconds{50} || slow_shader_compile_start) {
if (!slow_shader_compile_start) {
slow_shader_start = high_resolution_clock::now();
slow_shader_compile_start = true;
slow_shader_first_value = value;
}
// only calculate an estimate time after a second has passed since stage change
auto diff = duration_cast<milliseconds>(now - slow_shader_start);
if (diff > seconds{1}) {
auto eta_mseconds =
static_cast<long>(static_cast<double>(total - slow_shader_first_value) /
(value - slow_shader_first_value) * diff.count());
estimate =
tr("Estimated Time %1")
.arg(QTime(0, 0, 0, 0)
.addMSecs(std::max<long>(eta_mseconds - diff.count() + 1000, 1000))
.toString("mm:ss"));
}
} }
void LoadingScreen::OnLoadProgress(std::size_t value, std::size_t total) { // update labels and progress bar
if (total != previous_total) { ui->stage->setText(stage_translations[stage].arg(value).arg(total));
ui->progress_bar->setMaximum(total); ui->value->setText(estimate);
previous_total = total; ui->progress_bar->setValue(static_cast<int>(value));
} previous_time = now;
ui->progress_bar->setValue(value);
} }
void LoadingScreen::paintEvent(QPaintEvent* event) { void LoadingScreen::paintEvent(QPaintEvent* event) {

38
src/yuzu/loading_screen.h
View file

@ -4,7 +4,9 @@
#pragma once #pragma once
#include <chrono>
#include <memory> #include <memory>
#include <QString>
#include <QWidget> #include <QWidget>
#if !QT_CONFIG(movie) #if !QT_CONFIG(movie)
@ -19,9 +21,15 @@ namespace Ui {
class LoadingScreen; class LoadingScreen;
} }
namespace VideoCore {
enum class LoadCallbackStage;
}
class QBuffer; class QBuffer;
class QByteArray; class QByteArray;
class QGraphicsOpacityEffect;
class QMovie; class QMovie;
class QPropertyAnimation;
class LoadingScreen : public QWidget { class LoadingScreen : public QWidget {
Q_OBJECT Q_OBJECT
@ -39,11 +47,21 @@ public:
/// used resources such as the logo and banner. /// used resources such as the logo and banner.
void Clear(); void Clear();
/// Slot used to update the status of the progress bar
void OnLoadProgress(VideoCore::LoadCallbackStage stage, std::size_t value, std::size_t total);
/// Hides the LoadingScreen with a fade out effect
void OnLoadComplete();
// In order to use a custom widget with a stylesheet, you need to override the paintEvent // In order to use a custom widget with a stylesheet, you need to override the paintEvent
// See https://wiki.qt.io/How_to_Change_the_Background_Color_of_QWidget // See https://wiki.qt.io/How_to_Change_the_Background_Color_of_QWidget
void paintEvent(QPaintEvent* event) override; void paintEvent(QPaintEvent* event) override;
void OnLoadProgress(std::size_t value, std::size_t total); signals:
void LoadProgress(VideoCore::LoadCallbackStage stage, std::size_t value, std::size_t total);
/// Signals that this widget is completely hidden now and should be replaced with the other
/// widget
void Hidden();
private: private:
#ifndef YUZU_QT_MOVIE_MISSING #ifndef YUZU_QT_MOVIE_MISSING
@ -53,4 +71,22 @@ private:
#endif #endif
std::unique_ptr<Ui::LoadingScreen> ui; std::unique_ptr<Ui::LoadingScreen> ui;
std::size_t previous_total = 0; std::size_t previous_total = 0;
VideoCore::LoadCallbackStage previous_stage;
QGraphicsOpacityEffect* opacity_effect = nullptr;
std::unique_ptr<QPropertyAnimation> fadeout_animation;
// Definitions for the differences in text and styling for each stage
std::unordered_map<VideoCore::LoadCallbackStage, const char*> progressbar_style;
std::unordered_map<VideoCore::LoadCallbackStage, QString> stage_translations;
// newly generated shaders are added to the end of the file, so when loading and compiling
// shaders, it will start quickly but end slow if new shaders were added since previous launch.
// These variables are used to detect the change in speed so we can generate an ETA
bool slow_shader_compile_start = false;
std::chrono::high_resolution_clock::time_point slow_shader_start;
std::chrono::high_resolution_clock::time_point previous_time;
std::size_t slow_shader_first_value = 0;
}; };
Q_DECLARE_METATYPE(VideoCore::LoadCallbackStage);

92
src/yuzu/loading_screen.ui
View file

@ -30,6 +30,24 @@
<number>0</number> <number>0</number>
</property> </property>
<item> <item>
<widget class="QWidget" name="fade_parent" native="true">
<layout class="QVBoxLayout" name="verticalLayout_2">
<property name="spacing">
<number>0</number>
</property>
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item alignment="Qt::AlignLeft|Qt::AlignTop">
<widget class="QLabel" name="logo"> <widget class="QLabel" name="logo">
<property name="text"> <property name="text">
<string/> <string/>
@ -43,20 +61,81 @@
</widget> </widget>
</item> </item>
<item> <item>
<layout class="QHBoxLayout" name="horizontalLayout"> <layout class="QVBoxLayout" name="verticalLayout" stretch="1,0,1">
<item> <property name="spacing">
<widget class="QProgressBar" name="progress_bar"> <number>15</number>
</property>
<property name="sizeConstraint">
<enum>QLayout::SetNoConstraint</enum>
</property>
<item alignment="Qt::AlignHCenter|Qt::AlignBottom">
<widget class="QLabel" name="stage">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Minimum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="styleSheet"> <property name="styleSheet">
<string notr="true">font-size: 26px;</string> <string notr="true">background-color: black; color: white;
font: 75 20pt &quot;Arial&quot;;</string>
</property>
<property name="text">
<string>Loading Shaders 387 / 1628</string>
</property>
</widget>
</item>
<item alignment="Qt::AlignHCenter|Qt::AlignTop">
<widget class="QProgressBar" name="progress_bar">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>500</width>
<height>40</height>
</size>
</property>
<property name="styleSheet">
<string notr="true">QProgressBar {
color: white;
border: 2px solid white;
outline-color: black;
border-radius: 20px;
}
QProgressBar::chunk {
background-color: white;
border-radius: 15px;
}</string>
</property> </property>
<property name="value"> <property name="value">
<number>0</number> <number>50</number>
</property>
<property name="textVisible">
<bool>false</bool>
</property> </property>
<property name="format"> <property name="format">
<string>Loading Shaders %v out of %m</string> <string>Loading Shaders %v out of %m</string>
</property> </property>
</widget> </widget>
</item> </item>
<item alignment="Qt::AlignHCenter|Qt::AlignTop">
<widget class="QLabel" name="value">
<property name="toolTip">
<string notr="true"/>
</property>
<property name="styleSheet">
<string notr="true">background-color: black; color: white;
font: 75 15pt &quot;Arial&quot;;</string>
</property>
<property name="text">
<string>Stage 1 of 2. Estimate Time 5m 4s</string>
</property>
</widget>
</item>
</layout> </layout>
</item> </item>
<item alignment="Qt::AlignRight|Qt::AlignBottom"> <item alignment="Qt::AlignRight|Qt::AlignBottom">
@ -74,6 +153,9 @@
</item> </item>
</layout> </layout>
</widget> </widget>
</item>
</layout>
</widget>
<resources/> <resources/>
<connections/> <connections/>
</ui> </ui>

13
src/yuzu/main.cpp
View file

@ -415,6 +415,13 @@ void GMainWindow::InitializeWidgets() {
loading_screen = new LoadingScreen(this); loading_screen = new LoadingScreen(this);
loading_screen->hide(); loading_screen->hide();
ui.horizontalLayout->addWidget(loading_screen); ui.horizontalLayout->addWidget(loading_screen);
connect(loading_screen, &LoadingScreen::Hidden, [&] {
loading_screen->Clear();
if (emulation_running) {
render_window->show();
render_window->setFocus();
}
});
// Create status bar // Create status bar
message_label = new QLabel(); message_label = new QLabel();
@ -904,7 +911,6 @@ void GMainWindow::BootGame(const QString& filename) {
loading_screen->Prepare(Core::System::GetInstance().GetAppLoader()); loading_screen->Prepare(Core::System::GetInstance().GetAppLoader());
loading_screen->show(); loading_screen->show();
loading_screen->setFocus();
emulation_running = true; emulation_running = true;
if (ui.action_Fullscreen->isChecked()) { if (ui.action_Fullscreen->isChecked()) {
@ -1514,10 +1520,7 @@ void GMainWindow::OnStopGame() {
} }
void GMainWindow::OnLoadComplete() { void GMainWindow::OnLoadComplete() {
loading_screen->hide(); loading_screen->OnLoadComplete();
loading_screen->Clear();
render_window->show();
render_window->setFocus();
} }
void GMainWindow::OnMenuReportCompatibility() { void GMainWindow::OnMenuReportCompatibility() {