From dde524d5b51d38a0c86bee68036e1a4b163c1564 Mon Sep 17 00:00:00 2001 From: Vitaly Novichkov Date: Sun, 11 Nov 2018 00:34:40 +0300 Subject: [PATCH 1/2] Engine: Rename "screen-*" into "viewport-*" in `engine.ini` The sense of "screen" is the physical resolution, the sense of "viewport" is the surface where the game drawing. These "screen-*" properties are was in sense "surface where the game drawing", therefore they are better name as "viewport-*". --- Engine/data_configs/config_engine.cpp | 24 ++++++++++++++++-------- Engine/data_configs/config_manager.cpp | 6 +++--- Engine/data_configs/config_manager.h | 6 +++--- Engine/main.cpp | 6 +++--- 4 files changed, 25 insertions(+), 17 deletions(-) diff --git a/Engine/data_configs/config_engine.cpp b/Engine/data_configs/config_engine.cpp index 1610408926..4555eccc05 100644 --- a/Engine/data_configs/config_engine.cpp +++ b/Engine/data_configs/config_engine.cpp @@ -66,14 +66,22 @@ bool ConfigManager::loadEngineSettings() engineset.endGroup(); engineset.beginGroup("common"); { - engineset.read("screen-width", screen_width, 800); - engineset.read("screen-height", screen_height, 600); - std::string scrType; - engineset.read("screen-type", scrType, "static"); - if(scrType == "dynamic") - screen_type = SCR_Dynamic; - else - screen_type = SCR_Static; + IniProcessing::StrEnumMap scrTypeMap = + { + {"scalable", SCR_Static}, + {"resizable", SCR_Dynamic}, + {"static", SCR_Static}, + {"dynamic", SCR_Dynamic} + }; + // In-Game viewport properties + engineset.read("viewport-width", viewport_width, 800); + engineset.read("viewport-height", viewport_height, 600); + engineset.readEnum("viewport-type", viewport_type, SCR_Static, scrTypeMap); + // Aliases to Viewport size, deprecated + engineset.read("screen-width", viewport_width, viewport_width); + engineset.read("screen-height", viewport_height, viewport_height); + engineset.readEnum("screen-type", viewport_type, viewport_type, scrTypeMap); + // Mouse cursor properties engineset.read("cursor-image-normal", setup_cursors.normal, ""); checkForImage(setup_cursors.normal, dirs.gcommon); engineset.read("cursor-image-rubber", setup_cursors.rubber, ""); diff --git a/Engine/data_configs/config_manager.cpp b/Engine/data_configs/config_manager.cpp index 31c9dd7614..dc4eb733de 100644 --- a/Engine/data_configs/config_manager.cpp +++ b/Engine/data_configs/config_manager.cpp @@ -46,10 +46,10 @@ ScriptsSetup ConfigManager::setup_Scripts; Strings::List ConfigManager::errorsList; //Common Data -unsigned int ConfigManager::screen_width = 800; -unsigned int ConfigManager::screen_height = 600; +unsigned int ConfigManager::viewport_width = 800; +unsigned int ConfigManager::viewport_height = 600; -ConfigManager::screenType ConfigManager::screen_type = ConfigManager::SCR_Static; +ConfigManager::screenType ConfigManager::viewport_type = ConfigManager::SCR_Static; //Fonts FontsSetup ConfigManager::setup_fonts; diff --git a/Engine/data_configs/config_manager.h b/Engine/data_configs/config_manager.h index 6e267371b7..eb7e1caad3 100644 --- a/Engine/data_configs/config_manager.h +++ b/Engine/data_configs/config_manager.h @@ -222,15 +222,15 @@ namespace ConfigManager //Common Data extern TexturesBank common_textures; - extern unsigned int screen_width; - extern unsigned int screen_height; + extern unsigned int viewport_width; + extern unsigned int viewport_height; enum screenType { SCR_Static = 0, //Static / Scalable screen SCR_Dynamic //Dynamic screen }; - extern screenType screen_type; + extern screenType viewport_type; //Fonts extern FontsSetup setup_fonts; diff --git a/Engine/main.cpp b/Engine/main.cpp index 0e80509f82..744afda3b8 100644 --- a/Engine/main.cpp +++ b/Engine/main.cpp @@ -218,10 +218,10 @@ int main(int argc, char *argv[]) if(!ConfigManager::config_name.empty()) PGE_Window::setWindowTitle(ConfigManager::config_name); - if(ConfigManager::screen_width != static_cast(PGE_Window::Width) && - ConfigManager::screen_height != static_cast(PGE_Window::Height)) + if(ConfigManager::viewport_width != static_cast(PGE_Window::Width) && + ConfigManager::viewport_height != static_cast(PGE_Window::Height)) { - PGE_Window::changeInternalResolution(ConfigManager::screen_width, ConfigManager::screen_height); + PGE_Window::changeInternalResolution(ConfigManager::viewport_width, ConfigManager::viewport_height); } pLogDebug("Configuration package successfully loaded!"); From 321877ae97f928ae248ef1cc7a0ba47a3a95b869 Mon Sep 17 00:00:00 2001 From: hacheipe399 - second account Date: Sun, 11 Nov 2018 14:34:46 -0300 Subject: [PATCH 2/2] Updated spanish translation --- Editor/languages/editor_es.ts | 149 +++++++++++++++++----------------- 1 file changed, 75 insertions(+), 74 deletions(-) diff --git a/Editor/languages/editor_es.ts b/Editor/languages/editor_es.ts index 692a52f762..fc2cf7c7ab 100644 --- a/Editor/languages/editor_es.ts +++ b/Editor/languages/editor_es.ts @@ -20,7 +20,7 @@ AppSettings Settings - Opciones + Opciones Main @@ -1229,7 +1229,7 @@ Por favor guárdelos antes de hacer algo más. Creates and deletes ItemSelectDialog to analyze memory leaking - + Crea y elimina ItemSelectDialog par analizar fugas de memoria @@ -1625,7 +1625,7 @@ as well as toolboxes in toolbars and menus. This editor also allows you to selec Edit raw user data... - + Editar datos de usuario en bruto... @@ -1770,7 +1770,7 @@ Límites: longitud máxima de 27 caracteres Edit raw user data... - + Editar datos de usuario en bruto... @@ -1778,52 +1778,52 @@ Límites: longitud máxima de 27 caracteres Search by Name Element search criteria - + Buscar por Nombre Search by ID Element search criteria - + Buscar por ID Search by ID (Contained) Element search criteria - + Buscar por ID (contenido) Sort by Search settings pop-up menu, sort submenu - + Ordenar por Name Sort by name - Nombre + Nombre ID Sort by ID - ID + ID Descending Descending sorting order - + Descendiente Uniform item sizes view Align elements inside of Item Box list in uniform view - + Vista uniforme Show custom elements Show custom elements only in Item Box List - + Mostrar elementos personalizados Show standard elements Show standard elements only in Item Box List - + Mostrar elementos estándar @@ -2204,7 +2204,7 @@ Límite: máxima longitud de 28 caracteres Edit raw user data... - + Editar datos de usuario en bruto... @@ -3115,11 +3115,11 @@ Do you want to save your changes? Search - Buscar + Buscar <Save file first> - + <Guardar archivo primero> @@ -3555,23 +3555,23 @@ To use LunaTester you should have right Integration configuration package!Terminate running process Ends the LunaTester process, regardless of whether it's in the background or foreground, so the engine can be loaded from scratch. - + Terminar proceso ejecutado Ends the LunaTester process so the engine can be loaded from scratch. - + Termina el proceso del LunaTester para que el motor pueda ejecutarse de nuevo. Are you sure you want to close LunaTester? If you are testing a level, this will immediately end it! - + ¿Está seguro de querer cerrar LunaTester? Si está probando un nivel, ¡esto lo terminará inmediatamente! LunaTester has been successfully closed. - + Se terminó el proceso de LunaTester exitosamente. LunaTester is not running. - + LunaTester no está siendo ejecutado. @@ -8577,12 +8577,13 @@ Por favor guarde primero. When reloading the configuration, all opened files will be closed and restored after reloading. Do you want to continue? - + Cuando se recarga la configuración, todos los archivos abiertos se cerrarán y restaurarán luego de recargar. ¿Desea continuar? The configuration pack has changed! To start using the new configuration pack, you need to restart the Editor. Do you want to continue? - + ¡El paquete de configuración se cambió! +Para comenzar a usar el nuevo paquete, necesita reiniciar el Editor. ¿Desea continuar? @@ -9825,23 +9826,23 @@ El máximo es %2. Initializing tileset categories... - + Inicializando categorías de tileset... LTR - + LTR Block user data change - + Cambio de datos de bloques de usuario BGO user data change - + Cambio de datos de OF de usuario NPC user data change - + Cambio de datos de PNJ de usuairo @@ -10727,164 +10728,164 @@ Si desea crear tilesets específicos para niveles/mapas con gráficos personaliz TilesetEditor Tileset Editor - Editor de conjuntos de bloques + Editor de conjuntos de bloques Items - Items + Items Block - Bloque + Bloque BGO - OF + OF NPC - PNJ + PNJ Terrain tile - Azulejo de Terreno + Azulejo de Terreno Scenery - Decoraciones + Decoraciones Path - Directorio + Directorio Level - Nivel + Nivel Type: - Tipo: + Tipo: Clear - Limpiar + Limpiar Save - Guardar + Guardar Tileset name: - Nombre del conjunto: + Nombre del conjunto: Open - Abrir + Abrir Height: - Altura: + Altura: Width: - Ancho: + Ancho: Show custom only - Mostrar sólo personalizados + Mostrar sólo personalizados Current Level/World specific - Específico de mundo/nivel actual + Específico de mundo/nivel actual Delete this tileset - Eliminar el tileset + Eliminar el tileset Show default only - Mostrar solo predeterminado + Mostrar solo predeterminado Search - Buscar + Buscar Search settings - + Opciones de búsqueda Search by Name Element search criteria - + Buscar por Nombre Search by ID Element search criteria - + Buscar por ID Search by ID (Contained) Element search criteria - + Buscar por ID (contenido) Sort by Search settings pop-up menu, sort submenu - + Ordenar por Name Sort by name - Nombre + Nombre ID Sort by ID - ID + ID Descending Descending sorting order - + Descendiente Clean tileset editor - Limpiar editor de tilesets + Limpiar editor de tilesets Do you want to clean tileset editor to create a new tileset? - ¿Desea limpiar el editor para crear un nuevo tileset? + ¿Desea limpiar el editor para crear un nuevo tileset? Please enter a filename! - + ¡Ingrese un nombre de archivo! Filename: - Nombre de archivo: + Nombre de archivo: Open Tileset - Abrir baldosas + Abrir baldosas Failed to load tileset! - ¡Falló la carga de baldozas! + ¡Falló la carga de baldozas! Failed to load tileset! Data may be corrupted! - ¡Falló la carga de baldosas! + ¡Falló la carga de baldosas! ¡Los datos pueden estar corruptos! Tileset box editor - Editor de cajas de tilesets + Editor de cajas de tilesets Don't show this message again. - No mostrar este mensaje otra vez. + No mostrar este mensaje otra vez. Welcome to tileset editor! @@ -10895,7 +10896,7 @@ All tilesets which made here will be saved in this folder: I.e. there are will work globally for this configuration package and can be used in the gropus of tilesets. If you wish to create level/world specific tilesets with using of custom graphics, please open the Tileset Item Box and find the button "New Tileset" in the "Custom" tab. - ¡Bienvenido al editor de tilesets! + ¡Bienvenido al editor de tilesets! Éste es un editor de tilesets globales. Todos los tilesets que se harán aquí serán guardados en ésta carpeta: @@ -10906,19 +10907,19 @@ Si desea crear tilesets específicos para niveles/mapas con gráficos personaliz Remove tileset - Remover + Remover Do you want to remove this tileset? - ¿Desea remover este tileset? + ¿Desea remover este tileset? Tileset removed - Tileset removido + Tileset removido Tileset has been removed! - ¡El tileset fue removido! + ¡El tileset fue removido! @@ -11027,7 +11028,7 @@ Data may be corrupted! Category order weight - + Prioridad de orden de categoría @@ -11203,7 +11204,7 @@ Data may be corrupted! UserDataEdit User data editing - + Edición de datos de usuario