ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "(Menu) Delta timing" 

This reverts commit 24f7acb93c.
This commit is contained in:
twinaphex 2015-02-24 03:06:25 +01:00
parent fc75b55219
commit 2e0902fda1
4 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
menu/drivers/xmb.c
View File

@ -1136,7 +1136,7 @@ static void xmb_frame(void)
if (!gl) if (!gl)
return; return;
menu_animation_update(menu->animation, menu->dt / 7500000.0); menu_animation_update(menu->animation, 0.002);
glViewport(0, 0, gl->win_width, gl->win_height); glViewport(0, 0, gl->win_width, gl->win_height);

7
menu/menu.c
View File

@ -21,7 +21,6 @@
#include "../dynamic.h" #include "../dynamic.h"
#include "../frontend/frontend.h" #include "../frontend/frontend.h"
#include "../../retroarch.h" #include "../../retroarch.h"
#include "../../performance.h"
#include <file/file_path.h> #include <file/file_path.h>
/** /**
@ -378,12 +377,6 @@ int menu_iterate(retro_input_t input,
int32_t ret = 0; int32_t ret = 0;
unsigned action = menu_input_frame(input, trigger_input); unsigned action = menu_input_frame(input, trigger_input);
menu_handle_t *menu = menu_driver_resolve();
menu->cur_time = rarch_get_time_usec();
menu->dt = menu->cur_time - menu->old_time;
menu->old_time = menu->cur_time;
if (driver.menu_ctx) if (driver.menu_ctx)
{ {
if (driver.menu_ctx->set_texture) if (driver.menu_ctx->set_texture)

9
menu/menu_driver.h
View File

@ -98,16 +98,11 @@ typedef struct
{ {
void *userdata; void *userdata;
/* Delta timing */
float dt;
float cur_time;
float old_time;
/* Used for key repeat */ /* Used for key repeat */
struct struct
{ {
float timer; unsigned timer;
float count; unsigned count;
} delay; } delay;
size_t begin; size_t begin;

2
menu/menu_input.c
View File

@ -497,7 +497,7 @@ unsigned menu_input_frame(retro_input_t input, retro_input_t trigger_input)
menu->mouse.enable = g_settings.menu.mouse_enable; menu->mouse.enable = g_settings.menu.mouse_enable;
menu->delay.count += menu->dt / 10000.0; menu->delay.count++;
if (driver.block_input) if (driver.block_input)
trigger_input = 0; trigger_input = 0;