Add Fade effects.

Also change me to `SuperSaiyajinStackie`.

Also update for latest Universal-Core changes.
This commit is contained in:
StackZ
2020-05-27 13:49:37 +02:00
parent 6e085dddcb
commit 779a7c6479
29 changed files with 267 additions and 126 deletions
+1 -2
View File
@@ -31,8 +31,7 @@
#include "gui.hpp"
#include "sprites.h"
namespace GFX
{
namespace GFX {
// Basic GUI.
void DrawTop(void);
void DrawBottom(void);
+1 -2
View File
@@ -29,8 +29,7 @@
#include <string>
namespace Msg
{
namespace Msg {
void DisplayMsg(std::string text);
void DisplayWarnMsg(std::string Text);
bool promptMsg(std::string promptMsg);
+1 -2
View File
@@ -32,8 +32,7 @@
#include <vector>
class Credits : public Screen
{
class Credits : public Screen {
public:
void Draw(void) const override;
void Logic(u32 hDown, u32 hHeld, touchPosition touch) override;
+38
View File
@@ -0,0 +1,38 @@
/*
* This file is part of Universal-Updater
* Copyright (C) 2019-2020 DeadPhoenix8091, Epicpkmn11, Flame, RocketRobz, StackZ, TotallyNotGuy
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
* Additional Terms 7.b and 7.c of GPLv3 apply to this file:
* * Requiring preservation of specified reasonable legal notices or
* author attributions in that material or in the Appropriate Legal
* Notices displayed by works containing it.
* * Prohibiting misrepresentation of the origin of that material,
* or requiring that modified versions of such material be marked in
* reasonable ways as different from the original version.
*/
#ifndef EXITING_HPP
#define EXITING_HPP
#include "common.hpp"
class Exiting : public Screen {
public:
void Draw(void) const override;
void Logic(u32 hDown, u32 hHeld, touchPosition touch) override;
};
#endif
+1 -2
View File
@@ -29,8 +29,7 @@
#include <vector>
class FTPScreen : public Screen
{
class FTPScreen : public Screen {
public:
void Draw(void) const override;
void Logic(u32 hDown, u32 hHeld, touchPosition touch) override;
+1 -2
View File
@@ -32,8 +32,7 @@
#include <vector>
class MainMenu : public Screen
{
class MainMenu : public Screen {
public:
void Draw(void) const override;
void Logic(u32 hDown, u32 hHeld, touchPosition touch) override;
+1 -2
View File
@@ -33,8 +33,7 @@
#include <vector>
class ScriptBrowse : public Screen
{
class ScriptBrowse : public Screen {
public:
void Draw(void) const override;
void Logic(u32 hDown, u32 hHeld, touchPosition touch) override;
+1 -2
View File
@@ -32,8 +32,7 @@
#include <vector>
class ScriptCreator : public Screen
{
class ScriptCreator : public Screen {
public:
void Draw(void) const override;
void Logic(u32 hDown, u32 hHeld, touchPosition touch) override;
+1 -2
View File
@@ -34,8 +34,7 @@
#include <vector>
class ScriptList : public Screen
{
class ScriptList : public Screen {
public:
void Draw(void) const override;
void Logic(u32 hDown, u32 hHeld, touchPosition touch) override;
+8 -2
View File
@@ -33,8 +33,7 @@
#include <vector>
class Settings : public Screen
{
class Settings : public Screen {
public:
void Draw(void) const override;
void Logic(u32 hDown, u32 hHeld, touchPosition touch) override;
@@ -65,6 +64,13 @@ private:
{80, 150, 149, 52} // Credits.
};
std::vector<Structs::ButtonPos> mainButtons2 = {
{0, 60, 149, 52}, // Change Music File.
{162, 60, 149, 52}, // Change bar style.
{0, 130, 149, 52}, // Change Key Delay.
{162, 130, 149, 52} // Toggle animation.
};
std::vector<Structs::ButtonPos> arrowPos = {
{0, 0, 25, 25}, // Previous Arrow.
{295, 0, 25, 25}, // Next Arrow.
+1 -2
View File
@@ -34,8 +34,7 @@
#include <vector>
class UniStore : public Screen
{
class UniStore : public Screen {
public:
void Draw(void) const override;
void Logic(u32 hDown, u32 hHeld, touchPosition touch) override;
+1 -1
View File
@@ -32,7 +32,7 @@
namespace Config {
extern int LangPath, Color1, Color2, Color3, TxtColor, SelectedColor, UnselectedColor, viewMode, progressbarColor, autoboot, outdated, uptodate, notFound, future, Button, keyDelay;
extern std::string lang, ScriptPath, MusicPath, StorePath, AutobootFile;
extern bool Logging, UseBars, GodMode;
extern bool Logging, UseBars, fading;
void load();
void save();
+1 -2
View File
@@ -5,8 +5,7 @@
bool matchPattern(std::string pattern, std::string tested);
namespace StringUtils
{
namespace StringUtils {
std::string format(const std::string& fmt_str, ...);
}