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
144#include "scripting/SettingsScriptingInterface.h"144#include "scripting/SettingsScriptingInterface.h"
145#include "scripting/WindowScriptingInterface.h"145#include "scripting/WindowScriptingInterface.h"
146#include "scripting/ControllerScriptingInterface.h"146#include "scripting/ControllerScriptingInterface.h"
147#include "scripting/TabletScriptingInterface.h"
147#include "scripting/ToolbarScriptingInterface.h"148#include "scripting/ToolbarScriptingInterface.h"
148#include "scripting/RatesScriptingInterface.h"149#include "scripting/RatesScriptingInterface.h"
149#if defined(Q_OS_MAC) || defined(Q_OS_WIN)150#if defined(Q_OS_MAC) || defined(Q_OS_WIN)
@@ -478,6 +479,7 @@ bool setupEssentials(int& argc, char** argv) { · 328 unmodified lines
478 DependencyManager::set<WindowScriptingInterface>();479 DependencyManager::set<WindowScriptingInterface>();
479 DependencyManager::set<HMDScriptingInterface>();480 DependencyManager::set<HMDScriptingInterface>();
480 DependencyManager::set<ResourceScriptingInterface>();481 DependencyManager::set<ResourceScriptingInterface>();
482 DependencyManager::set<TabletScriptingInterface>();
481 DependencyManager::set<ToolbarScriptingInterface>();483 DependencyManager::set<ToolbarScriptingInterface>();
482 DependencyManager::set<UserActivityLoggerScriptingInterface>();484 DependencyManager::set<UserActivityLoggerScriptingInterface>();
483 485
@@ -5181,6 +5183,8 @@ void Application::registerScriptEngineWithApplicationServices(ScriptEngine* scri · 4697 unmodified lines
5181 scriptEngine->registerGlobalObject("ScriptDiscoveryService", DependencyManager::get<ScriptEngines>().data());5183 scriptEngine->registerGlobalObject("ScriptDiscoveryService", DependencyManager::get<ScriptEngines>().data());
5182 scriptEngine->registerGlobalObject("Reticle", getApplicationCompositor().getReticleInterface());5184 scriptEngine->registerGlobalObject("Reticle", getApplicationCompositor().getReticleInterface());
5183 5185
5186 scriptEngine->registerGlobalObject("Tablet", DependencyManager::get<TabletScriptingInterface>().data());
5187
5184 scriptEngine->registerGlobalObject("UserActivityLogger", DependencyManager::get<UserActivityLoggerScriptingInterface>().data());5188 scriptEngine->registerGlobalObject("UserActivityLogger", DependencyManager::get<UserActivityLoggerScriptingInterface>().data());
5185 scriptEngine->registerGlobalObject("Users", DependencyManager::get<UsersScriptingInterface>().data());5189 scriptEngine->registerGlobalObject("Users", DependencyManager::get<UsersScriptingInterface>().data());
5186 5190