Implement on-screen touch combo keys.

Replace A,B,cross1,square1,triangle1 with number images 1-6

Rebuild the atlas, update the code to use combo keys 1-5

Also add psp_display.png from pull request #8082.
This commit is contained in:
xiushu authored and Henrik Rydgard committed 2015-10-24 13:22:43 +02:00
1 parent 6a373fe09a
commit 14e7658bbb
30 files changed
+5219 -4581

No files matched your search

+10
View File
@@ -51,6 +51,11 @@ void TouchControlVisibilityScreen::CreateViews() {
keyImages["Select"] = I_SELECT;
keyImages["L"] = I_L;
keyImages["R"] = I_R;
keyImages["Combo0"] = I_1;
keyImages["Combo1"] = I_2;
keyImages["Combo2"] = I_3;
keyImages["Combo3"] = I_4;
keyImages["Combo4"] = I_5;
keyToggles.clear();
keyToggles["Circle"] = &g_Config.bShowTouchCircle;
@@ -64,6 +69,11 @@ void TouchControlVisibilityScreen::CreateViews() {
keyToggles["Dpad"] = &g_Config.bShowTouchDpad;
keyToggles["Analog Stick"] = &g_Config.bShowTouchAnalogStick;
keyToggles["Unthrottle"] = &g_Config.bShowTouchUnthrottle;
keyToggles["Combo0"] = &g_Config.bShowComboKey0;
keyToggles["Combo1"] = &g_Config.bShowComboKey1;
keyToggles["Combo2"] = &g_Config.bShowComboKey2;
keyToggles["Combo3"] = &g_Config.bShowComboKey3;
keyToggles["Combo4"] = &g_Config.bShowComboKey4;
std::map<std::string, int>::iterator imageFinder;