Showing the changes to interface/src/Application.cpp (1 of 6 files). Show all
Unified · Split
| @@ -193,8 +193,7 @@ · 192 unmodified lines | |||
| 193 | #include "scripting/TTSScriptingInterface.h" | 193 | #include "scripting/TTSScriptingInterface.h" |
| 194 | #include "scripting/KeyboardScriptingInterface.h" | 194 | #include "scripting/KeyboardScriptingInterface.h" |
| 195 | #include "scripting/PerformanceScriptingInterface.h" | 195 | #include "scripting/PerformanceScriptingInterface.h" |
| 196 | 196 | #include "scripting/RenderScriptingInterface.h" | |
| 197 | |||
| 198 | 197 | ||
| 199 | #if defined(Q_OS_MAC) || defined(Q_OS_WIN) | 198 | #if defined(Q_OS_MAC) || defined(Q_OS_WIN) |
| 200 | #include "SpeechRecognizer.h" | 199 | #include "SpeechRecognizer.h" |
| @@ -3328,7 +3327,7 @@ void Application::onDesktopRootContextCreated(QQmlContext* surfaceContext) { · 3127 unmodified lines | |||
| 3328 | surfaceContext->setContextProperty("LODManager", DependencyManager::get<LODManager>().data()); | 3327 | surfaceContext->setContextProperty("LODManager", DependencyManager::get<LODManager>().data()); |
| 3329 | surfaceContext->setContextProperty("HMD", DependencyManager::get<HMDScriptingInterface>().data()); | 3328 | surfaceContext->setContextProperty("HMD", DependencyManager::get<HMDScriptingInterface>().data()); |
| 3330 | surfaceContext->setContextProperty("Scene", DependencyManager::get<SceneScriptingInterface>().data()); | 3329 | surfaceContext->setContextProperty("Scene", DependencyManager::get<SceneScriptingInterface>().data()); |
| 3331 | surfaceContext->setContextProperty("Render", _graphicsEngine.getRenderEngine()->getConfiguration().get()); | 3330 | surfaceContext->setContextProperty("Render", RenderScriptingInterface::getInstance()); |
| 3332 | surfaceContext->setContextProperty("Workload", _gameWorkload._engine->getConfiguration().get()); | 3331 | surfaceContext->setContextProperty("Workload", _gameWorkload._engine->getConfiguration().get()); |
| 3333 | surfaceContext->setContextProperty("Reticle", getApplicationCompositor().getReticleInterface()); | 3332 | surfaceContext->setContextProperty("Reticle", getApplicationCompositor().getReticleInterface()); |
| 3334 | surfaceContext->setContextProperty("Snapshot", DependencyManager::get<Snapshot>().data()); | 3333 | surfaceContext->setContextProperty("Snapshot", DependencyManager::get<Snapshot>().data()); |
| @@ -3443,7 +3442,7 @@ void Application::setupQmlSurface(QQmlContext* surfaceContext, bool setAdditiona · 108 unmodified lines | |||
| 3443 | surfaceContext->setContextProperty("InputConfiguration", DependencyManager::get<InputConfiguration>().data()); | 3442 | surfaceContext->setContextProperty("InputConfiguration", DependencyManager::get<InputConfiguration>().data()); |
| 3444 | surfaceContext->setContextProperty("SoundCache", DependencyManager::get<SoundCacheScriptingInterface>().data()); | 3443 | surfaceContext->setContextProperty("SoundCache", DependencyManager::get<SoundCacheScriptingInterface>().data()); |
| 3445 | surfaceContext->setContextProperty("AvatarBookmarks", DependencyManager::get<AvatarBookmarks>().data()); | 3444 | surfaceContext->setContextProperty("AvatarBookmarks", DependencyManager::get<AvatarBookmarks>().data()); |
| 3446 | surfaceContext->setContextProperty("Render", AbstractViewStateInterface::instance()->getRenderEngine()->getConfiguration().get()); | 3445 | surfaceContext->setContextProperty("Render", RenderScriptingInterface::getInstance()); |
| 3447 | surfaceContext->setContextProperty("Workload", qApp->getGameWorkload()._engine->getConfiguration().get()); | 3446 | surfaceContext->setContextProperty("Workload", qApp->getGameWorkload()._engine->getConfiguration().get()); |
| 3448 | surfaceContext->setContextProperty("Controller", DependencyManager::get<controller::ScriptingInterface>().data()); | 3447 | surfaceContext->setContextProperty("Controller", DependencyManager::get<controller::ScriptingInterface>().data()); |
| 3449 | surfaceContext->setContextProperty("Pointers", DependencyManager::get<PointerScriptingInterface>().data()); | 3448 | surfaceContext->setContextProperty("Pointers", DependencyManager::get<PointerScriptingInterface>().data()); |
| @@ -7397,7 +7396,7 @@ void Application::registerScriptEngineWithApplicationServices(ScriptEnginePointe · 3947 unmodified lines | |||
| 7397 | scriptEngine->registerFunction("HMD", "getHUDLookAtPosition3D", HMDScriptingInterface::getHUDLookAtPosition3D, 0); | 7396 | scriptEngine->registerFunction("HMD", "getHUDLookAtPosition3D", HMDScriptingInterface::getHUDLookAtPosition3D, 0); |
| 7398 | 7397 | ||
| 7399 | scriptEngine->registerGlobalObject("Scene", DependencyManager::get<SceneScriptingInterface>().data()); | 7398 | scriptEngine->registerGlobalObject("Scene", DependencyManager::get<SceneScriptingInterface>().data()); |
| 7400 | scriptEngine->registerGlobalObject("Render", _graphicsEngine.getRenderEngine()->getConfiguration().get()); | 7399 | scriptEngine->registerGlobalObject("Render", RenderScriptingInterface::getInstance()); |
| 7401 | scriptEngine->registerGlobalObject("Workload", _gameWorkload._engine->getConfiguration().get()); | 7400 | scriptEngine->registerGlobalObject("Workload", _gameWorkload._engine->getConfiguration().get()); |
| 7402 | 7401 | ||
| 7403 | GraphicsScriptingInterface::registerMetaTypes(scriptEngine.data()); | 7402 | GraphicsScriptingInterface::registerMetaTypes(scriptEngine.data()); |