History

Pass tablet QQuickItem to TabletScriptingInterface

Also, moved TabletScriptingInterface to script-engine library for easy access, baby.

Anthony J. Thibault committed 9 years ago

Commit d4f9d211 parent db0b2ba6 files · +21 −4Browse files

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

Unified · Split

libraries/script-engine/src/ScriptEngine.cpp+3−0
@@ -62,6 +62,7 @@ · 61 unmodified lines
62#include "WebSocketClass.h"62#include "WebSocketClass.h"
63#include "RecordingScriptingInterface.h"63#include "RecordingScriptingInterface.h"
64#include "ScriptEngines.h"64#include "ScriptEngines.h"
65#include "TabletScriptingInterface.h"
65 66
66#include "MIDIEvent.h"67#include "MIDIEvent.h"
67 68
@@ -542,6 +543,8 @@ void ScriptEngine::init() { · 474 unmodified lines
542 auto recordingInterface = DependencyManager::get<RecordingScriptingInterface>();543 auto recordingInterface = DependencyManager::get<RecordingScriptingInterface>();
543 registerGlobalObject("Recording", recordingInterface.data());544 registerGlobalObject("Recording", recordingInterface.data());
544 545
546 registerGlobalObject("Tablet", DependencyManager::get<TabletScriptingInterface>().data());
547
545 registerGlobalObject("Assets", &_assetScriptingInterface);548 registerGlobalObject("Assets", &_assetScriptingInterface);
546 registerGlobalObject("Resources", DependencyManager::get<ResourceScriptingInterface>().data());549 registerGlobalObject("Resources", DependencyManager::get<ResourceScriptingInterface>().data());
547}550}