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

ImGui: Add TTF font support

Browse Source 
We use the Roboto font that we're already shipping for now, although, we could
also support other fonts or have a setting.
This commit is contained in:
Henrik Rydgård 2024-11-22 13:54:19 +01:00
parent 21ffc37ebd
commit c529743e4a
6 changed files with 27 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
UI/EmuScreen.cpp
View File

@ -27,7 +27,7 @@ using namespace std::placeholders;
#include "Common/Render/Text/draw_text.h" #include "Common/Render/Text/draw_text.h"
#include "Common/File/FileUtil.h" #include "Common/File/FileUtil.h"
#include "Common/Battery/Battery.h" #include "Common/Battery/Battery.h"
#include "Common/File/VFS/VFS.h"
#include "Common/UI/Root.h" #include "Common/UI/Root.h"
#include "Common/UI/UI.h" #include "Common/UI/UI.h"
#include "Common/UI/Context.h" #include "Common/UI/Context.h"
@ -1646,7 +1646,13 @@ void EmuScreen::renderImDebugger() {
if (!imguiInited_) { if (!imguiInited_) {
imguiInited_ = true; imguiInited_ = true;
imDebugger_ = std::make_unique<ImDebugger>(); imDebugger_ = std::make_unique<ImDebugger>();
ImGui_ImplThin3d_Init(draw);
// Read the TTF font
size_t size = 0;
uint8_t *fontData = g_VFS.ReadFile("Roboto-Condensed.ttf", &size);
// This call works even if fontData is nullptr, in which case the font just won't get loaded.
// This takes ownership of the font array.
ImGui_ImplThin3d_Init(draw, fontData, size);
} }
if (PSP_IsInited()) { if (PSP_IsInited()) {

7
UI/ImDebugger/ImDebugger.cpp
View File

@ -371,7 +371,6 @@ void ImDebugger::Frame(MIPSDebugInterface *mipsDebug) {
ImGui::EndMenu(); ImGui::EndMenu();
} }
if (ImGui::BeginMenu("Window")) { if (ImGui::BeginMenu("Window")) {
ImGui::Checkbox("Dear ImGUI Demo", &cfg_.demoOpen);
ImGui::Checkbox("CPU debugger", &cfg_.disasmOpen); ImGui::Checkbox("CPU debugger", &cfg_.disasmOpen);
ImGui::Checkbox("Registers", &cfg_.regsOpen); ImGui::Checkbox("Registers", &cfg_.regsOpen);
ImGui::Checkbox("Callstacks", &cfg_.callstackOpen); ImGui::Checkbox("Callstacks", &cfg_.callstackOpen);
@ -382,6 +381,8 @@ void ImDebugger::Frame(MIPSDebugInterface *mipsDebug) {
ImGui::EndMenu(); ImGui::EndMenu();
} }
if (ImGui::BeginMenu("Misc")) { if (ImGui::BeginMenu("Misc")) {
ImGui::Checkbox("Dear ImGui Demo", &cfg_.demoOpen);
ImGui::Checkbox("ImGui Style editor", &cfg_.styleEditorOpen);
if (ImGui::MenuItem("Close Debugger")) { if (ImGui::MenuItem("Close Debugger")) {
g_Config.bShowImDebugger = false; g_Config.bShowImDebugger = false;
} }
@ -394,6 +395,10 @@ void ImDebugger::Frame(MIPSDebugInterface *mipsDebug) {
ImGui::ShowDemoWindow(&cfg_.demoOpen); ImGui::ShowDemoWindow(&cfg_.demoOpen);
} }
if (cfg_.styleEditorOpen) {
ImGui::ShowStyleEditor();
}
if (cfg_.disasmOpen) { if (cfg_.disasmOpen) {
disasm_.Draw(mipsDebug, &cfg_.disasmOpen, coreState); disasm_.Draw(mipsDebug, &cfg_.disasmOpen, coreState);
} }

1
UI/ImDebugger/ImDebugger.h
View File

@ -59,6 +59,7 @@ struct ImConfig {
bool hleModulesOpen = false; bool hleModulesOpen = false;
bool atracOpen = true; bool atracOpen = true;
bool structViewerOpen = false; bool structViewerOpen = false;
bool styleEditorOpen = false;
// HLE explorer settings // HLE explorer settings
// bool filterByUsed = true; // bool filterByUsed = true;

10
ext/imgui/imgui_impl_thin3d.cpp
View File

@ -217,8 +217,16 @@ void ImGui_ImplThin3d_DestroyDeviceObjects() {
} }
} }
bool ImGui_ImplThin3d_Init(Draw::DrawContext *draw) { bool ImGui_ImplThin3d_Init(Draw::DrawContext *draw, const uint8_t *ttf_font, size_t size) {
ImGuiIO& io = ImGui::GetIO(); ImGuiIO& io = ImGui::GetIO();
if (ttf_font) {
io.Fonts->AddFontFromMemoryTTF((void *)ttf_font, size, 18.0f * g_display.dpi_scale_x, nullptr, io.Fonts->GetGlyphRangesDefault());
} else {
// necessary?
io.Fonts->AddFontDefault();
}
ImGui::GetStyle().ScaleAllSizes(g_display.dpi_scale_x);
IMGUI_CHECKVERSION(); IMGUI_CHECKVERSION();
IM_ASSERT(io.BackendRendererUserData == nullptr && "Already initialized a renderer backend!"); IM_ASSERT(io.BackendRendererUserData == nullptr && "Already initialized a renderer backend!");

4
ext/imgui/imgui_impl_thin3d.h
View File

@ -33,8 +33,8 @@
#include "Common/GPU/thin3d.h" #include "Common/GPU/thin3d.h"
#include "Common/Math/lin/matrix4x4.h" #include "Common/Math/lin/matrix4x4.h"
// Called by user code // Called by user code. Takes ownership of the font buffer and later deletes it.
IMGUI_IMPL_API bool ImGui_ImplThin3d_Init(Draw::DrawContext *draw); IMGUI_IMPL_API bool ImGui_ImplThin3d_Init(Draw::DrawContext *draw, const uint8_t *ttf_font, size_t size);
IMGUI_IMPL_API void ImGui_ImplThin3d_Shutdown(); IMGUI_IMPL_API void ImGui_ImplThin3d_Shutdown();
IMGUI_IMPL_API void ImGui_ImplThin3d_NewFrame(Draw::DrawContext *draw, Lin::Matrix4x4 drawMatrix); IMGUI_IMPL_API void ImGui_ImplThin3d_NewFrame(Draw::DrawContext *draw, Lin::Matrix4x4 drawMatrix);
IMGUI_IMPL_API void ImGui_ImplThin3d_RenderDrawData(ImDrawData* draw_data, Draw::DrawContext *draw); IMGUI_IMPL_API void ImGui_ImplThin3d_RenderDrawData(ImDrawData* draw_data, Draw::DrawContext *draw);

2
ext/lua

@ -1 +1 @@
Subproject commit f3271af11ab8591164b871e36520a7210964f3f6 Subproject commit 7648485f14e8e5ee45e8e39b1eb4d3206dbd405a