From bb99f68d40ec7e0a67bb366067380d2638377a59 Mon Sep 17 00:00:00 2001
From: samcake <samuel.gateau@gmail.com>
Date: Mon, 2 Oct 2017 17:04:00 -0700
Subject: [PATCH] Avoiding the need for the GLobal frameTiing Scriptiong
 interface and just a regular member of APplication instead

---
 interface/src/Application.cpp        | 5 +----
 interface/src/Application.h          | 3 +++
 interface/src/Application_render.cpp | 2 --
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 35fc0049a8..97d621478d 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -188,7 +188,6 @@
 #include "InterfaceParentFinder.h"
 #include "ui/OctreeStatsProvider.h"
 
-//#include "FrameTimingsScriptingInterface.h"
 #include <GPUIdent.h>
 #include <gl/GLHelpers.h>
 #include <src/scripting/LimitlessVoiceRecognitionScriptingInterface.h>
@@ -2217,8 +2216,6 @@ void Application::initializeGL() {
     update(0);
 }
 
-//FrameTimingsScriptingInterface _frameTimingsScriptingInterface;
-
 extern void setupPreferences();
 
 void Application::initializeUi() {
@@ -2273,7 +2270,7 @@ void Application::initializeUi() {
     surfaceContext->setContextProperty("Recording", DependencyManager::get<RecordingScriptingInterface>().data());
     surfaceContext->setContextProperty("Preferences", DependencyManager::get<Preferences>().data());
     surfaceContext->setContextProperty("AddressManager", DependencyManager::get<AddressManager>().data());
-    //surfaceContext->setContextProperty("FrameTimings", &_frameTimingsScriptingInterface); // TODO: Remove this Context Property ? i don;t see anywhere
+    surfaceContext->setContextProperty("FrameTimings", &_frameTimingsScriptingInterface);
     surfaceContext->setContextProperty("Rates", new RatesScriptingInterface(this));
 
     surfaceContext->setContextProperty("TREE_SCALE", TREE_SCALE);
diff --git a/interface/src/Application.h b/interface/src/Application.h
index 77ae840274..3966d1c50d 100644
--- a/interface/src/Application.h
+++ b/interface/src/Application.h
@@ -76,6 +76,7 @@
 #include <procedural/ProceduralSkybox.h>
 #include <model/Skybox.h>
 #include <ModelScriptingInterface.h>
+#include "FrameTimingsScriptingInterface.h"
 
 #include "Sound.h"
 
@@ -537,6 +538,8 @@ private:
     RateCounter<> _avatarSimCounter;
     RateCounter<> _simCounter;
 
+    FrameTimingsScriptingInterface _frameTimingsScriptingInterface;
+
     QTimer _minimizedWindowTimer;
     QElapsedTimer _timerStart;
     QElapsedTimer _lastTimeUpdated;
diff --git a/interface/src/Application_render.cpp b/interface/src/Application_render.cpp
index 1c82c95a8a..b09705c300 100644
--- a/interface/src/Application_render.cpp
+++ b/interface/src/Application_render.cpp
@@ -14,11 +14,9 @@
 #include <display-plugins/CompositorHelper.h>
 #include <FramebufferCache.h>
 #include "ui/Stats.h"
-#include "FrameTimingsScriptingInterface.h"
 #include <SceneScriptingInterface.h>
 #include "Util.h"
 
-FrameTimingsScriptingInterface _frameTimingsScriptingInterface;
 
 // Statically provided display and input plugins
 extern DisplayPluginList getDisplayPlugins();