fixed some 60fps issues

Fixes OpenGL context for rendering graphics (#318 )
Added more json file translations (#317 )
2022-05-13 20:58:05 -04:00 · 2022-05-13 20:52:34 -04:00 · 2022-05-13 20:51:45 -04:00 · 2022-05-13 20:51:02 -04:00
16 changed files with 368 additions and 3 deletions
--- a/include/translations/icon_item_pause_static_de.json
+++ b/include/translations/icon_item_pause_static_de.json
@ -0,0 +1,31 @@
+[
+  {
+    "pause_botw_title": "Grund des Brunnens",
+    "pause_current_position": "ORT",
+    "pause_deku_title": "Im Deku-Baum",
+    "pause_dodongo_title": "Dodongos Höhle",
+    "pause_equipment": "AUSRÜSTUNG",
+    "pause_fire_title": "Feuertempel",
+    "pause_forest_title": "Waldtempel",
+    "pause_ice_cavern_title": "Eishöhle",
+    "pause_inside_jabu_title": "Jabu-Jabus Bauch",
+    "pause_map": "KARTE",
+    "pause_no": "Nein",
+    "pause_quest_status": "STATUS",
+    "pause_save": "SICHERN",
+    "pause_save_confirmation": "Spielstand gesichert.",
+    "pause_save_prompt": "Spielstand sichern ?",
+    "pause_select_item": "GEGENSTÄNDE",
+    "pause_shadow_title": "Schattentempel",
+    "pause_spirit_title": "Geistertempel",
+    "pause_to_decide": "Bestätigen mit",
+    "pause_to_equip": "Ausrüsten mit",
+    "pause_to_equipment": "Ausrüstung",
+    "pause_to_map": "Karte",
+    "pause_to_play_melody": "Melodie anhören mit",
+    "pause_to_quest_status": "Status",
+    "pause_to_select_item": "Gegenstände",
+    "pause_water_title": "Wassertempel",
+    "pause_yes": "Ja"
+  }
+]
--- a/include/translations/icon_item_pause_static_en.json
+++ b/include/translations/icon_item_pause_static_en.json
@ -0,0 +1,31 @@
+[
+  {
+    "pause_botw_title": "Bottom of the Well",
+    "pause_current_position": "CURRENT POSITION",
+    "pause_deku_title": "Inside the Deku Tree",
+    "pause_dodongo_title": "Dodongo's Cavern",
+    "pause_equipment": "EQUIPMENT",
+    "pause_fire_title": "Fire Temple",
+    "pause_forest_title": "Forest Temple",
+    "pause_ice_cavern_title": "Ice Cavern",
+    "pause_inside_jabu_title": "Inside Jabu-Jabu's Belly",
+    "pause_map": "MAP",
+    "pause_no": "No",
+    "pause_quest_status": "QUEST STATUS",
+    "pause_save": "SAVE",
+    "pause_save_confirmation": "Game saved.",
+    "pause_save_prompt": "Would you like to save?",
+    "pause_select_item": "SELECT ITEM",
+    "pause_shadow_title": "Shadow Temple",
+    "pause_spirit_title": "Spirit Temple",
+    "pause_to_decide": "to Decide",
+    "pause_to_equip": "to Equip",
+    "pause_to_equipment": "To Equipment",
+    "pause_to_map": "To Map",
+    "pause_to_play_melody": "to Play Melody",
+    "pause_to_quest_status": "To Quest Status",
+    "pause_to_select_item": "To Select Item",
+    "pause_water_title": "Water Temple",
+    "pause_yes": "Yes"
+  }
+]
--- a/include/translations/icon_item_pause_static_es.json
+++ b/include/translations/icon_item_pause_static_es.json
@ -0,0 +1,31 @@
+[
+  {
+    "pause_botw_title": "Fondo del pozo",
+    "pause_current_position": "UBICACIÓN ACTUAL",
+    "pause_deku_title": "Gran Árbol Deku",
+    "pause_dodongo_title": "Caverna Dodongo",
+    "pause_equipment": "EQUIPO",
+    "pause_fire_title": "Templo del Fuego",
+    "pause_forest_title": "Templo del Bosque",
+    "pause_ice_cavern_title": "Caverna de hielo",
+    "pause_inside_jabu_title": "En la barriga de Jabu-Jabu",
+    "pause_map": "MAPA",
+    "pause_no": "No",
+    "pause_quest_status": "ESTADO DE LA AVENTURA",
+    "pause_save": "GUARDAR",
+    "pause_save_confirmation": "Partida guardada.",
+    "pause_save_prompt": "¿Desea guardar la partida?",
+    "pause_select_item": "OBJETOS",
+    "pause_shadow_title": "Templo de las Sombras",
+    "pause_spirit_title": "Templo del Espíritu",
+    "pause_to_decide": "para elegir",
+    "pause_to_equip": "para equipar",
+    "pause_to_equipment": "Al equipo",
+    "pause_to_map": "Al mapa",
+    "pause_to_play_melody": "para escuchar la canción",
+    "pause_to_quest_status": "Al estado de la aventura",
+    "pause_to_select_item": "A objetos",
+    "pause_water_title": "Templo del Agua",
+    "pause_yes": "Sí"
+  }
+]
--- a/include/translations/icon_item_pause_static_fr.json
+++ b/include/translations/icon_item_pause_static_fr.json
@ -0,0 +1,31 @@
+[
+  {
+    "pause_botw_title": "Puits",
+    "pause_current_position": "POSITION ACTUELLE",
+    "pause_deku_title": "Arbre Mojo",
+    "pause_dodongo_title": "Caverne Dodongo",
+    "pause_equipment": "EQUIPEMENT",
+    "pause_fire_title": "Temple du Feu",
+    "pause_forest_title": "Temple de la Forêt",
+    "pause_ice_cavern_title": "Caverne Polaire",
+    "pause_inside_jabu_title": "Ventre de Jabu-Jabu",
+    "pause_map": "CARTE",
+    "pause_no": "Non",
+    "pause_quest_status": "STATUT",
+    "pause_save": "SAUVEGARDER",
+    "pause_save_confirmation": "Jeu sauvegardé",
+    "pause_save_prompt": "Voulez-vous sauvegarder ?",
+    "pause_select_item": "INVENTAIRE",
+    "pause_shadow_title": "Temple de l'Ombre",
+    "pause_spirit_title": "Temple de l'Esprit",
+    "pause_to_decide": "pour valider",
+    "pause_to_equip": "pour équiper",
+    "pause_to_equipment": "Equipement",
+    "pause_to_map": "Carte",
+    "pause_to_play_melody": "pour entendre le chant",
+    "pause_to_quest_status": "Statut",
+    "pause_to_select_item": "Inventaire",
+    "pause_water_title": "Temple de l'Eau",
+    "pause_yes": "Oui"
+  }
+]
--- a/include/translations/title_card_de.json
+++ b/include/translations/title_card_de.json
@ -0,0 +1,14 @@
+[
+  {
+    "barinade_title_card": "Elektroterrestrisches Biotentakel\nBARINADE",
+    "bongo_title_card": "Bestialische Schattenmonstrosität\nBONGO BONGO",
+    "ganondorf_title_card": "Großmeister des Bösen\nGANONDORF",
+    "ganon_title_card": "GANON",
+    "gohma_title_card": "Gepanzerter Spinnenparasit\nGOHMA",
+    "kingdodongo_title_card": "Infernosaurus\nKING DODONGO",
+    "morpha_title_card": "Aquamöbes Wassertentakel\nMORPHA",
+    "phantom_ganon_title_card": "Reitendes Unheil\nPHANTOM-GANON",
+    "twinrova_title_card": "Höllische Hexenarmada\nKILLA OHMAZ",
+    "volvagia_boss_title_card": "Subterraner Lavadrachoid\nVOLVAGIA"
+  }
+]
--- a/include/translations/title_card_en.json
+++ b/include/translations/title_card_en.json
@ -0,0 +1,14 @@
+[
+  {
+    "barinade_title_card": "Bio-electric Anemone\nBARINADE",
+    "bongo_title_card": "Phantom Shadow Beast\nBONGO BONGO",
+    "ganondorf_title_card": "Great King of Evil\nGANONDORF",
+    "ganon_title_card": "GANON",
+    "gohma_title_card": "Parasitic Armored Arachnid\nGOHMA",
+    "kingdodongo_title_card": "Infernal Dinosaur\nKING DODONGO",
+    "morpha_title_card": "Giant Aquatic Amoeba\nMORPHA",
+    "phantom_ganon_title_card": "Evil Spirit from Beyond\nPHANTOM GANON",
+    "twinrova_title_card": "Sorceress Sisters\nTWINROVA",
+    "volvagia_boss_title_card": "Subterranean Lava Dragon\nVOLVAGIA"
+  }
+]
--- a/include/translations/title_card_es.json
+++ b/include/translations/title_card_es.json
@ -0,0 +1,14 @@
+[
+  {
+    "barinade_title_card": "Anémona bioeléctrica\nBARINADE",
+    "bongo_title_card": "Fantasma bestial de la oscuridad\nBONGO BONGO",
+    "ganondorf_title_card": "Gran Rey Demonio\nGANONDORF",
+    "ganon_title_card": "GANON",
+    "gohma_title_card": "Arácnido parásito acorazado\nGOHMA",
+    "kingdodongo_title_card": "Dinosaurio infernal\nREY DODONGO",
+    "morpha_title_card": "Ameba acuática gigante\nMORPHA",
+    "phantom_ganon_title_card": "Espíritu maligno de ultratumba\nGANON FANTASMA",
+    "twinrova_title_card": "Hermanas hechiceras\nBIROVA",
+    "volvagia_boss_title_card": "Dragón de lava subterráneo\nVOLVAGIA"
+  }
+]
--- a/include/translations/title_card_fr.json
+++ b/include/translations/title_card_fr.json
@ -0,0 +1,14 @@
+[
+  {
+    "barinade_title_card": "Anémone Bio-Electrique\nBARINADE",
+    "bongo_title_card": "Monstre de l'Ombre\nBONGO BONGO",
+    "ganondorf_title_card": "Seigneur du Malin\nGANONDORF",
+    "ganon_title_card": "GANON",
+    "gohma_title_card": "Monstre Insectoïde Géant\nGOHMA",
+    "kingdodongo_title_card": "Dinosaure Infernal\nKING DODONGO",
+    "morpha_title_card": "Amibe Aquatique Géante\nMORPHA",
+    "phantom_ganon_title_card": "Esprit Maléfique de l'Au-Delà\nGANON SPECTRAL",
+    "twinrova_title_card": "Sorcières Jumelles\nDUO MALEFIQUE",
+    "volvagia_boss_title_card": "Dragon des Profondeurs\nVOLCANIA"
+  }
+]
--- a/include/translations/title_static_de.json
+++ b/include/translations/title_static_de.json
@ -0,0 +1,44 @@
+[
+  {
+    "are_you_sure": "Sicher ?",
+    "are_you_sure_2": "Sicher ?",
+    "check_brightness": "KONTRAST ÜBERPRÜFEN",
+    "controls": "A - Eingabe • B - Zurück",
+    "copy_button": "Kopieren",
+    "copy_to_which_file": "Wohin kopieren ?",
+    "copy_which_file": "Welche Datei ?",
+    "disk_button": "Disk",
+    "end_button": "ENDE",
+    "erase_button": "Löschen",
+    "erase_which_file": "Welche Datei ?",
+    "file_1_button": "Datei 1",
+    "file_2_button": "Datei 2",
+    "file_3_button": "Datei 3",
+    "file_copied": "Datei kopiert.",
+    "file_empty": "Datei ist leer !",
+    "file_erased": "Datei gelöscht.",
+    "file_in_use": "Datei ist belegt !",
+    "headset": "Kopfhörer",
+    "hold": "Z-Trigger halten",
+    "language": "SPRACHE",
+    "language_name": "Deutsch",
+    "language_name_all_caps": "DEUTSCH",
+    "l_targeting": "ZIELERFASSUNG (Z-TRIGGER)",
+    "mono": "Mono",
+    "name": "Name ?",
+    "no_empty_file": "Keine leere Datei !",
+    "no_file_to_copy": "Keine Datei vorhanden.",
+    "no_file_to_erase": "Keine Datei vorhanden.",
+    "open_this_file": "Datei öffnen ?",
+    "options_button": "Optionen",
+    "options": "Optionen",
+    "please_select_a_file": "Datei wählen.",
+    "quit_button": "Zurück",
+    "select_your_language": "• Wähle eine Sprache",
+    "SOUND": "SOUND",
+    "stereo": "Stereo",
+    "surround": "Surround",
+    "switch": "Einmal drücken",
+    "yes_button": "Ja"
+  }
+]
--- a/include/translations/title_static_en.json
+++ b/include/translations/title_static_en.json
@ -0,0 +1,44 @@
+[
+  {
+    "are_you_sure": "Are you sure ?",
+    "are_you_sure_2": "Are you sure ?",
+    "check_brightness": "CHECK BRIGHTNESS",
+    "controls": "A - Decide • B - Cancel",
+    "copy_button": "Copy",
+    "copy_to_which_file": "Copy to which file ?",
+    "copy_which_file": "Copy which file ?",
+    "disk_button": "Disk",
+    "end_button": "END",
+    "erase_button": "Erase",
+    "erase_which_file": "Erase which file ?",
+    "file_1_button": "File 1",
+    "file_2_button": "File 2",
+    "file_3_button": "File 3",
+    "file_copied": "File copied.",
+    "file_empty": "This is an empty file.",
+    "file_erased": "File erased.",
+    "file_in_use": "This file is in use.",
+    "headset": "Headset",
+    "hold": "Hold",
+    "language": "LANGUAGE",
+    "language_name": "English",
+    "language_name_all_caps": "ENGLISH",
+    "l_targeting": "Z TARGETING",
+    "mono": "Mono",
+    "name": "Name ?",
+    "no_empty_file": "There is no empty file.",
+    "no_file_to_copy": "No file to copy.",
+    "no_file_to_erase": "No file to erase.",
+    "open_this_file": "Open this file ?",
+    "options_button": "Options",
+    "options": "Options",
+    "please_select_a_file": "Please select a file.",
+    "quit_button": "Quit",
+    "select_your_language": "• Select your Language",
+    "SOUND": "SOUND",
+    "stereo": "Stereo",
+    "surround": "Surround",
+    "switch": "Switch",
+    "yes_button": "Yes"
+  }
+]
--- a/include/translations/title_static_es.json
+++ b/include/translations/title_static_es.json
@ -0,0 +1,44 @@
+[
+  {
+    "are_you_sure": "¿Seguro?",
+    "are_you_sure_2": "¿Seguro?",
+    "check_brightness": "CONTROL DE BRILLO",
+    "controls": "A - Elegir • B - Cancelar",
+    "copy_button": "Copiar",
+    "copy_to_which_file": "¿Dónde copio el archivo?",
+    "copy_which_file": "¿Qué archivo copio?",
+    "disk_button": "Disco",
+    "end_button": "FIN",
+    "erase_button": "Borrar",
+    "erase_which_file": "¿Qué archivo borro?",
+    "file_1_button": "Archivo 1",
+    "file_2_button": "Archivo 2",
+    "file_3_button": "Archivo 3",
+    "file_copied": "Archivo copiado.",
+    "file_empty": "Este archivo está vacío.",
+    "file_erased": "Archivo borrado.",
+    "file_in_use": "Este archivo está en uso.",
+    "headset": "Cascos",
+    "hold": "Mantener",
+    "language": "IDIOMA",
+    "language_name": "español",
+    "language_name_all_caps": "ESPAÑOL",
+    "l_targeting": "FIJAR BLANCO CON Z",
+    "mono": "Mono",
+    "name": "¿Nombre?",
+    "no_empty_file": "No hay archivos vacíos.",
+    "no_file_to_copy": "No hay archivo que copiar.",
+    "no_file_to_erase": "No hay archivo que borrar.",
+    "open_this_file": "¿Abro este archivo?",
+    "options_button": "Opciones",
+    "options": "Opciones",
+    "please_select_a_file": "Elija un archivo",
+    "quit_button": "Volver",
+    "select_your_language": "• Seleccione su idioma",
+    "SOUND": "SONIDO",
+    "stereo": "Estéreo",
+    "surround": "Surround",
+    "switch": "Cambiar",
+    "yes_button": "Sí"
+  }
+]
--- a/include/translations/title_static_fr.json
+++ b/include/translations/title_static_fr.json
@ -0,0 +1,44 @@
+[
+  {
+    "are_you_sure": "Etes-vous sûr ?",
+    "are_you_sure_2": "Etes-vous sûr ?",
+    "check_brightness": "CONTROLE LUMIERE",
+    "controls": "A - Valider • B - Annuler",
+    "copy_button": "Copier",
+    "copy_to_which_file": "Copier sur quel fichier ?",
+    "copy_which_file": "Copier quel fichier ?",
+    "disk_button": "Disk",
+    "end_button": "FIN",
+    "erase_button": "Effacer",
+    "erase_which_file": "Effacer quel fichier ?",
+    "file_1_button": "Fichier 1",
+    "file_2_button": "Fichier 2",
+    "file_3_button": "Fichter 3",
+    "file_copied": "Fichier copié",
+    "file_empty": "Ce fichier est vide",
+    "file_erased": "Fichier effacé",
+    "file_in_use": "Ce fichier est utilisé",
+    "headset": "Casque",
+    "hold": "Maintenue",
+    "language": "LANGUE",
+    "language_name": "français",
+    "language_name_all_caps": "FRANÇAIS",
+    "l_targeting": "VISEE Z",
+    "mono": "Mono",
+    "name": "Nom ?",
+    "no_empty_file": "Aucun fichier vide",
+    "no_file_to_copy": "Aucun fichier à copier",
+    "no_file_to_erase": "Aucun fichier à effacer",
+    "open_this_file": "Ouvrir ce fichier ?",
+    "options_button": "Options",
+    "options": "Options",
+    "please_select_a_file": "Veuillez choisir un fichier",
+    "quit_button": "Retour",
+    "select_your_language": "• Sélectionnez votre Langue",
+    "SOUND": "SON",
+    "stereo": "Stéréo",
+    "surround": "Surround",
+    "switch": "Fixe",
+    "yes_button": "Oui"
+  }
+]
--- a/src/code/audio_heap.cpp
+++ b/src/code/audio_heap.cpp
@ -230,7 +230,7 @@ void* AudioHeap_Alloc(AudioAllocPool* pool, u32 size)
 #ifdef _MSC_VER
 	return _aligned_malloc(ALIGN16(size), 0x10);
 #else
-	return aligned_alloc(ALIGN16(size), 0x10);
+	return aligned_alloc(0x10, ALIGN16(size));
 #endif
 	// return malloc(size);
 	u32 aligned = ALIGN16(size);
--- a/src/code/z_lib.cpp
+++ b/src/code/z_lib.cpp
@ -621,7 +621,7 @@ static inline f32 _Math_SmoothStepToF(T* pValue, f32 target, f32 fraction, const
 	float minStep = _minStep.value();
 	if(*pValue != target)
 	{
-		f32 stepSize = (target - *pValue) * (fraction * FRAMERATE_SCALER);
+		f32 stepSize = (target - *pValue) * (fraction);

 		if((stepSize >= minStep) || (stepSize <= -minStep))
 		{
--- a/src/overlays/actors/ovl_player_actor/z_player.cpp
+++ b/src/overlays/actors/ovl_player_actor/z_player.cpp
@ -14995,7 +14995,7 @@ void Player_UpdateFunc_FallingFromLight(Player* pthis, GlobalContext* globalCtx)
 				func_80853080(pthis, globalCtx);
 			}
 		}
-		Math_SmoothStepToF(&pthis->actor.velocity.y, 2.0f, 0.3f, 8.0f, 0.5f);
+		Math_SmoothStepToF(&pthis->actor.velocity.y, 2.0f, 0.3f * FRAMERATE_SCALER, 8.0f, 0.5f);
 	}

 	if((globalCtx->sceneNum == SCENE_KENJYANOMA) && func_8083ADD4(globalCtx, pthis))
--- a/src/port/window/sdl/window_sdl2.cpp
+++ b/src/port/window/sdl/window_sdl2.cpp
@ -19,6 +19,9 @@

 void quit();
 void Set_Language(u8 language_id);
+#ifndef _WIN32
+void WindowsWGL_GrabWindow(void* wnd);
+#endif

 /*
 #ifdef _WIN32
@ -238,6 +241,12 @@ namespace platform::window
 				set_fullscreen(true, false);
 			}
 #endif
+
+#ifndef _WIN32
+			SDL_GLContext* context = (SDL_GLContext* )SDL_GL_CreateContext(wnd);
+			SDL_GL_MakeCurrent(wnd, context);
+			WindowsWGL_GrabWindow(wnd);
+#endif
 			/*if(oot::config().video().vsync())
 			{
 				set_vsync(oot::config().video().vsync());
Author	SHA1	Message	Date
Blake Warner	1f47f792c5	fixed some 60fps issues	2022-05-13 20:58:05 -04:00
metronidazole	0b46da7e5f	Fixes OpenGL context for rendering graphics (#318 )	2022-05-13 20:52:34 -04:00
Amaro Martínez	39f85a6e90	Added more json file translations (#317 ) * Added json file translations for item pause * Added json file translations for title static * Added json file translations for title cards	2022-05-13 20:51:45 -04:00
metronidazole	0056219148	Fixed buffer creation in AudioHeap_Alloc (mixed params in aligned_alloc) (#319 )	2022-05-13 20:51:02 -04:00