mirror/projectm
3
0
Fork 0
mirror of https://github.com/projectM-visualizer/projectm.git synced 2026-03-02 05:25:41 +00:00
Code Issues Projects Releases Wiki Activity

Menu and FPS changes (#303)

Browse Source 
* Set build target to 10 (generic) instead the specific build the original author used.

* Move help menu down a line and indent to align with preset title and FPS.

* More accurate FPS:
 - by resetting timers whenever F5 is pushed.
 - by performing math based on percise seconds that passed, rather than assuming it will trigger exactly 250 milliseconds.

* Set idle preset name so it's displayed with F3.
This commit is contained in:
milkdropper
2020-01-18 14:57:57 +04:00
committed by Mischa Spiegelmock
parent 8c4763e79a
commit b4a3fd6d0f
14 changed files with 30 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/libprojectM/KeyHandler.cpp
View File

@ -123,7 +123,6 @@ void projectM::default_key_handler( projectMEvent event, projectMKeycode keycode
case PROJECTM_K_h:
renderer->showhelp = !renderer->showhelp;
renderer->showstats= false;
renderer->showfps=false;
case PROJECTM_K_F1:
renderer->showhelp = !renderer->showhelp;
renderer->showstats=false;
@ -135,10 +134,15 @@ void projectM::default_key_handler( projectMEvent event, projectMKeycode keycode
case PROJECTM_K_F5:
renderer->showfps = !renderer->showfps;
if (renderer->showfps)
{
renderer->showpreset = false;
}
// Initialize counters and reset frame count.
renderer->lastTime = duration_cast<milliseconds>(system_clock::now().time_since_epoch());
renderer->currentTime = duration_cast<milliseconds>(system_clock::now().time_since_epoch());
renderer->totalframes = 0;
// Hide preset name from screen and replace it with FPS counter.
if (renderer->showfps)
{
renderer->showpreset = false;
}
break;
case PROJECTM_K_F4:
if (!renderer->showhelp)
@ -146,10 +150,11 @@ void projectM::default_key_handler( projectMEvent event, projectMKeycode keycode
break;
case PROJECTM_K_F3: {
renderer->showpreset = !renderer->showpreset;
if (renderer->showpreset)
{
renderer->showfps = false;
}
// Hide FPS from screen and replace it with preset name.
if (renderer->showpreset)
{
renderer->showfps = false;
}
break;
}
case PROJECTM_K_F2: