From 69f1cfbcb9125aa9d449a5d01b3734bcd51309e8 Mon Sep 17 00:00:00 2001
From: "Anthony J. Thibault" <ajt@highfidelity.io>
Date: Wed, 4 Nov 2015 12:04:34 -0800
Subject: [PATCH] Fixes for Mac build and crash on startup

For some reason the qt code gen is getting confused by the #if 0
in 3DConnextionClient.h, so I added a stub implementation.

In Application.cpp the change of moving idle into paintGL had a sideeffect
of calling OffscreenGlCanvas before it was initialized.  To work around this
I added a guard to prevent calling idle before all the gl windows/widgets have
been initialized.
---
 interface/src/Application.cpp             | 12 ++++++------
 interface/src/Application.h               |  3 ++-
 interface/src/devices/3DConnexionClient.h | 15 +++++++++++++++
 3 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index d31d9de4a0..556664ec10 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -940,14 +940,12 @@ void Application::initializeGL() {
     qCDebug(interfaceapp) << "Created Display Window.";
 
     // initialize glut for shape drawing; Qt apparently initializes it on OS X
-    #ifndef __APPLE__
-    static bool isInitialized = false;
-    if (isInitialized) {
+    if (_isGLInitialized) {
         return;
     } else {
-        isInitialized = true;
+        _isGLInitialized = true;
     }
-    #endif
+
     // Where the gpuContext is initialized and where the TRUE Backend is created and assigned
     gpu::Context::init<gpu::GLBackend>();
     _gpuContext = std::make_shared<gpu::Context>();
@@ -1059,7 +1057,9 @@ void Application::paintGL() {
         _lastFramesPerSecondUpdate = now;
     }
 
-    idle(now);
+    if (_isGLInitialized) {
+        idle(now);
+    }
 
     PROFILE_RANGE(__FUNCTION__);
     PerformanceTimer perfTimer("paintGL");
diff --git a/interface/src/Application.h b/interface/src/Application.h
index 212687c11e..5a5d5a015c 100644
--- a/interface/src/Application.h
+++ b/interface/src/Application.h
@@ -414,7 +414,7 @@ private:
 
     bool _dependencyManagerIsSetup;
 
-    OffscreenGlCanvas* _offscreenContext;
+    OffscreenGlCanvas* _offscreenContext {nullptr};
     DisplayPluginPointer _displayPlugin;
     InputPluginList _activeInputPlugins;
 
@@ -548,6 +548,7 @@ private:
     quint64 _lastSimsPerSecondUpdate = 0;
     bool _isForeground = true; // starts out assumed to be in foreground
     bool _inPaint = false;
+    bool _isGLInitialized {false};
 };
 
 #endif // hifi_Application_h
diff --git a/interface/src/devices/3DConnexionClient.h b/interface/src/devices/3DConnexionClient.h
index 03a43d4c64..b6fa6a37c3 100755
--- a/interface/src/devices/3DConnexionClient.h
+++ b/interface/src/devices/3DConnexionClient.h
@@ -220,4 +220,19 @@ public:
 
 #endif
 
+#include <QObject>
+#include <QLibrary>
+
+// stub
+class ConnexionClient : public QObject {
+    Q_OBJECT
+public:
+    static ConnexionClient& getInstance();
+    void init() {};
+    void destroy() {};
+    bool Is3dmouseAttached() { return false; };
+public slots:
+    void toggleConnexion(bool shouldEnable) {};
+};
+
 #endif // defined(hifi_3DConnexionClient_h)