Switch all images to dynamic lookup in the atlas by string ID.

SLN fix

It works, but with the wrong images and the wrong characters!

Fix another bug in atlastool's binary output

Get Android building again.

Oops, didn't mean to disable this permanently.

Error checking

Minor cleanup

Gotta tweak my git ignores...

Regenerate metadata

.gitignore

@@ -28,8 +28,6 @@ Windows/ARM64
 Windows/ipch
 Windows/bin-release
 Windows/win-version.h
-ui_atlas.zim.png
-ui_atlas_high.zim.png
 android/assets
 ext/_Output
 android/lint.xml
@@ -87,9 +85,9 @@ __testfinish.txt
 __testfailure.bmp
 GameLogNotes.txt
 screenshots
-android/ui_atlas.zim
 android/assets/lang
 android/assets/flash0
+ui_atlas.zim.png
 ppge_atlas.zim.png
 local.properties
 r.sh

CMakeLists.txt

@@ -863,7 +863,6 @@ list(APPEND NativeAppSource
 	UI/CwCheatScreen.cpp
 	UI/InstallZipScreen.cpp
 	UI/ProfilerDraw.cpp
-	UI/ui_atlas.cpp
 	UI/TextureUtil.cpp
 	UI/ComboKeyMappingScreen.cpp
 )
@@ -1754,8 +1753,6 @@ add_library(${CoreLibName} ${CoreLinkType}
 	Core/Util/BlockAllocator.h
 	Core/Util/PPGeDraw.cpp
 	Core/Util/PPGeDraw.h
-	Core/Util/ppge_atlas.cpp
-	Core/Util/ppge_atlas.h
 	${CORE_NEON}
 	${GPU_SOURCES}
 	ext/disarm.cpp
@@ -1927,6 +1924,7 @@ endif()
 
 set(NativeAssets
 	android/assets/ui_atlas.zim
+	android/assets/ui_atlas.meta
 	assets/lang
 	assets/shaders
 	assets/Roboto-Condensed.ttf
@@ -1935,6 +1933,7 @@ set(NativeAssets
 	assets/gamecontrollerdb.txt
 	assets/langregion.ini
 	assets/ppge_atlas.zim
+	assets/ppge_atlas.meta
 	assets/rargray.png
 	assets/unknown.png
 	assets/zip.png

Core/Core.vcxproj

@@ -71,7 +71,6 @@
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\Windows\fix_2017.props" />
   </ImportGroup>
-
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
@@ -834,7 +833,6 @@
     <ClCompile Include="Util\DisArm64.cpp" />
     <ClCompile Include="Util\GameManager.cpp" />
     <ClCompile Include="Util\PPGeDraw.cpp" />
-    <ClCompile Include="Util\ppge_atlas.cpp" />
     <ClCompile Include="..\ext\xxhash.c">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">MaxSpeed</Optimization>
       <IntrinsicFunctions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</IntrinsicFunctions>
@@ -1166,7 +1164,6 @@
     <ClInclude Include="Util\DisArm64.h" />
     <ClInclude Include="Util\GameManager.h" />
     <ClInclude Include="Util\PPGeDraw.h" />
-    <ClInclude Include="Util\ppge_atlas.h" />
     <ClInclude Include="..\ext\xxhash.h" />
     <ClInclude Include="WaveFile.h" />
     <ClInclude Include="WebServer.h" />

Core/Core.vcxproj.filters

@@ -336,9 +336,6 @@
     <ClCompile Include="Util\PPGeDraw.cpp">
       <Filter>Util</Filter>
     </ClCompile>
-    <ClCompile Include="Util\ppge_atlas.cpp">
-      <Filter>Util</Filter>
-    </ClCompile>
     <ClCompile Include="HLE\sceFont.cpp">
       <Filter>HLE\Libraries</Filter>
     </ClCompile>
@@ -1000,9 +997,6 @@
     <ClInclude Include="Util\PPGeDraw.h">
       <Filter>Util</Filter>
     </ClInclude>
-    <ClInclude Include="Util\ppge_atlas.h">
-      <Filter>Util</Filter>
-    </ClInclude>
     <ClInclude Include="HLE\sceFont.h">
       <Filter>HLE\Libraries</Filter>
     </ClInclude>

Core/Dialog/PSPDialog.cpp

@@ -144,8 +144,13 @@ void PSPDialog::DoState(PointerWrap &p)
 	p.Do(isFading);
 	p.Do(fadeIn);
 	p.Do(fadeValue);
+
+	// I don't think we should save these two... Let's just ignore them for now for compat.
+	int okButtonImg = 0;
 	p.Do(okButtonImg);
+	int cancelButtonImg = 0;
 	p.Do(cancelButtonImg);
+
 	p.Do(okButtonFlag);
 	p.Do(cancelButtonFlag);
 

Core/Dialog/PSPDialog.h

@@ -17,6 +17,8 @@
 
 #pragma once
 
+#include "gfx/texture_atlas.h"
+
 #include "Common/Common.h"
 #include "Common/CommonTypes.h"
 #include "Common/Swap.h"
@@ -112,8 +114,8 @@ class PSPDialog
 	bool fadeIn;
 	u32 fadeValue;
 
-	int okButtonImg;
-	int cancelButtonImg;
+	ImageID okButtonImg;
+	ImageID cancelButtonImg;
 	int okButtonFlag;
 	int cancelButtonFlag;
 };

Core/Dialog/PSPMsgDialog.cpp

@@ -225,14 +225,14 @@ int PSPMsgDialog::Update(int animSpeed) {
 		UpdateButtons();
 		UpdateFade(animSpeed);
 
-		okButtonImg = I_CIRCLE;
-		cancelButtonImg = I_CROSS;
+		okButtonImg = ImageID("I_CIRCLE");
+		cancelButtonImg = ImageID("I_CROSS");
 		okButtonFlag = CTRL_CIRCLE;
 		cancelButtonFlag = CTRL_CROSS;
 		if (messageDialog.common.buttonSwap == 1)
 		{
-			okButtonImg = I_CROSS;
-			cancelButtonImg = I_CIRCLE;
+			okButtonImg = ImageID("I_CROSS");
+			cancelButtonImg = ImageID("I_CIRCLE");
 			okButtonFlag = CTRL_CROSS;
 			cancelButtonFlag = CTRL_CIRCLE;
 		}

Core/Dialog/PSPNetconfDialog.cpp

@@ -71,7 +71,7 @@ int PSPNetconfDialog::Update(int animSpeed) {
 	auto di = GetI18NCategory("Dialog");
 	auto err = GetI18NCategory("Error");
 	const float WRAP_WIDTH = 254.0f;
-	const int confirmBtnImage = g_Config.iButtonPreference == PSP_SYSTEMPARAM_BUTTON_CROSS ? I_CROSS : I_CIRCLE;
+	const ImageID confirmBtnImage = g_Config.iButtonPreference == PSP_SYSTEMPARAM_BUTTON_CROSS ? ImageID("I_CROSS") : ImageID("I_CIRCLE");
 	const int confirmBtn = g_Config.iButtonPreference == PSP_SYSTEMPARAM_BUTTON_CROSS ? CTRL_CROSS : CTRL_CIRCLE;
 
 	if (status == SCE_UTILITY_STATUS_INITIALIZE) {

Core/Dialog/PSPOskDialog.cpp

@@ -919,15 +919,15 @@ int PSPOskDialog::Update(int animSpeed) {
 
 	auto di = GetI18NCategory("Dialog");
 
-	PPGeDrawImage(I_SQUARE, 365, 222, 16, 16, 0, CalcFadedColor(0xFFFFFFFF));
+	PPGeDrawImage(ImageID("I_SQUARE"), 365, 222, 16, 16, 0, CalcFadedColor(0xFFFFFFFF));
 	PPGeDrawText(di->T("Space"), 390, 222, PPGE_ALIGN_LEFT, 0.5f, CalcFadedColor(0xFFFFFFFF));
 
 	if (g_Config.iButtonPreference != PSP_SYSTEMPARAM_BUTTON_CIRCLE) {
-		PPGeDrawImage(I_CROSS, 45, 222, 16, 16, 0, CalcFadedColor(0xFFFFFFFF));
-		PPGeDrawImage(I_CIRCLE, 45, 247, 16, 16, 0, CalcFadedColor(0xFFFFFFFF));
+		PPGeDrawImage(ImageID("I_CROSS"), 45, 222, 16, 16, 0, CalcFadedColor(0xFFFFFFFF));
+		PPGeDrawImage(ImageID("I_CIRCLE"), 45, 247, 16, 16, 0, CalcFadedColor(0xFFFFFFFF));
 	} else {
-		PPGeDrawImage(I_CIRCLE, 45, 222, 16, 16, 0, CalcFadedColor(0xFFFFFFFF));
-		PPGeDrawImage(I_CROSS, 45, 247, 16, 16, 0, CalcFadedColor(0xFFFFFFFF));
+		PPGeDrawImage(ImageID("I_CIRCLE"), 45, 222, 16, 16, 0, CalcFadedColor(0xFFFFFFFF));
+		PPGeDrawImage(ImageID("I_CROSS"), 45, 247, 16, 16, 0, CalcFadedColor(0xFFFFFFFF));
 	}
 
 	PPGeDrawText(di->T("Select"), 75, 222, PPGE_ALIGN_LEFT, 0.5f, CalcFadedColor(0xFFFFFFFF));

Core/Dialog/PSPSaveDialog.cpp

@@ -610,13 +610,13 @@ int PSPSaveDialog::Update(int animSpeed)
 	UpdateButtons();
 	UpdateFade(animSpeed);
 
-	okButtonImg = I_CIRCLE;
-	cancelButtonImg = I_CROSS;
+	okButtonImg = ImageID("I_CIRCLE");
+	cancelButtonImg = ImageID("I_CROSS");
 	okButtonFlag = CTRL_CIRCLE;
 	cancelButtonFlag = CTRL_CROSS;
 	if (param.GetPspParam()->common.buttonSwap == 1) {
-		okButtonImg = I_CROSS;
-		cancelButtonImg = I_CIRCLE;
+		okButtonImg = ImageID("I_CROSS");
+		cancelButtonImg = ImageID("I_CIRCLE");
 		okButtonFlag = CTRL_CROSS;
 		cancelButtonFlag = CTRL_CIRCLE;
 	}

Core/Util/PPGeDraw.cpp

@@ -18,6 +18,8 @@
 #include <algorithm>
 
 #include "base/stringutil.h"
+#include "file/vfs.h"
+#include "gfx/texture_atlas.h"
 #include "image/zim_load.h"
 #include "image/png_load.h"
 #include "util/text/utf8.h"
@@ -36,6 +38,8 @@
 #include "Core/MemMapHelpers.h"
 #include "Core/System.h"
 
+Atlas g_ppge_atlas;
+
 static u32 atlasPtr;
 static int atlasWidth;
 static int atlasHeight;
@@ -190,6 +194,12 @@ void __PPGeInit()
 		return;
 	}
 
+	size_t atlas_data_size;
+	uint8_t *atlas_data;
+	atlas_data = VFSReadFile("ppge_atlas.meta", &atlas_data_size);
+	g_ppge_atlas.Load(atlas_data, atlas_data_size);
+	delete[] atlas_data;
+
 	u32 atlasSize = height[0] * width[0] / 2;  // it's a 4-bit paletted texture in ram
 	atlasWidth = width[0];
 	atlasHeight = height[0];
@@ -617,7 +627,7 @@ static AtlasTextMetrics BreakLines(const char *text, const AtlasFont &atlasfont,
 void PPGeMeasureText(float *w, float *h, int *n, 
 					const char *text, float scale, int WrapType, int wrapWidth)
 {
-	const AtlasFont &atlasfont = *ppge_atlas.fonts[0];
+	const AtlasFont &atlasfont = g_ppge_atlas.fonts[0];
 	AtlasTextMetrics metrics = BreakLines(text, atlasfont, 0, 0, 0, scale, scale, WrapType, wrapWidth, true);
 	if (w) *w = metrics.maxWidth;
 	if (h) *h = metrics.lineHeight;
@@ -626,7 +636,7 @@ void PPGeMeasureText(float *w, float *h, int *n,
 
 void PPGePrepareText(const char *text, float x, float y, int align, float scale, float lineHeightScale, int WrapType, int wrapWidth)
 {
-	const AtlasFont &atlasfont = *ppge_atlas.fonts[0];
+	const AtlasFont &atlasfont = g_ppge_atlas.fonts[0];
 	char_lines_metrics = BreakLines(text, atlasfont, x, y, align, scale, lineHeightScale, WrapType, wrapWidth, false);
 }
 
@@ -731,15 +741,16 @@ void PPGeDrawTextWrapped(const char *text, float x, float y, float wrapWidth, fl
 }
 
 // Draws a "4-patch" for button-like things that can be resized
-void PPGeDraw4Patch(int atlasImage, float x, float y, float w, float h, u32 color)
-{
+void PPGeDraw4Patch(ImageID atlasImage, float x, float y, float w, float h, u32 color) {
 	if (!dlPtr)
 		return;
-	const AtlasImage &img = ppge_images[atlasImage];
-	float borderx = img.w / 20;
-	float bordery = img.h / 20;
-	float u1 = img.u1, uhalf = (img.u1 + img.u2) / 2, u2 = img.u2;
-	float v1 = img.v1, vhalf = (img.v1 + img.v2) / 2, v2 = img.v2;
+	const AtlasImage *img = g_ppge_atlas.getImage(atlasImage);
+	if (!img)
+		return;
+	float borderx = img->w / 20;
+	float bordery = img->h / 20;
+	float u1 = img->u1, uhalf = (img->u1 + img->u2) / 2, u2 = img->u2;
+	float v1 = img->v1, vhalf = (img->v1 + img->v2) / 2, v2 = img->v2;
 	float xmid1 = x + borderx;
 	float xmid2 = x + w - borderx;
 	float ymid1 = y + bordery;
@@ -771,8 +782,7 @@ void PPGeDraw4Patch(int atlasImage, float x, float y, float w, float h, u32 colo
 	EndVertexDataAndDraw(GE_PRIM_RECTANGLES);
 }
 
-void PPGeDrawRect(float x1, float y1, float x2, float y2, u32 color)
-{
+void PPGeDrawRect(float x1, float y1, float x2, float y2, u32 color) {
 	if (!dlPtr)
 		return;
 
@@ -787,29 +797,32 @@ void PPGeDrawRect(float x1, float y1, float x2, float y2, u32 color)
 }
 
 // Just blits an image to the screen, multiplied with the color.
-void PPGeDrawImage(int atlasImage, float x, float y, int align, u32 color)
+void PPGeDrawImage(ImageID atlasImage, float x, float y, int align, u32 color)
 {
 	if (!dlPtr)
 		return;
 
-	const AtlasImage &img = ppge_atlas.images[atlasImage];
-	float w = img.w;
-	float h = img.h;
+	const AtlasImage *img = g_ppge_atlas.getImage(atlasImage);
+	if (!img) {
+		return;
+	}
+	float w = img->w;
+	float h = img->h;
 	BeginVertexData();
-	Vertex(x, y, img.u1, img.v1, atlasWidth, atlasHeight, color);
-	Vertex(x + w, y + h, img.u2, img.v2, atlasWidth, atlasHeight, color);
+	Vertex(x, y, img->u1, img->v1, atlasWidth, atlasHeight, color);
+	Vertex(x + w, y + h, img->u2, img->v2, atlasWidth, atlasHeight, color);
 	EndVertexDataAndDraw(GE_PRIM_RECTANGLES);
 }
 
-void PPGeDrawImage(int atlasImage, float x, float y, float w, float h, int align, u32 color)
+void PPGeDrawImage(ImageID atlasImage, float x, float y, float w, float h, int align, u32 color)
 {
 	if (!dlPtr)
 		return;
 
-	const AtlasImage &img = ppge_atlas.images[atlasImage];
+	const AtlasImage *img = g_ppge_atlas.getImage(atlasImage);
 	BeginVertexData();
-	Vertex(x, y, img.u1, img.v1, atlasWidth, atlasHeight, color);
-	Vertex(x + w, y + h, img.u2, img.v2, atlasWidth, atlasHeight, color);
+	Vertex(x, y, img->u1, img->v1, atlasWidth, atlasHeight, color);
+	Vertex(x + w, y + h, img->u2, img->v2, atlasWidth, atlasHeight, color);
 	EndVertexDataAndDraw(GE_PRIM_RECTANGLES);
 }
 

Core/Util/PPGeDraw.h

@@ -19,7 +19,9 @@
 
 #include <vector>
 #include <string>
-#include "ppge_atlas.h"
+
+#include "gfx/texture_atlas.h"
+
 #include "Common/CommonTypes.h"
 
 class PointerWrap;
@@ -98,11 +100,11 @@ void PPGeDrawText(const char *text, float x, float y, int align, float scale = 1
 void PPGeDrawTextWrapped(const char *text, float x, float y, float wrapWidth, float wrapHeight, int align, float scale = 1.0f, u32 color = 0xFFFFFFFF);
 
 // Draws a "4-patch" for button-like things that can be resized.
-void PPGeDraw4Patch(int atlasImage, float x, float y, float w, float h, u32 color = 0xFFFFFFFF);
+void PPGeDraw4Patch(ImageID atlasImage, float x, float y, float w, float h, u32 color = 0xFFFFFFFF);
 
 // Just blits an image to the screen, multiplied with the color.
-void PPGeDrawImage(int atlasImage, float x, float y, int align, u32 color = 0xFFFFFFFF);
-void PPGeDrawImage(int atlasImage, float x, float y, float w, float h, int align, u32 color = 0xFFFFFFFF);
+void PPGeDrawImage(ImageID atlasImage, float x, float y, int align, u32 color = 0xFFFFFFFF);
+void PPGeDrawImage(ImageID atlasImage, float x, float y, float w, float h, int align, u32 color = 0xFFFFFFFF);
 void PPGeDrawImage(float x, float y, float w, float h, float u1, float v1, float u2, float v2, int tw, int th, u32 color);
 
 class PPGeImage {