History

Merge branch 'master' into modal_dialogs_async

vladest committed 9 years ago

Commit 681fc522 parents 1b5e6fd 98b1fe634 files · +474 −113Browse files

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

Unified · Split

interface/src/Application.cpp+4−11
@@ -166,6 +166,7 @@ · 165 unmodified lines
166#include "scripting/WindowScriptingInterface.h"166#include "scripting/WindowScriptingInterface.h"
167#include "scripting/ControllerScriptingInterface.h"167#include "scripting/ControllerScriptingInterface.h"
168#include "scripting/RatesScriptingInterface.h"168#include "scripting/RatesScriptingInterface.h"
169#include "scripting/SelectionScriptingInterface.h"
169#if defined(Q_OS_MAC) || defined(Q_OS_WIN)170#if defined(Q_OS_MAC) || defined(Q_OS_WIN)
170#include "SpeechRecognizer.h"171#include "SpeechRecognizer.h"
171#endif172#endif
@@ -675,6 +676,7 @@ bool setupEssentials(int& argc, char** argv, bool runningMarkerExisted) { · 503 unmodified lines
675 DependencyManager::set<Snapshot>();676 DependencyManager::set<Snapshot>();
676 DependencyManager::set<CloseEventSender>();677 DependencyManager::set<CloseEventSender>();
677 DependencyManager::set<ResourceManager>();678 DependencyManager::set<ResourceManager>();
679 DependencyManager::set<SelectionScriptingInterface>();
678 DependencyManager::set<ContextOverlayInterface>();680 DependencyManager::set<ContextOverlayInterface>();
679 DependencyManager::set<Ledger>();681 DependencyManager::set<Ledger>();
680 DependencyManager::set<Wallet>();682 DependencyManager::set<Wallet>();
@@ -2318,6 +2320,7 @@ void Application::initializeUi() { · 1637 unmodified lines
2318 surfaceContext->setContextProperty("ApplicationCompositor", &getApplicationCompositor());2320 surfaceContext->setContextProperty("ApplicationCompositor", &getApplicationCompositor());
2319 2321
2320 surfaceContext->setContextProperty("AvatarInputs", AvatarInputs::getInstance());2322 surfaceContext->setContextProperty("AvatarInputs", AvatarInputs::getInstance());
2323 surfaceContext->setContextProperty("Selection", DependencyManager::get<SelectionScriptingInterface>().data());
2321 surfaceContext->setContextProperty("ContextOverlay", DependencyManager::get<ContextOverlayInterface>().data());2324 surfaceContext->setContextProperty("ContextOverlay", DependencyManager::get<ContextOverlayInterface>().data());
2322 2325
2323 if (auto steamClient = PluginManager::getInstance()->getSteamClientPlugin()) {2326 if (auto steamClient = PluginManager::getInstance()->getSteamClientPlugin()) {
@@ -5641,17 +5644,6 @@ void Application::displaySide(RenderArgs* renderArgs, Camera& theCamera, bool se · 3317 unmodified lines
5641 }5644 }
5642 renderArgs->_debugFlags = renderDebugFlags;5645 renderArgs->_debugFlags = renderDebugFlags;
5643 //ViveControllerManager::getInstance().updateRendering(renderArgs, _main3DScene, transaction);5646 //ViveControllerManager::getInstance().updateRendering(renderArgs, _main3DScene, transaction);
5644
5645 RenderArgs::OutlineFlags renderOutlineFlags = RenderArgs::RENDER_OUTLINE_NONE;
5646 auto contextOverlayInterface = DependencyManager::get<ContextOverlayInterface>();
5647 if (contextOverlayInterface->getEnabled()) {
5648 if (DependencyManager::get<ContextOverlayInterface>()->getIsInMarketplaceInspectionMode()) {
5649 renderOutlineFlags = RenderArgs::RENDER_OUTLINE_MARKETPLACE_MODE;
5650 } else {
5651 renderOutlineFlags = RenderArgs::RENDER_OUTLINE_WIREFRAMES;
5652 }
5653 }
5654 renderArgs->_outlineFlags = renderOutlineFlags;
5655 }5647 }
5656 }5648 }
5657 5649
@@ -6118,6 +6110,7 @@ void Application::registerScriptEngineWithApplicationServices(ScriptEngine* scri · 460 unmodified lines
6118 auto entityScriptServerLog = DependencyManager::get<EntityScriptServerLogClient>();6110 auto entityScriptServerLog = DependencyManager::get<EntityScriptServerLogClient>();
6119 scriptEngine->registerGlobalObject("EntityScriptServerLog", entityScriptServerLog.data());6111 scriptEngine->registerGlobalObject("EntityScriptServerLog", entityScriptServerLog.data());
6120 scriptEngine->registerGlobalObject("AvatarInputs", AvatarInputs::getInstance());6112 scriptEngine->registerGlobalObject("AvatarInputs", AvatarInputs::getInstance());
6113 scriptEngine->registerGlobalObject("Selection", DependencyManager::get<SelectionScriptingInterface>().data());
6121 scriptEngine->registerGlobalObject("ContextOverlay", DependencyManager::get<ContextOverlayInterface>().data());6114 scriptEngine->registerGlobalObject("ContextOverlay", DependencyManager::get<ContextOverlayInterface>().data());
6122 6115
6123 qScriptRegisterMetaType(scriptEngine, OverlayIDtoScriptValue, OverlayIDfromScriptValue);6116 qScriptRegisterMetaType(scriptEngine, OverlayIDtoScriptValue, OverlayIDfromScriptValue);

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t