Working on mac compilability

cmake/externals/openvr/CMakeLists.txt

@@ -7,8 +7,8 @@ string(TOUPPER ${EXTERNAL_NAME} EXTERNAL_NAME_UPPER)
 
 ExternalProject_Add(
   ${EXTERNAL_NAME}
-  URL https://github.com/ValveSoftware/openvr/archive/0.9.1.zip
-  URL_MD5 f986f5a6815e9454c53c5bf58ce02fdc
+  URL https://github.com/ValveSoftware/openvr/archive/0.9.2.zip
+  URL_MD5 3ff7b67861b63ef673014e353f2c1bf6
   CONFIGURE_COMMAND ""
   BUILD_COMMAND ""
   INSTALL_COMMAND ""

interface/InterfaceConfig.h.in

@@ -12,7 +12,6 @@
 #ifndef interface__InterfaceConfig__
 #define interface__InterfaceConfig__
 
-#define GL_GLEXT_PROTOTYPES 1
-@GL_HEADERS@
+#include <gpu/GPUConfig.h>
 
 #endif

interface/src/DisplayPlugins.cpp

@@ -63,7 +63,9 @@ const DisplayPluginList& getDisplayPlugins() {
             new Oculus_0_5_DisplayPlugin(),
 #endif
 
+#ifndef Q_OS_MAC
             new OpenVrDisplayPlugin(),
+#endif
             nullptr
         };
         for (int i = 0; PLUGIN_POOL[i]; ++i) {

interface/src/GLCanvas.cpp

@@ -1,165 +0,0 @@
-//
-//  GLCanvas.cpp
-//  interface/src
-//
-//  Created by Stephen Birarda on 8/14/13.
-//  Copyright 2013 High Fidelity, Inc.
-//
-//  Distributed under the Apache License, Version 2.0.
-//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
-//
-
-#if 0
-#include "Application.h"
-#include "GLCanvas.h"
-
-
-const int MSECS_PER_FRAME_WHEN_THROTTLED = 66;
-
-GLCanvas::GLCanvas() : QGLWidget(QGL::NoDepthBuffer | QGL::NoStencilBuffer),
-    _throttleRendering(false),
-    _idleRenderInterval(MSECS_PER_FRAME_WHEN_THROTTLED)
-{
-#ifdef Q_OS_LINUX
-    // Cause GLCanvas::eventFilter to be called.
-    // It wouldn't hurt to do this on Mac and PC too; but apparently it's only needed on linux.
-    qApp->installEventFilter(this);
-#endif
-}
-
-void GLCanvas::stopFrameTimer() {
-    _frameTimer.stop();
-}
-
-bool GLCanvas::isThrottleRendering() const {
-    return _throttleRendering || parentWidget()->isMinimized();
-}
-
-int GLCanvas::getDeviceWidth() const {
-    return width() * (windowHandle() ? (float)windowHandle()->devicePixelRatio() : 1.0f);
-}
-
-int GLCanvas::getDeviceHeight() const {
-    return height() * (windowHandle() ? (float)windowHandle()->devicePixelRatio() : 1.0f);
-}
-
-void GLCanvas::initializeGL() {
-    setAttribute(Qt::WA_AcceptTouchEvents);
-    setAcceptDrops(true);
-    connect(Application::getInstance(), SIGNAL(applicationStateChanged(Qt::ApplicationState)), this, SLOT(activeChanged(Qt::ApplicationState)));
-    connect(&_frameTimer, SIGNAL(timeout()), this, SLOT(throttleRender()));
-
-    // Note, we *DO NOT* want Qt to automatically swap buffers for us.  This results in the "ringing" bug mentioned in WL#19514 when we're throttling the framerate.
-    setAutoBufferSwap(false);
-}
-
-void GLCanvas::paintGL() {
-    if (!isThrottleRendering()) {
-        Application::getInstance()->paintGL();
-    }
-}
-
-void GLCanvas::resizeGL(int width, int height) {
-    Application::getInstance()->resizeGL();
-}
-
-void GLCanvas::activeChanged(Qt::ApplicationState state) {
-    switch (state) {
-        case Qt::ApplicationActive:
-            // If we're active, stop the frame timer and the throttle.
-            _frameTimer.stop();
-            _throttleRendering = false;
-            break;
-
-        case Qt::ApplicationSuspended:
-        case Qt::ApplicationHidden:
-            // If we're hidden or are about to suspend, don't render anything.
-            _throttleRendering = false;
-            _frameTimer.stop();
-            break;
-
-        default:
-            // Otherwise, throttle.
-            if (!_throttleRendering && !Application::getInstance()->isAboutToQuit()) {
-                _frameTimer.start(_idleRenderInterval);
-                _throttleRendering = true;
-            }
-            break;
-    }
-}
-
-void GLCanvas::throttleRender() {
-    _frameTimer.start(_idleRenderInterval);
-    if (!parentWidget()->isMinimized()) {
-        Application::getInstance()->paintGL();
-    }
-}
-
-int updateTime = 0;
-bool GLCanvas::event(QEvent* event) {
-    switch (event->type()) {
-        case QEvent::MouseMove:
-        case QEvent::MouseButtonPress:
-        case QEvent::MouseButtonRelease:
-        case QEvent::MouseButtonDblClick:
-        case QEvent::KeyPress:
-        case QEvent::KeyRelease:
-        case QEvent::FocusIn:
-        case QEvent::FocusOut:
-        case QEvent::Resize:
-        case QEvent::TouchBegin:
-        case QEvent::TouchEnd:
-        case QEvent::TouchUpdate:
-        case QEvent::Wheel:
-        case QEvent::DragEnter:
-        case QEvent::Drop:
-            if (QCoreApplication::sendEvent(QCoreApplication::instance(), event)) {
-                return true;
-            }
-            break;
-        case QEvent::Paint:
-            // Ignore paint events that occur after we've decided to quit
-            if (Application::getInstance()->isAboutToQuit()) {
-                return true;
-            }
-            break;
-
-        default:
-            break;
-    }
-    return QGLWidget::event(event);
-}
-
-
-// Pressing Alt (and Meta) key alone activates the menubar because its style inherits the
-// SHMenuBarAltKeyNavigation from QWindowsStyle. This makes it impossible for a scripts to
-// receive keyPress events for the Alt (and Meta) key in a reliable manner.
-//
-// This filter catches events before QMenuBar can steal the keyboard focus.
-// The idea was borrowed from
-// http://www.archivum.info/qt-interest@trolltech.com/2006-09/00053/Re-(Qt4)-Alt-key-focus-QMenuBar-(solved).html
-
-bool GLCanvas::eventFilter(QObject*, QEvent* event) {
-    switch (event->type()) {
-        case QEvent::KeyPress:
-        case QEvent::KeyRelease:
-        case QEvent::ShortcutOverride:
-        {
-            QKeyEvent* keyEvent = static_cast<QKeyEvent*>(event);
-            if (keyEvent->key() == Qt::Key_Alt || keyEvent->key() == Qt::Key_Meta) {
-                if (event->type() == QEvent::KeyPress) {
-                    keyPressEvent(keyEvent);
-                } else if (event->type() == QEvent::KeyRelease) {
-                    keyReleaseEvent(keyEvent);
-                } else {
-                    QGLWidget::event(event);
-                }
-                return true;
-            }
-        }
-        default:
-            break;
-    }
-    return false;
-}
-#endif

interface/src/GLCanvas.h

@@ -1,55 +0,0 @@
-//
-//  GLCanvas.h
-//  interface/src
-//
-//  Created by Stephen Birarda on 8/14/13.
-//  Copyright 2013 High Fidelity, Inc.
-//
-//  Distributed under the Apache License, Version 2.0.
-//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
-//
-
-#if 0
-#ifndef hifi_GLCanvas_h
-#define hifi_GLCanvas_h
-
-#include <QDebug>
-#include <QGLWidget>
-#include <QTimer>
-
-/// customized canvas that simply forwards requests/events to the singleton application
-class GLCanvas : public QGLWidget {
-    Q_OBJECT
-    
-public:
-    GLCanvas();
-    
-    void stopFrameTimer();
-
-    bool isThrottleRendering() const;
-    
-    int getDeviceWidth() const;
-    int getDeviceHeight() const;
-    QSize getDeviceSize() const { return QSize(getDeviceWidth(), getDeviceHeight()); }
-    
-protected:
-
-    QTimer _frameTimer;
-    bool _throttleRendering;
-    int _idleRenderInterval;
-
-    virtual void initializeGL();
-    virtual void paintGL();
-    virtual void resizeGL(int width, int height);
-    virtual bool event(QEvent* event);
-
-private slots:
-    void activeChanged(Qt::ApplicationState state);
-    void throttleRender();
-    bool eventFilter(QObject*, QEvent* event);
-   
-};
-
-
-#endif // hifi_GLCanvas_h
-#endif

interface/src/UIUtil.cpp

@@ -12,8 +12,6 @@
 #include <QStyle>
 #include <QStyleOptionTitleBar>
 
-#include "GLCanvas.h"
-
 #include "UIUtil.h"
 
 int UIUtil::getWindowTitleBarHeight(const QWidget* window) {

interface/src/scripting/ControllerScriptingInterface.cpp

@@ -11,7 +11,6 @@
 
 #include <avatar/AvatarManager.h>
 #include <avatar/MyAvatar.h>
-#include <GLCanvas.h>
 #include <HandData.h>
 #include <HFBackEvent.h>
 

interface/src/ui/Snapshot.cpp

@@ -22,7 +22,6 @@
 #include <avatar/AvatarManager.h>
 #include <avatar/MyAvatar.h>
 #include <FileUtils.h>
-#include <GLCanvas.h>
 #include <NodeList.h>
 
 #include "Application.h"

interface/src/ui/Stats.cpp

@@ -21,7 +21,6 @@
 #include <avatar/AvatarManager.h>
 #include <Application.h>
 #include <GeometryCache.h>
-#include <GLCanvas.h>
 #include <LODManager.h>
 #include <PerfStat.h>
 

libraries/display-plugins/CMakeLists.txt

@@ -26,7 +26,9 @@ find_package(LibOVR REQUIRED)
 target_include_directories(${TARGET_NAME} PRIVATE ${LIBOVR_INCLUDE_DIRS})
 target_link_libraries(${TARGET_NAME} ${LIBOVR_LIBRARIES})
 
-add_dependency_external_projects(OpenVR)
-find_package(OpenVR REQUIRED)
-target_include_directories(${TARGET_NAME} PRIVATE ${OPENVR_INCLUDE_DIRS})
-target_link_libraries(${TARGET_NAME} ${OPENVR_LIBRARIES})
+if (!APPLE)
+  add_dependency_external_projects(OpenVR)
+  find_package(OpenVR REQUIRED)
+  target_include_directories(${TARGET_NAME} PRIVATE ${OPENVR_INCLUDE_DIRS})
+  target_link_libraries(${TARGET_NAME} ${OPENVR_LIBRARIES})
+endif()

libraries/display-plugins/src/display-plugins/WindowOpenGLDisplayPlugin.cpp

@@ -39,6 +39,10 @@ void WindowOpenGLDisplayPlugin::initSurfaceFormat(QSurfaceFormat& format) {
 void WindowOpenGLDisplayPlugin::activate(PluginContainer * container) {
     OpenGLDisplayPlugin::activate(container);
     _window = createWindow(container);
+    customizeWindow(container);
+
+    _window->makeCurrent();
+    customizeContext(container);
 }
 
 void WindowOpenGLDisplayPlugin::deactivate() {
@@ -54,11 +58,6 @@ GlWindow* WindowOpenGLDisplayPlugin::createWindow(PluginContainer * container) {
     result->setFormat(format);
     result->create();
     result->installEventFilter(this);
-    customizeWindow(container);
-
-    result->makeCurrent();
-    customizeContext(container);
-
     return result;
 }
 

libraries/display-plugins/src/display-plugins/oculus/Oculus_0_5_DisplayPlugin.cpp

@@ -38,7 +38,7 @@ const QString Oculus_0_5_DisplayPlugin::NAME("Oculus Rift (0.5)");
 const QString & Oculus_0_5_DisplayPlugin::getName() const {
     return NAME;
 }
-
+    
 bool Oculus_0_5_DisplayPlugin::isSupported() const {
     if (!ovr_Initialize(nullptr)) {
         return false;

libraries/display-plugins/src/display-plugins/oculus/Oculus_0_5_DisplayPlugin.h

@@ -22,9 +22,6 @@ using MirrorFboPtr = QSharedPointer<MirrorFramebufferWrapper>;
 
 class Oculus_0_5_DisplayPlugin : public OculusBaseDisplayPlugin {
 public:
-    virtual void init() override;
-    virtual void deinit() override;
-
     virtual bool isSupported() const override;
     virtual const QString & getName() const override;
 
@@ -36,7 +33,6 @@ public:
 
 protected:
     virtual void display(GLuint finalTexture, const glm::uvec2& sceneSize) override;
-    virtual void customizeContext(PluginContainer * container) override;
     // Do not perform swap in finish
     virtual void finishFrame() override;
 

libraries/display-plugins/src/display-plugins/openvr/OpenVrDisplayPlugin.cpp

@@ -7,6 +7,8 @@
 //
 #include "OpenVrDisplayPlugin.h"
 
+#if !defined(Q_OS_MAC)
+
 #include <memory>
 
 #include <QMainWindow>
@@ -163,8 +165,8 @@ void OpenVrDisplayPlugin::customizeContext(PluginContainer * container) {
 
 void OpenVrDisplayPlugin::display(GLuint finalTexture, const glm::uvec2& sceneSize) {
     // Flip y-axis since GL UV coords are backwards.
-    static vr::Compositor_TextureBounds leftBounds{ 0, 1, 0.5f, 0 };
-    static vr::Compositor_TextureBounds rightBounds{ 0.5f, 1, 1, 0 };
+    static vr::VRTextureBounds_t leftBounds{ 0, 1, 0.5f, 0 };
+    static vr::VRTextureBounds_t rightBounds{ 0.5f, 1, 1, 0 };
     _compositor->Submit(vr::Eye_Left, (void*)finalTexture, &leftBounds);
     _compositor->Submit(vr::Eye_Right, (void*)finalTexture, &rightBounds);
     glFinish();
@@ -173,10 +175,13 @@ void OpenVrDisplayPlugin::display(GLuint finalTexture, const glm::uvec2& sceneSi
 void OpenVrDisplayPlugin::finishFrame() {
 //    swapBuffers();
     doneCurrent();
-    _compositor->WaitGetPoses(_trackedDevicePose, vr::k_unMaxTrackedDeviceCount);
+    _compositor->WaitGetPoses(_trackedDevicePose, vr::k_unMaxTrackedDeviceCount,
+                              nullptr, 0);
     _trackedDevicePoseMat4[0] = toGlm(_trackedDevicePose[0].mDeviceToAbsoluteTracking);
     openvr_for_each_eye([&](vr::Hmd_Eye eye) {
         _eyesData[eye]._pose = _sensorResetMat * _trackedDevicePoseMat4[0];
     });
 };
 
+#endif
+

libraries/display-plugins/src/display-plugins/openvr/OpenVrDisplayPlugin.h

@@ -7,6 +7,8 @@
 //
 #pragma once
 
+#if !defined(Q_OS_MAC)
+
 #include "../MainWindowOpenGLDisplayPlugin.h"
 
 class OpenVrDisplayPlugin : public MainWindowOpenGLDisplayPlugin {
@@ -38,3 +40,6 @@ protected:
 private:
     static const QString NAME;
 };
+
+#endif
+

libraries/display-plugins/src/display-plugins/openvr/OpenVrHelpers.h

@@ -7,8 +7,10 @@
 //
 #pragma once
 
+#if !defined(Q_OS_MAC)
 #include <openvr.h>
 #include <GLMHelpers.h>
 #include <glm/gtc/type_ptr.hpp>
 #include <glm/gtc/matrix_transform.hpp>
+#endif
 

libraries/gpu/CMakeLists.txt

@@ -7,18 +7,24 @@ setup_hifi_library()
 
 link_hifi_libraries(shared)
 
-if (APPLE)
-  # link in required OS X frameworks and include the right GL headers
-  find_library(OpenGL OpenGL)
+if(ANDROID)
+
+  target_link_libraries(${TARGET_NAME} "-lGLESv3" "-lEGL")
+
+else()
 
-  target_link_libraries(${TARGET_NAME} ${OpenGL})
-elseif (WIN32)
   add_dependency_external_projects(glew)
   find_package(GLEW REQUIRED)
   target_include_directories(${TARGET_NAME} PUBLIC ${GLEW_INCLUDE_DIRS})
+  
+  target_link_libraries(${TARGET_NAME} ${GLEW_LIBRARIES})
 
-  target_link_libraries(${TARGET_NAME} ${GLEW_LIBRARIES} opengl32.lib)
+  find_package(OpenGL REQUIRED)
+  target_link_libraries(${TARGET_NAME} "${OPENGL_LIBRARY}")
 
+endif()
+
+if (WIN32)
   if (USE_NSIGHT)
     # try to find the Nsight package and add it to the build if we find it
     find_package(NSIGHT)
@@ -28,16 +34,4 @@ elseif (WIN32)
       target_link_libraries(${TARGET_NAME} "${NSIGHT_LIBRARIES}")
     endif ()
   endif()
-elseif (ANDROID)
-  target_link_libraries(${TARGET_NAME} "-lGLESv3" "-lEGL")
-else ()
-  find_package(OpenGL REQUIRED)
-  
-  if (${OPENGL_INCLUDE_DIR})
-    include_directories(SYSTEM "${OPENGL_INCLUDE_DIR}")
-  endif ()
-  
-  target_link_libraries(${TARGET_NAME} "${OPENGL_LIBRARY}")
-  
-  target_include_directories(${TARGET_NAME} PUBLIC ${OPENGL_INCLUDE_DIR})
-endif (APPLE)
+endif ()

libraries/gpu/src/gpu/GPUConfig.h

@@ -12,22 +12,21 @@
 #ifndef gpu__GPUConfig__
 #define gpu__GPUConfig__
 
+#include "../GL/glew.h"
+
 #define GL_GLEXT_PROTOTYPES 1
 
 #define GPU_CORE 1
 #define GPU_LEGACY 0
 
 #if defined(__APPLE__)
-#include <OpenGL/gl.h>
-#include <OpenGL/glext.h>
 
 #define GPU_FEATURE_PROFILE GPU_LEGACY
 #define GPU_TRANSFORM_PROFILE GPU_LEGACY
 
 #elif defined(WIN32)
 #include <windowshacks.h>
-#include <GL/glew.h>
-#include <GL/wglew.h>
+#include "../GL/wglew.h"
 
 #define GPU_FEATURE_PROFILE GPU_CORE
 #define GPU_TRANSFORM_PROFILE GPU_CORE
@@ -35,12 +34,12 @@
 #elif defined(ANDROID)
 
 #else
-#include <GL/gl.h>
-#include <GL/glext.h>
 
 #define GPU_FEATURE_PROFILE GPU_LEGACY
 #define GPU_TRANSFORM_PROFILE GPU_LEGACY
+#include <GL/glxew.h>
 
 #endif
 
+
 #endif