History

Merge branch 'master' of https://github.com/worklist/hifi

Philip Rosedale committed 13 years ago

Commit c3097742 parents 7880c74 fc3ce262 files · +9 −0Browse files

Showing the changes to interface/src/Application.cpp (1 of 2 files). Show all

Unified · Split

interface/src/Application.cpp+5−0
@@ -944,6 +944,11 @@ void Application::idle() { · 943 unmodified lines
944 // Only run simulation code if more than IDLE_SIMULATE_MSECS have passed since last time we ran944 // Only run simulation code if more than IDLE_SIMULATE_MSECS have passed since last time we ran
945 945
946 if (diffclock(&_lastTimeIdle, &check) > IDLE_SIMULATE_MSECS) {946 if (diffclock(&_lastTimeIdle, &check) > IDLE_SIMULATE_MSECS) {
947 // We call processEvents() here because the idle timer takes priority over
948 // event handling in Qt, so when the framerate gets low events will pile up
949 // unless we handle them here.
950 processEvents();
951
947 update(1.0f / _fps);952 update(1.0f / _fps);
948 953
949 _glWidget->updateGL();954 _glWidget->updateGL();

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t