History

Moving the REcordingScriptingInterface into the script-engine and wiiring up in the assignment-client

Sam Gateau committed 10 years ago

Commit 5b929291 parent 85530335 files · +42 −16Browse files

Showing the changes to libraries/script-engine/src/ScriptEngine.cpp (1 of 5 files). Show all

Unified · Split

libraries/script-engine/src/ScriptEngine.cpp+4−0
@@ -46,6 +46,7 @@ · 45 unmodified lines
46#include "WebSocketClass.h"46#include "WebSocketClass.h"
47 47
48#include "SceneScriptingInterface.h"48#include "SceneScriptingInterface.h"
49#include "RecordingScriptingInterface.h"
49 50
50#include "MIDIEvent.h"51#include "MIDIEvent.h"
51 52
@@ -375,6 +376,9 @@ void ScriptEngine::init() { · 323 unmodified lines
375 auto scriptingInterface = DependencyManager::get<controller::ScriptingInterface>();376 auto scriptingInterface = DependencyManager::get<controller::ScriptingInterface>();
376 registerGlobalObject("Controller", scriptingInterface.data());377 registerGlobalObject("Controller", scriptingInterface.data());
377 UserInputMapper::registerControllerTypes(this);378 UserInputMapper::registerControllerTypes(this);
379
380 auto recordingInterface = DependencyManager::get<RecordingScriptingInterface>();
381 registerGlobalObject("Recording", recordingInterface.data());
378}382}
379 383
380void ScriptEngine::registerValue(const QString& valueName, QScriptValue value) {384void ScriptEngine::registerValue(const QString& valueName, QScriptValue value) {