Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-09 18:26:26 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Avoiding the need for the GLobal frameTiing Scriptiong interface and just a regular member of APplication instead

Browse source
This commit is contained in:
samcake 2017-10-02 17:04:00 -07:00
parent fc2329193e
commit bb99f68d40
3 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
interface/src/Application.cpp
View file

@ -188,7 +188,6 @@
#include "InterfaceParentFinder.h" #include "InterfaceParentFinder.h"
#include "ui/OctreeStatsProvider.h" #include "ui/OctreeStatsProvider.h"
//#include "FrameTimingsScriptingInterface.h"
#include <GPUIdent.h> #include <GPUIdent.h>
#include <gl/GLHelpers.h> #include <gl/GLHelpers.h>
#include <src/scripting/LimitlessVoiceRecognitionScriptingInterface.h> #include <src/scripting/LimitlessVoiceRecognitionScriptingInterface.h>
@ -2217,8 +2216,6 @@ void Application::initializeGL() {
update(0); update(0);
} }
//FrameTimingsScriptingInterface _frameTimingsScriptingInterface;
extern void setupPreferences(); extern void setupPreferences();
void Application::initializeUi() { void Application::initializeUi() {
@ -2273,7 +2270,7 @@ void Application::initializeUi() {
surfaceContext->setContextProperty("Recording", DependencyManager::get<RecordingScriptingInterface>().data()); surfaceContext->setContextProperty("Recording", DependencyManager::get<RecordingScriptingInterface>().data());
surfaceContext->setContextProperty("Preferences", DependencyManager::get<Preferences>().data()); surfaceContext->setContextProperty("Preferences", DependencyManager::get<Preferences>().data());
surfaceContext->setContextProperty("AddressManager", DependencyManager::get<AddressManager>().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("Rates", new RatesScriptingInterface(this));
surfaceContext->setContextProperty("TREE_SCALE", TREE_SCALE); surfaceContext->setContextProperty("TREE_SCALE", TREE_SCALE);

3
interface/src/Application.h
View file

@ -76,6 +76,7 @@
#include <procedural/ProceduralSkybox.h> #include <procedural/ProceduralSkybox.h>
#include <model/Skybox.h> #include <model/Skybox.h>
#include <ModelScriptingInterface.h> #include <ModelScriptingInterface.h>
#include "FrameTimingsScriptingInterface.h"
#include "Sound.h" #include "Sound.h"
@ -537,6 +538,8 @@ private:
RateCounter<> _avatarSimCounter; RateCounter<> _avatarSimCounter;
RateCounter<> _simCounter; RateCounter<> _simCounter;
FrameTimingsScriptingInterface _frameTimingsScriptingInterface;
QTimer _minimizedWindowTimer; QTimer _minimizedWindowTimer;
QElapsedTimer _timerStart; QElapsedTimer _timerStart;
QElapsedTimer _lastTimeUpdated; QElapsedTimer _lastTimeUpdated;

2
interface/src/Application_render.cpp
View file

@ -14,11 +14,9 @@
#include <display-plugins/CompositorHelper.h> #include <display-plugins/CompositorHelper.h>
#include <FramebufferCache.h> #include <FramebufferCache.h>
#include "ui/Stats.h" #include "ui/Stats.h"
#include "FrameTimingsScriptingInterface.h"
#include <SceneScriptingInterface.h> #include <SceneScriptingInterface.h>
#include "Util.h" #include "Util.h"
FrameTimingsScriptingInterface _frameTimingsScriptingInterface;
// Statically provided display and input plugins // Statically provided display and input plugins
extern DisplayPluginList getDisplayPlugins(); extern DisplayPluginList getDisplayPlugins();