Also, moved TabletScriptingInterface to script-engine library for easy access, baby.
Showing the changes to interface/src/Application.cpp (1 of 6 files). Show all
Unified · Split
| @@ -104,6 +104,7 @@ · 103 unmodified lines | |||
| 104 | #include <ScriptCache.h> | 104 | #include <ScriptCache.h> |
| 105 | #include <SoundCache.h> | 105 | #include <SoundCache.h> |
| 106 | #include <steamworks-wrapper/SteamClient.h> | 106 | #include <steamworks-wrapper/SteamClient.h> |
| 107 | #include <TabletScriptingInterface.h> | ||
| 107 | #include <Tooltip.h> | 108 | #include <Tooltip.h> |
| 108 | #include <udt/PacketHeaders.h> | 109 | #include <udt/PacketHeaders.h> |
| 109 | #include <UserActivityLogger.h> | 110 | #include <UserActivityLogger.h> |
| @@ -144,7 +145,6 @@ · 34 unmodified lines | |||
| 144 | #include "scripting/SettingsScriptingInterface.h" | 145 | #include "scripting/SettingsScriptingInterface.h" |
| 145 | #include "scripting/WindowScriptingInterface.h" | 146 | #include "scripting/WindowScriptingInterface.h" |
| 146 | #include "scripting/ControllerScriptingInterface.h" | 147 | #include "scripting/ControllerScriptingInterface.h" |
| 147 | #include "scripting/TabletScriptingInterface.h" | ||
| 148 | #include "scripting/ToolbarScriptingInterface.h" | 148 | #include "scripting/ToolbarScriptingInterface.h" |
| 149 | #include "scripting/RatesScriptingInterface.h" | 149 | #include "scripting/RatesScriptingInterface.h" |
| 150 | #if defined(Q_OS_MAC) || defined(Q_OS_WIN) | 150 | #if defined(Q_OS_MAC) || defined(Q_OS_WIN) |
| @@ -5183,8 +5183,6 @@ void Application::registerScriptEngineWithApplicationServices(ScriptEngine* scri · 5032 unmodified lines | |||
| 5183 | scriptEngine->registerGlobalObject("ScriptDiscoveryService", DependencyManager::get<ScriptEngines>().data()); | 5183 | scriptEngine->registerGlobalObject("ScriptDiscoveryService", DependencyManager::get<ScriptEngines>().data()); |
| 5184 | scriptEngine->registerGlobalObject("Reticle", getApplicationCompositor().getReticleInterface()); | 5184 | scriptEngine->registerGlobalObject("Reticle", getApplicationCompositor().getReticleInterface()); |
| 5185 | 5185 | ||
| 5186 | scriptEngine->registerGlobalObject("Tablet", DependencyManager::get<TabletScriptingInterface>().data()); | ||
| 5187 | |||
| 5188 | scriptEngine->registerGlobalObject("UserActivityLogger", DependencyManager::get<UserActivityLoggerScriptingInterface>().data()); | 5186 | scriptEngine->registerGlobalObject("UserActivityLogger", DependencyManager::get<UserActivityLoggerScriptingInterface>().data()); |
| 5189 | scriptEngine->registerGlobalObject("Users", DependencyManager::get<UsersScriptingInterface>().data()); | 5187 | scriptEngine->registerGlobalObject("Users", DependencyManager::get<UsersScriptingInterface>().data()); |
| 5190 | 5188 | ||