History

Merge branch 'master' of github.com:highfidelity/hifi into entity-attachment-bookmark

Dante Ruiz committed 8 years ago

Commit ebb09f42 parents 3abb3d6 0e72197197 files · +1209 −705Browse files

Showing the changes to interface/src/Application.cpp (1 of 197 files). Show all

Unified · Split

interface/src/Application.cpp+16−11
@@ -158,7 +158,7 @@ · 157 unmodified lines
158#include "scripting/AssetMappingsScriptingInterface.h"158#include "scripting/AssetMappingsScriptingInterface.h"
159#include "scripting/ClipboardScriptingInterface.h"159#include "scripting/ClipboardScriptingInterface.h"
160#include "scripting/DesktopScriptingInterface.h"160#include "scripting/DesktopScriptingInterface.h"
161#include "scripting/GlobalServicesScriptingInterface.h"161#include "scripting/AccountServicesScriptingInterface.h"
162#include "scripting/HMDScriptingInterface.h"162#include "scripting/HMDScriptingInterface.h"
163#include "scripting/MenuScriptingInterface.h"163#include "scripting/MenuScriptingInterface.h"
164#include "scripting/SettingsScriptingInterface.h"164#include "scripting/SettingsScriptingInterface.h"
@@ -2379,9 +2379,11 @@ void Application::initializeUi() { · 2214 unmodified lines
2379 surfaceContext->setContextProperty("SoundCache", DependencyManager::get<SoundCache>().data());2379 surfaceContext->setContextProperty("SoundCache", DependencyManager::get<SoundCache>().data());
2380 surfaceContext->setContextProperty("InputConfiguration", DependencyManager::get<InputConfiguration>().data());2380 surfaceContext->setContextProperty("InputConfiguration", DependencyManager::get<InputConfiguration>().data());
2381 2381
2382 surfaceContext->setContextProperty("Account", GlobalServicesScriptingInterface::getInstance());2382 surfaceContext->setContextProperty("Account", AccountServicesScriptingInterface::getInstance()); // DEPRECATED - TO BE REMOVED
2383 surfaceContext->setContextProperty("GlobalServices", AccountServicesScriptingInterface::getInstance()); // DEPRECATED - TO BE REMOVED
2384 surfaceContext->setContextProperty("AccountServices", AccountServicesScriptingInterface::getInstance());
2385
2383 surfaceContext->setContextProperty("DialogsManager", _dialogsManagerScriptingInterface);2386 surfaceContext->setContextProperty("DialogsManager", _dialogsManagerScriptingInterface);
2384 surfaceContext->setContextProperty("GlobalServices", GlobalServicesScriptingInterface::getInstance());
2385 surfaceContext->setContextProperty("FaceTracker", DependencyManager::get<DdeFaceTracker>().data());2387 surfaceContext->setContextProperty("FaceTracker", DependencyManager::get<DdeFaceTracker>().data());
2386 surfaceContext->setContextProperty("AvatarManager", DependencyManager::get<AvatarManager>().data());2388 surfaceContext->setContextProperty("AvatarManager", DependencyManager::get<AvatarManager>().data());
2387 surfaceContext->setContextProperty("UndoStack", &_undoStackScriptingInterface);2389 surfaceContext->setContextProperty("UndoStack", &_undoStackScriptingInterface);
@@ -5468,7 +5470,7 @@ void Application::clearDomainOctreeDetails() { · 3080 unmodified lines
5468 5470
5469 auto skyStage = DependencyManager::get<SceneScriptingInterface>()->getSkyStage();5471 auto skyStage = DependencyManager::get<SceneScriptingInterface>()->getSkyStage();
5470 5472
5471 skyStage->setBackgroundMode(model::SunSkyStage::SKY_DEFAULT);5473 skyStage->setBackgroundMode(graphics::SunSkyStage::SKY_DEFAULT);
5472 5474
5473 DependencyManager::get<AnimationCache>()->clearUnusedResources();5475 DependencyManager::get<AnimationCache>()->clearUnusedResources();
5474 DependencyManager::get<ModelCache>()->clearUnusedResources();5476 DependencyManager::get<ModelCache>()->clearUnusedResources();
@@ -5779,10 +5781,11 @@ void Application::registerScriptEngineWithApplicationServices(ScriptEnginePointe · 304 unmodified lines
5779 scriptEngine->registerGlobalObject("ModelCache", DependencyManager::get<ModelCache>().data());5781 scriptEngine->registerGlobalObject("ModelCache", DependencyManager::get<ModelCache>().data());
5780 scriptEngine->registerGlobalObject("SoundCache", DependencyManager::get<SoundCache>().data());5782 scriptEngine->registerGlobalObject("SoundCache", DependencyManager::get<SoundCache>().data());
5781 5783
5782 scriptEngine->registerGlobalObject("Account", GlobalServicesScriptingInterface::getInstance());
5783 scriptEngine->registerGlobalObject("DialogsManager", _dialogsManagerScriptingInterface);5784 scriptEngine->registerGlobalObject("DialogsManager", _dialogsManagerScriptingInterface);
5784 5785
5785 scriptEngine->registerGlobalObject("GlobalServices", GlobalServicesScriptingInterface::getInstance());5786 scriptEngine->registerGlobalObject("Account", AccountServicesScriptingInterface::getInstance()); // DEPRECATED - TO BE REMOVED
5787 scriptEngine->registerGlobalObject("GlobalServices", AccountServicesScriptingInterface::getInstance()); // DEPRECATED - TO BE REMOVED
5788 scriptEngine->registerGlobalObject("AccountServices", AccountServicesScriptingInterface::getInstance());
5786 qScriptRegisterMetaType(scriptEngine.data(), DownloadInfoResultToScriptValue, DownloadInfoResultFromScriptValue);5789 qScriptRegisterMetaType(scriptEngine.data(), DownloadInfoResultToScriptValue, DownloadInfoResultFromScriptValue);
5787 5790
5788 scriptEngine->registerGlobalObject("FaceTracker", DependencyManager::get<DdeFaceTracker>().data());5791 scriptEngine->registerGlobalObject("FaceTracker", DependencyManager::get<DdeFaceTracker>().data());
@@ -7402,11 +7405,13 @@ void Application::updateThreadPoolCount() const { · 1613 unmodified lines
7402}7405}
7403 7406
7404void Application::updateSystemTabletMode() {7407void Application::updateSystemTabletMode() {
7405 qApp->setProperty(hifi::properties::HMD, isHMDMode());7408 if (_settingsLoaded) {
7406 if (isHMDMode()) {7409 qApp->setProperty(hifi::properties::HMD, isHMDMode());
7407 DependencyManager::get<TabletScriptingInterface>()->setToolbarMode(getHmdTabletBecomesToolbarSetting());7410 if (isHMDMode()) {
7408 } else {7411 DependencyManager::get<TabletScriptingInterface>()->setToolbarMode(getHmdTabletBecomesToolbarSetting());
7409 DependencyManager::get<TabletScriptingInterface>()->setToolbarMode(getDesktopTabletBecomesToolbarSetting());7412 } else {
7413 DependencyManager::get<TabletScriptingInterface>()->setToolbarMode(getDesktopTabletBecomesToolbarSetting());
7414 }
7410 }7415 }
7411}7416}
7412 7417