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

Rename custom build atlas_zim to allow keeping both

Browse Source 
official PPSSPP and it's atlas in same folder as custom build.
This commit is contained in:
LunaMoo committed 2019-06-04 11:42:06 +02:00
1 parent 02e1408186
commit 30d7b7cb58
9 files changed
+11 -11
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

.gitignore
+1 -1
View File
@@ -86,7 +86,7 @@ __testfinish.txt
__testfailure.bmp
GameLogNotes.txt
screenshots
android/ui_atlas.zim
android/ui_atlas_luna.zim
android/assets/lang
android/assets/flash0
ppge_atlas.zim.png
CMakeLists.txt
+1 -1
View File
@@ -1913,7 +1913,7 @@ if(WIN32)
endif()
set(NativeAssets
android/assets/ui_atlas.zim
android/assets/ui_atlas_luna.zim
assets/lang
assets/shaders
assets/scalers
UI/ui_atlas.cpp
+1 -1
View File
@@ -34000,7 +34000,7 @@ const AtlasImage ui_images[39] = {
{0.096924f, 0.075928f, 0.111084f, 0.083740f, 30, 17, "I_PSP_DISPLAY"},
};
const Atlas ui_atlas = {
"ui_atlas.zim",
"ui_atlas_luna.zim",
ui_fonts, 1,
ui_images, 39,
};
UWP/UWP.vcxproj
+1 -1
View File
@@ -549,7 +549,7 @@ copy AssetsGold\*.* Assets /Y
<Image Include="Content\rargray.png">
<DeploymentContent>true</DeploymentContent>
</Image>
<Image Include="Content\ui_atlas.zim">
<Image Include="Content\ui_atlas_luna.zim">
<DeploymentContent>true</DeploymentContent>
<FileType>Document</FileType>
</Image>
UWP/UWP.vcxproj.filters
+1 -1
View File
@@ -82,7 +82,7 @@
<Image Include="Content\zip.png">
<Filter>Content</Filter>
</Image>
<Image Include="Content\ui_atlas.zim">
<Image Include="Content\ui_atlas_luna.zim">
<Filter>Content</Filter>
</Image>
<Image Include="AssetsGold\StoreLogo.scale-100.png">
android/.gitignore
+2 -2
View File
@@ -7,8 +7,8 @@ gen
obj
.externalNativeBuild
android.iml
#ui_atlas.zim
#ui_atlas_luna.zim
ui_atlas.zim.png
#assets/ui_atlas.zim
#assets/ui_atlas_luna.zim
#jni/ui_atlas.cpp
#jni/ui_atlas.h
android/buildassets.sh
+1 -1
View File
@@ -3,7 +3,7 @@ cp ../assets/7z.png assets/
cp ../assets/rargray.png assets/
cp ../assets/unknown.png assets/
cp ../assets/zip.png assets/
cp ../assets/ui_atlas.zim assets/
cp ../assets/ui_atlas_luna.zim assets/
cp ../assets/ppge_atlas.zim assets/
cp ../assets/Roboto-Condensed.ttf assets/
cp -r ../assets/flash0 assets/
assets/ui_atlas.zim → assets/ui_atlas_luna.zim
View File
File renamed without changes.
ext/native/ui/ui_context.cpp
+3 -3
View File
@@ -35,10 +35,10 @@ void UIContext::Init(Draw::DrawContext *thin3d, Draw::Pipeline *uipipe, Draw::Pi
void UIContext::BeginFrame() {
if (!uitexture_) {
uitexture_ = CreateTextureFromFile(draw_, "ui_atlas.zim", ImageFileType::ZIM, false);
uitexture_ = CreateTextureFromFile(draw_, "ui_atlas_luna.zim", ImageFileType::ZIM, false);
if (!uitexture_) {
PanicAlert("Failed to load ui_atlas.zim.\n\nPlace it in the directory \"assets\" under your PPSSPP directory.");
FLOG("Failed to load ui_atlas.zim");
PanicAlert("Failed to load ui_atlas_luna.zim.\n\nPlace it in the directory \"assets\" under your PPSSPP directory.");
FLOG("Failed to load ui_atlas_luna.zim");
}
}
uidrawbufferTop_->SetCurZ(0.0f);