hipnosuer
/
Zuma
forked from ShuriZma/suyu
1
0
Fork 0
Code Pull Requests Activity

Rename step 1 and step 2 to be a little more descriptive

This commit is contained in:
James Rowe 2019-01-20 18:40:25 -07:00
parent 56541b1ae5
commit ea73ffe202
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/video_core/rasterizer_interface.h
View File

@ -14,8 +14,8 @@ namespace VideoCore {
enum class LoadCallbackStage { enum class LoadCallbackStage {
Prepare, Prepare,
Raw, Decompile,
Binary, Build,
Complete, Complete,
}; };
using DiskResourceLoadCallback = std::function<void(LoadCallbackStage, std::size_t, std::size_t)>; using DiskResourceLoadCallback = std::function<void(LoadCallbackStage, std::size_t, std::size_t)>;

12
src/yuzu/loading_screen.cpp
View File

@ -32,7 +32,7 @@ constexpr const char* PROGRESSBAR_STYLE_PREPARE = R"(
QProgressBar {} QProgressBar {}
QProgressBar::chunk {})"; QProgressBar::chunk {})";
constexpr const char* PROGRESSBAR_STYLE_RAW = R"( constexpr const char* PROGRESSBAR_STYLE_DECOMPILE = R"(
QProgressBar { QProgressBar {
background-color: black; background-color: black;
border: 2px solid white; border: 2px solid white;
@ -43,7 +43,7 @@ QProgressBar::chunk {
background-color: #0ab9e6; background-color: #0ab9e6;
})"; })";
constexpr const char* PROGRESSBAR_STYLE_BINARY = R"( constexpr const char* PROGRESSBAR_STYLE_BUILD = R"(
QProgressBar { QProgressBar {
background-color: black; background-color: black;
border: 2px solid white; border: 2px solid white;
@ -76,14 +76,14 @@ LoadingScreen::LoadingScreen(QWidget* parent)
stage_translations = { stage_translations = {
{VideoCore::LoadCallbackStage::Prepare, tr("Loading...")}, {VideoCore::LoadCallbackStage::Prepare, tr("Loading...")},
{VideoCore::LoadCallbackStage::Raw, tr("Preparing Shaders %1 / %2")}, {VideoCore::LoadCallbackStage::Decompile, tr("Preparing Shaders %1 / %2")},
{VideoCore::LoadCallbackStage::Binary, tr("Loading Shaders %1 / %2")}, {VideoCore::LoadCallbackStage::Build, tr("Loading Shaders %1 / %2")},
{VideoCore::LoadCallbackStage::Complete, tr("Launching...")}, {VideoCore::LoadCallbackStage::Complete, tr("Launching...")},
}; };
progressbar_style = { progressbar_style = {
{VideoCore::LoadCallbackStage::Prepare, PROGRESSBAR_STYLE_PREPARE}, {VideoCore::LoadCallbackStage::Prepare, PROGRESSBAR_STYLE_PREPARE},
{VideoCore::LoadCallbackStage::Raw, PROGRESSBAR_STYLE_RAW}, {VideoCore::LoadCallbackStage::Decompile, PROGRESSBAR_STYLE_DECOMPILE},
{VideoCore::LoadCallbackStage::Binary, PROGRESSBAR_STYLE_BINARY}, {VideoCore::LoadCallbackStage::Build, PROGRESSBAR_STYLE_BUILD},
{VideoCore::LoadCallbackStage::Complete, PROGRESSBAR_STYLE_COMPLETE}, {VideoCore::LoadCallbackStage::Complete, PROGRESSBAR_STYLE_COMPLETE},
}; };
} }