Showing the changes to interface/src/Application.cpp (1 of 86 files). Show all
Unified · Split
| @@ -141,6 +141,7 @@ · 140 unmodified lines | |||
| 141 | #include "LODManager.h" | 141 | #include "LODManager.h" |
| 142 | #include "ModelPackager.h" | 142 | #include "ModelPackager.h" |
| 143 | #include "networking/HFWebEngineProfile.h" | 143 | #include "networking/HFWebEngineProfile.h" |
| 144 | #include "networking/HFTabletWebEngineProfile.h" | ||
| 144 | #include "scripting/TestScriptingInterface.h" | 145 | #include "scripting/TestScriptingInterface.h" |
| 145 | #include "scripting/AccountScriptingInterface.h" | 146 | #include "scripting/AccountScriptingInterface.h" |
| 146 | #include "scripting/AssetMappingsScriptingInterface.h" | 147 | #include "scripting/AssetMappingsScriptingInterface.h" |
| @@ -179,6 +180,7 @@ · 32 unmodified lines | |||
| 179 | #include "FrameTimingsScriptingInterface.h" | 180 | #include "FrameTimingsScriptingInterface.h" |
| 180 | #include <GPUIdent.h> | 181 | #include <GPUIdent.h> |
| 181 | #include <gl/GLHelpers.h> | 182 | #include <gl/GLHelpers.h> |
| 183 | #include <src/scripting/LimitlessVoiceRecognitionScriptingInterface.h> | ||
| 182 | #include <EntityScriptClient.h> | 184 | #include <EntityScriptClient.h> |
| 183 | #include <ModelScriptingInterface.h> | 185 | #include <ModelScriptingInterface.h> |
| 184 | 186 | ||
| @@ -521,7 +523,9 @@ bool setupEssentials(int& argc, char** argv) { · 336 unmodified lines | |||
| 521 | DependencyManager::set<OffscreenQmlSurfaceCache>(); | 523 | DependencyManager::set<OffscreenQmlSurfaceCache>(); |
| 522 | DependencyManager::set<EntityScriptClient>(); | 524 | DependencyManager::set<EntityScriptClient>(); |
| 523 | DependencyManager::set<EntityScriptServerLogClient>(); | 525 | DependencyManager::set<EntityScriptServerLogClient>(); |
| 526 | DependencyManager::set<LimitlessVoiceRecognitionScriptingInterface>(); | ||
| 524 | DependencyManager::set<OctreeStatsProvider>(nullptr, qApp->getOcteeSceneStats()); | 527 | DependencyManager::set<OctreeStatsProvider>(nullptr, qApp->getOcteeSceneStats()); |
| 528 | |||
| 525 | return previousSessionCrashed; | 529 | return previousSessionCrashed; |
| 526 | } | 530 | } |
| 527 | 531 | ||
| @@ -548,7 +552,7 @@ const float DEFAULT_HMD_TABLET_SCALE_PERCENT = 100.0f; · 20 unmodified lines | |||
| 548 | const float DEFAULT_DESKTOP_TABLET_SCALE_PERCENT = 75.0f; | 552 | const float DEFAULT_DESKTOP_TABLET_SCALE_PERCENT = 75.0f; |
| 549 | const bool DEFAULT_DESKTOP_TABLET_BECOMES_TOOLBAR = true; | 553 | const bool DEFAULT_DESKTOP_TABLET_BECOMES_TOOLBAR = true; |
| 550 | const bool DEFAULT_HMD_TABLET_BECOMES_TOOLBAR = false; | 554 | const bool DEFAULT_HMD_TABLET_BECOMES_TOOLBAR = false; |
| 551 | const bool DEFAULT_PREFER_AVATAR_FINGER_OVER_STYLUS = true; | 555 | const bool DEFAULT_PREFER_AVATAR_FINGER_OVER_STYLUS = false; |
| 552 | 556 | ||
| 553 | Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bool runServer, QString runServerPathOption) : | 557 | Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bool runServer, QString runServerPathOption) : |
| 554 | QApplication(argc, argv), | 558 | QApplication(argc, argv), |
| @@ -1929,6 +1933,7 @@ void Application::initializeUi() { · 1374 unmodified lines | |||
| 1929 | qmlRegisterType<Preference>("Hifi", 1, 0, "Preference"); | 1933 | qmlRegisterType<Preference>("Hifi", 1, 0, "Preference"); |
| 1930 | 1934 | ||
| 1931 | qmlRegisterType<HFWebEngineProfile>("HFWebEngineProfile", 1, 0, "HFWebEngineProfile"); | 1935 | qmlRegisterType<HFWebEngineProfile>("HFWebEngineProfile", 1, 0, "HFWebEngineProfile"); |
| 1936 | qmlRegisterType<HFTabletWebEngineProfile>("HFTabletWebEngineProfile", 1, 0, "HFTabletWebEngineProfile"); | ||
| 1932 | 1937 | ||
| 1933 | auto offscreenUi = DependencyManager::get<OffscreenUi>(); | 1938 | auto offscreenUi = DependencyManager::get<OffscreenUi>(); |
| 1934 | offscreenUi->create(_glWidget->qglContext()); | 1939 | offscreenUi->create(_glWidget->qglContext()); |
| @@ -4562,6 +4567,8 @@ void Application::update(float deltaTime) { · 2627 unmodified lines | |||
| 4562 | } | 4567 | } |
| 4563 | 4568 | ||
| 4564 | AnimDebugDraw::getInstance().update(); | 4569 | AnimDebugDraw::getInstance().update(); |
| 4570 | |||
| 4571 | DependencyManager::get<LimitlessVoiceRecognitionScriptingInterface>()->update(); | ||
| 4565 | } | 4572 | } |
| 4566 | 4573 | ||
| 4567 | void Application::sendAvatarViewFrustum() { | 4574 | void Application::sendAvatarViewFrustum() { |
| @@ -5508,6 +5515,8 @@ void Application::registerScriptEngineWithApplicationServices(ScriptEngine* scri · 940 unmodified lines | |||
| 5508 | scriptEngine->registerGlobalObject("UserActivityLogger", DependencyManager::get<UserActivityLoggerScriptingInterface>().data()); | 5515 | scriptEngine->registerGlobalObject("UserActivityLogger", DependencyManager::get<UserActivityLoggerScriptingInterface>().data()); |
| 5509 | scriptEngine->registerGlobalObject("Users", DependencyManager::get<UsersScriptingInterface>().data()); | 5516 | scriptEngine->registerGlobalObject("Users", DependencyManager::get<UsersScriptingInterface>().data()); |
| 5510 | 5517 | ||
| 5518 | scriptEngine->registerGlobalObject("LimitlessSpeechRecognition", DependencyManager::get<LimitlessVoiceRecognitionScriptingInterface>().data()); | ||
| 5519 | |||
| 5511 | if (auto steamClient = PluginManager::getInstance()->getSteamClientPlugin()) { | 5520 | if (auto steamClient = PluginManager::getInstance()->getSteamClientPlugin()) { |
| 5512 | scriptEngine->registerGlobalObject("Steam", new SteamScriptingInterface(scriptEngine, steamClient.get())); | 5521 | scriptEngine->registerGlobalObject("Steam", new SteamScriptingInterface(scriptEngine, steamClient.get())); |
| 5513 | } | 5522 | } |