Emulator-Archive/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2024-11-23 05:19:56 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Allow to change atlas per theme

Browse Source
This commit is contained in:
iota97 2022-03-31 17:03:34 +02:00
parent 6f04f52f5c
commit 53fe6940df
6 changed files with 81 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Common/UI/Context.cpp
View File

@ -10,7 +10,6 @@
#include "Common/UI/Context.h"
#include "Common/Render/DrawBuffer.h"
#include "Common/Render/Text/draw_text.h"
#include "Common/Log.h"
#include "UI/TextureUtil.h"
@ -36,10 +35,14 @@ void UIContext::Init(Draw::DrawContext *thin3d, Draw::Pipeline *uipipe, Draw::Pi
textDrawer_ = TextDrawer::Create(thin3d); // May return nullptr if no implementation is available for this platform.
}
void UIContext::setUIAtlas(const std::string &name) {
UIAtlas_ = name;
}
void UIContext::BeginFrame() {
if (!uitexture_) {
uitexture_ = CreateTextureFromFile(draw_, "ui_atlas.zim", ImageFileType::ZIM, false);
_dbg_assert_msg_(uitexture_, "Failed to load ui_atlas.zim.\n\nPlace it in the directory \"assets\" under your PPSSPP directory.");
if (!uitexture_ || UIAtlas_ != lastUIAtlas_) {
uitexture_ = CreateTextureFromFile(draw_, UIAtlas_.c_str(), ImageFileType::ZIM, false);
lastUIAtlas_ = UIAtlas_;
if (!fontTexture_) {
#if PPSSPP_PLATFORM(WINDOWS) || PPSSPP_PLATFORM(ANDROID)
// Don't bother with loading font_atlas.zim

6
Common/UI/Context.h
View File

@ -3,6 +3,7 @@
#include <memory>
#include <vector>
#include <cstdint>
#include <string>
#include "Common/Math/geom2d.h"
#include "Common/Math/lin/vec3.h"
@ -100,6 +101,8 @@ public:
void PopTransform();
Bounds TransformBounds(const Bounds &bounds);
void setUIAtlas(const std::string &name);
private:
Draw::DrawContext *draw_ = nullptr;
Bounds bounds_;
@ -120,4 +123,7 @@ private:
std::vector<Bounds> scissorStack_;
std::vector<UITransform> transformStack_;
std::string lastUIAtlas_;
std::string UIAtlas_ = "ui_atlas.zim";
};

4
UI/GameSettingsScreen.cpp
View File

@ -885,9 +885,9 @@ void GameSettingsScreen::CreateViews() {
backgroundChoice_->OnClick.Handle(this, &GameSettingsScreen::OnChangeBackground);
}
PopupMultiChoiceDynamic *theme = systemSettings->Add(new PopupMultiChoiceDynamic(&g_Config.sThemeName, sy->T("Color Theme"), GetThemeInfoNames(), th->GetName(), screenManager()));
PopupMultiChoiceDynamic *theme = systemSettings->Add(new PopupMultiChoiceDynamic(&g_Config.sThemeName, sy->T("Theme"), GetThemeInfoNames(), th->GetName(), screenManager()));
theme->OnChoice.Add([=](EventParams &e) {
UpdateTheme();
UpdateTheme(screenManager()->getUIContext());
return UI::EVENT_CONTINUE;
});

39
UI/NativeApp.cpp
View File

@ -130,11 +130,6 @@
#include "android/jni/app-android.h"
#endif
// The new UI framework, for initialization
static Atlas g_ui_atlas;
static Atlas g_font_atlas;
#if PPSSPP_ARCH(ARM) && defined(__ANDROID__)
#include "../../android/jni/ArmEmitterTest.h"
#elif PPSSPP_ARCH(ARM64) && defined(__ANDROID__)
@ -876,22 +871,6 @@ void NativeInit(int argc, const char *argv[], const char *savegame_dir, const ch
void RenderOverlays(UIContext *dc, void *userdata);
bool CreateGlobalPipelines();
static void LoadAtlasMetadata(Atlas &metadata, const char *filename, bool required) {
size_t atlas_data_size = 0;
if (!metadata.IsMetadataLoaded()) {
const uint8_t *atlas_data = VFSReadFile(filename, &atlas_data_size);
bool load_success = atlas_data != nullptr && metadata.Load(atlas_data, atlas_data_size);
if (!load_success) {
if (required)
ERROR_LOG(G3D, "Failed to load %s - graphics will be broken", filename);
else
WARN_LOG(G3D, "Failed to load %s", filename);
// Stumble along with broken visuals instead of dying...
}
delete[] atlas_data;
}
}
bool NativeInitGraphics(GraphicsContext *graphicsContext) {
INFO_LOG(SYSTEM, "NativeInitGraphics");
@ -906,22 +885,14 @@ bool NativeInitGraphics(GraphicsContext *graphicsContext) {
return false;
}
// Load any missing atlas metadata (the images are loaded from UIContext).
LoadAtlasMetadata(g_ui_atlas, "ui_atlas.meta", true);
#if !(PPSSPP_PLATFORM(WINDOWS) || PPSSPP_PLATFORM(ANDROID))
LoadAtlasMetadata(g_font_atlas, "font_atlas.meta", g_ui_atlas.num_fonts == 0);
#else
LoadAtlasMetadata(g_font_atlas, "asciifont_atlas.meta", g_ui_atlas.num_fonts == 0);
#endif
ui_draw2d.SetAtlas(GetUIAtlas());
ui_draw2d.SetFontAtlas(GetFontAtlas());
ui_draw2d_front.SetAtlas(GetUIAtlas());
ui_draw2d_front.SetFontAtlas(GetFontAtlas());
ui_draw2d.SetAtlas(&g_ui_atlas);
ui_draw2d.SetFontAtlas(&g_font_atlas);
ui_draw2d_front.SetAtlas(&g_ui_atlas);
ui_draw2d_front.SetFontAtlas(&g_font_atlas);
UpdateTheme();
uiContext = new UIContext();
uiContext->theme = GetTheme();
UpdateTheme(uiContext);
ui_draw2d.Init(g_draw, texColorPipeline);
ui_draw2d_front.Init(g_draw, texColorPipeline);

58
UI/Theme.cpp
View File

@ -25,6 +25,7 @@
#include "Common/File/VFS/VFS.h"
#include "Common/Data/Format/IniFile.h"
#include "Common/File/DirListing.h"
#include "Common/LogManager.h"
#include "Core/Config.h"
@ -52,6 +53,8 @@ struct ThemeInfo {
uint32_t uPopupStyleBg = 0xFF303030;
uint32_t uBackgroundColor = 0xFF754D24;
std::string UIAtlas;
bool operator == (const std::string &other) {
return name == other;
}
@ -63,6 +66,9 @@ struct ThemeInfo {
static UI::Theme ui_theme;
static std::vector<ThemeInfo> themeInfos;
static Atlas ui_atlas;
static Atlas font_atlas;
static void LoadThemeInfo(const std::vector<Path> &directories) {
themeInfos.clear();
ThemeInfo def{};
@ -128,6 +134,22 @@ static void LoadThemeInfo(const std::vector<Path> &directories) {
section.Get("PopupStyleBg", &info.uPopupStyleBg, info.uPopupStyleBg);
section.Get("BackgroundColor", &info.uBackgroundColor, info.uBackgroundColor);
std::string tmpPath;
section.Get("UIAtlas", &tmpPath, "");
if (tmpPath != "") {
tmpPath = (path / tmpPath).ToString();
File::FileInfo tmpInfo;
if (VFSGetFileInfo((tmpPath+".meta").c_str(), &tmpInfo) && VFSGetFileInfo((tmpPath+".zim").c_str(), &tmpInfo)) {
info.UIAtlas = tmpPath;
} else {
// Files not found, fallback to default
info.UIAtlas = "ui_atlas";
}
} else {
info.UIAtlas = "ui_atlas";
}
appendTheme(info);
}
}
@ -141,7 +163,23 @@ static UI::Style MakeStyle(uint32_t fg, uint32_t bg) {
return s;
}
void UpdateTheme() {
static void LoadAtlasMetadata(Atlas &metadata, const char *filename, bool required) {
size_t atlas_data_size = 0;
if (!metadata.IsMetadataLoaded()) {
const uint8_t *atlas_data = VFSReadFile(filename, &atlas_data_size);
bool load_success = atlas_data != nullptr && metadata.Load(atlas_data, atlas_data_size);
if (!load_success) {
if (required)
ERROR_LOG(G3D, "Failed to load %s - graphics will be broken", filename);
else
WARN_LOG(G3D, "Failed to load %s", filename);
// Stumble along with broken visuals instead of dying...
}
delete[] atlas_data;
}
}
void UpdateTheme(UIContext *ctx) {
// First run, get the default in at least
if (themeInfos.empty()) {
ReloadAllThemeInfo();
@ -188,12 +226,30 @@ void UpdateTheme() {
ui_theme.popupTitle.fgColor = themeInfos[i].uPopupTitleStyleFg;
ui_theme.popupStyle = MakeStyle(themeInfos[i].uPopupStyleFg, themeInfos[i].uPopupStyleBg);
ui_theme.backgroundColor = themeInfos[i].uBackgroundColor;
// Load any missing atlas metadata (the images are loaded from UIContext).
LoadAtlasMetadata(ui_atlas, (themeInfos[i].UIAtlas+".meta").c_str(), true);
#if !(PPSSPP_PLATFORM(WINDOWS) || PPSSPP_PLATFORM(ANDROID))
LoadAtlasMetadata(font_atlas, "font_atlas.meta", ui_atlas.num_fonts == 0);
#else
LoadAtlasMetadata(font_atlas, "asciifont_atlas.meta", ui_atlas.num_fonts == 0);
#endif
ctx->setUIAtlas(themeInfos[i].UIAtlas+".zim");
}
UI::Theme *GetTheme() {
return &ui_theme;
}
Atlas *GetFontAtlas() {
return &font_atlas;
}
Atlas *GetUIAtlas() {
return &ui_atlas;
}
void ReloadAllThemeInfo() {
std::vector<Path> directories;
directories.push_back(Path("themes")); // For VFS

5
UI/Theme.h
View File

@ -21,9 +21,12 @@
#include <vector>
#include "Common/UI/Context.h"
#include "Common/Render/TextureAtlas.h"
void ReloadAllThemeInfo();
std::vector<std::string> GetThemeInfoNames();
void UpdateTheme();
void UpdateTheme(UIContext *ctx);
Atlas *GetFontAtlas();
Atlas *GetUIAtlas();
UI::Theme *GetTheme();