preserve-emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2026-07-11 01:25:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix references to the old font files

Browse Source
This commit is contained in:
Henrik Rydgård
2025-11-14 09:10:24 +01:00
parent 35a084bfaa
commit 8052c15f61
9 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Common/Render/Text/draw_text_cocoa.mm
-2
View File
@@ -32,8 +32,6 @@ enum {
MAX_TEXT_HEIGHT = 512
};
#define APPLE_FONT "RobotoCondensed-Regular"
// for future OpenEmu support
#ifndef PPSSPP_FONT_BUNDLE
#define PPSSPP_FONT_BUNDLE [NSBundle mainBundle]
UI/EmuScreen.cpp
+2 -2
View File
@@ -1862,9 +1862,9 @@ void EmuScreen::runImDebugger() {
// Read the TTF font
size_t propSize = 0;
uint8_t *propFontData = g_VFS.ReadFile("Roboto-Condensed.ttf", &propSize);
const uint8_t *propFontData = g_VFS.ReadFile("Roboto_Condensed-Regular.ttf", &propSize);
size_t fixedSize = 0;
uint8_t *fixedFontData = g_VFS.ReadFile("Inconsolata-Medium.ttf", &fixedSize);
const uint8_t *fixedFontData = g_VFS.ReadFile("Inconsolata-Regular.ttf", &fixedSize);
// 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, propFontData, propSize, fixedFontData, fixedSize);
android/ab.cmd
+1 -1
View File
@@ -5,7 +5,7 @@ xcopy ..\assets\shaders assets\shaders\ /s /y <d.txt
xcopy ..\assets\themes assets\themes\ /s /y <d.txt
xcopy ..\assets\ui_images assets\ui_images\ /s /y <d.txt
copy ..\assets\*.ini assets\
copy ..\assets\Roboto-Condensed.ttf assets\Roboto-Condensed.ttf
copy ..\assets\*.ttf assets\
copy ..\assets\*.png assets\
copy ..\assets\*.zim assets\
copy ..\assets\*.meta assets\
android/ab.sh
+1 -1
View File
@@ -7,7 +7,7 @@ cp -r ../assets/debugger assets/
cp -r ../assets/upload assets/
cp -r ../assets/ui_images assets/
cp ../assets/*.ini assets/
cp ../assets/Roboto-Condensed.ttf assets/Roboto-Condensed.ttf
cp ../assets/*.ttf assets/
cp ../assets/*.png assets/
cp ../assets/*.zim assets/
cp ../assets/*.meta assets/
android/buildassets.sh
+1 -1
View File
@@ -7,7 +7,7 @@ cp ../assets/*.zim assets/
cp ../assets/*.meta assets/
cp ../assets/*.wav assets/
cp ../assets/*.ini assets/
cp ../assets/Roboto-Condensed.ttf assets/
cp ../assets/*.ttf assets/
cp -r ../assets/flash0 assets/
cp -r ../assets/lang assets/
cp -r ../assets/ui_images assets/
asciifont_atlasscript.txt
+1 -1
View File
@@ -1,2 +1,2 @@
2048
font UBUNTU24 assets/Roboto-Condensed.ttf UWERS 34 -2
font UBUNTU24 assets/Roboto_Condensed-Regular.ttf UWERS 34 -2
assets/lang/de_DE.ini
-1
View File
@@ -191,7 +191,6 @@ Refresh interval = Aktualisierungsintervall
Auto Max Quality = Autom. Max. &Qualität
Buy PPSSPP Gold = Goldversion kaufen
Copy PSP memory base address = PSP-Speicherplatz und -Adresse kopieren
Font = Roboto Condensed
About PPSSPP... = Über PPSSPP...
Auto = Autom.
Backend = Grafik-Backend
font_atlasscript.txt
+1 -1
View File
@@ -1,3 +1,3 @@
2048
font UBUNTU24 assets/Roboto-Condensed.ttf UWERS 34 -2
font UBUNTU24 assets/Roboto_Condensed-Regular.ttf UWERS 34 -2
font UBUNTU24 C:/dev/ARIALUNI.ttf UWEhkcRGHKVTeS 30 0
ios/Launch Screen.storyboard
+2 -2
View File
@@ -8,8 +8,8 @@
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<customFonts key="customFonts">
<array key="Roboto-Condensed.ttf">
<string>Roboto-Condensed</string>
<array key="Roboto_Condensed-Regular.ttf">
<string>Roboto_Condensed-Regular</string>
</array>
</customFonts>
<scenes>