diff --git a/Content/Translations/cs.mo b/Content/Translations/cs.mo index 83b34a89..a57235b1 100644 Binary files a/Content/Translations/cs.mo and b/Content/Translations/cs.mo differ diff --git a/Content/Translations/cs.po b/Content/Translations/cs.po index c18a75e5..87fd457c 100644 --- a/Content/Translations/cs.po +++ b/Content/Translations/cs.po @@ -1,8 +1,8 @@ msgid "" msgstr "" "Project-Id-Version: jazz2-resurrection\n" -"POT-Creation-Date: 2024-07-07 09:09+0200\n" -"PO-Revision-Date: 2024-07-07 09:10+0200\n" +"POT-Creation-Date: 2024-07-07 20:26+0200\n" +"PO-Revision-Date: 2024-07-07 20:26+0200\n" "Last-Translator: \n" "Language-Team: Dan R.\n" "Language: cs\n" @@ -1499,59 +1499,65 @@ msgid "Allow access to external storage" msgstr "Povolit přístup k externímu uložišti" #. TRANSLATORS: Menu item in Options > Controls section -#: Sources/Jazz2/UI/Menu/ControlsOptionsSection.cpp:19 -#: Sources/Jazz2/UI/Menu/RemapControlsSection.cpp:170 +#: Sources/Jazz2/UI/Menu/ControlsOptionsSection.cpp:20 +#: Sources/Jazz2/UI/Menu/RemapControlsSection.cpp:171 #, c-format -msgid "Remap Controls for Player #%i" +msgid "Remap Controls for Player %i" msgstr "Přenastavit ovládání pro hráče %i" #. TRANSLATORS: Menu item in Options > Controls section -#: Sources/Jazz2/UI/Menu/ControlsOptionsSection.cpp:22 +#: Sources/Jazz2/UI/Menu/ControlsOptionsSection.cpp:24 +#: Sources/Jazz2/UI/Menu/RemapControlsSection.cpp:174 +msgid "Remap Controls" +msgstr "Přenastavit ovládání" + +#. TRANSLATORS: Menu item in Options > Controls section +#: Sources/Jazz2/UI/Menu/ControlsOptionsSection.cpp:27 #: Sources/Jazz2/UI/Menu/TouchControlsOptionsSection.cpp:45 msgid "Touch Controls" msgstr "Dotykové ovládací prvky" #. TRANSLATORS: Menu item in Options > Controls section -#: Sources/Jazz2/UI/Menu/ControlsOptionsSection.cpp:24 +#: Sources/Jazz2/UI/Menu/ControlsOptionsSection.cpp:29 msgid "Toggle Run" msgstr "Přepínat běhání" -#: Sources/Jazz2/UI/Menu/ControlsOptionsSection.cpp:25 +#: Sources/Jazz2/UI/Menu/ControlsOptionsSection.cpp:30 msgid "Gamepad Button Labels" msgstr "Popisky tlačítek na gamepadu" #. TRANSLATORS: Menu item in Options > Controls section (Android only) -#: Sources/Jazz2/UI/Menu/ControlsOptionsSection.cpp:28 +#: Sources/Jazz2/UI/Menu/ControlsOptionsSection.cpp:33 msgid "Native Back Button" msgstr "Nativní tlačítko Zpět" -#: Sources/Jazz2/UI/Menu/ControlsOptionsSection.cpp:30 +#: Sources/Jazz2/UI/Menu/ControlsOptionsSection.cpp:35 #: Sources/Jazz2/UI/Menu/InputDiagnosticsSection.cpp:72 msgid "Input Diagnostics" msgstr "Diagnostika ovládání" #. TRANSLATORS: Menu item in Options section -#: Sources/Jazz2/UI/Menu/ControlsOptionsSection.cpp:63 +#: Sources/Jazz2/UI/Menu/ControlsOptionsSection.cpp:68 #: Sources/Jazz2/UI/Menu/OptionsSection.cpp:25 msgid "Controls" msgstr "Ovládání" -#: Sources/Jazz2/UI/Menu/ControlsOptionsSection.cpp:107 +#: Sources/Jazz2/UI/Menu/ControlsOptionsSection.cpp:112 #: Sources/Jazz2/UI/Menu/GameplayEnhancementsSection.cpp:125 #: Sources/Jazz2/UI/Menu/GameplayEnhancementsSection.cpp:130 #: Sources/Jazz2/UI/Menu/GameplayOptionsSection.cpp:142 #: Sources/Jazz2/UI/Menu/GameplayOptionsSection.cpp:145 #: Sources/Jazz2/UI/Menu/GameplayOptionsSection.cpp:150 -#: Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp:121 +#: Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp:124 msgid "Enabled" msgstr "Povoleno" -#: Sources/Jazz2/UI/Menu/ControlsOptionsSection.cpp:107 +#: Sources/Jazz2/UI/Menu/ControlsOptionsSection.cpp:112 #: Sources/Jazz2/UI/Menu/GameplayEnhancementsSection.cpp:125 #: Sources/Jazz2/UI/Menu/GameplayEnhancementsSection.cpp:130 #: Sources/Jazz2/UI/Menu/GameplayOptionsSection.cpp:150 -#: Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp:116 -#: Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp:121 +#: Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp:118 +#: Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp:124 msgid "Disabled" msgstr "Zakázáno" @@ -1751,32 +1757,45 @@ msgstr "Nezarovnaný pohled" #. TRANSLATORS: Menu item in Options > Graphics section #: Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp:39 +msgid "Preferred Splitscreen" +msgstr "Preferované rozdělení obrazovky" + +#. TRANSLATORS: Menu item in Options > Graphics section +#: Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp:41 msgid "Keep Aspect Ratio In Cinematics" msgstr "Zachovat poměr stran u filmů" #. TRANSLATORS: Menu item in Options > Graphics section -#: Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp:41 +#: Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp:43 msgid "Performance Metrics" msgstr "Metrika výkonu" #. TRANSLATORS: Menu item in Options section -#: Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp:74 +#: Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp:76 #: Sources/Jazz2/UI/Menu/OptionsSection.cpp:19 msgid "Graphics" msgstr "Grafika" -#: Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp:114 +#: Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp:116 msgid "Low" msgstr "Nízká" -#: Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp:114 +#: Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp:116 msgid "High" msgstr "Vysoká" -#: Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp:116 +#: Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp:118 msgid "Enabled \f[c:#d0705d](Experimental)\f[/c]" msgstr "Povoleno \f[c:#d0705d](Experimentální)\f[/c]" +#: Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp:119 +msgid "Vertical" +msgstr "Vertikální" + +#: Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp:119 +msgid "Horizontal" +msgstr "Horizontální" + #. TRANSLATORS: Header in Import Episodes section #: Sources/Jazz2/UI/Menu/ImportSection.cpp:70 msgid "Select files of your original game to unlock additional episodes" @@ -1907,7 +1926,7 @@ msgstr "Běh" #. TRANSLATORS: Menu item in Options > Controls > Remap Controls section #: Sources/Jazz2/UI/Menu/RemapControlsSection.cpp:31 -#: Sources/Jazz2/UI/Menu/RemapControlsSection.cpp:183 +#: Sources/Jazz2/UI/Menu/RemapControlsSection.cpp:188 msgid "Change Weapon" msgstr "Změnit zbraň" @@ -1923,16 +1942,16 @@ msgid "Weapon %i" msgstr "Zbraň %i" #. TRANSLATORS: Bottom hint in Options > Controls > Remap Controls section -#: Sources/Jazz2/UI/Menu/RemapControlsSection.cpp:177 +#: Sources/Jazz2/UI/Menu/RemapControlsSection.cpp:182 msgid "Press any key or button to assign" msgstr "Stiskněte tlačítko nebo klávesu pro přiřazení" -#: Sources/Jazz2/UI/Menu/RemapControlsSection.cpp:183 +#: Sources/Jazz2/UI/Menu/RemapControlsSection.cpp:188 msgid "or" msgstr "nebo" #. TRANSLATORS: Bottom hint in Options > Controls > Remap Controls section, prefixed with key/button to press -#: Sources/Jazz2/UI/Menu/RemapControlsSection.cpp:189 +#: Sources/Jazz2/UI/Menu/RemapControlsSection.cpp:194 msgid "to remove assignment" msgstr "pro odstranění přiřazení" diff --git a/Content/Translations/fr.po b/Content/Translations/fr.po index 0e198fd4..8fd90001 100644 --- a/Content/Translations/fr.po +++ b/Content/Translations/fr.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: jazz2-resurrection\n" -"POT-Creation-Date: 2024-07-07 09:10+0200\n" +"POT-Creation-Date: 2024-07-07 20:26+0200\n" "PO-Revision-Date: \n" "Last-Translator: \n" "Language-Team: Mwyann\n" @@ -1511,59 +1511,65 @@ msgid "Allow access to external storage" msgstr "Autoriser l'accès au stockage externe" #. TRANSLATORS: Menu item in Options > Controls section -#: Sources/Jazz2/UI/Menu/ControlsOptionsSection.cpp:19 -#: Sources/Jazz2/UI/Menu/RemapControlsSection.cpp:170 +#: Sources/Jazz2/UI/Menu/ControlsOptionsSection.cpp:20 +#: Sources/Jazz2/UI/Menu/RemapControlsSection.cpp:171 #, c-format -msgid "Remap Controls for Player #%i" +msgid "Remap Controls for Player %i" msgstr "" #. TRANSLATORS: Menu item in Options > Controls section -#: Sources/Jazz2/UI/Menu/ControlsOptionsSection.cpp:22 +#: Sources/Jazz2/UI/Menu/ControlsOptionsSection.cpp:24 +#: Sources/Jazz2/UI/Menu/RemapControlsSection.cpp:174 +msgid "Remap Controls" +msgstr "" + +#. TRANSLATORS: Menu item in Options > Controls section +#: Sources/Jazz2/UI/Menu/ControlsOptionsSection.cpp:27 #: Sources/Jazz2/UI/Menu/TouchControlsOptionsSection.cpp:45 msgid "Touch Controls" msgstr "Contrôles tactiles" #. TRANSLATORS: Menu item in Options > Controls section -#: Sources/Jazz2/UI/Menu/ControlsOptionsSection.cpp:24 +#: Sources/Jazz2/UI/Menu/ControlsOptionsSection.cpp:29 msgid "Toggle Run" msgstr "Mode Marche/Course" -#: Sources/Jazz2/UI/Menu/ControlsOptionsSection.cpp:25 +#: Sources/Jazz2/UI/Menu/ControlsOptionsSection.cpp:30 msgid "Gamepad Button Labels" msgstr "Etiquettes des boutons de la manette" #. TRANSLATORS: Menu item in Options > Controls section (Android only) -#: Sources/Jazz2/UI/Menu/ControlsOptionsSection.cpp:28 +#: Sources/Jazz2/UI/Menu/ControlsOptionsSection.cpp:33 msgid "Native Back Button" msgstr "Touche retour native" -#: Sources/Jazz2/UI/Menu/ControlsOptionsSection.cpp:30 +#: Sources/Jazz2/UI/Menu/ControlsOptionsSection.cpp:35 #: Sources/Jazz2/UI/Menu/InputDiagnosticsSection.cpp:72 msgid "Input Diagnostics" msgstr "Diagnostic des entrées" #. TRANSLATORS: Menu item in Options section -#: Sources/Jazz2/UI/Menu/ControlsOptionsSection.cpp:63 +#: Sources/Jazz2/UI/Menu/ControlsOptionsSection.cpp:68 #: Sources/Jazz2/UI/Menu/OptionsSection.cpp:25 msgid "Controls" msgstr "Contrôles" -#: Sources/Jazz2/UI/Menu/ControlsOptionsSection.cpp:107 +#: Sources/Jazz2/UI/Menu/ControlsOptionsSection.cpp:112 #: Sources/Jazz2/UI/Menu/GameplayEnhancementsSection.cpp:125 #: Sources/Jazz2/UI/Menu/GameplayEnhancementsSection.cpp:130 #: Sources/Jazz2/UI/Menu/GameplayOptionsSection.cpp:142 #: Sources/Jazz2/UI/Menu/GameplayOptionsSection.cpp:145 #: Sources/Jazz2/UI/Menu/GameplayOptionsSection.cpp:150 -#: Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp:121 +#: Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp:124 msgid "Enabled" msgstr "Activé" -#: Sources/Jazz2/UI/Menu/ControlsOptionsSection.cpp:107 +#: Sources/Jazz2/UI/Menu/ControlsOptionsSection.cpp:112 #: Sources/Jazz2/UI/Menu/GameplayEnhancementsSection.cpp:125 #: Sources/Jazz2/UI/Menu/GameplayEnhancementsSection.cpp:130 #: Sources/Jazz2/UI/Menu/GameplayOptionsSection.cpp:150 -#: Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp:116 -#: Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp:121 +#: Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp:118 +#: Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp:124 msgid "Disabled" msgstr "Désactivé" @@ -1765,32 +1771,45 @@ msgstr "Vue non alignée" #. TRANSLATORS: Menu item in Options > Graphics section #: Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp:39 +msgid "Preferred Splitscreen" +msgstr "" + +#. TRANSLATORS: Menu item in Options > Graphics section +#: Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp:41 msgid "Keep Aspect Ratio In Cinematics" msgstr "Conserver ratio des cinématiques" #. TRANSLATORS: Menu item in Options > Graphics section -#: Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp:41 +#: Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp:43 msgid "Performance Metrics" msgstr "Indicateurs de performance" #. TRANSLATORS: Menu item in Options section -#: Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp:74 +#: Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp:76 #: Sources/Jazz2/UI/Menu/OptionsSection.cpp:19 msgid "Graphics" msgstr "Graphismes" -#: Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp:114 +#: Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp:116 msgid "Low" msgstr "Bas" -#: Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp:114 +#: Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp:116 msgid "High" msgstr "Haut" -#: Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp:116 +#: Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp:118 msgid "Enabled \f[c:#d0705d](Experimental)\f[/c]" msgstr "Activé \f[c:#d0705d](Expérimental)\f[/c]" +#: Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp:119 +msgid "Vertical" +msgstr "" + +#: Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp:119 +msgid "Horizontal" +msgstr "" + #. TRANSLATORS: Header in Import Episodes section #: Sources/Jazz2/UI/Menu/ImportSection.cpp:70 msgid "Select files of your original game to unlock additional episodes" @@ -1924,7 +1943,7 @@ msgstr "Courir" #. TRANSLATORS: Menu item in Options > Controls > Remap Controls section #: Sources/Jazz2/UI/Menu/RemapControlsSection.cpp:31 -#: Sources/Jazz2/UI/Menu/RemapControlsSection.cpp:183 +#: Sources/Jazz2/UI/Menu/RemapControlsSection.cpp:188 msgid "Change Weapon" msgstr "Changer d'arme" @@ -1940,16 +1959,16 @@ msgid "Weapon %i" msgstr "Arme %i" #. TRANSLATORS: Bottom hint in Options > Controls > Remap Controls section -#: Sources/Jazz2/UI/Menu/RemapControlsSection.cpp:177 +#: Sources/Jazz2/UI/Menu/RemapControlsSection.cpp:182 msgid "Press any key or button to assign" msgstr "Appuyer sur une touche ou un bouton pour attribuer" -#: Sources/Jazz2/UI/Menu/RemapControlsSection.cpp:183 +#: Sources/Jazz2/UI/Menu/RemapControlsSection.cpp:188 msgid "or" msgstr "ou" #. TRANSLATORS: Bottom hint in Options > Controls > Remap Controls section, prefixed with key/button to press -#: Sources/Jazz2/UI/Menu/RemapControlsSection.cpp:189 +#: Sources/Jazz2/UI/Menu/RemapControlsSection.cpp:194 msgid "to remove assignment" msgstr "pour désattribuer" diff --git a/Content/Translations/it.po b/Content/Translations/it.po index e20d19d1..43dd75c2 100644 --- a/Content/Translations/it.po +++ b/Content/Translations/it.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: jazz2-resurrection\n" -"POT-Creation-Date: 2024-07-07 09:11+0200\n" +"POT-Creation-Date: 2024-07-07 20:27+0200\n" "PO-Revision-Date: \n" "Last-Translator: Hexaae\n" "Language-Team: Hexaae\n" @@ -1505,59 +1505,65 @@ msgid "Allow access to external storage" msgstr "Permetti l'accesso a un archivio esterno" #. TRANSLATORS: Menu item in Options > Controls section -#: Sources/Jazz2/UI/Menu/ControlsOptionsSection.cpp:19 -#: Sources/Jazz2/UI/Menu/RemapControlsSection.cpp:170 +#: Sources/Jazz2/UI/Menu/ControlsOptionsSection.cpp:20 +#: Sources/Jazz2/UI/Menu/RemapControlsSection.cpp:171 #, c-format -msgid "Remap Controls for Player #%i" +msgid "Remap Controls for Player %i" msgstr "" #. TRANSLATORS: Menu item in Options > Controls section -#: Sources/Jazz2/UI/Menu/ControlsOptionsSection.cpp:22 +#: Sources/Jazz2/UI/Menu/ControlsOptionsSection.cpp:24 +#: Sources/Jazz2/UI/Menu/RemapControlsSection.cpp:174 +msgid "Remap Controls" +msgstr "" + +#. TRANSLATORS: Menu item in Options > Controls section +#: Sources/Jazz2/UI/Menu/ControlsOptionsSection.cpp:27 #: Sources/Jazz2/UI/Menu/TouchControlsOptionsSection.cpp:45 msgid "Touch Controls" msgstr "Controlli touch" #. TRANSLATORS: Menu item in Options > Controls section -#: Sources/Jazz2/UI/Menu/ControlsOptionsSection.cpp:24 +#: Sources/Jazz2/UI/Menu/ControlsOptionsSection.cpp:29 msgid "Toggle Run" msgstr "Cambia corsa continua" -#: Sources/Jazz2/UI/Menu/ControlsOptionsSection.cpp:25 +#: Sources/Jazz2/UI/Menu/ControlsOptionsSection.cpp:30 msgid "Gamepad Button Labels" msgstr "" #. TRANSLATORS: Menu item in Options > Controls section (Android only) -#: Sources/Jazz2/UI/Menu/ControlsOptionsSection.cpp:28 +#: Sources/Jazz2/UI/Menu/ControlsOptionsSection.cpp:33 msgid "Native Back Button" msgstr "Pulsante Indietro nativo" -#: Sources/Jazz2/UI/Menu/ControlsOptionsSection.cpp:30 +#: Sources/Jazz2/UI/Menu/ControlsOptionsSection.cpp:35 #: Sources/Jazz2/UI/Menu/InputDiagnosticsSection.cpp:72 msgid "Input Diagnostics" msgstr "Diagnostica immissione" #. TRANSLATORS: Menu item in Options section -#: Sources/Jazz2/UI/Menu/ControlsOptionsSection.cpp:63 +#: Sources/Jazz2/UI/Menu/ControlsOptionsSection.cpp:68 #: Sources/Jazz2/UI/Menu/OptionsSection.cpp:25 msgid "Controls" msgstr "Controlli" -#: Sources/Jazz2/UI/Menu/ControlsOptionsSection.cpp:107 +#: Sources/Jazz2/UI/Menu/ControlsOptionsSection.cpp:112 #: Sources/Jazz2/UI/Menu/GameplayEnhancementsSection.cpp:125 #: Sources/Jazz2/UI/Menu/GameplayEnhancementsSection.cpp:130 #: Sources/Jazz2/UI/Menu/GameplayOptionsSection.cpp:142 #: Sources/Jazz2/UI/Menu/GameplayOptionsSection.cpp:145 #: Sources/Jazz2/UI/Menu/GameplayOptionsSection.cpp:150 -#: Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp:121 +#: Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp:124 msgid "Enabled" msgstr "Attivata" -#: Sources/Jazz2/UI/Menu/ControlsOptionsSection.cpp:107 +#: Sources/Jazz2/UI/Menu/ControlsOptionsSection.cpp:112 #: Sources/Jazz2/UI/Menu/GameplayEnhancementsSection.cpp:125 #: Sources/Jazz2/UI/Menu/GameplayEnhancementsSection.cpp:130 #: Sources/Jazz2/UI/Menu/GameplayOptionsSection.cpp:150 -#: Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp:116 -#: Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp:121 +#: Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp:118 +#: Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp:124 msgid "Disabled" msgstr "Disattivata" @@ -1758,32 +1764,45 @@ msgstr "Viewport non allineata" #. TRANSLATORS: Menu item in Options > Graphics section #: Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp:39 +msgid "Preferred Splitscreen" +msgstr "" + +#. TRANSLATORS: Menu item in Options > Graphics section +#: Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp:41 msgid "Keep Aspect Ratio In Cinematics" msgstr "Mantenere il rapporto d'aspetto nei filmati" #. TRANSLATORS: Menu item in Options > Graphics section -#: Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp:41 +#: Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp:43 msgid "Performance Metrics" msgstr "Metriche delle prestazioni" #. TRANSLATORS: Menu item in Options section -#: Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp:74 +#: Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp:76 #: Sources/Jazz2/UI/Menu/OptionsSection.cpp:19 msgid "Graphics" msgstr "Grafica" -#: Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp:114 +#: Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp:116 msgid "Low" msgstr "Bassa" -#: Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp:114 +#: Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp:116 msgid "High" msgstr "Alta" -#: Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp:116 +#: Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp:118 msgid "Enabled \f[c:#d0705d](Experimental)\f[/c]" msgstr "Abilitata \f[c:#d0705d](Sperimentale)\f[/c]" +#: Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp:119 +msgid "Vertical" +msgstr "" + +#: Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp:119 +msgid "Horizontal" +msgstr "" + #. TRANSLATORS: Header in Import Episodes section #: Sources/Jazz2/UI/Menu/ImportSection.cpp:70 msgid "Select files of your original game to unlock additional episodes" @@ -1915,7 +1934,7 @@ msgstr "Corri" #. TRANSLATORS: Menu item in Options > Controls > Remap Controls section #: Sources/Jazz2/UI/Menu/RemapControlsSection.cpp:31 -#: Sources/Jazz2/UI/Menu/RemapControlsSection.cpp:183 +#: Sources/Jazz2/UI/Menu/RemapControlsSection.cpp:188 msgid "Change Weapon" msgstr "Cambia arma" @@ -1931,16 +1950,16 @@ msgid "Weapon %i" msgstr "Arma %i" #. TRANSLATORS: Bottom hint in Options > Controls > Remap Controls section -#: Sources/Jazz2/UI/Menu/RemapControlsSection.cpp:177 +#: Sources/Jazz2/UI/Menu/RemapControlsSection.cpp:182 msgid "Press any key or button to assign" msgstr "Premi un tasto o pulsante per assegnare" -#: Sources/Jazz2/UI/Menu/RemapControlsSection.cpp:183 +#: Sources/Jazz2/UI/Menu/RemapControlsSection.cpp:188 msgid "or" msgstr "o" #. TRANSLATORS: Bottom hint in Options > Controls > Remap Controls section, prefixed with key/button to press -#: Sources/Jazz2/UI/Menu/RemapControlsSection.cpp:189 +#: Sources/Jazz2/UI/Menu/RemapControlsSection.cpp:194 msgid "to remove assignment" msgstr "per rimuovere l'assegnazione" diff --git a/Content/Translations/pl.po b/Content/Translations/pl.po index dbb054fc..60f6a043 100644 --- a/Content/Translations/pl.po +++ b/Content/Translations/pl.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: jazz2-resurrection\n" -"POT-Creation-Date: 2024-07-07 09:11+0200\n" +"POT-Creation-Date: 2024-07-07 20:27+0200\n" "PO-Revision-Date: \n" "Last-Translator: \n" "Language-Team: Patrxgt\n" @@ -1511,59 +1511,65 @@ msgid "Allow access to external storage" msgstr "Zezwól na dostęp do pamięci zewnętrznej" #. TRANSLATORS: Menu item in Options > Controls section -#: Sources/Jazz2/UI/Menu/ControlsOptionsSection.cpp:19 -#: Sources/Jazz2/UI/Menu/RemapControlsSection.cpp:170 +#: Sources/Jazz2/UI/Menu/ControlsOptionsSection.cpp:20 +#: Sources/Jazz2/UI/Menu/RemapControlsSection.cpp:171 #, c-format -msgid "Remap Controls for Player #%i" +msgid "Remap Controls for Player %i" msgstr "" #. TRANSLATORS: Menu item in Options > Controls section -#: Sources/Jazz2/UI/Menu/ControlsOptionsSection.cpp:22 +#: Sources/Jazz2/UI/Menu/ControlsOptionsSection.cpp:24 +#: Sources/Jazz2/UI/Menu/RemapControlsSection.cpp:174 +msgid "Remap Controls" +msgstr "" + +#. TRANSLATORS: Menu item in Options > Controls section +#: Sources/Jazz2/UI/Menu/ControlsOptionsSection.cpp:27 #: Sources/Jazz2/UI/Menu/TouchControlsOptionsSection.cpp:45 msgid "Touch Controls" msgstr "Sterowanie dotykowe" #. TRANSLATORS: Menu item in Options > Controls section -#: Sources/Jazz2/UI/Menu/ControlsOptionsSection.cpp:24 +#: Sources/Jazz2/UI/Menu/ControlsOptionsSection.cpp:29 msgid "Toggle Run" msgstr "Przełączanie biegu" -#: Sources/Jazz2/UI/Menu/ControlsOptionsSection.cpp:25 +#: Sources/Jazz2/UI/Menu/ControlsOptionsSection.cpp:30 msgid "Gamepad Button Labels" msgstr "Oznaczenia przycisków kontrolera" #. TRANSLATORS: Menu item in Options > Controls section (Android only) -#: Sources/Jazz2/UI/Menu/ControlsOptionsSection.cpp:28 +#: Sources/Jazz2/UI/Menu/ControlsOptionsSection.cpp:33 msgid "Native Back Button" msgstr "Natywny przycisk \"Wstecz\"" -#: Sources/Jazz2/UI/Menu/ControlsOptionsSection.cpp:30 +#: Sources/Jazz2/UI/Menu/ControlsOptionsSection.cpp:35 #: Sources/Jazz2/UI/Menu/InputDiagnosticsSection.cpp:72 msgid "Input Diagnostics" msgstr "Diagnostyka sterowania" #. TRANSLATORS: Menu item in Options section -#: Sources/Jazz2/UI/Menu/ControlsOptionsSection.cpp:63 +#: Sources/Jazz2/UI/Menu/ControlsOptionsSection.cpp:68 #: Sources/Jazz2/UI/Menu/OptionsSection.cpp:25 msgid "Controls" msgstr "Sterowanie" -#: Sources/Jazz2/UI/Menu/ControlsOptionsSection.cpp:107 +#: Sources/Jazz2/UI/Menu/ControlsOptionsSection.cpp:112 #: Sources/Jazz2/UI/Menu/GameplayEnhancementsSection.cpp:125 #: Sources/Jazz2/UI/Menu/GameplayEnhancementsSection.cpp:130 #: Sources/Jazz2/UI/Menu/GameplayOptionsSection.cpp:142 #: Sources/Jazz2/UI/Menu/GameplayOptionsSection.cpp:145 #: Sources/Jazz2/UI/Menu/GameplayOptionsSection.cpp:150 -#: Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp:121 +#: Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp:124 msgid "Enabled" msgstr "Włączono" -#: Sources/Jazz2/UI/Menu/ControlsOptionsSection.cpp:107 +#: Sources/Jazz2/UI/Menu/ControlsOptionsSection.cpp:112 #: Sources/Jazz2/UI/Menu/GameplayEnhancementsSection.cpp:125 #: Sources/Jazz2/UI/Menu/GameplayEnhancementsSection.cpp:130 #: Sources/Jazz2/UI/Menu/GameplayOptionsSection.cpp:150 -#: Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp:116 -#: Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp:121 +#: Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp:118 +#: Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp:124 msgid "Disabled" msgstr "Wyłączono" @@ -1764,32 +1770,45 @@ msgstr "Zmiennoprzecinkowa precyzja" #. TRANSLATORS: Menu item in Options > Graphics section #: Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp:39 +msgid "Preferred Splitscreen" +msgstr "" + +#. TRANSLATORS: Menu item in Options > Graphics section +#: Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp:41 msgid "Keep Aspect Ratio In Cinematics" msgstr "Zachowaj proporcje w przerywnikach" #. TRANSLATORS: Menu item in Options > Graphics section -#: Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp:41 +#: Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp:43 msgid "Performance Metrics" msgstr "Statystyki wydajności" #. TRANSLATORS: Menu item in Options section -#: Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp:74 +#: Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp:76 #: Sources/Jazz2/UI/Menu/OptionsSection.cpp:19 msgid "Graphics" msgstr "Grafika" -#: Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp:114 +#: Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp:116 msgid "Low" msgstr "Brzydka" -#: Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp:114 +#: Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp:116 msgid "High" msgstr "Ładna" -#: Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp:116 +#: Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp:118 msgid "Enabled \f[c:#d0705d](Experimental)\f[/c]" msgstr "Włączono \f[c:#d0705d](Eksperymentalne)\f[/c]" +#: Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp:119 +msgid "Vertical" +msgstr "" + +#: Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp:119 +msgid "Horizontal" +msgstr "" + #. TRANSLATORS: Header in Import Episodes section #: Sources/Jazz2/UI/Menu/ImportSection.cpp:70 msgid "Select files of your original game to unlock additional episodes" @@ -1920,7 +1939,7 @@ msgstr "Bieg" #. TRANSLATORS: Menu item in Options > Controls > Remap Controls section #: Sources/Jazz2/UI/Menu/RemapControlsSection.cpp:31 -#: Sources/Jazz2/UI/Menu/RemapControlsSection.cpp:183 +#: Sources/Jazz2/UI/Menu/RemapControlsSection.cpp:188 msgid "Change Weapon" msgstr "Zmień broń" @@ -1936,16 +1955,16 @@ msgid "Weapon %i" msgstr "Broń %i" #. TRANSLATORS: Bottom hint in Options > Controls > Remap Controls section -#: Sources/Jazz2/UI/Menu/RemapControlsSection.cpp:177 +#: Sources/Jazz2/UI/Menu/RemapControlsSection.cpp:182 msgid "Press any key or button to assign" msgstr "Naciśnij dowolny przycisk, aby przypisać" -#: Sources/Jazz2/UI/Menu/RemapControlsSection.cpp:183 +#: Sources/Jazz2/UI/Menu/RemapControlsSection.cpp:188 msgid "or" msgstr "lub" #. TRANSLATORS: Bottom hint in Options > Controls > Remap Controls section, prefixed with key/button to press -#: Sources/Jazz2/UI/Menu/RemapControlsSection.cpp:189 +#: Sources/Jazz2/UI/Menu/RemapControlsSection.cpp:194 msgid "to remove assignment" msgstr "aby usunąć przypisanie" diff --git a/Content/Translations/pt.po b/Content/Translations/pt.po index fbfaec1b..5cd61b44 100644 --- a/Content/Translations/pt.po +++ b/Content/Translations/pt.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: jazz2-resurrection\n" -"POT-Creation-Date: 2024-07-07 09:11+0200\n" +"POT-Creation-Date: 2024-07-07 20:27+0200\n" "PO-Revision-Date: \n" "Last-Translator: \n" "Language-Team: \n" @@ -1134,59 +1134,65 @@ msgid "Allow access to external storage" msgstr "" #. TRANSLATORS: Menu item in Options > Controls section -#: Sources/Jazz2/UI/Menu/ControlsOptionsSection.cpp:19 -#: Sources/Jazz2/UI/Menu/RemapControlsSection.cpp:170 +#: Sources/Jazz2/UI/Menu/ControlsOptionsSection.cpp:20 +#: Sources/Jazz2/UI/Menu/RemapControlsSection.cpp:171 #, c-format -msgid "Remap Controls for Player #%i" +msgid "Remap Controls for Player %i" msgstr "" #. TRANSLATORS: Menu item in Options > Controls section -#: Sources/Jazz2/UI/Menu/ControlsOptionsSection.cpp:22 +#: Sources/Jazz2/UI/Menu/ControlsOptionsSection.cpp:24 +#: Sources/Jazz2/UI/Menu/RemapControlsSection.cpp:174 +msgid "Remap Controls" +msgstr "" + +#. TRANSLATORS: Menu item in Options > Controls section +#: Sources/Jazz2/UI/Menu/ControlsOptionsSection.cpp:27 #: Sources/Jazz2/UI/Menu/TouchControlsOptionsSection.cpp:45 msgid "Touch Controls" msgstr "" #. TRANSLATORS: Menu item in Options > Controls section -#: Sources/Jazz2/UI/Menu/ControlsOptionsSection.cpp:24 +#: Sources/Jazz2/UI/Menu/ControlsOptionsSection.cpp:29 msgid "Toggle Run" msgstr "" -#: Sources/Jazz2/UI/Menu/ControlsOptionsSection.cpp:25 +#: Sources/Jazz2/UI/Menu/ControlsOptionsSection.cpp:30 msgid "Gamepad Button Labels" msgstr "" #. TRANSLATORS: Menu item in Options > Controls section (Android only) -#: Sources/Jazz2/UI/Menu/ControlsOptionsSection.cpp:28 +#: Sources/Jazz2/UI/Menu/ControlsOptionsSection.cpp:33 msgid "Native Back Button" msgstr "" -#: Sources/Jazz2/UI/Menu/ControlsOptionsSection.cpp:30 +#: Sources/Jazz2/UI/Menu/ControlsOptionsSection.cpp:35 #: Sources/Jazz2/UI/Menu/InputDiagnosticsSection.cpp:72 msgid "Input Diagnostics" msgstr "" #. TRANSLATORS: Menu item in Options section -#: Sources/Jazz2/UI/Menu/ControlsOptionsSection.cpp:63 +#: Sources/Jazz2/UI/Menu/ControlsOptionsSection.cpp:68 #: Sources/Jazz2/UI/Menu/OptionsSection.cpp:25 msgid "Controls" msgstr "Controlos" -#: Sources/Jazz2/UI/Menu/ControlsOptionsSection.cpp:107 +#: Sources/Jazz2/UI/Menu/ControlsOptionsSection.cpp:112 #: Sources/Jazz2/UI/Menu/GameplayEnhancementsSection.cpp:125 #: Sources/Jazz2/UI/Menu/GameplayEnhancementsSection.cpp:130 #: Sources/Jazz2/UI/Menu/GameplayOptionsSection.cpp:142 #: Sources/Jazz2/UI/Menu/GameplayOptionsSection.cpp:145 #: Sources/Jazz2/UI/Menu/GameplayOptionsSection.cpp:150 -#: Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp:121 +#: Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp:124 msgid "Enabled" msgstr "Ativado" -#: Sources/Jazz2/UI/Menu/ControlsOptionsSection.cpp:107 +#: Sources/Jazz2/UI/Menu/ControlsOptionsSection.cpp:112 #: Sources/Jazz2/UI/Menu/GameplayEnhancementsSection.cpp:125 #: Sources/Jazz2/UI/Menu/GameplayEnhancementsSection.cpp:130 #: Sources/Jazz2/UI/Menu/GameplayOptionsSection.cpp:150 -#: Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp:116 -#: Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp:121 +#: Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp:118 +#: Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp:124 msgid "Disabled" msgstr "Desativado" @@ -1382,32 +1388,45 @@ msgstr "" #. TRANSLATORS: Menu item in Options > Graphics section #: Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp:39 -msgid "Keep Aspect Ratio In Cinematics" +msgid "Preferred Splitscreen" msgstr "" #. TRANSLATORS: Menu item in Options > Graphics section #: Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp:41 +msgid "Keep Aspect Ratio In Cinematics" +msgstr "" + +#. TRANSLATORS: Menu item in Options > Graphics section +#: Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp:43 msgid "Performance Metrics" msgstr "" #. TRANSLATORS: Menu item in Options section -#: Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp:74 +#: Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp:76 #: Sources/Jazz2/UI/Menu/OptionsSection.cpp:19 msgid "Graphics" msgstr "" -#: Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp:114 +#: Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp:116 msgid "Low" msgstr "" -#: Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp:114 +#: Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp:116 msgid "High" msgstr "" -#: Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp:116 +#: Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp:118 msgid "Enabled \f[c:#d0705d](Experimental)\f[/c]" msgstr "" +#: Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp:119 +msgid "Vertical" +msgstr "" + +#: Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp:119 +msgid "Horizontal" +msgstr "" + #. TRANSLATORS: Header in Import Episodes section #: Sources/Jazz2/UI/Menu/ImportSection.cpp:70 msgid "Select files of your original game to unlock additional episodes" @@ -1538,7 +1557,7 @@ msgstr "Correr" #. TRANSLATORS: Menu item in Options > Controls > Remap Controls section #: Sources/Jazz2/UI/Menu/RemapControlsSection.cpp:31 -#: Sources/Jazz2/UI/Menu/RemapControlsSection.cpp:183 +#: Sources/Jazz2/UI/Menu/RemapControlsSection.cpp:188 msgid "Change Weapon" msgstr "Mudar de Arma" @@ -1554,16 +1573,16 @@ msgid "Weapon %i" msgstr "" #. TRANSLATORS: Bottom hint in Options > Controls > Remap Controls section -#: Sources/Jazz2/UI/Menu/RemapControlsSection.cpp:177 +#: Sources/Jazz2/UI/Menu/RemapControlsSection.cpp:182 msgid "Press any key or button to assign" msgstr "" -#: Sources/Jazz2/UI/Menu/RemapControlsSection.cpp:183 +#: Sources/Jazz2/UI/Menu/RemapControlsSection.cpp:188 msgid "or" msgstr "" #. TRANSLATORS: Bottom hint in Options > Controls > Remap Controls section, prefixed with key/button to press -#: Sources/Jazz2/UI/Menu/RemapControlsSection.cpp:189 +#: Sources/Jazz2/UI/Menu/RemapControlsSection.cpp:194 msgid "to remove assignment" msgstr "" diff --git a/Content/Translations/pt_BR.po b/Content/Translations/pt_BR.po index be1100cc..40f8c302 100644 --- a/Content/Translations/pt_BR.po +++ b/Content/Translations/pt_BR.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: jazz2-resurrection\n" -"POT-Creation-Date: 2024-07-07 09:11+0200\n" +"POT-Creation-Date: 2024-07-07 20:27+0200\n" "PO-Revision-Date: \n" "Last-Translator: Eduardo Karasinski \n" "Language-Team: edukara\n" @@ -1504,59 +1504,65 @@ msgid "Allow access to external storage" msgstr "Permitir acesso ao dispositivo de armazenamento externo" #. TRANSLATORS: Menu item in Options > Controls section -#: Sources/Jazz2/UI/Menu/ControlsOptionsSection.cpp:19 -#: Sources/Jazz2/UI/Menu/RemapControlsSection.cpp:170 +#: Sources/Jazz2/UI/Menu/ControlsOptionsSection.cpp:20 +#: Sources/Jazz2/UI/Menu/RemapControlsSection.cpp:171 #, c-format -msgid "Remap Controls for Player #%i" +msgid "Remap Controls for Player %i" msgstr "" #. TRANSLATORS: Menu item in Options > Controls section -#: Sources/Jazz2/UI/Menu/ControlsOptionsSection.cpp:22 +#: Sources/Jazz2/UI/Menu/ControlsOptionsSection.cpp:24 +#: Sources/Jazz2/UI/Menu/RemapControlsSection.cpp:174 +msgid "Remap Controls" +msgstr "" + +#. TRANSLATORS: Menu item in Options > Controls section +#: Sources/Jazz2/UI/Menu/ControlsOptionsSection.cpp:27 #: Sources/Jazz2/UI/Menu/TouchControlsOptionsSection.cpp:45 msgid "Touch Controls" msgstr "Controles de Toque" #. TRANSLATORS: Menu item in Options > Controls section -#: Sources/Jazz2/UI/Menu/ControlsOptionsSection.cpp:24 +#: Sources/Jazz2/UI/Menu/ControlsOptionsSection.cpp:29 msgid "Toggle Run" msgstr "" -#: Sources/Jazz2/UI/Menu/ControlsOptionsSection.cpp:25 +#: Sources/Jazz2/UI/Menu/ControlsOptionsSection.cpp:30 msgid "Gamepad Button Labels" msgstr "" #. TRANSLATORS: Menu item in Options > Controls section (Android only) -#: Sources/Jazz2/UI/Menu/ControlsOptionsSection.cpp:28 +#: Sources/Jazz2/UI/Menu/ControlsOptionsSection.cpp:33 msgid "Native Back Button" msgstr "Botão de Retorno Nativo" -#: Sources/Jazz2/UI/Menu/ControlsOptionsSection.cpp:30 +#: Sources/Jazz2/UI/Menu/ControlsOptionsSection.cpp:35 #: Sources/Jazz2/UI/Menu/InputDiagnosticsSection.cpp:72 msgid "Input Diagnostics" msgstr "Diagnósticos" #. TRANSLATORS: Menu item in Options section -#: Sources/Jazz2/UI/Menu/ControlsOptionsSection.cpp:63 +#: Sources/Jazz2/UI/Menu/ControlsOptionsSection.cpp:68 #: Sources/Jazz2/UI/Menu/OptionsSection.cpp:25 msgid "Controls" msgstr "Controles" -#: Sources/Jazz2/UI/Menu/ControlsOptionsSection.cpp:107 +#: Sources/Jazz2/UI/Menu/ControlsOptionsSection.cpp:112 #: Sources/Jazz2/UI/Menu/GameplayEnhancementsSection.cpp:125 #: Sources/Jazz2/UI/Menu/GameplayEnhancementsSection.cpp:130 #: Sources/Jazz2/UI/Menu/GameplayOptionsSection.cpp:142 #: Sources/Jazz2/UI/Menu/GameplayOptionsSection.cpp:145 #: Sources/Jazz2/UI/Menu/GameplayOptionsSection.cpp:150 -#: Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp:121 +#: Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp:124 msgid "Enabled" msgstr "Habilitado" -#: Sources/Jazz2/UI/Menu/ControlsOptionsSection.cpp:107 +#: Sources/Jazz2/UI/Menu/ControlsOptionsSection.cpp:112 #: Sources/Jazz2/UI/Menu/GameplayEnhancementsSection.cpp:125 #: Sources/Jazz2/UI/Menu/GameplayEnhancementsSection.cpp:130 #: Sources/Jazz2/UI/Menu/GameplayOptionsSection.cpp:150 -#: Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp:116 -#: Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp:121 +#: Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp:118 +#: Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp:124 msgid "Disabled" msgstr "Desabilitado" @@ -1752,32 +1758,45 @@ msgstr "" #. TRANSLATORS: Menu item in Options > Graphics section #: Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp:39 +msgid "Preferred Splitscreen" +msgstr "" + +#. TRANSLATORS: Menu item in Options > Graphics section +#: Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp:41 msgid "Keep Aspect Ratio In Cinematics" msgstr "Manter a Proporção nas Cinemáticas" #. TRANSLATORS: Menu item in Options > Graphics section -#: Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp:41 +#: Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp:43 msgid "Performance Metrics" msgstr "Métricas de Performance" #. TRANSLATORS: Menu item in Options section -#: Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp:74 +#: Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp:76 #: Sources/Jazz2/UI/Menu/OptionsSection.cpp:19 msgid "Graphics" msgstr "Gráficos" -#: Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp:114 +#: Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp:116 msgid "Low" msgstr "Baixo" -#: Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp:114 +#: Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp:116 msgid "High" msgstr "Alto" -#: Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp:116 +#: Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp:118 msgid "Enabled \f[c:#d0705d](Experimental)\f[/c]" msgstr "" +#: Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp:119 +msgid "Vertical" +msgstr "" + +#: Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp:119 +msgid "Horizontal" +msgstr "" + #. TRANSLATORS: Header in Import Episodes section #: Sources/Jazz2/UI/Menu/ImportSection.cpp:70 msgid "Select files of your original game to unlock additional episodes" @@ -1909,7 +1928,7 @@ msgstr "Correr" #. TRANSLATORS: Menu item in Options > Controls > Remap Controls section #: Sources/Jazz2/UI/Menu/RemapControlsSection.cpp:31 -#: Sources/Jazz2/UI/Menu/RemapControlsSection.cpp:183 +#: Sources/Jazz2/UI/Menu/RemapControlsSection.cpp:188 msgid "Change Weapon" msgstr "Trocar Arma" @@ -1925,16 +1944,16 @@ msgid "Weapon %i" msgstr "" #. TRANSLATORS: Bottom hint in Options > Controls > Remap Controls section -#: Sources/Jazz2/UI/Menu/RemapControlsSection.cpp:177 +#: Sources/Jazz2/UI/Menu/RemapControlsSection.cpp:182 msgid "Press any key or button to assign" msgstr "" -#: Sources/Jazz2/UI/Menu/RemapControlsSection.cpp:183 +#: Sources/Jazz2/UI/Menu/RemapControlsSection.cpp:188 msgid "or" msgstr "" #. TRANSLATORS: Bottom hint in Options > Controls > Remap Controls section, prefixed with key/button to press -#: Sources/Jazz2/UI/Menu/RemapControlsSection.cpp:189 +#: Sources/Jazz2/UI/Menu/RemapControlsSection.cpp:194 msgid "to remove assignment" msgstr "" diff --git a/Content/Translations/ro.po b/Content/Translations/ro.po index a7bc3d02..7bdbdda2 100644 --- a/Content/Translations/ro.po +++ b/Content/Translations/ro.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: jazz2-resurrection\n" -"POT-Creation-Date: 2024-07-07 09:11+0200\n" +"POT-Creation-Date: 2024-07-07 20:28+0200\n" "PO-Revision-Date: \n" "Last-Translator: \n" "Language-Team: 1NSH4N3 & Akfiz\n" @@ -1505,59 +1505,65 @@ msgid "Allow access to external storage" msgstr "Permite accesul la stocarea externă" #. TRANSLATORS: Menu item in Options > Controls section -#: Sources/Jazz2/UI/Menu/ControlsOptionsSection.cpp:19 -#: Sources/Jazz2/UI/Menu/RemapControlsSection.cpp:170 +#: Sources/Jazz2/UI/Menu/ControlsOptionsSection.cpp:20 +#: Sources/Jazz2/UI/Menu/RemapControlsSection.cpp:171 #, c-format -msgid "Remap Controls for Player #%i" +msgid "Remap Controls for Player %i" msgstr "" #. TRANSLATORS: Menu item in Options > Controls section -#: Sources/Jazz2/UI/Menu/ControlsOptionsSection.cpp:22 +#: Sources/Jazz2/UI/Menu/ControlsOptionsSection.cpp:24 +#: Sources/Jazz2/UI/Menu/RemapControlsSection.cpp:174 +msgid "Remap Controls" +msgstr "" + +#. TRANSLATORS: Menu item in Options > Controls section +#: Sources/Jazz2/UI/Menu/ControlsOptionsSection.cpp:27 #: Sources/Jazz2/UI/Menu/TouchControlsOptionsSection.cpp:45 msgid "Touch Controls" msgstr "Comenzi Tactile" #. TRANSLATORS: Menu item in Options > Controls section -#: Sources/Jazz2/UI/Menu/ControlsOptionsSection.cpp:24 +#: Sources/Jazz2/UI/Menu/ControlsOptionsSection.cpp:29 msgid "Toggle Run" msgstr "Comutați Alergarea" -#: Sources/Jazz2/UI/Menu/ControlsOptionsSection.cpp:25 +#: Sources/Jazz2/UI/Menu/ControlsOptionsSection.cpp:30 msgid "Gamepad Button Labels" msgstr "Etichete pentru butoanele gamepadului" #. TRANSLATORS: Menu item in Options > Controls section (Android only) -#: Sources/Jazz2/UI/Menu/ControlsOptionsSection.cpp:28 +#: Sources/Jazz2/UI/Menu/ControlsOptionsSection.cpp:33 msgid "Native Back Button" msgstr "Butonul Nativ de Întoarcere" -#: Sources/Jazz2/UI/Menu/ControlsOptionsSection.cpp:30 +#: Sources/Jazz2/UI/Menu/ControlsOptionsSection.cpp:35 #: Sources/Jazz2/UI/Menu/InputDiagnosticsSection.cpp:72 msgid "Input Diagnostics" msgstr "Diagnosticarea intrărilor" #. TRANSLATORS: Menu item in Options section -#: Sources/Jazz2/UI/Menu/ControlsOptionsSection.cpp:63 +#: Sources/Jazz2/UI/Menu/ControlsOptionsSection.cpp:68 #: Sources/Jazz2/UI/Menu/OptionsSection.cpp:25 msgid "Controls" msgstr "Controluri" -#: Sources/Jazz2/UI/Menu/ControlsOptionsSection.cpp:107 +#: Sources/Jazz2/UI/Menu/ControlsOptionsSection.cpp:112 #: Sources/Jazz2/UI/Menu/GameplayEnhancementsSection.cpp:125 #: Sources/Jazz2/UI/Menu/GameplayEnhancementsSection.cpp:130 #: Sources/Jazz2/UI/Menu/GameplayOptionsSection.cpp:142 #: Sources/Jazz2/UI/Menu/GameplayOptionsSection.cpp:145 #: Sources/Jazz2/UI/Menu/GameplayOptionsSection.cpp:150 -#: Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp:121 +#: Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp:124 msgid "Enabled" msgstr "Activat" -#: Sources/Jazz2/UI/Menu/ControlsOptionsSection.cpp:107 +#: Sources/Jazz2/UI/Menu/ControlsOptionsSection.cpp:112 #: Sources/Jazz2/UI/Menu/GameplayEnhancementsSection.cpp:125 #: Sources/Jazz2/UI/Menu/GameplayEnhancementsSection.cpp:130 #: Sources/Jazz2/UI/Menu/GameplayOptionsSection.cpp:150 -#: Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp:116 -#: Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp:121 +#: Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp:118 +#: Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp:124 msgid "Disabled" msgstr "Dezactivat" @@ -1757,32 +1763,45 @@ msgstr "Vizualizare nealiniată" #. TRANSLATORS: Menu item in Options > Graphics section #: Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp:39 +msgid "Preferred Splitscreen" +msgstr "" + +#. TRANSLATORS: Menu item in Options > Graphics section +#: Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp:41 msgid "Keep Aspect Ratio In Cinematics" msgstr "Păstrează Raportul de Aspect în Cinematice" #. TRANSLATORS: Menu item in Options > Graphics section -#: Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp:41 +#: Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp:43 msgid "Performance Metrics" msgstr "Indicatori de Performanță" #. TRANSLATORS: Menu item in Options section -#: Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp:74 +#: Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp:76 #: Sources/Jazz2/UI/Menu/OptionsSection.cpp:19 msgid "Graphics" msgstr "Grafică" -#: Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp:114 +#: Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp:116 msgid "Low" msgstr "Scăzută" -#: Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp:114 +#: Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp:116 msgid "High" msgstr "Înaltă" -#: Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp:116 +#: Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp:118 msgid "Enabled \f[c:#d0705d](Experimental)\f[/c]" msgstr "Activat \f[c:#d0705d](Experimental)\f[/c]" +#: Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp:119 +msgid "Vertical" +msgstr "" + +#: Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp:119 +msgid "Horizontal" +msgstr "" + #. TRANSLATORS: Header in Import Episodes section #: Sources/Jazz2/UI/Menu/ImportSection.cpp:70 msgid "Select files of your original game to unlock additional episodes" @@ -1914,7 +1933,7 @@ msgstr "Fugi" #. TRANSLATORS: Menu item in Options > Controls > Remap Controls section #: Sources/Jazz2/UI/Menu/RemapControlsSection.cpp:31 -#: Sources/Jazz2/UI/Menu/RemapControlsSection.cpp:183 +#: Sources/Jazz2/UI/Menu/RemapControlsSection.cpp:188 msgid "Change Weapon" msgstr "Schimbă Arma" @@ -1930,16 +1949,16 @@ msgid "Weapon %i" msgstr "Armă %i" #. TRANSLATORS: Bottom hint in Options > Controls > Remap Controls section -#: Sources/Jazz2/UI/Menu/RemapControlsSection.cpp:177 +#: Sources/Jazz2/UI/Menu/RemapControlsSection.cpp:182 msgid "Press any key or button to assign" msgstr "Apăsați orice tastă sau buton pentru a atribui" -#: Sources/Jazz2/UI/Menu/RemapControlsSection.cpp:183 +#: Sources/Jazz2/UI/Menu/RemapControlsSection.cpp:188 msgid "or" msgstr "sau" #. TRANSLATORS: Bottom hint in Options > Controls > Remap Controls section, prefixed with key/button to press -#: Sources/Jazz2/UI/Menu/RemapControlsSection.cpp:189 +#: Sources/Jazz2/UI/Menu/RemapControlsSection.cpp:194 msgid "to remove assignment" msgstr "pentru a elimina atribuirea" diff --git a/Content/Translations/ru.po b/Content/Translations/ru.po index 0aef4b23..cc114bb3 100644 --- a/Content/Translations/ru.po +++ b/Content/Translations/ru.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: jazz2-resurrection\n" -"POT-Creation-Date: 2024-07-07 09:12+0200\n" +"POT-Creation-Date: 2024-07-07 20:28+0200\n" "PO-Revision-Date: \n" "Last-Translator: \n" "Language-Team: MAN-biker\n" @@ -1505,59 +1505,65 @@ msgid "Allow access to external storage" msgstr "ДАТЬ ДОСТУП К ВНЕШНЕМУ ХРАНИЛИЩУ" #. TRANSLATORS: Menu item in Options > Controls section -#: Sources/Jazz2/UI/Menu/ControlsOptionsSection.cpp:19 -#: Sources/Jazz2/UI/Menu/RemapControlsSection.cpp:170 +#: Sources/Jazz2/UI/Menu/ControlsOptionsSection.cpp:20 +#: Sources/Jazz2/UI/Menu/RemapControlsSection.cpp:171 #, c-format -msgid "Remap Controls for Player #%i" +msgid "Remap Controls for Player %i" msgstr "" #. TRANSLATORS: Menu item in Options > Controls section -#: Sources/Jazz2/UI/Menu/ControlsOptionsSection.cpp:22 +#: Sources/Jazz2/UI/Menu/ControlsOptionsSection.cpp:24 +#: Sources/Jazz2/UI/Menu/RemapControlsSection.cpp:174 +msgid "Remap Controls" +msgstr "" + +#. TRANSLATORS: Menu item in Options > Controls section +#: Sources/Jazz2/UI/Menu/ControlsOptionsSection.cpp:27 #: Sources/Jazz2/UI/Menu/TouchControlsOptionsSection.cpp:45 msgid "Touch Controls" msgstr "СЕНСОРНОЕ УПРАВЛЕНИЕ" #. TRANSLATORS: Menu item in Options > Controls section -#: Sources/Jazz2/UI/Menu/ControlsOptionsSection.cpp:24 +#: Sources/Jazz2/UI/Menu/ControlsOptionsSection.cpp:29 msgid "Toggle Run" msgstr "" -#: Sources/Jazz2/UI/Menu/ControlsOptionsSection.cpp:25 +#: Sources/Jazz2/UI/Menu/ControlsOptionsSection.cpp:30 msgid "Gamepad Button Labels" msgstr "" #. TRANSLATORS: Menu item in Options > Controls section (Android only) -#: Sources/Jazz2/UI/Menu/ControlsOptionsSection.cpp:28 +#: Sources/Jazz2/UI/Menu/ControlsOptionsSection.cpp:33 msgid "Native Back Button" msgstr "ОРИГИНАЛЬНАЯ КНОПКА «НАЗАД»" -#: Sources/Jazz2/UI/Menu/ControlsOptionsSection.cpp:30 +#: Sources/Jazz2/UI/Menu/ControlsOptionsSection.cpp:35 #: Sources/Jazz2/UI/Menu/InputDiagnosticsSection.cpp:72 msgid "Input Diagnostics" msgstr "" #. TRANSLATORS: Menu item in Options section -#: Sources/Jazz2/UI/Menu/ControlsOptionsSection.cpp:63 +#: Sources/Jazz2/UI/Menu/ControlsOptionsSection.cpp:68 #: Sources/Jazz2/UI/Menu/OptionsSection.cpp:25 msgid "Controls" msgstr "УПРАВЛЕНИЕ" -#: Sources/Jazz2/UI/Menu/ControlsOptionsSection.cpp:107 +#: Sources/Jazz2/UI/Menu/ControlsOptionsSection.cpp:112 #: Sources/Jazz2/UI/Menu/GameplayEnhancementsSection.cpp:125 #: Sources/Jazz2/UI/Menu/GameplayEnhancementsSection.cpp:130 #: Sources/Jazz2/UI/Menu/GameplayOptionsSection.cpp:142 #: Sources/Jazz2/UI/Menu/GameplayOptionsSection.cpp:145 #: Sources/Jazz2/UI/Menu/GameplayOptionsSection.cpp:150 -#: Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp:121 +#: Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp:124 msgid "Enabled" msgstr "ВКЛЮЧЕНО" -#: Sources/Jazz2/UI/Menu/ControlsOptionsSection.cpp:107 +#: Sources/Jazz2/UI/Menu/ControlsOptionsSection.cpp:112 #: Sources/Jazz2/UI/Menu/GameplayEnhancementsSection.cpp:125 #: Sources/Jazz2/UI/Menu/GameplayEnhancementsSection.cpp:130 #: Sources/Jazz2/UI/Menu/GameplayOptionsSection.cpp:150 -#: Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp:116 -#: Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp:121 +#: Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp:118 +#: Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp:124 msgid "Disabled" msgstr "ВЫКЛЮЧЕНО" @@ -1753,32 +1759,45 @@ msgstr "" #. TRANSLATORS: Menu item in Options > Graphics section #: Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp:39 +msgid "Preferred Splitscreen" +msgstr "" + +#. TRANSLATORS: Menu item in Options > Graphics section +#: Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp:41 msgid "Keep Aspect Ratio In Cinematics" msgstr "СОХРАНЯТЬ ПРОПОРЦИИ ВИДЕОРОЛИКОВ" #. TRANSLATORS: Menu item in Options > Graphics section -#: Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp:41 +#: Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp:43 msgid "Performance Metrics" msgstr "ОТОБРАЖЕНИЕ СЧЁТЧИКА КАДРОВ" #. TRANSLATORS: Menu item in Options section -#: Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp:74 +#: Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp:76 #: Sources/Jazz2/UI/Menu/OptionsSection.cpp:19 msgid "Graphics" msgstr "ГРАФИКА" -#: Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp:114 +#: Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp:116 msgid "Low" msgstr "" -#: Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp:114 +#: Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp:116 msgid "High" msgstr "" -#: Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp:116 +#: Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp:118 msgid "Enabled \f[c:#d0705d](Experimental)\f[/c]" msgstr "" +#: Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp:119 +msgid "Vertical" +msgstr "" + +#: Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp:119 +msgid "Horizontal" +msgstr "" + #. TRANSLATORS: Header in Import Episodes section #: Sources/Jazz2/UI/Menu/ImportSection.cpp:70 msgid "Select files of your original game to unlock additional episodes" @@ -1909,7 +1928,7 @@ msgstr "БЕГ" #. TRANSLATORS: Menu item in Options > Controls > Remap Controls section #: Sources/Jazz2/UI/Menu/RemapControlsSection.cpp:31 -#: Sources/Jazz2/UI/Menu/RemapControlsSection.cpp:183 +#: Sources/Jazz2/UI/Menu/RemapControlsSection.cpp:188 msgid "Change Weapon" msgstr "СМЕНА ОРУЖИЯ" @@ -1925,16 +1944,16 @@ msgid "Weapon %i" msgstr "" #. TRANSLATORS: Bottom hint in Options > Controls > Remap Controls section -#: Sources/Jazz2/UI/Menu/RemapControlsSection.cpp:177 +#: Sources/Jazz2/UI/Menu/RemapControlsSection.cpp:182 msgid "Press any key or button to assign" msgstr "" -#: Sources/Jazz2/UI/Menu/RemapControlsSection.cpp:183 +#: Sources/Jazz2/UI/Menu/RemapControlsSection.cpp:188 msgid "or" msgstr "" #. TRANSLATORS: Bottom hint in Options > Controls > Remap Controls section, prefixed with key/button to press -#: Sources/Jazz2/UI/Menu/RemapControlsSection.cpp:189 +#: Sources/Jazz2/UI/Menu/RemapControlsSection.cpp:194 msgid "to remove assignment" msgstr "" diff --git a/Content/Translations/tr.po b/Content/Translations/tr.po index 15fbd4ab..0e0bc88c 100644 --- a/Content/Translations/tr.po +++ b/Content/Translations/tr.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: jazz2-resurrection\n" -"POT-Creation-Date: 2024-07-07 09:12+0200\n" +"POT-Creation-Date: 2024-07-07 20:28+0200\n" "PO-Revision-Date: \n" "Last-Translator: \n" "Language-Team: Consul\n" @@ -1495,59 +1495,65 @@ msgid "Allow access to external storage" msgstr "Harici depolama erişimine izin ver" #. TRANSLATORS: Menu item in Options > Controls section -#: Sources/Jazz2/UI/Menu/ControlsOptionsSection.cpp:19 -#: Sources/Jazz2/UI/Menu/RemapControlsSection.cpp:170 +#: Sources/Jazz2/UI/Menu/ControlsOptionsSection.cpp:20 +#: Sources/Jazz2/UI/Menu/RemapControlsSection.cpp:171 #, c-format -msgid "Remap Controls for Player #%i" +msgid "Remap Controls for Player %i" msgstr "" #. TRANSLATORS: Menu item in Options > Controls section -#: Sources/Jazz2/UI/Menu/ControlsOptionsSection.cpp:22 +#: Sources/Jazz2/UI/Menu/ControlsOptionsSection.cpp:24 +#: Sources/Jazz2/UI/Menu/RemapControlsSection.cpp:174 +msgid "Remap Controls" +msgstr "" + +#. TRANSLATORS: Menu item in Options > Controls section +#: Sources/Jazz2/UI/Menu/ControlsOptionsSection.cpp:27 #: Sources/Jazz2/UI/Menu/TouchControlsOptionsSection.cpp:45 msgid "Touch Controls" msgstr "Dokunmatik Kontrol Ayarları" #. TRANSLATORS: Menu item in Options > Controls section -#: Sources/Jazz2/UI/Menu/ControlsOptionsSection.cpp:24 +#: Sources/Jazz2/UI/Menu/ControlsOptionsSection.cpp:29 msgid "Toggle Run" msgstr "" -#: Sources/Jazz2/UI/Menu/ControlsOptionsSection.cpp:25 +#: Sources/Jazz2/UI/Menu/ControlsOptionsSection.cpp:30 msgid "Gamepad Button Labels" msgstr "" #. TRANSLATORS: Menu item in Options > Controls section (Android only) -#: Sources/Jazz2/UI/Menu/ControlsOptionsSection.cpp:28 +#: Sources/Jazz2/UI/Menu/ControlsOptionsSection.cpp:33 msgid "Native Back Button" msgstr "Geri Tuşu" -#: Sources/Jazz2/UI/Menu/ControlsOptionsSection.cpp:30 +#: Sources/Jazz2/UI/Menu/ControlsOptionsSection.cpp:35 #: Sources/Jazz2/UI/Menu/InputDiagnosticsSection.cpp:72 msgid "Input Diagnostics" msgstr "Giriş Tanılama" #. TRANSLATORS: Menu item in Options section -#: Sources/Jazz2/UI/Menu/ControlsOptionsSection.cpp:63 +#: Sources/Jazz2/UI/Menu/ControlsOptionsSection.cpp:68 #: Sources/Jazz2/UI/Menu/OptionsSection.cpp:25 msgid "Controls" msgstr "Kontrol Ayarları" -#: Sources/Jazz2/UI/Menu/ControlsOptionsSection.cpp:107 +#: Sources/Jazz2/UI/Menu/ControlsOptionsSection.cpp:112 #: Sources/Jazz2/UI/Menu/GameplayEnhancementsSection.cpp:125 #: Sources/Jazz2/UI/Menu/GameplayEnhancementsSection.cpp:130 #: Sources/Jazz2/UI/Menu/GameplayOptionsSection.cpp:142 #: Sources/Jazz2/UI/Menu/GameplayOptionsSection.cpp:145 #: Sources/Jazz2/UI/Menu/GameplayOptionsSection.cpp:150 -#: Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp:121 +#: Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp:124 msgid "Enabled" msgstr "Açık" -#: Sources/Jazz2/UI/Menu/ControlsOptionsSection.cpp:107 +#: Sources/Jazz2/UI/Menu/ControlsOptionsSection.cpp:112 #: Sources/Jazz2/UI/Menu/GameplayEnhancementsSection.cpp:125 #: Sources/Jazz2/UI/Menu/GameplayEnhancementsSection.cpp:130 #: Sources/Jazz2/UI/Menu/GameplayOptionsSection.cpp:150 -#: Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp:116 -#: Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp:121 +#: Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp:118 +#: Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp:124 msgid "Disabled" msgstr "Kapalı" @@ -1747,32 +1753,45 @@ msgstr "Hizalanmamış Görünüm" #. TRANSLATORS: Menu item in Options > Graphics section #: Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp:39 +msgid "Preferred Splitscreen" +msgstr "" + +#. TRANSLATORS: Menu item in Options > Graphics section +#: Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp:41 msgid "Keep Aspect Ratio In Cinematics" msgstr "Sinematiklerde En-Boy Oranını Koru" #. TRANSLATORS: Menu item in Options > Graphics section -#: Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp:41 +#: Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp:43 msgid "Performance Metrics" msgstr "Performans Değerleri" #. TRANSLATORS: Menu item in Options section -#: Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp:74 +#: Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp:76 #: Sources/Jazz2/UI/Menu/OptionsSection.cpp:19 msgid "Graphics" msgstr "Grafik Ayarları" -#: Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp:114 +#: Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp:116 msgid "Low" msgstr "Düşük" -#: Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp:114 +#: Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp:116 msgid "High" msgstr "Yüksek" -#: Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp:116 +#: Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp:118 msgid "Enabled \f[c:#d0705d](Experimental)\f[/c]" msgstr "Etkin \f[c:#d0705d](Deneysel)\f[/c]" +#: Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp:119 +msgid "Vertical" +msgstr "" + +#: Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp:119 +msgid "Horizontal" +msgstr "" + #. TRANSLATORS: Header in Import Episodes section #: Sources/Jazz2/UI/Menu/ImportSection.cpp:70 msgid "Select files of your original game to unlock additional episodes" @@ -1903,7 +1922,7 @@ msgstr "Koş" #. TRANSLATORS: Menu item in Options > Controls > Remap Controls section #: Sources/Jazz2/UI/Menu/RemapControlsSection.cpp:31 -#: Sources/Jazz2/UI/Menu/RemapControlsSection.cpp:183 +#: Sources/Jazz2/UI/Menu/RemapControlsSection.cpp:188 msgid "Change Weapon" msgstr "Silah Değiştir" @@ -1919,16 +1938,16 @@ msgid "Weapon %i" msgstr "" #. TRANSLATORS: Bottom hint in Options > Controls > Remap Controls section -#: Sources/Jazz2/UI/Menu/RemapControlsSection.cpp:177 +#: Sources/Jazz2/UI/Menu/RemapControlsSection.cpp:182 msgid "Press any key or button to assign" msgstr "" -#: Sources/Jazz2/UI/Menu/RemapControlsSection.cpp:183 +#: Sources/Jazz2/UI/Menu/RemapControlsSection.cpp:188 msgid "or" msgstr "" #. TRANSLATORS: Bottom hint in Options > Controls > Remap Controls section, prefixed with key/button to press -#: Sources/Jazz2/UI/Menu/RemapControlsSection.cpp:189 +#: Sources/Jazz2/UI/Menu/RemapControlsSection.cpp:194 msgid "to remove assignment" msgstr "" diff --git a/Sources/Jazz2/LevelHandler.cpp b/Sources/Jazz2/LevelHandler.cpp index 352a931c..9a558643 100644 --- a/Sources/Jazz2/LevelHandler.cpp +++ b/Sources/Jazz2/LevelHandler.cpp @@ -404,6 +404,8 @@ namespace Jazz2 float timeMult = theApplication().GetTimeMult(); + _tileMap->OnEndFrame(); + if (!IsPausable() || _pauseMenu == nullptr) { ResolveCollisions(timeMult); @@ -415,7 +417,7 @@ namespace Jazz2 } for (auto& viewport : _assignedViewports) { - viewport->OnFrameEnd(); + viewport->OnEndFrame(); } #if defined(DEATH_DEBUG) && defined(WITH_IMGUI) @@ -450,7 +452,7 @@ namespace Jazz2 constexpr float defaultRatio = (float)DefaultWidth / DefaultHeight; float currentRatio = (float)width / height; - int32_t w, h; + std::int32_t w, h; if (currentRatio > defaultRatio) { w = std::min(DefaultWidth, width); h = (std::int32_t)(w / currentRatio); @@ -463,16 +465,16 @@ namespace Jazz2 } _viewSize = Vector2i(w, h); - - // Divide viewports - h /= (std::int32_t)_assignedViewports.size(); + _upscalePass.Initialize(w, h, width, height); for (std::size_t i = 0; i < _assignedViewports.size(); i++) { PlayerViewport& viewport = *_assignedViewports[i]; bool notInitialized = (viewport._view == nullptr); + Recti bounds = GetPlayerViewportBounds(w, h, (std::int32_t)i); + if (notInitialized) { - viewport._viewTexture = std::make_unique(nullptr, Texture::Format::RGB8, w, h); + viewport._viewTexture = std::make_unique(nullptr, Texture::Format::RGB8, bounds.W, bounds.H); viewport._view = std::make_unique(viewport._viewTexture.get(), Viewport::DepthStencilFormat::None); viewport._camera = std::make_unique(); @@ -482,14 +484,14 @@ namespace Jazz2 viewport._view->setRootNode(_rootNode.get()); } else { viewport._view->removeAllTextures(); - viewport._viewTexture->init(nullptr, Texture::Format::RGB8, w, h); + viewport._viewTexture->init(nullptr, Texture::Format::RGB8, bounds.W, bounds.H); viewport._view->setTexture(viewport._viewTexture.get()); } viewport._viewTexture->setMagFiltering(SamplerFilter::Nearest); viewport._viewTexture->setWrap(SamplerWrapping::ClampToEdge); - viewport._camera->setOrthoProjection(0.0f, (float)w, (float)h, 0.0f); + viewport._camera->setOrthoProjection(0.0f, (float)bounds.W, (float)bounds.H, 0.0f); auto& resolver = ContentResolver::Get(); @@ -507,34 +509,42 @@ namespace Jazz2 : PrecompiledShader::CombineWithWater); if (notInitialized) { - viewport._lightingBuffer = std::make_unique(nullptr, Texture::Format::RG8, w, h); + viewport._lightingBuffer = std::make_unique(nullptr, Texture::Format::RG8, bounds.W, bounds.H); viewport._lightingView = std::make_unique(viewport._lightingBuffer.get(), Viewport::DepthStencilFormat::None); viewport._lightingView->setRootNode(viewport._lightingRenderer.get()); viewport._lightingView->setCamera(viewport._camera.get()); } else { viewport._lightingView->removeAllTextures(); - viewport._lightingBuffer->init(nullptr, Texture::Format::RG8, w, h); + viewport._lightingBuffer->init(nullptr, Texture::Format::RG8, bounds.W, bounds.H); viewport._lightingView->setTexture(viewport._lightingBuffer.get()); } viewport._lightingBuffer->setMagFiltering(SamplerFilter::Nearest); viewport._lightingBuffer->setWrap(SamplerWrapping::ClampToEdge); - viewport._downsamplePass.Initialize(viewport._viewTexture.get(), w / 2, h / 2, Vector2f::Zero); - viewport._blurPass1.Initialize(viewport._downsamplePass.GetTarget(), w / 2, h / 2, Vector2f(1.0f, 0.0f)); - viewport._blurPass2.Initialize(viewport._blurPass1.GetTarget(), w / 2, h / 2, Vector2f(0.0f, 1.0f)); - viewport._blurPass3.Initialize(viewport._blurPass2.GetTarget(), w / 4, h / 4, Vector2f(1.0f, 0.0f)); - viewport._blurPass4.Initialize(viewport._blurPass3.GetTarget(), w / 4, h / 4, Vector2f(0.0f, 1.0f)); - } + viewport._downsamplePass.Initialize(viewport._viewTexture.get(), bounds.W / 2, bounds.H / 2, Vector2f::Zero); + viewport._blurPass1.Initialize(viewport._downsamplePass.GetTarget(), bounds.W / 2, bounds.H / 2, Vector2f(1.0f, 0.0f)); + viewport._blurPass2.Initialize(viewport._blurPass1.GetTarget(), bounds.W / 2, bounds.H / 2, Vector2f(0.0f, 1.0f)); + viewport._blurPass3.Initialize(viewport._blurPass2.GetTarget(), bounds.W / 4, bounds.H / 4, Vector2f(1.0f, 0.0f)); + viewport._blurPass4.Initialize(viewport._blurPass3.GetTarget(), bounds.W / 4, bounds.H / 4, Vector2f(0.0f, 1.0f)); + + if (notInitialized) { + viewport._combineRenderer = std::make_unique(&viewport); + viewport._combineRenderer->setParent(_upscalePass.GetNode()); + + if (_hud != nullptr) { + _hud->setParent(_upscalePass.GetNode()); + } + } - _upscalePass.Initialize(_viewSize.X, _viewSize.Y, width, height); + viewport._combineRenderer->Initialize(bounds.X, bounds.Y, bounds.W, bounds.H); + } // Viewports must be registered in reverse order _upscalePass.Register(); for (std::size_t i = 0; i < _assignedViewports.size(); i++) { PlayerViewport& viewport = *_assignedViewports[i]; - bool notInitialized = (viewport._combineRenderer == nullptr); viewport._blurPass4.Register(); viewport._blurPass3.Register(); @@ -543,18 +553,6 @@ namespace Jazz2 viewport._downsamplePass.Register(); Viewport::chain().push_back(viewport._lightingView.get()); - - if (notInitialized) { - viewport._combineRenderer = std::make_unique(&viewport); - viewport._combineRenderer->setParent(_upscalePass.GetNode()); - - if (_hud != nullptr) { - _hud->setParent(_upscalePass.GetNode()); - } - } - - viewport._combineRenderer->Initialize(0, h * (std::int32_t)i, w, h); - Viewport::chain().push_back(viewport._view.get()); if (_pauseMenu != nullptr) { @@ -1365,6 +1363,32 @@ namespace Jazz2 } } + Recti LevelHandler::GetPlayerViewportBounds(std::int32_t w, std::int32_t h, std::int32_t index) + { + std::int32_t count = (std::int32_t)_assignedViewports.size(); + + switch (count) { + case 1: { + return Recti(0, 0, w, h); + } + case 2: { + if (PreferencesCache::PreferVerticalSplitscreen) { + std::int32_t halfW = w / 2; + return Recti(index * halfW, 0, halfW, h); + } else { + std::int32_t halfH = h / 2; + return Recti(0, index * halfH, w, halfH); + } + } + case 3: + case 4: { + std::int32_t halfW = (w + 1) / 2; + std::int32_t halfH = (h + 1) / 2; + return Recti((index % 2) * halfW, (index / 2) * halfH, halfW, halfH); + } + } + } + void LevelHandler::ProcessWeather(float timeMult) { if (_weatherType == WeatherType::None) { @@ -1894,12 +1918,15 @@ namespace Jazz2 #if defined(WITH_IMGUI) ImVec2 LevelHandler::WorldPosToScreenSpace(const Vector2f pos) { - Vector2i originalSize = _view->size(); + auto& mainViewport = _assignedViewports[0]; + + Rectf bounds = mainViewport->GetBounds(); + Vector2i originalSize = mainViewport->_view->size(); Vector2f upscaledSize = _upscalePass.GetTargetSize(); - Vector2i halfView = originalSize / 2; + Vector2f halfView = bounds.Center(); return ImVec2( - (pos.X - _cameraPos.X + halfView.X) * upscaledSize.X / originalSize.X, - (pos.Y - _cameraPos.Y + halfView.Y) * upscaledSize.Y / originalSize.Y + (pos.X - mainViewport->_cameraPos.X + halfView.X) * upscaledSize.X / originalSize.X, + (pos.Y - mainViewport->_cameraPos.Y + halfView.Y) * upscaledSize.Y / originalSize.Y ); } #endif diff --git a/Sources/Jazz2/LevelHandler.h b/Sources/Jazz2/LevelHandler.h index 96daa5c3..c2d8c9c4 100644 --- a/Sources/Jazz2/LevelHandler.h +++ b/Sources/Jazz2/LevelHandler.h @@ -255,6 +255,7 @@ namespace Jazz2 virtual void ProcessQueuedNextLevel(); virtual void PrepareNextLevelInitialization(LevelInitialization& levelInit); + Recti GetPlayerViewportBounds(std::int32_t w, std::int32_t h, std::int32_t index); void ProcessWeather(float timeMult); void ResolveCollisions(float timeMult); void AssignViewport(Actors::Player* player); diff --git a/Sources/Jazz2/PlayerViewport.cpp b/Sources/Jazz2/PlayerViewport.cpp index 6f96bb6f..b4be3584 100644 --- a/Sources/Jazz2/PlayerViewport.cpp +++ b/Sources/Jazz2/PlayerViewport.cpp @@ -233,7 +233,7 @@ namespace Jazz2 return _targetPlayer; } - void PlayerViewport::OnFrameEnd() + void PlayerViewport::OnEndFrame() { _lightingView->setClearColor(_ambientLight.W, 0.0f, 0.0f, 1.0f); } diff --git a/Sources/Jazz2/PlayerViewport.h b/Sources/Jazz2/PlayerViewport.h index 7d4240e0..ec79b4f8 100644 --- a/Sources/Jazz2/PlayerViewport.h +++ b/Sources/Jazz2/PlayerViewport.h @@ -112,7 +112,7 @@ namespace Jazz2 Rectf GetBounds() const; Actors::Player* GetTargetPlayer() const; - void OnFrameEnd(); + void OnEndFrame(); void UpdateCamera(float timeMult); void ShakeCameraView(float duration); void WarpCameraToTarget(bool fast); diff --git a/Sources/Jazz2/PreferencesCache.cpp b/Sources/Jazz2/PreferencesCache.cpp index 7ea8862d..619ff3c2 100644 --- a/Sources/Jazz2/PreferencesCache.cpp +++ b/Sources/Jazz2/PreferencesCache.cpp @@ -29,6 +29,7 @@ namespace Jazz2 bool PreferencesCache::ShowPlayerTrails = true; bool PreferencesCache::LowWaterQuality = false; bool PreferencesCache::UnalignedViewport = false; + bool PreferencesCache::PreferVerticalSplitscreen = false; bool PreferencesCache::EnableReforgedGameplay = true; bool PreferencesCache::EnableReforgedHUD = true; bool PreferencesCache::EnableReforgedMainMenu = true; @@ -187,6 +188,7 @@ namespace Jazz2 ShowPlayerTrails = ((boolOptions & BoolOptions::ShowPlayerTrails) == BoolOptions::ShowPlayerTrails); LowWaterQuality = ((boolOptions & BoolOptions::LowWaterQuality) == BoolOptions::LowWaterQuality); UnalignedViewport = ((boolOptions & BoolOptions::UnalignedViewport) == BoolOptions::UnalignedViewport); + PreferVerticalSplitscreen = ((boolOptions & BoolOptions::PreferVerticalSplitscreen) == BoolOptions::PreferVerticalSplitscreen); EnableReforgedGameplay = ((boolOptions & BoolOptions::EnableReforgedGameplay) == BoolOptions::EnableReforgedGameplay); EnableLedgeClimb = ((boolOptions & BoolOptions::EnableLedgeClimb) == BoolOptions::EnableLedgeClimb); WeaponWheel = ((boolOptions & BoolOptions::EnableWeaponWheel) == BoolOptions::EnableWeaponWheel ? WeaponWheelStyle::Enabled : WeaponWheelStyle::Disabled); @@ -399,6 +401,7 @@ namespace Jazz2 if (ShowPlayerTrails) boolOptions |= BoolOptions::ShowPlayerTrails; if (LowWaterQuality) boolOptions |= BoolOptions::LowWaterQuality; if (UnalignedViewport) boolOptions |= BoolOptions::UnalignedViewport; + if (PreferVerticalSplitscreen) boolOptions |= BoolOptions::PreferVerticalSplitscreen; if (EnableReforgedGameplay) boolOptions |= BoolOptions::EnableReforgedGameplay; if (EnableLedgeClimb) boolOptions |= BoolOptions::EnableLedgeClimb; if (WeaponWheel != WeaponWheelStyle::Disabled) boolOptions |= BoolOptions::EnableWeaponWheel; diff --git a/Sources/Jazz2/PreferencesCache.h b/Sources/Jazz2/PreferencesCache.h index 84209824..acf5f55e 100644 --- a/Sources/Jazz2/PreferencesCache.h +++ b/Sources/Jazz2/PreferencesCache.h @@ -100,6 +100,7 @@ namespace Jazz2 static bool ShowPlayerTrails; static bool LowWaterQuality; static bool UnalignedViewport; + static bool PreferVerticalSplitscreen; // Gameplay static bool EnableReforgedGameplay; @@ -150,6 +151,7 @@ namespace Jazz2 ShowPlayerTrails = 0x08, LowWaterQuality = 0x10, UnalignedViewport = 0x20, + PreferVerticalSplitscreen = 0x40, EnableReforgedGameplay = 0x100, EnableLedgeClimb = 0x200, diff --git a/Sources/Jazz2/Tiles/TileMap.cpp b/Sources/Jazz2/Tiles/TileMap.cpp index d3aaefa3..9b24ddb6 100644 --- a/Sources/Jazz2/Tiles/TileMap.cpp +++ b/Sources/Jazz2/Tiles/TileMap.cpp @@ -158,7 +158,12 @@ namespace Jazz2::Tiles AdvanceCollapsingTileTimers(timeMult); UpdateDebris(timeMult); + } + void TileMap::OnEndFrame() + { + // The command cache must be reset every frame, + // OnDraw() is called multiple times if multiple viewports are active _renderCommandsCount = 0; } diff --git a/Sources/Jazz2/Tiles/TileMap.h b/Sources/Jazz2/Tiles/TileMap.h index 95adf35b..24b01415 100644 --- a/Sources/Jazz2/Tiles/TileMap.h +++ b/Sources/Jazz2/Tiles/TileMap.h @@ -158,6 +158,7 @@ namespace Jazz2::Tiles void SetPitType(PitType value); void OnUpdate(float timeMult) override; + void OnEndFrame(); bool OnDraw(RenderQueue& renderQueue) override; bool IsTileEmpty(std::int32_t tx, std::int32_t ty); diff --git a/Sources/Jazz2/UI/ControlScheme.h b/Sources/Jazz2/UI/ControlScheme.h index 479f7ec8..a4af3093 100644 --- a/Sources/Jazz2/UI/ControlScheme.h +++ b/Sources/Jazz2/UI/ControlScheme.h @@ -42,11 +42,12 @@ namespace Jazz2::UI ControlScheme() = delete; ~ControlScheme() = delete; - static constexpr std::int32_t MaxSupportedPlayers = 2; #if defined(DEATH_TARGET_SWITCH) + static constexpr std::int32_t MaxSupportedPlayers = 1; // TODO: Game is crashing on Switch if more than 1 gamepad is used static constexpr std::int32_t MaxConnectedGamepads = 1; #else + static constexpr std::int32_t MaxSupportedPlayers = 4; static constexpr std::int32_t MaxConnectedGamepads = 4; #endif diff --git a/Sources/Jazz2/UI/HUD.cpp b/Sources/Jazz2/UI/HUD.cpp index dcddea1b..df2b6428 100644 --- a/Sources/Jazz2/UI/HUD.cpp +++ b/Sources/Jazz2/UI/HUD.cpp @@ -197,11 +197,6 @@ namespace Jazz2::UI adjustedScopedView.X = left; adjustedScopedView.W = right - left; - if (i < _levelHandler->_assignedViewports.size() - 1) { - DrawSolid(Vector2f(0.0f, scopedView.H - 1.0f), ShadowLayer, Vector2f(scopedView.W, 1.0f), Colorf(1.0f, 1.0f, 1.0f, 0.1f), true); - DrawSolid(Vector2f(0.0f, scopedView.H), ShadowLayer, Vector2f(scopedView.W, 1.0f), Colorf(0.0f, 0.0f, 0.0f, 0.4f)); - } - DrawHealth(scopedView, adjustedScopedView, player); DrawScore(scopedView, player); DrawWeaponAmmo(adjustedScopedView, player); @@ -209,6 +204,7 @@ namespace Jazz2::UI DrawWeaponWheel(scopedView, player); } + DrawViewportSeparators(); DrawCoins(view, charOffset); DrawGems(view, charOffset); DrawActiveBoss(adjustedView); @@ -736,6 +732,39 @@ namespace Jazz2::UI } } + void HUD::DrawViewportSeparators() + { + switch (_levelHandler->_assignedViewports.size()) { + case 2: { + if (PreferencesCache::PreferVerticalSplitscreen) { + std::int32_t halfW = ViewSize.X / 2; + DrawSolid(Vector2f(halfW - 1.0f, 0.0f), ShadowLayer, Vector2f(1.0f, ViewSize.Y), Colorf(0.0f, 0.0f, 0.0f, 0.4f)); + DrawSolid(Vector2f(halfW, 0.0f), ShadowLayer, Vector2f(1.0f, ViewSize.Y), Colorf(1.0f, 1.0f, 1.0f, 0.1f), true); + } else { + std::int32_t halfH = ViewSize.Y / 2; + DrawSolid(Vector2f(0.0f, halfH - 1.0f), ShadowLayer, Vector2f(ViewSize.X, 1.0f), Colorf(1.0f, 1.0f, 1.0f, 0.1f), true); + DrawSolid(Vector2f(0.0f, halfH), ShadowLayer, Vector2f(ViewSize.X, 1.0f), Colorf(0.0f, 0.0f, 0.0f, 0.4f)); + } + break; + } + case 3: { + std::int32_t halfW = ViewSize.X / 2; + std::int32_t halfH = ViewSize.Y / 2; + DrawSolid(Vector2f(halfW, halfH), ShadowLayer, Vector2f(halfW, halfH), Colorf::Black); + DEATH_FALLTHROUGH + } + case 4: { + std::int32_t halfW = ViewSize.X / 2; + std::int32_t halfH = ViewSize.Y / 2; + DrawSolid(Vector2f(halfW - 1.0f, 0.0f), ShadowLayer, Vector2f(1.0f, ViewSize.Y), Colorf(0.0f, 0.0f, 0.0f, 0.4f)); + DrawSolid(Vector2f(halfW, 0.0f), ShadowLayer, Vector2f(1.0f, ViewSize.Y), Colorf(1.0f, 1.0f, 1.0f, 0.1f), true); + DrawSolid(Vector2f(0.0f, halfH - 1.0f), ShadowLayer, Vector2f(ViewSize.X, 1.0f), Colorf(1.0f, 1.0f, 1.0f, 0.1f), true); + DrawSolid(Vector2f(0.0f, halfH), ShadowLayer, Vector2f(ViewSize.X, 1.0f), Colorf(0.0f, 0.0f, 0.0f, 0.4f)); + break; + } + } + } + void HUD::DrawCoins(const Rectf& view, std::int32_t& charOffset) { constexpr float StillTime = 120.0f; diff --git a/Sources/Jazz2/UI/HUD.h b/Sources/Jazz2/UI/HUD.h index d2c1bc48..83073961 100644 --- a/Sources/Jazz2/UI/HUD.h +++ b/Sources/Jazz2/UI/HUD.h @@ -30,6 +30,7 @@ namespace Jazz2::UI void OnTouchEvent(const TouchEvent& event, uint32_t& overrideActions); void ShowLevelText(const StringView text); + void DrawViewportSeparators(); void ShowCoins(std::int32_t count); void ShowGems(std::int32_t count); diff --git a/Sources/Jazz2/UI/Menu/ControlsOptionsSection.cpp b/Sources/Jazz2/UI/Menu/ControlsOptionsSection.cpp index 595fdae5..bb027ce9 100644 --- a/Sources/Jazz2/UI/Menu/ControlsOptionsSection.cpp +++ b/Sources/Jazz2/UI/Menu/ControlsOptionsSection.cpp @@ -14,9 +14,14 @@ namespace Jazz2::UI::Menu ControlsOptionsSection::ControlsOptionsSection() : _isDirty(false) { - for (std::int32_t i = 0; i < ControlScheme::MaxSupportedPlayers; i++) { + if (ControlScheme::MaxSupportedPlayers > 1) { + for (std::int32_t i = 0; i < ControlScheme::MaxSupportedPlayers; i++) { + // TRANSLATORS: Menu item in Options > Controls section + _items.emplace_back(ControlsOptionsItem { ControlsOptionsItemType::RemapControls, _f("Remap Controls for Player %i", i + 1), false, i }); + } + } else { // TRANSLATORS: Menu item in Options > Controls section - _items.emplace_back(ControlsOptionsItem { ControlsOptionsItemType::RemapControls, _f("Remap Controls for Player #%i", i + 1), false, i }); + _items.emplace_back(ControlsOptionsItem { ControlsOptionsItemType::RemapControls, _("Remap Controls") }); } // TRANSLATORS: Menu item in Options > Controls section _items.emplace_back(ControlsOptionsItem { ControlsOptionsItemType::TouchControls, _("Touch Controls") }); @@ -66,7 +71,7 @@ namespace Jazz2::UI::Menu void ControlsOptionsSection::OnLayoutItem(Canvas* canvas, ListViewItem& item) { - item.Height = (item.Item.HasBooleanValue ? 52 : ItemHeight * 8 / 7); + item.Height = (item.Item.HasBooleanValue ? 52 : (item.Item.Type == ControlsOptionsItemType::RemapControls ? (ItemHeight * 4 / 5) : (ItemHeight * 8 / 7))); } void ControlsOptionsSection::OnDrawItem(Canvas* canvas, ListViewItem& item, int32_t& charOffset, bool isSelected) diff --git a/Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp b/Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp index 32f1aee7..81cd6f1d 100644 --- a/Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp +++ b/Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp @@ -36,6 +36,8 @@ namespace Jazz2::UI::Menu // TRANSLATORS: Menu item in Options > Graphics section _items.emplace_back(GraphicsOptionsItem { GraphicsOptionsItemType::UnalignedViewport, _("Unaligned Viewport"), true }); // TRANSLATORS: Menu item in Options > Graphics section + _items.emplace_back(GraphicsOptionsItem { GraphicsOptionsItemType::PreferVerticalSplitscreen, _("Preferred Splitscreen"), true }); + // TRANSLATORS: Menu item in Options > Graphics section _items.emplace_back(GraphicsOptionsItem { GraphicsOptionsItemType::KeepAspectRatioInCinematics, _("Keep Aspect Ratio In Cinematics"), true }); // TRANSLATORS: Menu item in Options > Graphics section _items.emplace_back(GraphicsOptionsItem { GraphicsOptionsItemType::ShowPerformanceMetrics, _("Performance Metrics"), true }); @@ -114,6 +116,7 @@ namespace Jazz2::UI::Menu case GraphicsOptionsItemType::LowWaterQuality: enabled = PreferencesCache::LowWaterQuality; customText = (enabled ? _("Low") : _("High")); break; case GraphicsOptionsItemType::ShowPlayerTrails: enabled = PreferencesCache::ShowPlayerTrails; break; case GraphicsOptionsItemType::UnalignedViewport: enabled = PreferencesCache::UnalignedViewport; customText = (enabled ? _("Enabled \f[c:#d0705d](Experimental)\f[/c]") : _("Disabled")); break; + case GraphicsOptionsItemType::PreferVerticalSplitscreen: enabled = PreferencesCache::PreferVerticalSplitscreen; customText = (enabled ? _("Vertical") : _("Horizontal")); break; case GraphicsOptionsItemType::KeepAspectRatioInCinematics: enabled = PreferencesCache::KeepAspectRatioInCinematics; break; case GraphicsOptionsItemType::ShowPerformanceMetrics: enabled = PreferencesCache::ShowPerformanceMetrics; break; } @@ -182,6 +185,13 @@ namespace Jazz2::UI::Menu _animation = 0.0f; _root->PlaySfx("MenuSelect"_s, 0.6f); break; + case GraphicsOptionsItemType::PreferVerticalSplitscreen: + PreferencesCache::PreferVerticalSplitscreen = !PreferencesCache::PreferVerticalSplitscreen; + _root->ApplyPreferencesChanges(ChangedPreferencesType::Graphics); + _isDirty = true; + _animation = 0.0f; + _root->PlaySfx("MenuSelect"_s, 0.6f); + break; case GraphicsOptionsItemType::KeepAspectRatioInCinematics: PreferencesCache::KeepAspectRatioInCinematics = !PreferencesCache::KeepAspectRatioInCinematics; _isDirty = true; diff --git a/Sources/Jazz2/UI/Menu/GraphicsOptionsSection.h b/Sources/Jazz2/UI/Menu/GraphicsOptionsSection.h index 2e98052d..880d4b53 100644 --- a/Sources/Jazz2/UI/Menu/GraphicsOptionsSection.h +++ b/Sources/Jazz2/UI/Menu/GraphicsOptionsSection.h @@ -13,6 +13,7 @@ namespace Jazz2::UI::Menu LowWaterQuality, ShowPlayerTrails, UnalignedViewport, + PreferVerticalSplitscreen, KeepAspectRatioInCinematics, ShowPerformanceMetrics }; diff --git a/Sources/Jazz2/UI/Menu/InGameMenu.cpp b/Sources/Jazz2/UI/Menu/InGameMenu.cpp index f0819158..224be9a1 100644 --- a/Sources/Jazz2/UI/Menu/InGameMenu.cpp +++ b/Sources/Jazz2/UI/Menu/InGameMenu.cpp @@ -127,11 +127,6 @@ namespace Jazz2::UI::Menu auto& viewport = viewports[i]; Rectf scopedView = viewport->GetBounds(); DrawTexture(*viewport->_blurPass4.GetTarget(), Vector2f(scopedView.X, scopedView.Y), 500, Vector2f(scopedView.W, scopedView.H), Vector4f(1.0f, 0.0f, 1.0f, 0.0f), Colorf(0.5f, 0.5f, 0.5f, std::min(AnimTime * 8.0f, 1.0f))); - - if (i < viewports.size() - 1) { - DrawSolid(Vector2f(0.0f, scopedView.H - 1.0f), ShadowLayer, Vector2f(scopedView.W, 1.0f), Colorf(1.0f, 1.0f, 1.0f, 0.02f), true); - DrawSolid(Vector2f(0.0f, scopedView.H), ShadowLayer, Vector2f(scopedView.W, 1.0f), Colorf(0.0f, 0.0f, 0.0f, 0.2f)); - } Vector4f ambientColor = viewport->_ambientLight; if (ambientColor.W < 1.0f) { @@ -139,6 +134,8 @@ namespace Jazz2::UI::Menu } } + DrawViewportSeparators(); + if (_owner->_touchButtonsTimer > 0.0f && _owner->_sections.size() >= 2) { float arrowScale = (ViewSize.Y >= 300 ? 1.0f : 0.7f); _owner->DrawElement(MenuLineArrow, -1, static_cast(center.X), titleY - (ViewSize.Y >= 300 ? 30.0f : 12.0f), ShadowLayer, Alignment::Center, Colorf::White, arrowScale, arrowScale); @@ -183,6 +180,39 @@ namespace Jazz2::UI::Menu return true; } + void InGameMenu::MenuBackgroundCanvas::DrawViewportSeparators() + { + switch (_owner->_root->_assignedViewports.size()) { + case 2: { + if (PreferencesCache::PreferVerticalSplitscreen) { + std::int32_t halfW = ViewSize.X / 2; + DrawSolid(Vector2f(halfW - 1.0f, 0.0f), ShadowLayer, Vector2f(1.0f, ViewSize.Y), Colorf(0.0f, 0.0f, 0.0f, 0.2f)); + DrawSolid(Vector2f(halfW, 0.0f), ShadowLayer, Vector2f(1.0f, ViewSize.Y), Colorf(1.0f, 1.0f, 1.0f, 0.02f), true); + } else { + std::int32_t halfH = ViewSize.Y / 2; + DrawSolid(Vector2f(0.0f, halfH - 1.0f), ShadowLayer, Vector2f(ViewSize.X, 1.0f), Colorf(1.0f, 1.0f, 1.0f, 0.02f), true); + DrawSolid(Vector2f(0.0f, halfH), ShadowLayer, Vector2f(ViewSize.X, 1.0f), Colorf(0.0f, 0.0f, 0.0f, 0.2f)); + } + break; + } + case 3: { + std::int32_t halfW = ViewSize.X / 2; + std::int32_t halfH = ViewSize.Y / 2; + DrawSolid(Vector2f(halfW, halfH), ShadowLayer, Vector2f(halfW, halfH), Colorf::Black); + DEATH_FALLTHROUGH + } + case 4: { + std::int32_t halfW = ViewSize.X / 2; + std::int32_t halfH = ViewSize.Y / 2; + DrawSolid(Vector2f(halfW - 1.0f, 0.0f), ShadowLayer, Vector2f(1.0f, ViewSize.Y), Colorf(0.0f, 0.0f, 0.0f, 0.2f)); + DrawSolid(Vector2f(halfW, 0.0f), ShadowLayer, Vector2f(1.0f, ViewSize.Y), Colorf(1.0f, 1.0f, 1.0f, 0.02f), true); + DrawSolid(Vector2f(0.0f, halfH - 1.0f), ShadowLayer, Vector2f(ViewSize.X, 1.0f), Colorf(1.0f, 1.0f, 1.0f, 0.02f), true); + DrawSolid(Vector2f(0.0f, halfH), ShadowLayer, Vector2f(ViewSize.X, 1.0f), Colorf(0.0f, 0.0f, 0.0f, 0.2f)); + break; + } + } + } + bool InGameMenu::MenuClippedCanvas::OnDraw(RenderQueue& renderQueue) { if (_owner->_sections.empty()) { diff --git a/Sources/Jazz2/UI/Menu/InGameMenu.h b/Sources/Jazz2/UI/Menu/InGameMenu.h index 3ab3917a..aea6b96f 100644 --- a/Sources/Jazz2/UI/Menu/InGameMenu.h +++ b/Sources/Jazz2/UI/Menu/InGameMenu.h @@ -84,6 +84,8 @@ namespace Jazz2::UI::Menu private: InGameMenu* _owner; + + void DrawViewportSeparators(); }; class MenuClippedCanvas : public Canvas diff --git a/Sources/Jazz2/UI/Menu/RemapControlsSection.cpp b/Sources/Jazz2/UI/Menu/RemapControlsSection.cpp index 35e77462..869d3e29 100644 --- a/Sources/Jazz2/UI/Menu/RemapControlsSection.cpp +++ b/Sources/Jazz2/UI/Menu/RemapControlsSection.cpp @@ -167,8 +167,13 @@ namespace Jazz2::UI::Menu _root->DrawElement(MenuLine, 1, centerX, bottomLine, IMenuContainer::MainLayer, Alignment::Center, Colorf::White, 1.6f); std::int32_t charOffset = 0; - _root->DrawStringShadow(_f("Remap Controls for Player #%i", _playerIndex + 1), charOffset, centerX, topLine - 21.0f, IMenuContainer::FontLayer, - Alignment::Center, Colorf(0.46f, 0.46f, 0.46f, 0.5f), 0.9f, 0.7f, 1.1f, 1.1f, 0.4f, 0.9f); + if (ControlScheme::MaxSupportedPlayers > 1) { + _root->DrawStringShadow(_f("Remap Controls for Player %i", _playerIndex + 1), charOffset, centerX, topLine - 21.0f, IMenuContainer::FontLayer, + Alignment::Center, Colorf(0.46f, 0.46f, 0.46f, 0.5f), 0.9f, 0.7f, 1.1f, 1.1f, 0.4f, 0.9f); + } else { + _root->DrawStringShadow(_("Remap Controls"), charOffset, centerX, topLine - 21.0f, IMenuContainer::FontLayer, + Alignment::Center, Colorf(0.46f, 0.46f, 0.46f, 0.5f), 0.9f, 0.7f, 1.1f, 1.1f, 0.4f, 0.9f); + } if (_waitForInput) { Colorf textColor = Font::DefaultColor; diff --git a/Sources/Jazz2/UI/Menu/StartGameOptionsSection.cpp b/Sources/Jazz2/UI/Menu/StartGameOptionsSection.cpp index 31a4974d..1ce8d498 100644 --- a/Sources/Jazz2/UI/Menu/StartGameOptionsSection.cpp +++ b/Sources/Jazz2/UI/Menu/StartGameOptionsSection.cpp @@ -195,8 +195,8 @@ namespace Jazz2::UI::Menu offset = 50.0f; spacing = 100.0f; } else { - offset = 100.0f; - spacing = 300.0f / _availableCharacters; + offset = 36.0f + 20.0f * ControlScheme::MaxSupportedPlayers; + spacing = 300.0f / ControlScheme::MaxSupportedPlayers; } if (contentBounds.W < 480) { @@ -217,10 +217,10 @@ namespace Jazz2::UI::Menu _root->DrawElement(MenuGlow, 0, x, center.Y + 28.0f, IMenuContainer::MainLayer, Alignment::Center, Colorf(1.0f, 1.0f, 1.0f, 0.2f), (j + 3) * 0.4f, 2.2f, true, true); _root->DrawStringShadow(stringBuffer, charOffset, x, center.Y + 28.0f, IMenuContainer::FontLayer, - Alignment::Center, Colorf(0.45f, 0.45f, 0.45f, 0.5f), 1.0f, 0.4f, 0.9f, 0.9f, 0.8f, 0.9f); + Alignment::Center, Colorf(0.45f, 0.45f, 0.45f, 0.5f), 1.0f, 0.4f, 0.9f, 0.9f, 0.8f, 1.0f); } else { _root->DrawStringShadow(stringBuffer, charOffset, x, center.Y + 28.0f, IMenuContainer::FontLayer, - Alignment::Center, Font::DefaultColor, 0.8f, 0.0f, 4.0f, 4.0f, 0.4f, 0.9f); + Alignment::Center, Font::DefaultColor, 0.8f, 0.0f, 4.0f, 4.0f, 0.4f, 1.0f); } } diff --git a/Sources/Main.cpp b/Sources/Main.cpp index 2d0476f0..e3f6a695 100644 --- a/Sources/Main.cpp +++ b/Sources/Main.cpp @@ -93,7 +93,7 @@ class GameEventHandler : public IAppEventHandler, public IInputEventHandler, pub void OnPreInit(AppConfiguration& config) override; void OnInit() override; - void OnFrameStart() override; + void OnBeginFrame() override; void OnPostUpdate() override; void OnResizeWindow(std::int32_t width, std::int32_t height) override; void OnShutdown() override; @@ -409,7 +409,7 @@ void GameEventHandler::OnInit() LOGI("Rendering resolution: %ix%i", res.X, res.Y); } -void GameEventHandler::OnFrameStart() +void GameEventHandler::OnBeginFrame() { if (!_pendingCallbacks.empty()) { ZoneScopedNC("Pending callbacks", 0x888888); diff --git a/Sources/nCine/Application.cpp b/Sources/nCine/Application.cpp index b535c505..be823d16 100644 --- a/Sources/nCine/Application.cpp +++ b/Sources/nCine/Application.cpp @@ -667,7 +667,7 @@ namespace nCine LOGI("Application initialized"); #if defined(NCINE_PROFILING) - timings_[(int)Timings::InitCommon] = profileStartTime_.secondsSince(); + timings_[(std::int32_t)Timings::InitCommon] = profileStartTime_.secondsSince(); #endif { ZoneScopedNC("onInit", 0x81A861); @@ -676,7 +676,7 @@ namespace nCine #endif appEventHandler_->OnInit(); #if defined(NCINE_PROFILING) - timings_[(int)Timings::AppInit] = profileStartTime_.secondsSince(); + timings_[(std::int32_t)Timings::AppInit] = profileStartTime_.secondsSince(); #endif LOGI("IAppEventHandler::OnInit() invoked"); } @@ -712,13 +712,13 @@ namespace nCine #endif { - ZoneScopedNC("OnFrameStart", 0x81A861); + ZoneScopedNC("OnBeginFrame", 0x81A861); #if defined(NCINE_PROFILING) profileStartTime_ = TimeStamp::now(); #endif - appEventHandler_->OnFrameStart(); + appEventHandler_->OnBeginFrame(); #if defined(NCINE_PROFILING) - timings_[(int)Timings::FrameStart] = profileStartTime_.secondsSince(); + timings_[(std::int32_t)Timings::BeginFrame] = profileStartTime_.secondsSince(); #endif } @@ -737,7 +737,7 @@ namespace nCine #endif screenViewport_->update(); #if defined(NCINE_PROFILING) - timings_[(int)Timings::Update] = profileStartTime_.secondsSince(); + timings_[(std::int32_t)Timings::Update] = profileStartTime_.secondsSince(); #endif } @@ -748,7 +748,7 @@ namespace nCine #endif appEventHandler_->OnPostUpdate(); #if defined(NCINE_PROFILING) - timings_[(int)Timings::PostUpdate] = profileStartTime_.secondsSince(); + timings_[(std::int32_t)Timings::PostUpdate] = profileStartTime_.secondsSince(); #endif } @@ -759,7 +759,7 @@ namespace nCine #endif screenViewport_->visit(); #if defined(NCINE_PROFILING) - timings_[(int)Timings::Visit] = profileStartTime_.secondsSince(); + timings_[(std::int32_t)Timings::Visit] = profileStartTime_.secondsSince(); #endif } @@ -772,7 +772,7 @@ namespace nCine RenderQueue* imguiRenderQueue = (guiSettings_.imguiViewport ? guiSettings_.imguiViewport->renderQueue_.get() : screenViewport_->renderQueue_.get()); imguiDrawing_->endFrame(*imguiRenderQueue); # if defined(NCINE_PROFILING) - timings_[(int)Timings::ImGui] += profileStartTime_.secondsSince(); + timings_[(std::int32_t)Timings::ImGui] += profileStartTime_.secondsSince(); # endif } #endif @@ -785,7 +785,7 @@ namespace nCine screenViewport_->sortAndCommitQueue(); screenViewport_->draw(); #if defined(NCINE_PROFILING) - timings_[(int)Timings::Draw] = profileStartTime_.secondsSince(); + timings_[(std::int32_t)Timings::Draw] = profileStartTime_.secondsSince(); #endif } } else { @@ -797,7 +797,7 @@ namespace nCine # endif imguiDrawing_->endFrame(); # if defined(NCINE_PROFILING) - timings_[(int)Timings::ImGui] += profileStartTime_.secondsSince(); + timings_[(std::int32_t)Timings::ImGui] += profileStartTime_.secondsSince(); # endif } #endif @@ -812,9 +812,9 @@ namespace nCine #if defined(NCINE_PROFILING) profileStartTime_ = TimeStamp::now(); #endif - appEventHandler_->OnFrameEnd(); + appEventHandler_->OnEndFrame(); #if defined(NCINE_PROFILING) - timings_[(int)Timings::FrameEnd] = profileStartTime_.secondsSince(); + timings_[(std::int32_t)Timings::EndFrame] = profileStartTime_.secondsSince(); #endif } diff --git a/Sources/nCine/Application.h b/Sources/nCine/Application.h index 97022c25..3aa32ac4 100644 --- a/Sources/nCine/Application.h +++ b/Sources/nCine/Application.h @@ -69,14 +69,14 @@ namespace nCine PreInit, InitCommon, AppInit, - FrameStart, + BeginFrame, UpdateVisitDraw, Update, PostUpdate, Visit, Draw, ImGui, - FrameEnd, + EndFrame, Count }; diff --git a/Sources/nCine/Graphics/ImGuiDebugOverlay.cpp b/Sources/nCine/Graphics/ImGuiDebugOverlay.cpp index db50c056..54e1cfad 100644 --- a/Sources/nCine/Graphics/ImGuiDebugOverlay.cpp +++ b/Sources/nCine/Graphics/ImGuiDebugOverlay.cpp @@ -152,12 +152,12 @@ namespace nCine #if defined(NCINE_PROFILING) const float* timings = theApplication().GetTimings(); - plotValues_[ValuesType::FrameStart][index_] = timings[(int)Application::Timings::FrameStart] * 1000.0f; + plotValues_[ValuesType::BeginFrame][index_] = timings[(int)Application::Timings::BeginFrame] * 1000.0f; if (appCfg.withScenegraph) { plotValues_[ValuesType::PostUpdate][index_] = timings[(int)Application::Timings::PostUpdate] * 1000.0f; } plotValues_[ValuesType::ImGui][index_] = timings[(int)Application::Timings::ImGui] * 1000.0f; - plotValues_[ValuesType::FrameEnd][index_] = timings[(int)Application::Timings::FrameEnd] * 1000.0f; + plotValues_[ValuesType::EndFrame][index_] = timings[(int)Application::Timings::EndFrame] * 1000.0f; if (appCfg.withScenegraph) { plotValues_[ValuesType::UpdateVisitDraw][index_] = timings[(int)Application::Timings::Update] * 1000.0f + @@ -1607,10 +1607,10 @@ namespace nCine if (plotAdditionalFrameValues_) { ImGui::Separator(); - ImGui::PlotLines("OnFrameStart", plotValues_[ValuesType::FrameStart].get(), numValues_, index_, nullptr, 0.0f, maxUpdateVisitDraw_, ImVec2(appWidth * 0.2f, 0.0f)); + ImGui::PlotLines("OnFrameStart", plotValues_[ValuesType::BeginFrame].get(), numValues_, index_, nullptr, 0.0f, maxUpdateVisitDraw_, ImVec2(appWidth * 0.2f, 0.0f)); if (appCfg.withScenegraph) ImGui::PlotLines("OnPostUpdate", plotValues_[ValuesType::PostUpdate].get(), numValues_, index_, nullptr, 0.0f, maxUpdateVisitDraw_, ImVec2(appWidth * 0.2f, 0.0f)); - ImGui::PlotLines("OnFrameEnd", plotValues_[ValuesType::FrameEnd].get(), numValues_, index_, nullptr, 0.0f, maxUpdateVisitDraw_, ImVec2(appWidth * 0.2f, 0.0f)); + ImGui::PlotLines("OnFrameEnd", plotValues_[ValuesType::EndFrame].get(), numValues_, index_, nullptr, 0.0f, maxUpdateVisitDraw_, ImVec2(appWidth * 0.2f, 0.0f)); ImGui::PlotLines("ImGui", plotValues_[ValuesType::ImGui].get(), numValues_, index_, nullptr, 0.0f, maxUpdateVisitDraw_, ImVec2(appWidth * 0.2f, 0.0f)); } #endif diff --git a/Sources/nCine/Graphics/ImGuiDebugOverlay.h b/Sources/nCine/Graphics/ImGuiDebugOverlay.h index 4db504b0..2144c6a4 100644 --- a/Sources/nCine/Graphics/ImGuiDebugOverlay.h +++ b/Sources/nCine/Graphics/ImGuiDebugOverlay.h @@ -43,14 +43,14 @@ namespace nCine enum { FrameTime = 0, - FrameStart, + BeginFrame, UpdateVisitDraw, Update, PostUpdate, Visit, Draw, ImGui, - FrameEnd, + EndFrame, CulledNodes, VboUsed, IboUsed, diff --git a/Sources/nCine/IAppEventHandler.h b/Sources/nCine/IAppEventHandler.h index d201990f..897c4693 100644 --- a/Sources/nCine/IAppEventHandler.h +++ b/Sources/nCine/IAppEventHandler.h @@ -19,13 +19,13 @@ namespace nCine /// Called once on application initialization virtual void OnInit() { } /// Called at the start of each frame - virtual void OnFrameStart() { } + virtual void OnBeginFrame() { } /// Called every time the scenegraph has been traversed and all nodes have been transformed virtual void OnPostUpdate() { } /// Called every time a viewport is going to be drawn virtual void OnDrawViewport(Viewport& viewport) { } /// Called at the end of each frame, just before swapping buffers - virtual void OnFrameEnd() { } + virtual void OnEndFrame() { } /// Called every time the window is resized (by the system or the user) virtual void OnResizeWindow(int width, int height) { } /// Called once on application shutdown