History

Merge branch 'master' of git://github.com/worklist/hifi into 19373

atlante45 committed 13 years ago

Commit 5d4d0ba2 parents 4dda71e e9f8e5011 files · +606 −205Browse files

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

Unified · Split

interface/src/Application.cpp+15−12
@@ -955,14 +955,17 @@ void Application::idle() { · 954 unmodified lines
955 // Only run simulation code if more than IDLE_SIMULATE_MSECS have passed since last time we ran955 // Only run simulation code if more than IDLE_SIMULATE_MSECS have passed since last time we ran
956 956
957 if (diffclock(&_lastTimeIdle, &check) > IDLE_SIMULATE_MSECS) {957 if (diffclock(&_lastTimeIdle, &check) > IDLE_SIMULATE_MSECS) {
958 // We call processEvents() here because the idle timer takes priority over
959 // event handling in Qt, so when the framerate gets low events will pile up
960 // unless we handle them here.
961 958
962 // NOTE - this is commented out for now - causing event processing issues reported by Philip and Ryan959 // If we're using multi-touch look, immediately process any
963 // birarda - July 3rd960 // touch events, and no other events.
964 961 // This is necessary because id the idle() call takes longer than the
965 // processEvents();962 // interval between idle() calls, the event loop never gets to run,
963 // and touch events get delayed.
964 if (_touchLook->isChecked()) {
965 sendPostedEvents(NULL, QEvent::TouchBegin);
966 sendPostedEvents(NULL, QEvent::TouchUpdate);
967 sendPostedEvents(NULL, QEvent::TouchEnd);
968 }
966 969
967 update(1.0f / _fps);970 update(1.0f / _fps);
968 971
@@ -1930,11 +1933,11 @@ void Application::update(float deltaTime) { · 961 unmodified lines
1930 1933
1931void Application::updateAvatar(float deltaTime) {1934void Application::updateAvatar(float deltaTime) {
1932 1935
1933 // Update my avatar's head position from gyros and/or webcam1936 // Update my avatar's state from gyros and/or webcam
1934 _myAvatar.updateHeadFromGyrosAndOrWebcam(_gyroLook->isChecked(),1937 _myAvatar.updateFromGyrosAndOrWebcam(_gyroLook->isChecked(),
1935 glm::vec3(_headCameraPitchYawScale,1938 glm::vec3(_headCameraPitchYawScale,
1936 _headCameraPitchYawScale,1939 _headCameraPitchYawScale,
1937 _headCameraPitchYawScale));1940 _headCameraPitchYawScale));
1938 1941
1939 if (_serialHeadSensor.isActive()) {1942 if (_serialHeadSensor.isActive()) {
1940 1943

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