History

Fleshing out TabletScriptingInterface.

Added TabletProxy and TabletButtonProxy

Anthony J. Thibault committed 9 years ago

Commit db0b2ba1 parent d94da763 files · +141 −15Browse files

Showing the changes to interface/src/Application.cpp (1 of 3 files). Show all

Unified · Split

interface/src/Application.cpp+4−0
@@ -144,6 +144,7 @@ · 143 unmodified lines
144144 #include "scripting/SettingsScriptingInterface.h"
145145 #include "scripting/WindowScriptingInterface.h"
146146 #include "scripting/ControllerScriptingInterface.h"
147+#include "scripting/TabletScriptingInterface.h"
147148 #include "scripting/ToolbarScriptingInterface.h"
148149 #include "scripting/RatesScriptingInterface.h"
149150 #if defined(Q_OS_MAC) || defined(Q_OS_WIN)
@@ -478,6 +479,7 @@ bool setupEssentials(int& argc, char** argv) { · 328 unmodified lines
478479 DependencyManager::set<WindowScriptingInterface>();
479480 DependencyManager::set<HMDScriptingInterface>();
480481 DependencyManager::set<ResourceScriptingInterface>();
482+ DependencyManager::set<TabletScriptingInterface>();
481483 DependencyManager::set<ToolbarScriptingInterface>();
482484 DependencyManager::set<UserActivityLoggerScriptingInterface>();
483485
@@ -5181,6 +5183,8 @@ void Application::registerScriptEngineWithApplicationServices(ScriptEngine* scri · 4697 unmodified lines
51815183 scriptEngine->registerGlobalObject("ScriptDiscoveryService", DependencyManager::get<ScriptEngines>().data());
51825184 scriptEngine->registerGlobalObject("Reticle", getApplicationCompositor().getReticleInterface());
51835185
5186+ scriptEngine->registerGlobalObject("Tablet", DependencyManager::get<TabletScriptingInterface>().data());
5187+
51845188 scriptEngine->registerGlobalObject("UserActivityLogger", DependencyManager::get<UserActivityLoggerScriptingInterface>().data());
51855189 scriptEngine->registerGlobalObject("Users", DependencyManager::get<UsersScriptingInterface>().data());
51865190