Showing the changes to interface/src/Application.cpp (1 of 52 files). Show all
Unified · Split
| @@ -963,7 +963,7 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo · 962 unmodified lines | ||
| 963 | 963 | DependencyManager::get<AddressManager>().data(), &AddressManager::storeCurrentAddress); |
| 964 | 964 | |
| 965 | 965 | auto scriptEngines = DependencyManager::get<ScriptEngines>().data(); |
| 966 | − scriptEngines->registerScriptInitializer([this](ScriptEngine* engine){ | |
| 966 | + scriptEngines->registerScriptInitializer([this](ScriptEnginePointer engine){ | |
| 967 | 967 | registerScriptEngineWithApplicationServices(engine); |
| 968 | 968 | }); |
| 969 | 969 | |
| @@ -5209,7 +5209,7 @@ void Application::update(float deltaTime) { · 4239 unmodified lines | ||
| 5209 | 5209 | } |
| 5210 | 5210 | } |
| 5211 | 5211 | |
| 5212 | − avatarManager->postUpdate(deltaTime); | |
| 5212 | + avatarManager->postUpdate(deltaTime, getMain3DScene()); | |
| 5213 | 5213 | |
| 5214 | 5214 | { |
| 5215 | 5215 | PROFILE_RANGE_EX(app, "PreRenderLambdas", 0xffff0000, (uint64_t)0); |
| @@ -5930,7 +5930,7 @@ int Application::processOctreeStats(ReceivedMessage& message, SharedNodePointer · 714 unmodified lines | ||
| 5930 | 5930 | void Application::packetSent(quint64 length) { |
| 5931 | 5931 | } |
| 5932 | 5932 | |
| 5933 | −void Application::registerScriptEngineWithApplicationServices(ScriptEngine* scriptEngine) { | |
| 5933 | +void Application::registerScriptEngineWithApplicationServices(ScriptEnginePointer scriptEngine) { | |
| 5934 | 5934 | |
| 5935 | 5935 | scriptEngine->setEmitScriptUpdatesFunction([this]() { |
| 5936 | 5936 | SharedNodePointer entityServerNode = DependencyManager::get<NodeList>()->soloNodeOfType(NodeType::EntityServer); |
| @@ -5965,29 +5965,31 @@ void Application::registerScriptEngineWithApplicationServices(ScriptEngine* scri · 28 unmodified lines | ||
| 5965 | 5965 | |
| 5966 | 5966 | ClipboardScriptingInterface* clipboardScriptable = new ClipboardScriptingInterface(); |
| 5967 | 5967 | scriptEngine->registerGlobalObject("Clipboard", clipboardScriptable); |
| 5968 | − connect(scriptEngine, &ScriptEngine::finished, clipboardScriptable, &ClipboardScriptingInterface::deleteLater); | |
| 5968 | + connect(scriptEngine.data(), &ScriptEngine::finished, clipboardScriptable, &ClipboardScriptingInterface::deleteLater); | |
| 5969 | 5969 | |
| 5970 | 5970 | scriptEngine->registerGlobalObject("Overlays", &_overlays); |
| 5971 | − qScriptRegisterMetaType(scriptEngine, OverlayPropertyResultToScriptValue, OverlayPropertyResultFromScriptValue); | |
| 5972 | − qScriptRegisterMetaType(scriptEngine, RayToOverlayIntersectionResultToScriptValue, | |
| 5971 | + qScriptRegisterMetaType(scriptEngine.data(), OverlayPropertyResultToScriptValue, OverlayPropertyResultFromScriptValue); | |
| 5972 | + qScriptRegisterMetaType(scriptEngine.data(), RayToOverlayIntersectionResultToScriptValue, | |
| 5973 | 5973 | RayToOverlayIntersectionResultFromScriptValue); |
| 5974 | 5974 | |
| 5975 | 5975 | scriptEngine->registerGlobalObject("OffscreenFlags", DependencyManager::get<OffscreenUi>()->getFlags()); |
| 5976 | 5976 | scriptEngine->registerGlobalObject("Desktop", DependencyManager::get<DesktopScriptingInterface>().data()); |
| 5977 | 5977 | |
| 5978 | − qScriptRegisterMetaType(scriptEngine, wrapperToScriptValue<ToolbarProxy>, wrapperFromScriptValue<ToolbarProxy>); | |
| 5979 | − qScriptRegisterMetaType(scriptEngine, wrapperToScriptValue<ToolbarButtonProxy>, wrapperFromScriptValue<ToolbarButtonProxy>); | |
| 5978 | + qScriptRegisterMetaType(scriptEngine.data(), wrapperToScriptValue<ToolbarProxy>, wrapperFromScriptValue<ToolbarProxy>); | |
| 5979 | + qScriptRegisterMetaType(scriptEngine.data(), | |
| 5980 | + wrapperToScriptValue<ToolbarButtonProxy>, wrapperFromScriptValue<ToolbarButtonProxy>); | |
| 5980 | 5981 | scriptEngine->registerGlobalObject("Toolbars", DependencyManager::get<ToolbarScriptingInterface>().data()); |
| 5981 | 5982 | |
| 5982 | − qScriptRegisterMetaType(scriptEngine, wrapperToScriptValue<TabletProxy>, wrapperFromScriptValue<TabletProxy>); | |
| 5983 | − qScriptRegisterMetaType(scriptEngine, wrapperToScriptValue<TabletButtonProxy>, wrapperFromScriptValue<TabletButtonProxy>); | |
| 5983 | + qScriptRegisterMetaType(scriptEngine.data(), wrapperToScriptValue<TabletProxy>, wrapperFromScriptValue<TabletProxy>); | |
| 5984 | + qScriptRegisterMetaType(scriptEngine.data(), | |
| 5985 | + wrapperToScriptValue<TabletButtonProxy>, wrapperFromScriptValue<TabletButtonProxy>); | |
| 5984 | 5986 | scriptEngine->registerGlobalObject("Tablet", DependencyManager::get<TabletScriptingInterface>().data()); |
| 5985 | 5987 | |
| 5986 | − | |
| 5987 | − DependencyManager::get<TabletScriptingInterface>().data()->setToolbarScriptingInterface(DependencyManager::get<ToolbarScriptingInterface>().data()); | |
| 5988 | + auto toolbarScriptingInterface = DependencyManager::get<ToolbarScriptingInterface>().data(); | |
| 5989 | + DependencyManager::get<TabletScriptingInterface>().data()->setToolbarScriptingInterface(toolbarScriptingInterface); | |
| 5988 | 5990 | |
| 5989 | 5991 | scriptEngine->registerGlobalObject("Window", DependencyManager::get<WindowScriptingInterface>().data()); |
| 5990 | − qScriptRegisterMetaType(scriptEngine, CustomPromptResultToScriptValue, CustomPromptResultFromScriptValue); | |
| 5992 | + qScriptRegisterMetaType(scriptEngine.data(), CustomPromptResultToScriptValue, CustomPromptResultFromScriptValue); | |
| 5991 | 5993 | scriptEngine->registerGetterSetter("location", LocationScriptingInterface::locationGetter, |
| 5992 | 5994 | LocationScriptingInterface::locationSetter, "Window"); |
| 5993 | 5995 | // register `location` on the global object. |
| @@ -6019,7 +6021,7 @@ void Application::registerScriptEngineWithApplicationServices(ScriptEngine* scri · 25 unmodified lines | ||
| 6019 | 6021 | scriptEngine->registerGlobalObject("DialogsManager", _dialogsManagerScriptingInterface); |
| 6020 | 6022 | |
| 6021 | 6023 | scriptEngine->registerGlobalObject("GlobalServices", GlobalServicesScriptingInterface::getInstance()); |
| 6022 | − qScriptRegisterMetaType(scriptEngine, DownloadInfoResultToScriptValue, DownloadInfoResultFromScriptValue); | |
| 6024 | + qScriptRegisterMetaType(scriptEngine.data(), DownloadInfoResultToScriptValue, DownloadInfoResultFromScriptValue); | |
| 6023 | 6025 | |
| 6024 | 6026 | scriptEngine->registerGlobalObject("FaceTracker", DependencyManager::get<DdeFaceTracker>().data()); |
| 6025 | 6027 | |
| @@ -6047,11 +6049,11 @@ void Application::registerScriptEngineWithApplicationServices(ScriptEngine* scri · 21 unmodified lines | ||
| 6047 | 6049 | scriptEngine->registerGlobalObject("LimitlessSpeechRecognition", DependencyManager::get<LimitlessVoiceRecognitionScriptingInterface>().data()); |
| 6048 | 6050 | |
| 6049 | 6051 | if (auto steamClient = PluginManager::getInstance()->getSteamClientPlugin()) { |
| 6050 | − scriptEngine->registerGlobalObject("Steam", new SteamScriptingInterface(scriptEngine, steamClient.get())); | |
| 6052 | + scriptEngine->registerGlobalObject("Steam", new SteamScriptingInterface(scriptEngine.data(), steamClient.get())); | |
| 6051 | 6053 | } |
| 6052 | 6054 | auto scriptingInterface = DependencyManager::get<controller::ScriptingInterface>(); |
| 6053 | 6055 | scriptEngine->registerGlobalObject("Controller", scriptingInterface.data()); |
| 6054 | − UserInputMapper::registerControllerTypes(scriptEngine); | |
| 6056 | + UserInputMapper::registerControllerTypes(scriptEngine.data()); | |
| 6055 | 6057 | |
| 6056 | 6058 | auto recordingInterface = DependencyManager::get<RecordingScriptingInterface>(); |
| 6057 | 6059 | scriptEngine->registerGlobalObject("Recording", recordingInterface.data()); |
| @@ -6062,14 +6064,19 @@ void Application::registerScriptEngineWithApplicationServices(ScriptEngine* scri · 4 unmodified lines | ||
| 6062 | 6064 | scriptEngine->registerGlobalObject("Selection", DependencyManager::get<SelectionScriptingInterface>().data()); |
| 6063 | 6065 | scriptEngine->registerGlobalObject("ContextOverlay", DependencyManager::get<ContextOverlayInterface>().data()); |
| 6064 | 6066 | |
| 6065 | − qScriptRegisterMetaType(scriptEngine, OverlayIDtoScriptValue, OverlayIDfromScriptValue); | |
| 6067 | + qScriptRegisterMetaType(scriptEngine.data(), OverlayIDtoScriptValue, OverlayIDfromScriptValue); | |
| 6066 | 6068 | |
| 6067 | 6069 | // connect this script engines printedMessage signal to the global ScriptEngines these various messages |
| 6068 | − connect(scriptEngine, &ScriptEngine::printedMessage, DependencyManager::get<ScriptEngines>().data(), &ScriptEngines::onPrintedMessage); | |
| 6069 | − connect(scriptEngine, &ScriptEngine::errorMessage, DependencyManager::get<ScriptEngines>().data(), &ScriptEngines::onErrorMessage); | |
| 6070 | − connect(scriptEngine, &ScriptEngine::warningMessage, DependencyManager::get<ScriptEngines>().data(), &ScriptEngines::onWarningMessage); | |
| 6071 | − connect(scriptEngine, &ScriptEngine::infoMessage, DependencyManager::get<ScriptEngines>().data(), &ScriptEngines::onInfoMessage); | |
| 6072 | − connect(scriptEngine, &ScriptEngine::clearDebugWindow, DependencyManager::get<ScriptEngines>().data(), &ScriptEngines::onClearDebugWindow); | |
| 6070 | + connect(scriptEngine.data(), &ScriptEngine::printedMessage, | |
| 6071 | + DependencyManager::get<ScriptEngines>().data(), &ScriptEngines::onPrintedMessage); | |
| 6072 | + connect(scriptEngine.data(), &ScriptEngine::errorMessage, | |
| 6073 | + DependencyManager::get<ScriptEngines>().data(), &ScriptEngines::onErrorMessage); | |
| 6074 | + connect(scriptEngine.data(), &ScriptEngine::warningMessage, | |
| 6075 | + DependencyManager::get<ScriptEngines>().data(), &ScriptEngines::onWarningMessage); | |
| 6076 | + connect(scriptEngine.data(), &ScriptEngine::infoMessage, | |
| 6077 | + DependencyManager::get<ScriptEngines>().data(), &ScriptEngines::onInfoMessage); | |
| 6078 | + connect(scriptEngine.data(), &ScriptEngine::clearDebugWindow, | |
| 6079 | + DependencyManager::get<ScriptEngines>().data(), &ScriptEngines::onClearDebugWindow); | |
| 6073 | 6080 | |
| 6074 | 6081 | } |
| 6075 | 6082 | |