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

Merge pull request #12655 from hrydgard/remove-lowmem-atlas

Browse Source 
Remove support for "lowmem" UI atlas.
This commit is contained in:
Unknown W. Brackets 2020-02-29 14:15:35 -05:00 committed by GitHub
commit 417796c67e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 1397 additions and 1616 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2929
UI/ui_atlas.cpp
View File

File diff suppressed because it is too large Load Diff

3
UWP/UWP.vcxproj
View File

@ -1700,9 +1700,6 @@
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</DeploymentContent>
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</DeploymentContent>
</None>
<None Include="Content\ui_atlas_lowmem.zim">
<DeploymentContent>true</DeploymentContent>
</None>
<None Include="PPSSPP_UWP_TemporaryKey.pfx" />
<None Include="UWP_TemporaryKey.pfx" />
</ItemGroup>

5
UWP/UWP.vcxproj.filters
View File

@ -118,9 +118,6 @@
<None Include="Content\ppge_atlas.zim">
<Filter>Content</Filter>
</None>
<None Include="Content\ui_atlas_lowmem.zim">
<Filter>Content</Filter>
</None>
<None Include="PPSSPP_UWP_TemporaryKey.pfx" />
<None Include="Content\lang\ar_AE.ini">
<Filter>Content\lang</Filter>
@ -367,4 +364,4 @@
<Filter>Content</Filter>
</Font>
</ItemGroup>
</Project>
</Project>

3
Windows/PPSSPP.vcxproj
View File

@ -958,7 +958,6 @@
<None Include="..\assets\knownfuncs.ini" />
<None Include="..\assets\langregion.ini" />
<None Include="..\atlasscript.txt" />
<None Include="..\atlasscript_lowmem.txt" />
<None Include="..\CMakeLists.txt" />
<None Include="..\ios\AudioEngine.mm" />
<None Include="..\ios\main.mm" />
@ -1028,4 +1027,4 @@
<UserProperties RESOURCE_FILE="DaSh.rc" />
</VisualStudio>
</ProjectExtensions>
</Project>
</Project>

5
Windows/PPSSPP.vcxproj.filters
View File

@ -399,9 +399,6 @@
<None Include="..\atlasscript.txt">
<Filter>Other Platforms</Filter>
</None>
<None Include="..\atlasscript_lowmem.txt">
<Filter>Other Platforms</Filter>
</None>
<None Include="..\ios\AudioEngine.mm">
<Filter>Other Platforms</Filter>
</None>
@ -453,4 +450,4 @@
<Filter>Resource Files</Filter>
</Image>
</ItemGroup>
</Project>
</Project>

BIN
android/assets/ui_atlas.zim
View File

Binary file not shown.

BIN
assets/ui_atlas.zim
View File

Binary file not shown.

49
atlasscript_lowmem.txt
View File

@ -1,49 +0,0 @@
512
font UBUNTU24 assets/Roboto-Condensed.ttf U 34 -2
image I_SOLIDWHITE white.png copy
image I_CROSS source_assets/image/cross.png copy
image I_CIRCLE source_assets/image/circle.png copy
image I_SQUARE source_assets/image/square.png copy
image I_TRIANGLE source_assets/image/triangle.png copy
image I_SELECT source_assets/image/select.png copy
image I_START source_assets/image/start.png copy
image I_ARROW source_assets/image/arrow.png copy
image I_DIR source_assets/image/dir.png copy
image I_ROUND source_assets/image/round.png copy
image I_RECT source_assets/image/rect.png copy
image I_STICK source_assets/image/stick.png copy
image I_STICK_BG source_assets/image/stick_bg.png copy
image I_SHOULDER source_assets/image/shoulder.png copy
image I_DIR_LINE source_assets/image/dir_line.png copy
image I_ROUND_LINE source_assets/image/round_line.png copy
image I_RECT_LINE source_assets/image/rect_line.png copy
image I_SHOULDER_LINE source_assets/image/shoulder_line.png copy
image I_STICK_LINE source_assets/image/stick_line.png copy
image I_STICK_BG_LINE source_assets/image/stick_bg_line.png copy
image I_CHECKEDBOX source_assets/image/checkedbox.png copy
image I_BG source_assets/image/background2.png copy
image I_BG_GOLD source_assets/image/background_gold.png copy
image I_L source_assets/image/L.png copy
image I_R source_assets/image/R.png copy
image I_DROP_SHADOW source_assets/image/dropshadow.png copy
image I_LINES source_assets/image/lines.png copy
image I_GRID source_assets/image/grid.png copy
image I_LOGO source_assets/image/logo.png copy
image I_ICON source_assets/image/icon_regular_72.png copy
image I_ICONGOLD source_assets/image/icon_gold_72.png copy
image I_FOLDER source_assets/image/folder_line.png copy
image I_UP_DIRECTORY source_assets/image/up_line.png copy
image I_GEAR source_assets/image/gear.png copy
image I_1 source_assets/image/1.png copy
image I_2 source_assets/image/2.png copy
image I_3 source_assets/image/3.png copy
image I_4 source_assets/image/4.png copy
image I_5 source_assets/image/5.png copy
image I_6 source_assets/image/6.png copy
image I_PSP_DISPLAY source_assets/image/psp_display.png copy
image I_FLAG_JP source_assets/image/flag_jp.png copy
image I_FLAG_US source_assets/image/flag_us.png copy
image I_FLAG_EU source_assets/image/flag_eu.png copy
image I_FLAG_HK source_assets/image/flag_hk.png copy
image I_FLAG_AS source_assets/image/flag_as.png copy
image I_FLAG_KO source_assets/image/flag_ko.png copy

8
buildatlas.sh
View File

@ -1,6 +1,2 @@
# build the lowmem first so we see the output of the big one last.
./ext/native/tools/build/atlastool atlasscript_lowmem.txt ui 8888 && mv ui_atlas.zim assets/ui_atlas_lowmem.zim && mv ui_atlas.cpp ui_atlas_lowmem.cpp
./ext/native/tools/build/atlastool atlasscript.txt ui 8888 && cp ui_atlas.zim assets && cp ui_atlas.zim android/assets && cp ui_atlas.zim.png ui_atlas_high.zim.png && mv ui_atlas.cpp ui_atlas_highmem.cpp && mv ui_atlas.h UI
diff -I'^//.*' -D USING_QT_UI ui_atlas_highmem.cpp ui_atlas_lowmem.cpp > UI/ui_atlas.cpp
rm ui_atlas_highmem.cpp ui_atlas_lowmem.cpp ui_atlas.h
./ext/native/tools/build/atlastool atlasscript.txt ui 8888 && cp ui_atlas.zim assets && cp ui_atlas.zim android/assets && mv ui_atlas.cpp ui_atlas.h UI
rm ui_atlas.zim

11
ext/native/tools/atlastool.cpp
View File

@ -242,7 +242,7 @@ struct Bucket {
dest.resize(image_width, 1);
sort(items.begin(), items.end());
for (int i = 0; i < (int)items.size(); i++) {
if ((i + 1) % 200 == 0) {
if ((i + 1) % 2000 == 0) {
printf("Resolving (%i / %i)\n", i, (int)items.size());
}
int idx = (int)items[i].first.dat[0].size();
@ -388,6 +388,8 @@ void RasterizeFonts(const FontReferenceList &fontRefs, vector<CharRange> &ranges
// Wait what - how does this make sense?
*metrics_height = totalHeight / (float)fontRefs.size();
size_t missing_chars = 0;
// Convert all characters to bitmaps.
for (size_t r = 0, rn = ranges.size(); r < rn; r++) {
FT_Face_List &tryFonts = fontsByRange[ranges[r].start];
@ -411,7 +413,8 @@ void RasterizeFonts(const FontReferenceList &fontRefs, vector<CharRange> &ranges
}
}
if (!foundMatch) {
fprintf(stderr, "WARNING: No font contains character %x.\n", kar);
// fprintf(stderr, "WARNING: No font contains character %x.\n", kar);
missing_chars++;
continue;
}
@ -493,6 +496,10 @@ void RasterizeFonts(const FontReferenceList &fontRefs, vector<CharRange> &ranges
}
}
if (missing_chars) {
printf("Chars not found in any font: %d\n", (int)missing_chars);
}
for (size_t i = 0, n = fonts.size(); i < n; ++i) {
FT_Done_Face(fonts[i]);
}