Showing the changes to interface/src/Application.cpp (1 of 75 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 | |
| @@ -5226,7 +5226,7 @@ void Application::update(float deltaTime) { · 4256 unmodified lines | ||
| 5226 | 5226 | } |
| 5227 | 5227 | } |
| 5228 | 5228 | |
| 5229 | − avatarManager->postUpdate(deltaTime); | |
| 5229 | + avatarManager->postUpdate(deltaTime, getMain3DScene()); | |
| 5230 | 5230 | |
| 5231 | 5231 | { |
| 5232 | 5232 | PROFILE_RANGE_EX(app, "PreRenderLambdas", 0xffff0000, (uint64_t)0); |
| @@ -5947,7 +5947,7 @@ int Application::processOctreeStats(ReceivedMessage& message, SharedNodePointer · 714 unmodified lines | ||
| 5947 | 5947 | void Application::packetSent(quint64 length) { |
| 5948 | 5948 | } |
| 5949 | 5949 | |
| 5950 | −void Application::registerScriptEngineWithApplicationServices(ScriptEngine* scriptEngine) { | |
| 5950 | +void Application::registerScriptEngineWithApplicationServices(ScriptEnginePointer scriptEngine) { | |
| 5951 | 5951 | |
| 5952 | 5952 | scriptEngine->setEmitScriptUpdatesFunction([this]() { |
| 5953 | 5953 | SharedNodePointer entityServerNode = DependencyManager::get<NodeList>()->soloNodeOfType(NodeType::EntityServer); |
| @@ -5982,29 +5982,31 @@ void Application::registerScriptEngineWithApplicationServices(ScriptEngine* scri · 28 unmodified lines | ||
| 5982 | 5982 | |
| 5983 | 5983 | ClipboardScriptingInterface* clipboardScriptable = new ClipboardScriptingInterface(); |
| 5984 | 5984 | scriptEngine->registerGlobalObject("Clipboard", clipboardScriptable); |
| 5985 | − connect(scriptEngine, &ScriptEngine::finished, clipboardScriptable, &ClipboardScriptingInterface::deleteLater); | |
| 5985 | + connect(scriptEngine.data(), &ScriptEngine::finished, clipboardScriptable, &ClipboardScriptingInterface::deleteLater); | |
| 5986 | 5986 | |
| 5987 | 5987 | scriptEngine->registerGlobalObject("Overlays", &_overlays); |
| 5988 | − qScriptRegisterMetaType(scriptEngine, OverlayPropertyResultToScriptValue, OverlayPropertyResultFromScriptValue); | |
| 5989 | − qScriptRegisterMetaType(scriptEngine, RayToOverlayIntersectionResultToScriptValue, | |
| 5988 | + qScriptRegisterMetaType(scriptEngine.data(), OverlayPropertyResultToScriptValue, OverlayPropertyResultFromScriptValue); | |
| 5989 | + qScriptRegisterMetaType(scriptEngine.data(), RayToOverlayIntersectionResultToScriptValue, | |
| 5990 | 5990 | RayToOverlayIntersectionResultFromScriptValue); |
| 5991 | 5991 | |
| 5992 | 5992 | scriptEngine->registerGlobalObject("OffscreenFlags", DependencyManager::get<OffscreenUi>()->getFlags()); |
| 5993 | 5993 | scriptEngine->registerGlobalObject("Desktop", DependencyManager::get<DesktopScriptingInterface>().data()); |
| 5994 | 5994 | |
| 5995 | − qScriptRegisterMetaType(scriptEngine, wrapperToScriptValue<ToolbarProxy>, wrapperFromScriptValue<ToolbarProxy>); | |
| 5996 | − qScriptRegisterMetaType(scriptEngine, wrapperToScriptValue<ToolbarButtonProxy>, wrapperFromScriptValue<ToolbarButtonProxy>); | |
| 5995 | + qScriptRegisterMetaType(scriptEngine.data(), wrapperToScriptValue<ToolbarProxy>, wrapperFromScriptValue<ToolbarProxy>); | |
| 5996 | + qScriptRegisterMetaType(scriptEngine.data(), | |
| 5997 | + wrapperToScriptValue<ToolbarButtonProxy>, wrapperFromScriptValue<ToolbarButtonProxy>); | |
| 5997 | 5998 | scriptEngine->registerGlobalObject("Toolbars", DependencyManager::get<ToolbarScriptingInterface>().data()); |
| 5998 | 5999 | |
| 5999 | − qScriptRegisterMetaType(scriptEngine, wrapperToScriptValue<TabletProxy>, wrapperFromScriptValue<TabletProxy>); | |
| 6000 | − qScriptRegisterMetaType(scriptEngine, wrapperToScriptValue<TabletButtonProxy>, wrapperFromScriptValue<TabletButtonProxy>); | |
| 6000 | + qScriptRegisterMetaType(scriptEngine.data(), wrapperToScriptValue<TabletProxy>, wrapperFromScriptValue<TabletProxy>); | |
| 6001 | + qScriptRegisterMetaType(scriptEngine.data(), | |
| 6002 | + wrapperToScriptValue<TabletButtonProxy>, wrapperFromScriptValue<TabletButtonProxy>); | |
| 6001 | 6003 | scriptEngine->registerGlobalObject("Tablet", DependencyManager::get<TabletScriptingInterface>().data()); |
| 6002 | 6004 | |
| 6003 | − | |
| 6004 | − DependencyManager::get<TabletScriptingInterface>().data()->setToolbarScriptingInterface(DependencyManager::get<ToolbarScriptingInterface>().data()); | |
| 6005 | + auto toolbarScriptingInterface = DependencyManager::get<ToolbarScriptingInterface>().data(); | |
| 6006 | + DependencyManager::get<TabletScriptingInterface>().data()->setToolbarScriptingInterface(toolbarScriptingInterface); | |
| 6005 | 6007 | |
| 6006 | 6008 | scriptEngine->registerGlobalObject("Window", DependencyManager::get<WindowScriptingInterface>().data()); |
| 6007 | − qScriptRegisterMetaType(scriptEngine, CustomPromptResultToScriptValue, CustomPromptResultFromScriptValue); | |
| 6009 | + qScriptRegisterMetaType(scriptEngine.data(), CustomPromptResultToScriptValue, CustomPromptResultFromScriptValue); | |
| 6008 | 6010 | scriptEngine->registerGetterSetter("location", LocationScriptingInterface::locationGetter, |
| 6009 | 6011 | LocationScriptingInterface::locationSetter, "Window"); |
| 6010 | 6012 | // register `location` on the global object. |
| @@ -6036,7 +6038,7 @@ void Application::registerScriptEngineWithApplicationServices(ScriptEngine* scri · 25 unmodified lines | ||
| 6036 | 6038 | scriptEngine->registerGlobalObject("DialogsManager", _dialogsManagerScriptingInterface); |
| 6037 | 6039 | |
| 6038 | 6040 | scriptEngine->registerGlobalObject("GlobalServices", GlobalServicesScriptingInterface::getInstance()); |
| 6039 | − qScriptRegisterMetaType(scriptEngine, DownloadInfoResultToScriptValue, DownloadInfoResultFromScriptValue); | |
| 6041 | + qScriptRegisterMetaType(scriptEngine.data(), DownloadInfoResultToScriptValue, DownloadInfoResultFromScriptValue); | |
| 6040 | 6042 | |
| 6041 | 6043 | scriptEngine->registerGlobalObject("FaceTracker", DependencyManager::get<DdeFaceTracker>().data()); |
| 6042 | 6044 | |
| @@ -6064,11 +6066,11 @@ void Application::registerScriptEngineWithApplicationServices(ScriptEngine* scri · 21 unmodified lines | ||
| 6064 | 6066 | scriptEngine->registerGlobalObject("LimitlessSpeechRecognition", DependencyManager::get<LimitlessVoiceRecognitionScriptingInterface>().data()); |
| 6065 | 6067 | |
| 6066 | 6068 | if (auto steamClient = PluginManager::getInstance()->getSteamClientPlugin()) { |
| 6067 | − scriptEngine->registerGlobalObject("Steam", new SteamScriptingInterface(scriptEngine, steamClient.get())); | |
| 6069 | + scriptEngine->registerGlobalObject("Steam", new SteamScriptingInterface(scriptEngine.data(), steamClient.get())); | |
| 6068 | 6070 | } |
| 6069 | 6071 | auto scriptingInterface = DependencyManager::get<controller::ScriptingInterface>(); |
| 6070 | 6072 | scriptEngine->registerGlobalObject("Controller", scriptingInterface.data()); |
| 6071 | − UserInputMapper::registerControllerTypes(scriptEngine); | |
| 6073 | + UserInputMapper::registerControllerTypes(scriptEngine.data()); | |
| 6072 | 6074 | |
| 6073 | 6075 | auto recordingInterface = DependencyManager::get<RecordingScriptingInterface>(); |
| 6074 | 6076 | scriptEngine->registerGlobalObject("Recording", recordingInterface.data()); |
| @@ -6079,14 +6081,19 @@ void Application::registerScriptEngineWithApplicationServices(ScriptEngine* scri · 4 unmodified lines | ||
| 6079 | 6081 | scriptEngine->registerGlobalObject("Selection", DependencyManager::get<SelectionScriptingInterface>().data()); |
| 6080 | 6082 | scriptEngine->registerGlobalObject("ContextOverlay", DependencyManager::get<ContextOverlayInterface>().data()); |
| 6081 | 6083 | |
| 6082 | − qScriptRegisterMetaType(scriptEngine, OverlayIDtoScriptValue, OverlayIDfromScriptValue); | |
| 6084 | + qScriptRegisterMetaType(scriptEngine.data(), OverlayIDtoScriptValue, OverlayIDfromScriptValue); | |
| 6083 | 6085 | |
| 6084 | 6086 | // connect this script engines printedMessage signal to the global ScriptEngines these various messages |
| 6085 | − connect(scriptEngine, &ScriptEngine::printedMessage, DependencyManager::get<ScriptEngines>().data(), &ScriptEngines::onPrintedMessage); | |
| 6086 | − connect(scriptEngine, &ScriptEngine::errorMessage, DependencyManager::get<ScriptEngines>().data(), &ScriptEngines::onErrorMessage); | |
| 6087 | − connect(scriptEngine, &ScriptEngine::warningMessage, DependencyManager::get<ScriptEngines>().data(), &ScriptEngines::onWarningMessage); | |
| 6088 | − connect(scriptEngine, &ScriptEngine::infoMessage, DependencyManager::get<ScriptEngines>().data(), &ScriptEngines::onInfoMessage); | |
| 6089 | − connect(scriptEngine, &ScriptEngine::clearDebugWindow, DependencyManager::get<ScriptEngines>().data(), &ScriptEngines::onClearDebugWindow); | |
| 6087 | + connect(scriptEngine.data(), &ScriptEngine::printedMessage, | |
| 6088 | + DependencyManager::get<ScriptEngines>().data(), &ScriptEngines::onPrintedMessage); | |
| 6089 | + connect(scriptEngine.data(), &ScriptEngine::errorMessage, | |
| 6090 | + DependencyManager::get<ScriptEngines>().data(), &ScriptEngines::onErrorMessage); | |
| 6091 | + connect(scriptEngine.data(), &ScriptEngine::warningMessage, | |
| 6092 | + DependencyManager::get<ScriptEngines>().data(), &ScriptEngines::onWarningMessage); | |
| 6093 | + connect(scriptEngine.data(), &ScriptEngine::infoMessage, | |
| 6094 | + DependencyManager::get<ScriptEngines>().data(), &ScriptEngines::onInfoMessage); | |
| 6095 | + connect(scriptEngine.data(), &ScriptEngine::clearDebugWindow, | |
| 6096 | + DependencyManager::get<ScriptEngines>().data(), &ScriptEngines::onClearDebugWindow); | |
| 6090 | 6097 | |
| 6091 | 6098 | } |
| 6092 | 6099 | |