From 25bd6fa2c13e827859a04b7076cbab1106465548 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Fri, 20 Jan 2017 10:27:08 -0800 Subject: [PATCH] move recording interface to Agent/Application only --- assignment-client/src/Agent.cpp | 3 +++ interface/src/Application.cpp | 3 +++ libraries/script-engine/src/ScriptEngine.cpp | 3 --- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/assignment-client/src/Agent.cpp b/assignment-client/src/Agent.cpp index 234ae239cd..c462139ae9 100644 --- a/assignment-client/src/Agent.cpp +++ b/assignment-client/src/Agent.cpp @@ -376,6 +376,9 @@ void Agent::executeScript() { _scriptEngine->registerGlobalObject("EntityViewer", &_entityViewer); + auto recordingInterface = DependencyManager::get(); + _scriptEngine->registerGlobalObject("Recording", recordingInterface.data()); + // we need to make sure that init has been called for our EntityScriptingInterface // so that it actually has a jurisdiction listener when we ask it for it next entityScriptingInterface->init(); diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 5d32a830d0..ad2faa1047 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -5485,6 +5485,9 @@ void Application::registerScriptEngineWithApplicationServices(ScriptEngine* scri scriptEngine->registerGlobalObject("Controller", scriptingInterface.data()); UserInputMapper::registerControllerTypes(scriptEngine); + auto recordingInterface = DependencyManager::get(); + _scriptEngine->registerGlobalObject("Recording", recordingInterface.data()); + // connect this script engines printedMessage signal to the global ScriptEngines these various messages connect(scriptEngine, &ScriptEngine::printedMessage, DependencyManager::get().data(), &ScriptEngines::onPrintedMessage); connect(scriptEngine, &ScriptEngine::errorMessage, DependencyManager::get().data(), &ScriptEngines::onErrorMessage); diff --git a/libraries/script-engine/src/ScriptEngine.cpp b/libraries/script-engine/src/ScriptEngine.cpp index cedf5a4ed8..dd1f5a707f 100644 --- a/libraries/script-engine/src/ScriptEngine.cpp +++ b/libraries/script-engine/src/ScriptEngine.cpp @@ -562,9 +562,6 @@ void ScriptEngine::init() { // constants globalObject().setProperty("TREE_SCALE", newVariant(QVariant(TREE_SCALE))); - auto recordingInterface = DependencyManager::get(); - registerGlobalObject("Recording", recordingInterface.data()); - registerGlobalObject("Assets", &_assetScriptingInterface); registerGlobalObject("Resources", DependencyManager::get().data()); }