mirror of
https://github.com/MaSzyna-EU07/maszyna.git
synced 2026-07-22 13:59:19 +02:00
Loading screen overhaul POC
The loading screen has been significantly changed: - The background image is now properly picked randomly instead of taking the `textures/logo.bmp` file, prepended by an external program such as Rainsted/Starter. - The progress bar has been moved from a floating window to a thin green line at the bottom of the loading screen. - The log window is now hidden by default. It can be turned on by setting `loadinglog` to `true` in `eu07.ini`. - There is an animated wheel icon on the loading screen, and a trivia text is displayed. New translation key: - `"Did you know"` TODO: - Load trivia from a separate file.
This commit is contained in:
23
uilayer.h
23
uilayer.h
@@ -10,7 +10,6 @@ http://mozilla.org/MPL/2.0/.
|
||||
#pragma once
|
||||
|
||||
#include <string>
|
||||
#include <utility>
|
||||
#include "Texture.h"
|
||||
#include "widgets/popup.h"
|
||||
|
||||
@@ -101,10 +100,10 @@ public:
|
||||
void begin_ui_frame();
|
||||
static void begin_ui_frame_internal();
|
||||
//
|
||||
static void set_cursor( int Mode );
|
||||
// stores operation progress
|
||||
void set_progress( float Progress = 0.0f, float Subtaskprogress = 0.0f );
|
||||
void set_progress( std::string const &Text ) { m_progresstext = Text; }
|
||||
static void set_cursor( int Mode );
|
||||
// loading
|
||||
void set_progress(std::string const &Text);
|
||||
void set_progress(float progress, float subtaskprogress);
|
||||
// sets the ui background texture, if any
|
||||
void set_background( std::string const &Filename = "" );
|
||||
void set_tooltip( std::string const &Tooltip ) { m_tooltip = Tooltip; }
|
||||
@@ -121,6 +120,7 @@ public:
|
||||
|
||||
static ImFont *font_default;
|
||||
static ImFont *font_mono;
|
||||
static ImFont *font_loading;
|
||||
|
||||
protected:
|
||||
// members
|
||||
@@ -132,15 +132,17 @@ protected:
|
||||
virtual void render_menu_contents();
|
||||
ui_log_panel m_logpanel { "Log", true };
|
||||
bool m_suppress_menu = false; // if `true`, the menu at the top of the window will not be present
|
||||
// progress bar config
|
||||
float m_progress { 0.0f }; // percentage of filled progres bar, to indicate lengthy operations.
|
||||
float m_subtaskprogress{ 0.0f }; // percentage of filled progres bar, to indicate lengthy operations.
|
||||
std::string m_progresstext; // label placed over the progress bar
|
||||
|
||||
private:
|
||||
// methods
|
||||
// render() subclass details
|
||||
virtual void render_() {};
|
||||
virtual void render_() {}
|
||||
// draws background quad with specified earlier texture
|
||||
void render_background();
|
||||
// draws a progress bar in defined earlier state
|
||||
void render_progress();
|
||||
void render_tooltip();
|
||||
void render_panels();
|
||||
void render_menu();
|
||||
@@ -150,11 +152,6 @@ protected:
|
||||
// members
|
||||
static GLint m_textureunit;
|
||||
|
||||
// progress bar config. TODO: put these together into an object
|
||||
float m_progress { 0.0f }; // percentage of filled progres bar, to indicate lengthy operations.
|
||||
float m_subtaskprogress{ 0.0f }; // percentage of filled progres bar, to indicate lengthy operations.
|
||||
std::string m_progresstext; // label placed over the progress bar
|
||||
|
||||
texture_handle m_background { null_handle }; // path to texture used as the background. size depends on mAspect.
|
||||
std::vector<ui_panel *> m_panels;
|
||||
std::vector<std::unique_ptr<ui_panel>> m_ownedpanels;
|
||||
|
||||
Reference in New Issue
Block a user