Revert to using QGLWidget

Brad Davis committed 11 years ago

Commit 382ef051 parent 636407215 files · +305 −244Browse files

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

Unified · Split

 #include <EntityScriptingInterface.h>
 #include <ErrorDialog.h>
 #include <FramebufferCache.h>
-#include <GlWindow.h>
 #include <gpu/Batch.h>
 #include <gpu/Context.h>
 #include <gpu/GLBackend.h>
 #include "AudioClient.h"
 #include "DiscoverabilityManager.h"
+#include "GLCanvas.h"
 #include "InterfaceVersion.h"
 #include "LODManager.h"
 #include "Menu.h"
     ResourceCache::setRequestLimit(3);
-    _offscreenContext = new OffscreenGlCanvas();
+    _glWidget = new GLCanvas();
-    _offscreenContext->create();
+    _window->setCentralWidget(_glWidget);
-    _offscreenContext->makeCurrent();
-    _glWindow = new GlWindow(_offscreenContext->getContext());
-    QWidget* container = QWidget::createWindowContainer(_glWindow);
-    _window->setCentralWidget(container);
     _window->restoreGeometry();
-    _window->setVisible(true);
-    _window->setAttribute(Qt::WA_AcceptTouchEvents);
-    container->setFocusPolicy(Qt::StrongFocus);
-    container->setAttribute(Qt::WA_AcceptTouchEvents);
-    container->setFocus();
-    container->installEventFilter(DependencyManager::get<OffscreenUi>().data());
-    _offscreenContext->makeCurrent();
+    _glWidget->setFocusPolicy(Qt::StrongFocus);
-    initializeGL();
+    _glWidget->setFocus();
-    // initialization continues in initializeGL when OpenGL context is ready
 #ifdef Q_OS_MAC
     // OSX doesn't seem to provide for hiding the cursor only on the GL widget
     _window->setCursor(Qt::BlankCursor);
     // On windows and linux, hiding the top level cursor also means it's invisible
     // when hovering over the window menu, which is a pain, so only hide it for
     // the GL surface
-    container->setCursor(Qt::BlankCursor);
+    _glWidget->setCursor(Qt::BlankCursor);
 #endif
     // enable mouse tracking; otherwise, we only get drag events
-    container->setMouseTracking(true);
+    _glWidget->setMouseTracking(true);
+    _offscreenContext = new OffscreenGlCanvas();
+    _offscreenContext->create(_glWidget->context()->contextHandle());
+    _offscreenContext->makeCurrent();
+    initializeGL();
+    _window->setVisible(true);
+    _offscreenContext->makeCurrent();
     _toolWindow = new ToolWindow();
     _toolWindow->setWindowFlags(_toolWindow->windowFlags() | Qt::WindowStaysOnTopHint);
     offscreenUi->setBaseUrl(QUrl::fromLocalFile(PathUtils::resourcesPath() + "/qml/"));
     offscreenUi->load("Root.qml");
     offscreenUi->load("RootMenu.qml");
+    _glWidget->installEventFilter(offscreenUi.data());
     VrMenu::load();
     VrMenu::executeQueuedLambdas();
     offscreenUi->setMouseTranslator([=](const QPointF& pt) {
         }
     }
-    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;
 }
 }
 glm::uvec2 Application::getCanvasSize() const {
-    return toGlm(_glWindow->size());
+    return glm::uvec2(_glWidget->width(), _glWidget->height());
 }
 glm::uvec2 Application::getUiSize() const {
 }
 ivec2 Application::getTrueMouse() const {
-    return toGlm(_glWindow->mapFromGlobal(QCursor::pos()));
+    return toGlm(_glWidget->mapFromGlobal(QCursor::pos()));
 }
 bool Application::hasFocus() const {
     auto offscreenUi = DependencyManager::get<OffscreenUi>();
     DisplayPluginPointer oldDisplayPlugin = _displayPlugin;
     if (oldDisplayPlugin != newDisplayPlugin) {
-        if (oldDisplayPlugin) {
-            oldDisplayPlugin->removeEventFilter(qApp);
-            oldDisplayPlugin->removeEventFilter(offscreenUi.data());
-        }
         if (!_currentDisplayPluginActions.isEmpty()) {
             auto menu = Menu::getInstance();
             foreach(auto itemInfo, _currentDisplayPluginActions) {
         if (newDisplayPlugin) {
             _offscreenContext->makeCurrent();
             newDisplayPlugin->activate(this);
             _offscreenContext->makeCurrent();
-            newDisplayPlugin->installEventFilter(qApp);
-            newDisplayPlugin->installEventFilter(offscreenUi.data());
-            QWindow* pluginWindow = newDisplayPlugin->getWindow();
-            if (pluginWindow) {
-                DependencyManager::get<OffscreenUi>()->setProxyWindow(pluginWindow);
-            } else {
-                DependencyManager::get<OffscreenUi>()->setProxyWindow(nullptr);
-            }
             offscreenUi->resize(fromGlm(newDisplayPlugin->getRecommendedUiSize()));
             _offscreenContext->makeCurrent();
         }
     Menu::getInstance()->setIsOptionChecked(path, checked);
 }
-GlWindow* Application::getVisibleWindow() {
-    return _glWindow;
-}
 mat4 Application::getEyeProjection(int eye) const {
     if (isHMDMode()) {
         return getActiveDisplayPlugin()->getProjection((Eye)eye, _viewFrustum.getProjection());
     _window->setGeometry(_savedGeometry);
 #endif
 }
+void Application::showDisplayPluginsTools() {
+}
+QGLWidget* Application::getPrimarySurface() {
+    return _glWidget;
+}