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

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

Browse Source 
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
This commit is contained in:
Henrik Rydgård
2020-03-01 12:06:47 +01:00
parent 7e9578e49d
commit 45d94c4877
51 changed files with 676 additions and 476 deletions
Download Patch File Download Diff File Expand all files Collapse all files
UI/ComboKeyMappingScreen.cpp
+14 -14
View File
@@ -17,7 +17,6 @@
#include "TouchControlVisibilityScreen.h"
#include "Core/Config.h"
#include "UI/ui_atlas.h"
#include "i18n/i18n.h"
#include "ComboKeyMappingScreen.h"
#include "base/colorutil.h"
@@ -25,6 +24,7 @@
#include "base/timeutil.h"
#include "file/path.h"
#include "gfx_es2/draw_buffer.h"
#include "gfx/texture_atlas.h"
#include "math/curves.h"
#include "base/stringutil.h"
#include "ui/ui_context.h"
@@ -41,11 +41,11 @@ void Combo_keyScreen::CreateViews() {
LinearLayout *leftColumn = new LinearLayout(ORIENT_VERTICAL, new LinearLayoutParams(120, FILL_PARENT));
auto di = GetI18NCategory("Dialog");
static const int comboKeyImages[5] = {
I_1, I_2, I_3, I_4, I_5,
static const ImageID comboKeyImages[5] = {
ImageID("I_1"), ImageID("I_2"), ImageID("I_3"), ImageID("I_4"), ImageID("I_5"),
};
comboselect = new ChoiceStrip(ORIENT_VERTICAL, new AnchorLayoutParams(10, 10, NONE, NONE));
comboselect = new ChoiceStrip(ORIENT_VERTICAL, new AnchorLayoutParams(10, 10, NONE, NONE));
comboselect->SetSpacing(10);
for (int i = 0; i < 5; i++) {
comboselect->AddChoice(comboKeyImages[i]);
@@ -95,15 +95,15 @@ void Combo_keyScreen::CreateViews() {
break;
}
std::map<std::string, int> keyImages;
keyImages["Circle"] = I_CIRCLE;
keyImages["Cross"] = I_CROSS;
keyImages["Square"] = I_SQUARE;
keyImages["Triangle"] = I_TRIANGLE;
keyImages["L"] = I_L;
keyImages["R"] = I_R;
keyImages["Start"] = I_START;
keyImages["Select"] = I_SELECT;
std::map<std::string, ImageID> keyImages;
keyImages["Circle"] = ImageID("I_CIRCLE");
keyImages["Cross"] = ImageID("I_CROSS");
keyImages["Square"] = ImageID("I_SQUARE");
keyImages["Triangle"] = ImageID("I_TRIANGLE");
keyImages["L"] = ImageID("I_L");
keyImages["R"] = ImageID("I_R");
keyImages["Start"] = ImageID("I_START");
keyImages["Select"] = ImageID("I_SELECT");
keyToggles["Circle"] = &array[13];
keyToggles["Cross"] = &array[14];
keyToggles["Square"] = &array[15];
@@ -117,7 +117,7 @@ void Combo_keyScreen::CreateViews() {
keyToggles["Start"] = &array[3];
keyToggles["Select"] = &array[0];
std::map<std::string, int>::iterator imageFinder;
std::map<std::string, ImageID>::iterator imageFinder;
auto mc = GetI18NCategory("MappableControls");