diff --git a/.gitignore b/.gitignore index becbb37a0d..c1dfc7247d 100644 --- a/.gitignore +++ b/.gitignore @@ -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 diff --git a/CMakeLists.txt b/CMakeLists.txt index 3dd679c29e..0b5c329c9b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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 diff --git a/UI/ui_atlas.cpp b/UI/ui_atlas.cpp index 7f9f9859dc..007523e84b 100644 --- a/UI/ui_atlas.cpp +++ b/UI/ui_atlas.cpp @@ -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, }; diff --git a/UWP/UWP.vcxproj b/UWP/UWP.vcxproj index 53d38241e1..5f5c849fa4 100644 --- a/UWP/UWP.vcxproj +++ b/UWP/UWP.vcxproj @@ -549,7 +549,7 @@ copy AssetsGold\*.* Assets /Y true - + true Document diff --git a/UWP/UWP.vcxproj.filters b/UWP/UWP.vcxproj.filters index 944fd711c8..dce1a52757 100644 --- a/UWP/UWP.vcxproj.filters +++ b/UWP/UWP.vcxproj.filters @@ -82,7 +82,7 @@ Content - + Content diff --git a/android/.gitignore b/android/.gitignore index 4aa0d52b74..7011c5d20d 100644 --- a/android/.gitignore +++ b/android/.gitignore @@ -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 diff --git a/android/buildassets.sh b/android/buildassets.sh index 5bd6e9c0cf..2fca48280f 100644 --- a/android/buildassets.sh +++ b/android/buildassets.sh @@ -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/ diff --git a/assets/ui_atlas.zim b/assets/ui_atlas_luna.zim similarity index 100% rename from assets/ui_atlas.zim rename to assets/ui_atlas_luna.zim diff --git a/ext/native/ui/ui_context.cpp b/ext/native/ui/ui_context.cpp index b5f7ba204f..5ab864da6e 100644 --- a/ext/native/ui/ui_context.cpp +++ b/ext/native/ui/ui_context.cpp @@ -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);