Showing the changes to interface/src/Application.cpp (1 of 2 files). Show all
Unified · Split
| @@ -867,7 +867,11 @@ bool setupEssentials(int& argc, char** argv, bool runningMarkerExisted) { · 866 unmodified lines | |||
| 867 | DependencyManager::set<ScriptCache>(); | 867 | DependencyManager::set<ScriptCache>(); |
| 868 | DependencyManager::set<SoundCache>(); | 868 | DependencyManager::set<SoundCache>(); |
| 869 | DependencyManager::set<SoundCacheScriptingInterface>(); | 869 | DependencyManager::set<SoundCacheScriptingInterface>(); |
| 870 | |||
| 871 | #ifdef HAVE_DDE | ||
| 870 | DependencyManager::set<DdeFaceTracker>(); | 872 | DependencyManager::set<DdeFaceTracker>(); |
| 873 | #endif | ||
| 874 | |||
| 871 | DependencyManager::set<EyeTracker>(); | 875 | DependencyManager::set<EyeTracker>(); |
| 872 | DependencyManager::set<AudioClient>(); | 876 | DependencyManager::set<AudioClient>(); |
| 873 | DependencyManager::set<AudioScope>(); | 877 | DependencyManager::set<AudioScope>(); |
| @@ -3324,7 +3328,9 @@ void Application::onDesktopRootContextCreated(QQmlContext* surfaceContext) { · 2450 unmodified lines | |||
| 3324 | surfaceContext->setContextProperty("AccountServices", AccountServicesScriptingInterface::getInstance()); | 3328 | surfaceContext->setContextProperty("AccountServices", AccountServicesScriptingInterface::getInstance()); |
| 3325 | 3329 | ||
| 3326 | surfaceContext->setContextProperty("DialogsManager", _dialogsManagerScriptingInterface); | 3330 | surfaceContext->setContextProperty("DialogsManager", _dialogsManagerScriptingInterface); |
| 3331 | #ifdef HAVE_DDE | ||
| 3327 | surfaceContext->setContextProperty("FaceTracker", DependencyManager::get<DdeFaceTracker>().data()); | 3332 | surfaceContext->setContextProperty("FaceTracker", DependencyManager::get<DdeFaceTracker>().data()); |
| 3333 | #endif | ||
| 3328 | surfaceContext->setContextProperty("AvatarManager", DependencyManager::get<AvatarManager>().data()); | 3334 | surfaceContext->setContextProperty("AvatarManager", DependencyManager::get<AvatarManager>().data()); |
| 3329 | surfaceContext->setContextProperty("LODManager", DependencyManager::get<LODManager>().data()); | 3335 | surfaceContext->setContextProperty("LODManager", DependencyManager::get<LODManager>().data()); |
| 3330 | surfaceContext->setContextProperty("HMD", DependencyManager::get<HMDScriptingInterface>().data()); | 3336 | surfaceContext->setContextProperty("HMD", DependencyManager::get<HMDScriptingInterface>().data()); |
| @@ -5176,7 +5182,11 @@ ivec2 Application::getMouse() const { · 1845 unmodified lines | |||
| 5176 | FaceTracker* Application::getActiveFaceTracker() { | 5182 | FaceTracker* Application::getActiveFaceTracker() { |
| 5177 | auto dde = DependencyManager::get<DdeFaceTracker>(); | 5183 | auto dde = DependencyManager::get<DdeFaceTracker>(); |
| 5178 | 5184 | ||
| 5179 | return dde->isActive() ? static_cast<FaceTracker*>(dde.data()) : nullptr; | 5185 | if(dde){ |
| 5186 | return dde->isActive() ? static_cast<FaceTracker*>(dde.data()) : nullptr; | ||
| 5187 | }else{ | ||
| 5188 | return nullptr; | ||
| 5189 | } | ||
| 5180 | } | 5190 | } |
| 5181 | 5191 | ||
| 5182 | FaceTracker* Application::getSelectedFaceTracker() { | 5192 | FaceTracker* Application::getSelectedFaceTracker() { |
| @@ -7010,7 +7020,10 @@ void Application::copyDisplayViewFrustum(ViewFrustum& viewOut) const { · 1827 unmodified lines | |||
| 7010 | // feature. However, we still use this to reset face trackers, eye trackers, audio and to optionally re-load the avatar | 7020 | // feature. However, we still use this to reset face trackers, eye trackers, audio and to optionally re-load the avatar |
| 7011 | // rig and animations from scratch. | 7021 | // rig and animations from scratch. |
| 7012 | void Application::resetSensors(bool andReload) { | 7022 | void Application::resetSensors(bool andReload) { |
| 7023 | #ifdef HAVE_DDE | ||
| 7013 | DependencyManager::get<DdeFaceTracker>()->reset(); | 7024 | DependencyManager::get<DdeFaceTracker>()->reset(); |
| 7025 | #endif | ||
| 7026 | |||
| 7014 | DependencyManager::get<EyeTracker>()->reset(); | 7027 | DependencyManager::get<EyeTracker>()->reset(); |
| 7015 | _overlayConductor.centerUI(); | 7028 | _overlayConductor.centerUI(); |
| 7016 | getActiveDisplayPlugin()->resetSensors(); | 7029 | getActiveDisplayPlugin()->resetSensors(); |
| @@ -7402,8 +7415,10 @@ void Application::registerScriptEngineWithApplicationServices(ScriptEnginePointe · 385 unmodified lines | |||
| 7402 | scriptEngine->registerGlobalObject("AccountServices", AccountServicesScriptingInterface::getInstance()); | 7415 | scriptEngine->registerGlobalObject("AccountServices", AccountServicesScriptingInterface::getInstance()); |
| 7403 | qScriptRegisterMetaType(scriptEngine.data(), DownloadInfoResultToScriptValue, DownloadInfoResultFromScriptValue); | 7416 | qScriptRegisterMetaType(scriptEngine.data(), DownloadInfoResultToScriptValue, DownloadInfoResultFromScriptValue); |
| 7404 | 7417 | ||
| 7418 | #ifdef HAVE_DDE | ||
| 7405 | scriptEngine->registerGlobalObject("FaceTracker", DependencyManager::get<DdeFaceTracker>().data()); | 7419 | scriptEngine->registerGlobalObject("FaceTracker", DependencyManager::get<DdeFaceTracker>().data()); |
| 7406 | 7420 | #endif | |
| 7421 | |||
| 7407 | scriptEngine->registerGlobalObject("AvatarManager", DependencyManager::get<AvatarManager>().data()); | 7422 | scriptEngine->registerGlobalObject("AvatarManager", DependencyManager::get<AvatarManager>().data()); |
| 7408 | 7423 | ||
| 7409 | scriptEngine->registerGlobalObject("LODManager", DependencyManager::get<LODManager>().data()); | 7424 | scriptEngine->registerGlobalObject("LODManager", DependencyManager::get<LODManager>().data()); |