From 0a0d8d9e328e04a26270cf6c2ef04ed95d9e8630 Mon Sep 17 00:00:00 2001 From: Henrik Rydgard Date: Sun, 18 Aug 2013 20:25:33 +0200 Subject: [PATCH] Android/SDL buildfix, move remains of the old UI into other files. --- CMakeLists.txt | 1 - UI/EmuScreen.cpp | 1 - UI/GameScreen.cpp | 2 +- UI/GameSettingsScreen.cpp | 1 - UI/MainScreen.cpp | 2 +- UI/MenuScreens.cpp | 113 -------------------------------------- UI/MenuScreens.h | 28 ---------- UI/MiscScreens.cpp | 90 +++++++++++++++++++++++++++++- UI/NativeApp.cpp | 1 - UI/UI.vcxproj | 2 - UI/UI.vcxproj.filters | 6 -- android/jni/Android.mk | 1 - 12 files changed, 90 insertions(+), 158 deletions(-) delete mode 100644 UI/MenuScreens.cpp delete mode 100644 UI/MenuScreens.h diff --git a/CMakeLists.txt b/CMakeLists.txt index 7cb4e9fe75..327e49d923 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1130,7 +1130,6 @@ set(NativeAppSource UI/GameInfoCache.cpp UI/MainScreen.cpp UI/MiscScreens.cpp - UI/MenuScreens.cpp UI/GameScreen.cpp UI/GameSettingsScreen.cpp UI/GamepadEmu.cpp diff --git a/UI/EmuScreen.cpp b/UI/EmuScreen.cpp index e92db8934a..b3409d7e97 100644 --- a/UI/EmuScreen.cpp +++ b/UI/EmuScreen.cpp @@ -46,7 +46,6 @@ #include "UI/UIShader.h" #include "UI/MainScreen.h" -#include "UI/MenuScreens.h" #include "UI/EmuScreen.h" #include "UI/GameInfoCache.h" #include "UI/MiscScreens.h" diff --git a/UI/GameScreen.cpp b/UI/GameScreen.cpp index c2f6b0cbd9..9a41fd6b6b 100644 --- a/UI/GameScreen.cpp +++ b/UI/GameScreen.cpp @@ -17,6 +17,7 @@ #include "base/colorutil.h" #include "base/timeutil.h" +#include "gfx_es2/draw_buffer.h" #include "i18n/i18n.h" #include "math/curves.h" #include "ui/ui_context.h" @@ -26,7 +27,6 @@ #include "UI/GameScreen.h" #include "UI/GameSettingsScreen.h" #include "UI/GameInfoCache.h" -#include "UI/MenuScreens.h" #include "UI/MiscScreens.h" #include "UI/MainScreen.h" diff --git a/UI/GameSettingsScreen.cpp b/UI/GameSettingsScreen.cpp index c38ba36dd0..b7d5123873 100644 --- a/UI/GameSettingsScreen.cpp +++ b/UI/GameSettingsScreen.cpp @@ -22,7 +22,6 @@ #include "ui/ui_context.h" #include "UI/EmuScreen.h" #include "UI/PluginScreen.h" -#include "UI/MenuScreens.h" #include "UI/GameSettingsScreen.h" #include "UI/GameInfoCache.h" #include "UI/MiscScreens.h" diff --git a/UI/MainScreen.cpp b/UI/MainScreen.cpp index 2716321dc4..43d12b26d4 100644 --- a/UI/MainScreen.cpp +++ b/UI/MainScreen.cpp @@ -17,6 +17,7 @@ #include "base/colorutil.h" #include "base/timeutil.h" +#include "gfx_es2/draw_buffer.h" #include "math/curves.h" #include "ui/ui_context.h" #include "ui/view.h" @@ -29,7 +30,6 @@ #include "UI/EmuScreen.h" #include "UI/MainScreen.h" #include "UI/GameScreen.h" -#include "UI/MenuScreens.h" #include "UI/GameInfoCache.h" #include "UI/GameSettingsScreen.h" #include "UI/MiscScreens.h" diff --git a/UI/MenuScreens.cpp b/UI/MenuScreens.cpp deleted file mode 100644 index 1fab314fd7..0000000000 --- a/UI/MenuScreens.cpp +++ /dev/null @@ -1,113 +0,0 @@ -// Copyright (c) 2012- PPSSPP Project. - -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, version 2.0 or later versions. - -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License 2.0 for more details. - -// A copy of the GPL 2.0 should have been included with the program. -// If not, see http://www.gnu.org/licenses/ - -// Official git repository and contact information can be found at -// https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/. - -#include -#include -#include -#include -#include - -#ifdef _MSC_VER -#define snprintf _snprintf -#pragma execution_character_set("utf-8") -#endif - -#include "base/timeutil.h" -#include "base/colorutil.h" -#include "gfx_es2/draw_buffer.h" -#include "gfx_es2/gl_state.h" -#include "util/random/rng.h" - -#include "Core/HLE/sceUtility.h" -#include "UI/ui_atlas.h" -#include "UI/ui.h" - -static const int symbols[4] = { - I_CROSS, - I_CIRCLE, - I_SQUARE, - I_TRIANGLE -}; - -static const uint32_t colors[4] = { - 0xC0FFFFFF, - 0xC0FFFFFF, - 0xC0FFFFFF, - 0xC0FFFFFF, -}; - -void DrawBackground(float alpha) { - static float xbase[100] = {0}; - static float ybase[100] = {0}; - static int last_dp_xres = 0; - static int last_dp_yres = 0; - if (xbase[0] == 0.0f || last_dp_xres != dp_xres || last_dp_yres != dp_yres) { - GMRng rng; - for (int i = 0; i < 100; i++) { - xbase[i] = rng.F() * dp_xres; - ybase[i] = rng.F() * dp_yres; - } - last_dp_xres = dp_xres; - last_dp_yres = dp_yres; - } - glstate.depthWrite.set(GL_TRUE); - glstate.colorMask.set(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE); - glClearColor(0.1f,0.2f,0.43f,1.0f); - glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT); - ui_draw2d.DrawImageStretch(I_BG, 0, 0, dp_xres, dp_yres); - float t = time_now(); - for (int i = 0; i < 100; i++) { - float x = xbase[i]; - float y = ybase[i] + 40*cos(i * 7.2 + t * 1.3); - float angle = sin(i + t); - int n = i & 3; - ui_draw2d.DrawImageRotated(symbols[n], x, y, 1.0f, angle, colorAlpha(colors[n], alpha * 0.1f)); - } -} - -std::map> GetLangValuesMapping() { - std::map> langValuesMapping; - langValuesMapping["ja_JP"] = std::make_pair("日本語", PSP_SYSTEMPARAM_LANGUAGE_JAPANESE); - langValuesMapping["en_US"] = std::make_pair("English",PSP_SYSTEMPARAM_LANGUAGE_ENGLISH); - langValuesMapping["fr_FR"] = std::make_pair("Français", PSP_SYSTEMPARAM_LANGUAGE_FRENCH); - langValuesMapping["es_ES"] = std::make_pair("Castellano", PSP_SYSTEMPARAM_LANGUAGE_SPANISH); - langValuesMapping["es_LA"] = std::make_pair("Latino", PSP_SYSTEMPARAM_LANGUAGE_SPANISH); - langValuesMapping["de_DE"] = std::make_pair("Deutsch", PSP_SYSTEMPARAM_LANGUAGE_GERMAN); - langValuesMapping["it_IT"] = std::make_pair("Italiano", PSP_SYSTEMPARAM_LANGUAGE_ITALIAN); - langValuesMapping["nl_NL"] = std::make_pair("Nederlands", PSP_SYSTEMPARAM_LANGUAGE_DUTCH); - langValuesMapping["pt_PT"] = std::make_pair("Português", PSP_SYSTEMPARAM_LANGUAGE_PORTUGUESE); - langValuesMapping["pt_BR"] = std::make_pair("Brasileiro", PSP_SYSTEMPARAM_LANGUAGE_PORTUGUESE); - langValuesMapping["ru_RU"] = std::make_pair("Русский", PSP_SYSTEMPARAM_LANGUAGE_RUSSIAN); - langValuesMapping["ko_KR"] = std::make_pair("한국어", PSP_SYSTEMPARAM_LANGUAGE_KOREAN); - langValuesMapping["zh_TW"] = std::make_pair("繁體中文", PSP_SYSTEMPARAM_LANGUAGE_CHINESE_TRADITIONAL); - langValuesMapping["zh_CN"] = std::make_pair("简体中文", PSP_SYSTEMPARAM_LANGUAGE_CHINESE_SIMPLIFIED); - - //langValuesMapping["ar_AE"] = std::make_pair("العربية", PSP_SYSTEMPARAM_LANGUAGE_ENGLISH); - langValuesMapping["az_AZ"] = std::make_pair("Azeri", PSP_SYSTEMPARAM_LANGUAGE_ENGLISH); - langValuesMapping["ca_ES"] = std::make_pair("Català", PSP_SYSTEMPARAM_LANGUAGE_ENGLISH); - langValuesMapping["gr_EL"] = std::make_pair("ελληνικά", PSP_SYSTEMPARAM_LANGUAGE_ENGLISH); - langValuesMapping["he_IL"] = std::make_pair("עברית", PSP_SYSTEMPARAM_LANGUAGE_ENGLISH); - langValuesMapping["hu_HU"] = std::make_pair("Magyar", PSP_SYSTEMPARAM_LANGUAGE_ENGLISH); - langValuesMapping["id_ID"] = std::make_pair("Indonesia", PSP_SYSTEMPARAM_LANGUAGE_ENGLISH); - langValuesMapping["pl_PL"] = std::make_pair("Polski", PSP_SYSTEMPARAM_LANGUAGE_ENGLISH); - langValuesMapping["ro_RO"] = std::make_pair("Român", PSP_SYSTEMPARAM_LANGUAGE_ENGLISH); - langValuesMapping["sv_SE"] = std::make_pair("Svenska", PSP_SYSTEMPARAM_LANGUAGE_ENGLISH); - langValuesMapping["tr_TR"] = std::make_pair("Türk", PSP_SYSTEMPARAM_LANGUAGE_ENGLISH); - langValuesMapping["uk_UA"] = std::make_pair("Українська", PSP_SYSTEMPARAM_LANGUAGE_ENGLISH); - return langValuesMapping; -} - diff --git a/UI/MenuScreens.h b/UI/MenuScreens.h deleted file mode 100644 index 1bf3032a18..0000000000 --- a/UI/MenuScreens.h +++ /dev/null @@ -1,28 +0,0 @@ -// Copyright (c) 2012- PPSSPP Project. - -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, version 2.0 or later versions. - -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License 2.0 for more details. - -// A copy of the GPL 2.0 should have been included with the program. -// If not, see http://www.gnu.org/licenses/ - -// Official git repository and contact information can be found at -// https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/. - -#pragma once - -#include -#include -#include - -#include "ui/screen.h" -#include "ui/ui.h" -#include "file/file_util.h" - -std::map> GetLangValuesMapping(); \ No newline at end of file diff --git a/UI/MiscScreens.cpp b/UI/MiscScreens.cpp index fbbe397583..72387a1875 100644 --- a/UI/MiscScreens.cpp +++ b/UI/MiscScreens.cpp @@ -27,7 +27,6 @@ #include "ui/view.h" #include "ui/viewgroup.h" #include "UI/MiscScreens.h" -#include "UI/MenuScreens.h" #include "UI/EmuScreen.h" #include "UI/MainScreen.h" #include "Core/Config.h" @@ -41,7 +40,93 @@ #pragma execution_character_set("utf-8") #endif -void DrawBackground(float alpha); + +#include "base/timeutil.h" +#include "base/colorutil.h" +#include "gfx_es2/draw_buffer.h" +#include "gfx_es2/gl_state.h" +#include "util/random/rng.h" + +#include "Core/HLE/sceUtility.h" +#include "UI/ui_atlas.h" +#include "UI/ui.h" + +static const int symbols[4] = { + I_CROSS, + I_CIRCLE, + I_SQUARE, + I_TRIANGLE +}; + +static const uint32_t colors[4] = { + 0xC0FFFFFF, + 0xC0FFFFFF, + 0xC0FFFFFF, + 0xC0FFFFFF, +}; + +void DrawBackground(float alpha) { + static float xbase[100] = {0}; + static float ybase[100] = {0}; + static int last_dp_xres = 0; + static int last_dp_yres = 0; + if (xbase[0] == 0.0f || last_dp_xres != dp_xres || last_dp_yres != dp_yres) { + GMRng rng; + for (int i = 0; i < 100; i++) { + xbase[i] = rng.F() * dp_xres; + ybase[i] = rng.F() * dp_yres; + } + last_dp_xres = dp_xres; + last_dp_yres = dp_yres; + } + glstate.depthWrite.set(GL_TRUE); + glstate.colorMask.set(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE); + glClearColor(0.1f,0.2f,0.43f,1.0f); + glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT); + ui_draw2d.DrawImageStretch(I_BG, 0, 0, dp_xres, dp_yres); + float t = time_now(); + for (int i = 0; i < 100; i++) { + float x = xbase[i]; + float y = ybase[i] + 40*cos(i * 7.2 + t * 1.3); + float angle = sin(i + t); + int n = i & 3; + ui_draw2d.DrawImageRotated(symbols[n], x, y, 1.0f, angle, colorAlpha(colors[n], alpha * 0.1f)); + } +} + +std::map> GetLangValuesMapping() { + std::map> langValuesMapping; + langValuesMapping["ja_JP"] = std::make_pair("日本語", PSP_SYSTEMPARAM_LANGUAGE_JAPANESE); + langValuesMapping["en_US"] = std::make_pair("English",PSP_SYSTEMPARAM_LANGUAGE_ENGLISH); + langValuesMapping["fr_FR"] = std::make_pair("Français", PSP_SYSTEMPARAM_LANGUAGE_FRENCH); + langValuesMapping["es_ES"] = std::make_pair("Castellano", PSP_SYSTEMPARAM_LANGUAGE_SPANISH); + langValuesMapping["es_LA"] = std::make_pair("Latino", PSP_SYSTEMPARAM_LANGUAGE_SPANISH); + langValuesMapping["de_DE"] = std::make_pair("Deutsch", PSP_SYSTEMPARAM_LANGUAGE_GERMAN); + langValuesMapping["it_IT"] = std::make_pair("Italiano", PSP_SYSTEMPARAM_LANGUAGE_ITALIAN); + langValuesMapping["nl_NL"] = std::make_pair("Nederlands", PSP_SYSTEMPARAM_LANGUAGE_DUTCH); + langValuesMapping["pt_PT"] = std::make_pair("Português", PSP_SYSTEMPARAM_LANGUAGE_PORTUGUESE); + langValuesMapping["pt_BR"] = std::make_pair("Brasileiro", PSP_SYSTEMPARAM_LANGUAGE_PORTUGUESE); + langValuesMapping["ru_RU"] = std::make_pair("Русский", PSP_SYSTEMPARAM_LANGUAGE_RUSSIAN); + langValuesMapping["ko_KR"] = std::make_pair("한국어", PSP_SYSTEMPARAM_LANGUAGE_KOREAN); + langValuesMapping["zh_TW"] = std::make_pair("繁體中文", PSP_SYSTEMPARAM_LANGUAGE_CHINESE_TRADITIONAL); + langValuesMapping["zh_CN"] = std::make_pair("简体中文", PSP_SYSTEMPARAM_LANGUAGE_CHINESE_SIMPLIFIED); + + //langValuesMapping["ar_AE"] = std::make_pair("العربية", PSP_SYSTEMPARAM_LANGUAGE_ENGLISH); + langValuesMapping["az_AZ"] = std::make_pair("Azeri", PSP_SYSTEMPARAM_LANGUAGE_ENGLISH); + langValuesMapping["ca_ES"] = std::make_pair("Català", PSP_SYSTEMPARAM_LANGUAGE_ENGLISH); + langValuesMapping["gr_EL"] = std::make_pair("ελληνικά", PSP_SYSTEMPARAM_LANGUAGE_ENGLISH); + langValuesMapping["he_IL"] = std::make_pair("עברית", PSP_SYSTEMPARAM_LANGUAGE_ENGLISH); + langValuesMapping["hu_HU"] = std::make_pair("Magyar", PSP_SYSTEMPARAM_LANGUAGE_ENGLISH); + langValuesMapping["id_ID"] = std::make_pair("Indonesia", PSP_SYSTEMPARAM_LANGUAGE_ENGLISH); + langValuesMapping["pl_PL"] = std::make_pair("Polski", PSP_SYSTEMPARAM_LANGUAGE_ENGLISH); + langValuesMapping["ro_RO"] = std::make_pair("Român", PSP_SYSTEMPARAM_LANGUAGE_ENGLISH); + langValuesMapping["sv_SE"] = std::make_pair("Svenska", PSP_SYSTEMPARAM_LANGUAGE_ENGLISH); + langValuesMapping["tr_TR"] = std::make_pair("Türk", PSP_SYSTEMPARAM_LANGUAGE_ENGLISH); + langValuesMapping["uk_UA"] = std::make_pair("Українська", PSP_SYSTEMPARAM_LANGUAGE_ENGLISH); + return langValuesMapping; +} + + void UIScreenWithBackground::DrawBackground(UIContext &dc) { ::DrawBackground(1.0f); @@ -384,6 +469,7 @@ void CreditsScreen::render() { } y += itemHeight; } + /* I18NCategory *g = GetI18NCategory("General"); diff --git a/UI/NativeApp.cpp b/UI/NativeApp.cpp index 0f9d4e58f8..b5660e50b2 100644 --- a/UI/NativeApp.cpp +++ b/UI/NativeApp.cpp @@ -61,7 +61,6 @@ #include "ui_atlas.h" #include "EmuScreen.h" -#include "MenuScreens.h" #include "GameInfoCache.h" #include "UIShader.h" diff --git a/UI/UI.vcxproj b/UI/UI.vcxproj index d6d0c93ece..d5528d6dea 100644 --- a/UI/UI.vcxproj +++ b/UI/UI.vcxproj @@ -26,7 +26,6 @@ - @@ -43,7 +42,6 @@ - diff --git a/UI/UI.vcxproj.filters b/UI/UI.vcxproj.filters index ed6d93fa7f..cb7e461e8b 100644 --- a/UI/UI.vcxproj.filters +++ b/UI/UI.vcxproj.filters @@ -10,9 +10,6 @@ Screens - - Screens - Screens @@ -41,9 +38,6 @@ Screens - - Screens - Screens diff --git a/android/jni/Android.mk b/android/jni/Android.mk index d3f287417b..bd90b74e8f 100644 --- a/android/jni/Android.mk +++ b/android/jni/Android.mk @@ -131,7 +131,6 @@ LOCAL_SRC_FILES := \ $(SRC)/UI/ui_atlas.cpp \ $(SRC)/UI/NativeApp.cpp \ $(SRC)/UI/EmuScreen.cpp \ - $(SRC)/UI/MenuScreens.cpp \ $(SRC)/UI/MainScreen.cpp \ $(SRC)/UI/MiscScreens.cpp \ $(SRC)/UI/UIShader.cpp \