merge with hifi/plugins

Sam Gondelman committed 11 years ago

Commit f69b7552 parents 8fbbb26 95000ee231 files · +6439 −5987Browse files

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

Unified · Split

 #include <SceneScriptingInterface.h>
 #include <ScriptCache.h>
 #include <SettingHandle.h>
+#include <SimpleAverage.h>
 #include <SoundCache.h>
 #include <TextRenderer.h>
 #include <Tooltip.h>
 //  Starfield information
 static unsigned STARFIELD_NUM_STARS = 50000;
 static unsigned STARFIELD_SEED = 1;
+static uint8_t THROTTLED_IDLE_TIMER_DELAY = 10;
 const qint64 MAXIMUM_CACHE_SIZE = 10 * BYTES_PER_GIGABYTES;  // 10GB
         uvec2 finalSize = toGlm(size);
         // Ensure the rendering context commands are completed when rendering
         GLsync sync = glFenceSync(GL_SYNC_GPU_COMMANDS_COMPLETE, 0);
+        glFinish();
         _offscreenContext->doneCurrent();
         Q_ASSERT(!QOpenGLContext::currentContext());
         displayPlugin->preDisplay();
     InfoView::show(INFO_EDIT_ENTITIES_PATH);
 }
 void Application::resizeEvent(QResizeEvent * event) {
     resizeGL();
 }
             return true;
         }
     }
+    if (object == _glWindow) {
+        auto offscreenUi = DependencyManager::get<OffscreenUi>();
+        if (offscreenUi->eventFilter(object, event)) {
+            return true;
+        }
+        switch (event->type()) {
+        case QEvent::MouseMove:
+            mouseMoveEvent((QMouseEvent*)event);
+            return true;
+        case QEvent::MouseButtonPress:
+            mousePressEvent((QMouseEvent*)event);
+            return true;
+        case QEvent::MouseButtonDblClick:
+            mouseDoublePressEvent((QMouseEvent*)event);
+            return true;
+        case QEvent::MouseButtonRelease:
+            mouseReleaseEvent((QMouseEvent*)event);
+            return true;
+        case QEvent::KeyPress:
+            keyPressEvent((QKeyEvent*)event);
+            return true;
+        case QEvent::KeyRelease:
+            keyReleaseEvent((QKeyEvent*)event);
+            return true;
+        case QEvent::FocusOut:
+            focusOutEvent((QFocusEvent*)event);
+            return true;
+        case QEvent::TouchBegin:
+            touchBeginEvent(static_cast<QTouchEvent*>(event));
+            event->accept();
+            return true;
+        case QEvent::TouchEnd:
+            touchEndEvent(static_cast<QTouchEvent*>(event));
+            return true;
+        case QEvent::TouchUpdate:
+            touchUpdateEvent(static_cast<QTouchEvent*>(event));
+            return true;
+        case QEvent::Wheel:
+            wheelEvent(static_cast<QWheelEvent*>(event));
+            return true;
+        case QEvent::Drop:
+            dropEvent(static_cast<QDropEvent*>(event));
+            return true;
+        default:
+            break;
+        }
+    }
     return false;
 }
 }
 void Application::idle() {
-    PerformanceTimer perfTimer("idle");
+    static SimpleAverage<float> interIdleDurations;
+    static uint64_t lastIdleEnd{ 0 };
+    if (lastIdleEnd != 0) {
+        uint64_t now = usecTimestampNow();
+        interIdleDurations.update(now - lastIdleEnd);
+        static uint64_t lastReportTime = now;
+        if ((now - lastReportTime) >= (USECS_PER_SECOND)) {
+            static QString LOGLINE("Average inter-idle time: %1 us for %2 samples");
+            if (Menu::getInstance()->isOptionChecked(MenuOption::LogExtraTimings)) {
+                qCDebug(interfaceapp_timing) << LOGLINE.arg((int)interIdleDurations.getAverage()).arg(interIdleDurations.getCount());
+            }
+            interIdleDurations.reset();
+            lastReportTime = now;
+        }
+    }
+    PerformanceTimer perfTimer("idle");
     if (_aboutToQuit) {
         return; // bail early, nothing to do here.
     }
                 _idleLoopStdev.reset();
             }
-            // After finishing all of the above work, restart the idle timer, allowing 2ms to process events.
-            idleTimer->start(2);
         }
-    }
+        // After finishing all of the above work, ensure the idle timer is set to the proper interval,
+        // depending on whether we're throttling or not
+        idleTimer->start(getActiveDisplayPlugin()->isThrottled() ? THROTTLED_IDLE_TIMER_DELAY : 0);
+    }
     // check for any requested background downloads.
     emit checkBackgroundDownloads();
+    lastIdleEnd = usecTimestampNow();
 }
 #if 0
     // Make sure any new sounds are loaded as soon as know about them.
     connect(tree, &EntityTree::newCollisionSoundURL, DependencyManager::get<SoundCache>().data(), &SoundCache::getSound);
+    connect(_myAvatar, &MyAvatar::newCollisionSoundURL, DependencyManager::get<SoundCache>().data(), &SoundCache::getSound);
 }
 void Application::closeMirrorView() {
         renderContext._maxDrawnTransparentItems = sceneInterface->getEngineMaxDrawnTransparentItems();
         renderContext._maxDrawnOverlay3DItems = sceneInterface->getEngineMaxDrawnOverlay3DItems();
+        renderContext._drawItemStatus = sceneInterface->doEngineDisplayItemStatus();
         renderArgs->_shouldRender = LODManager::shouldRender;
         renderContext.args = renderArgs;
     }
     //Render the sixense lasers
     if (Menu::getInstance()->isOptionChecked(MenuOption::SixenseLasers)) {
-        _myAvatar->renderLaserPointers();
+        _myAvatar->renderLaserPointers(*renderArgs->_batch);
     }
     if (!selfAvatarOnly) {
     DisplayPluginPointer oldDisplayPlugin = _displayPlugin;
     if (oldDisplayPlugin != newDisplayPlugin) {
         if (oldDisplayPlugin) {
-            oldDisplayPlugin->removeEventFilter(offscreenUi.data());
             oldDisplayPlugin->removeEventFilter(qApp);
+            oldDisplayPlugin->removeEventFilter(offscreenUi.data());
         }
         if (!_currentDisplayPluginActions.isEmpty()) {
             newDisplayPlugin->activate(this);
             _offscreenContext->makeCurrent();
-            newDisplayPlugin->installEventFilter(offscreenUi.data());
             newDisplayPlugin->installEventFilter(qApp);
+            newDisplayPlugin->installEventFilter(offscreenUi.data());
             QWindow* pluginWindow = newDisplayPlugin->getWindow();
             if (pluginWindow) {
                 DependencyManager::get<OffscreenUi>()->setProxyWindow(pluginWindow);

merge with hifi/plugins

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code