Showing the changes to interface/src/Application.cpp (1 of 49 files). Show all
Unified · Split
| @@ -7476,10 +7476,10 @@ void Application::registerScriptEngineWithApplicationServices(const ScriptManage · 7475 unmodified lines | |||
| 7476 | 7476 | ||
| 7477 | ClipboardScriptingInterface* clipboardScriptable = new ClipboardScriptingInterface(); | 7477 | ClipboardScriptingInterface* clipboardScriptable = new ClipboardScriptingInterface(); |
| 7478 | scriptEngine->registerGlobalObject("Clipboard", clipboardScriptable); | 7478 | scriptEngine->registerGlobalObject("Clipboard", clipboardScriptable); |
| 7479 | connect(scriptManager.data(), &ScriptManager::finished, clipboardScriptable, &ClipboardScriptingInterface::deleteLater); | 7479 | connect(scriptManager.get(), &ScriptManager::finished, clipboardScriptable, &ClipboardScriptingInterface::deleteLater); |
| 7480 | 7480 | ||
| 7481 | scriptEngine->registerGlobalObject("Overlays", &_overlays); | 7481 | scriptEngine->registerGlobalObject("Overlays", &_overlays); |
| 7482 | scriptRegisterMetaType(scriptEngine.data(), RayToOverlayIntersectionResultToScriptValue, | 7482 | scriptRegisterMetaType(scriptEngine.get(), RayToOverlayIntersectionResultToScriptValue, |
| 7483 | RayToOverlayIntersectionResultFromScriptValue); | 7483 | RayToOverlayIntersectionResultFromScriptValue); |
| 7484 | 7484 | ||
| 7485 | bool clientScript = scriptManager->isClientScript(); | 7485 | bool clientScript = scriptManager->isClientScript(); |
| @@ -7497,13 +7497,13 @@ void Application::registerScriptEngineWithApplicationServices(const ScriptManage · 11 unmodified lines | |||
| 7497 | } | 7497 | } |
| 7498 | #endif | 7498 | #endif |
| 7499 | 7499 | ||
| 7500 | scriptRegisterMetaType(scriptEngine.data(), wrapperToScriptValue<ToolbarProxy>, wrapperFromScriptValue<ToolbarProxy>); | 7500 | scriptRegisterMetaType(scriptEngine.get(), wrapperToScriptValue<ToolbarProxy>, wrapperFromScriptValue<ToolbarProxy>); |
| 7501 | scriptRegisterMetaType(scriptEngine.data(), | 7501 | scriptRegisterMetaType(scriptEngine.get(), |
| 7502 | wrapperToScriptValue<ToolbarButtonProxy>, wrapperFromScriptValue<ToolbarButtonProxy>); | 7502 | wrapperToScriptValue<ToolbarButtonProxy>, wrapperFromScriptValue<ToolbarButtonProxy>); |
| 7503 | scriptEngine->registerGlobalObject("Toolbars", DependencyManager::get<ToolbarScriptingInterface>().data()); | 7503 | scriptEngine->registerGlobalObject("Toolbars", DependencyManager::get<ToolbarScriptingInterface>().data()); |
| 7504 | 7504 | ||
| 7505 | scriptRegisterMetaType(scriptEngine.data(), wrapperToScriptValue<TabletProxy>, wrapperFromScriptValue<TabletProxy>); | 7505 | scriptRegisterMetaType(scriptEngine.get(), wrapperToScriptValue<TabletProxy>, wrapperFromScriptValue<TabletProxy>); |
| 7506 | scriptRegisterMetaType(scriptEngine.data(), | 7506 | scriptRegisterMetaType(scriptEngine.get(), |
| 7507 | wrapperToScriptValue<TabletButtonProxy>, wrapperFromScriptValue<TabletButtonProxy>); | 7507 | wrapperToScriptValue<TabletButtonProxy>, wrapperFromScriptValue<TabletButtonProxy>); |
| 7508 | scriptEngine->registerGlobalObject("Tablet", DependencyManager::get<TabletScriptingInterface>().data()); | 7508 | scriptEngine->registerGlobalObject("Tablet", DependencyManager::get<TabletScriptingInterface>().data()); |
| 7509 | // FIXME remove these deprecated names for the tablet scripting interface | 7509 | // FIXME remove these deprecated names for the tablet scripting interface |
| @@ -7554,12 +7554,12 @@ void Application::registerScriptEngineWithApplicationServices(const ScriptManage · 44 unmodified lines | |||
| 7554 | scriptEngine->registerGlobalObject("Account", AccountServicesScriptingInterface::getInstance()); // DEPRECATED - TO BE REMOVED | 7554 | scriptEngine->registerGlobalObject("Account", AccountServicesScriptingInterface::getInstance()); // DEPRECATED - TO BE REMOVED |
| 7555 | scriptEngine->registerGlobalObject("GlobalServices", AccountServicesScriptingInterface::getInstance()); // DEPRECATED - TO BE REMOVED | 7555 | scriptEngine->registerGlobalObject("GlobalServices", AccountServicesScriptingInterface::getInstance()); // DEPRECATED - TO BE REMOVED |
| 7556 | scriptEngine->registerGlobalObject("AccountServices", AccountServicesScriptingInterface::getInstance()); | 7556 | scriptEngine->registerGlobalObject("AccountServices", AccountServicesScriptingInterface::getInstance()); |
| 7557 | scriptRegisterMetaType(scriptEngine.data(), DownloadInfoResultToScriptValue, DownloadInfoResultFromScriptValue); | 7557 | scriptRegisterMetaType(scriptEngine.get(), DownloadInfoResultToScriptValue, DownloadInfoResultFromScriptValue); |
| 7558 | 7558 | ||
| 7559 | scriptEngine->registerGlobalObject("AvatarManager", DependencyManager::get<AvatarManager>().data()); | 7559 | scriptEngine->registerGlobalObject("AvatarManager", DependencyManager::get<AvatarManager>().data()); |
| 7560 | 7560 | ||
| 7561 | scriptEngine->registerGlobalObject("LODManager", DependencyManager::get<LODManager>().data()); | 7561 | scriptEngine->registerGlobalObject("LODManager", DependencyManager::get<LODManager>().data()); |
| 7562 | scriptRegisterMetaType(scriptEngine.data(), worldDetailQualityToScriptValue, worldDetailQualityFromScriptValue); | 7562 | scriptRegisterMetaType(scriptEngine.get(), worldDetailQualityToScriptValue, worldDetailQualityFromScriptValue); |
| 7563 | 7563 | ||
| 7564 | scriptEngine->registerGlobalObject("Keyboard", DependencyManager::get<KeyboardScriptingInterface>().data()); | 7564 | scriptEngine->registerGlobalObject("Keyboard", DependencyManager::get<KeyboardScriptingInterface>().data()); |
| 7565 | scriptEngine->registerGlobalObject("Performance", new PerformanceScriptingInterface()); | 7565 | scriptEngine->registerGlobalObject("Performance", new PerformanceScriptingInterface()); |
| @@ -7574,7 +7574,7 @@ void Application::registerScriptEngineWithApplicationServices(const ScriptManage · 8 unmodified lines | |||
| 7574 | scriptEngine->registerGlobalObject("Render", RenderScriptingInterface::getInstance()); | 7574 | scriptEngine->registerGlobalObject("Render", RenderScriptingInterface::getInstance()); |
| 7575 | scriptEngine->registerGlobalObject("Workload", _gameWorkload._engine->getConfiguration().get()); | 7575 | scriptEngine->registerGlobalObject("Workload", _gameWorkload._engine->getConfiguration().get()); |
| 7576 | 7576 | ||
| 7577 | GraphicsScriptingInterface::registerMetaTypes(scriptEngine.data()); | 7577 | GraphicsScriptingInterface::registerMetaTypes(scriptEngine.get()); |
| 7578 | scriptEngine->registerGlobalObject("Graphics", DependencyManager::get<GraphicsScriptingInterface>().data()); | 7578 | scriptEngine->registerGlobalObject("Graphics", DependencyManager::get<GraphicsScriptingInterface>().data()); |
| 7579 | 7579 | ||
| 7580 | scriptEngine->registerGlobalObject("ScriptDiscoveryService", DependencyManager::get<ScriptEngines>().data()); | 7580 | scriptEngine->registerGlobalObject("ScriptDiscoveryService", DependencyManager::get<ScriptEngines>().data()); |
| @@ -7586,11 +7586,11 @@ void Application::registerScriptEngineWithApplicationServices(const ScriptManage · 5 unmodified lines | |||
| 7586 | scriptEngine->registerGlobalObject("GooglePoly", DependencyManager::get<GooglePolyScriptingInterface>().data()); | 7586 | scriptEngine->registerGlobalObject("GooglePoly", DependencyManager::get<GooglePolyScriptingInterface>().data()); |
| 7587 | 7587 | ||
| 7588 | if (auto steamClient = PluginManager::getInstance()->getSteamClientPlugin()) { | 7588 | if (auto steamClient = PluginManager::getInstance()->getSteamClientPlugin()) { |
| 7589 | scriptEngine->registerGlobalObject("Steam", new SteamScriptingInterface(scriptManager.data(), steamClient.get())); | 7589 | scriptEngine->registerGlobalObject("Steam", new SteamScriptingInterface(scriptManager.get(), steamClient.get())); |
| 7590 | } | 7590 | } |
| 7591 | auto scriptingInterface = DependencyManager::get<controller::ScriptingInterface>(); | 7591 | auto scriptingInterface = DependencyManager::get<controller::ScriptingInterface>(); |
| 7592 | scriptEngine->registerGlobalObject("Controller", scriptingInterface.data()); | 7592 | scriptEngine->registerGlobalObject("Controller", scriptingInterface.data()); |
| 7593 | UserInputMapper::registerControllerTypes(scriptEngine.data()); | 7593 | UserInputMapper::registerControllerTypes(scriptEngine.get()); |
| 7594 | 7594 | ||
| 7595 | auto recordingInterface = DependencyManager::get<RecordingScriptingInterface>(); | 7595 | auto recordingInterface = DependencyManager::get<RecordingScriptingInterface>(); |
| 7596 | scriptEngine->registerGlobalObject("Recording", recordingInterface.data()); | 7596 | scriptEngine->registerGlobalObject("Recording", recordingInterface.data()); |
| @@ -7606,18 +7606,18 @@ void Application::registerScriptEngineWithApplicationServices(const ScriptManage · 9 unmodified lines | |||
| 7606 | scriptEngine->registerGlobalObject("HifiAbout", AboutUtil::getInstance()); // Deprecated. | 7606 | scriptEngine->registerGlobalObject("HifiAbout", AboutUtil::getInstance()); // Deprecated. |
| 7607 | scriptEngine->registerGlobalObject("ResourceRequestObserver", DependencyManager::get<ResourceRequestObserver>().data()); | 7607 | scriptEngine->registerGlobalObject("ResourceRequestObserver", DependencyManager::get<ResourceRequestObserver>().data()); |
| 7608 | 7608 | ||
| 7609 | registerInteractiveWindowMetaType(scriptEngine.data()); | 7609 | registerInteractiveWindowMetaType(scriptEngine.get()); |
| 7610 | 7610 | ||
| 7611 | auto pickScriptingInterface = DependencyManager::get<PickScriptingInterface>(); | 7611 | auto pickScriptingInterface = DependencyManager::get<PickScriptingInterface>(); |
| 7612 | pickScriptingInterface->registerMetaTypes(scriptEngine.data()); | 7612 | pickScriptingInterface->registerMetaTypes(scriptEngine.get()); |
| 7613 | 7613 | ||
| 7614 | // connect this script engines printedMessage signal to the global ScriptEngines these various messages | 7614 | // connect this script engines printedMessage signal to the global ScriptEngines these various messages |
| 7615 | auto scriptEngines = DependencyManager::get<ScriptEngines>().data(); | 7615 | auto scriptEngines = DependencyManager::get<ScriptEngines>().data(); |
| 7616 | connect(scriptManager.data(), &ScriptManager::printedMessage, scriptEngines, &ScriptEngines::onPrintedMessage); | 7616 | connect(scriptManager.get(), &ScriptManager::printedMessage, scriptEngines, &ScriptEngines::onPrintedMessage); |
| 7617 | connect(scriptManager.data(), &ScriptManager::errorMessage, scriptEngines, &ScriptEngines::onErrorMessage); | 7617 | connect(scriptManager.get(), &ScriptManager::errorMessage, scriptEngines, &ScriptEngines::onErrorMessage); |
| 7618 | connect(scriptManager.data(), &ScriptManager::warningMessage, scriptEngines, &ScriptEngines::onWarningMessage); | 7618 | connect(scriptManager.get(), &ScriptManager::warningMessage, scriptEngines, &ScriptEngines::onWarningMessage); |
| 7619 | connect(scriptManager.data(), &ScriptManager::infoMessage, scriptEngines, &ScriptEngines::onInfoMessage); | 7619 | connect(scriptManager.get(), &ScriptManager::infoMessage, scriptEngines, &ScriptEngines::onInfoMessage); |
| 7620 | connect(scriptManager.data(), &ScriptManager::clearDebugWindow, scriptEngines, &ScriptEngines::onClearDebugWindow); | 7620 | connect(scriptManager.get(), &ScriptManager::clearDebugWindow, scriptEngines, &ScriptEngines::onClearDebugWindow); |
| 7621 | 7621 | ||
| 7622 | } | 7622 | } |
| 7623 | 7623 | ||