mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-06 09:40:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "(Menu) cleaner dt formulas"

Browse Source 
This reverts commit b6e214128abae076da9f1bb603082928ed1fa9e2.
This commit is contained in:
twinaphex 2015-02-24 03:06:13 +01:00
parent 58a25ef419
commit 64527f2cef
4 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
menu/drivers/xmb.c
View File

@ -26,7 +26,6 @@
#include <file/file_path.h> #include <file/file_path.h>
#include "../../gfx/gl_common.h" #include "../../gfx/gl_common.h"
#include "../../performance.h"
#include "../../gfx/video_thread_wrapper.h" #include "../../gfx/video_thread_wrapper.h"
#include <compat/posix_string.h> #include <compat/posix_string.h>
@ -37,7 +36,7 @@
#endif #endif
#ifndef XMB_DELAY #ifndef XMB_DELAY
#define XMB_DELAY 10 #define XMB_DELAY 0.02
#endif #endif
typedef struct typedef struct
@ -1137,7 +1136,7 @@ static void xmb_frame(void)
if (!gl) if (!gl)
return; return;
menu_animation_update(menu->animation, menu->dt / IDEAL_DT); menu_animation_update(menu->animation, menu->dt / 8000000.0);
glViewport(0, 0, gl->win_width, gl->win_height); glViewport(0, 0, gl->win_width, gl->win_height);

8
menu/menu.c
View File

@ -382,10 +382,10 @@ int menu_iterate(retro_input_t input,
menu->cur_time = rarch_get_time_usec(); menu->cur_time = rarch_get_time_usec();
menu->dt = menu->cur_time - menu->old_time; menu->dt = menu->cur_time - menu->old_time;
if (menu->dt >= IDEAL_DT * 2) if (menu->dt > 30000)
menu->dt = IDEAL_DT * 2; menu->dt = 30000;
if (menu->dt <= IDEAL_DT / 2) if (menu->dt < 4000)
menu->dt = IDEAL_DT / 2; menu->dt = 4000;
menu->old_time = menu->cur_time; menu->old_time = menu->cur_time;
if (driver.menu_ctx) if (driver.menu_ctx)

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 / IDEAL_DT; menu->delay.count += menu->dt / 10000.0;
if (driver.block_input) if (driver.block_input)
trigger_input = 0; trigger_input = 0;

4
performance.h
View File

@ -44,10 +44,6 @@ extern "C" {
#define MAX_COUNTERS 64 #define MAX_COUNTERS 64
#endif #endif
#ifndef IDEAL_DT
#define IDEAL_DT (1.0 / 60.0 * 1000000.0)
#endif
extern const struct retro_perf_counter *perf_counters_rarch[MAX_COUNTERS]; extern const struct retro_perf_counter *perf_counters_rarch[MAX_COUNTERS];
extern const struct retro_perf_counter *perf_counters_libretro[MAX_COUNTERS]; extern const struct retro_perf_counter *perf_counters_libretro[MAX_COUNTERS];
extern unsigned perf_ptr_rarch; extern unsigned perf_ptr_rarch;