Showing the changes to interface/src/Application.cpp (1 of 48 files). Show all
Unified · Split
| @@ -190,6 +190,7 @@ · 189 unmodified lines | |||
| 190 | #include <GPUIdent.h> | 190 | #include <GPUIdent.h> |
| 191 | #include <gl/GLHelpers.h> | 191 | #include <gl/GLHelpers.h> |
| 192 | #include <src/scripting/LimitlessVoiceRecognitionScriptingInterface.h> | 192 | #include <src/scripting/LimitlessVoiceRecognitionScriptingInterface.h> |
| 193 | #include <src/scripting/GooglePolyScriptingInterface.h> | ||
| 193 | #include <EntityScriptClient.h> | 194 | #include <EntityScriptClient.h> |
| 194 | #include <ModelScriptingInterface.h> | 195 | #include <ModelScriptingInterface.h> |
| 195 | 196 | ||
| @@ -697,6 +698,7 @@ bool setupEssentials(int& argc, char** argv, bool runningMarkerExisted) { · 501 unmodified lines | |||
| 697 | DependencyManager::set<EntityScriptClient>(); | 698 | DependencyManager::set<EntityScriptClient>(); |
| 698 | DependencyManager::set<EntityScriptServerLogClient>(); | 699 | DependencyManager::set<EntityScriptServerLogClient>(); |
| 699 | DependencyManager::set<LimitlessVoiceRecognitionScriptingInterface>(); | 700 | DependencyManager::set<LimitlessVoiceRecognitionScriptingInterface>(); |
| 701 | DependencyManager::set<GooglePolyScriptingInterface>(); | ||
| 700 | DependencyManager::set<OctreeStatsProvider>(nullptr, qApp->getOcteeSceneStats()); | 702 | DependencyManager::set<OctreeStatsProvider>(nullptr, qApp->getOcteeSceneStats()); |
| 701 | DependencyManager::set<AvatarBookmarks>(); | 703 | DependencyManager::set<AvatarBookmarks>(); |
| 702 | DependencyManager::set<LocationBookmarks>(); | 704 | DependencyManager::set<LocationBookmarks>(); |
| @@ -4278,7 +4280,7 @@ void Application::init() { · 3575 unmodified lines | |||
| 4278 | 4280 | ||
| 4279 | getEntities()->init(); | 4281 | getEntities()->init(); |
| 4280 | getEntities()->setEntityLoadingPriorityFunction([this](const EntityItem& item) { | 4282 | getEntities()->setEntityLoadingPriorityFunction([this](const EntityItem& item) { |
| 4281 | auto dims = item.getDimensions(); | 4283 | auto dims = item.getScaledDimensions(); |
| 4282 | auto maxSize = glm::compMax(dims); | 4284 | auto maxSize = glm::compMax(dims); |
| 4283 | 4285 | ||
| 4284 | if (maxSize <= 0.0f) { | 4286 | if (maxSize <= 0.0f) { |
| @@ -4632,7 +4634,7 @@ void Application::setKeyboardFocusEntity(const EntityItemID& entityItemID) { · 347 unmodified lines | |||
| 4632 | _lastAcceptedKeyPress = usecTimestampNow(); | 4634 | _lastAcceptedKeyPress = usecTimestampNow(); |
| 4633 | 4635 | ||
| 4634 | setKeyboardFocusHighlight(entity->getWorldPosition(), entity->getWorldOrientation(), | 4636 | setKeyboardFocusHighlight(entity->getWorldPosition(), entity->getWorldOrientation(), |
| 4635 | entity->getDimensions() * FOCUS_HIGHLIGHT_EXPANSION_FACTOR); | 4637 | entity->getScaledDimensions() * FOCUS_HIGHLIGHT_EXPANSION_FACTOR); |
| 4636 | } | 4638 | } |
| 4637 | } | 4639 | } |
| 4638 | } | 4640 | } |
| @@ -5940,6 +5942,7 @@ void Application::registerScriptEngineWithApplicationServices(ScriptEnginePointe · 1301 unmodified lines | |||
| 5940 | scriptEngine->registerGlobalObject("Users", DependencyManager::get<UsersScriptingInterface>().data()); | 5942 | scriptEngine->registerGlobalObject("Users", DependencyManager::get<UsersScriptingInterface>().data()); |
| 5941 | 5943 | ||
| 5942 | scriptEngine->registerGlobalObject("LimitlessSpeechRecognition", DependencyManager::get<LimitlessVoiceRecognitionScriptingInterface>().data()); | 5944 | scriptEngine->registerGlobalObject("LimitlessSpeechRecognition", DependencyManager::get<LimitlessVoiceRecognitionScriptingInterface>().data()); |
| 5945 | scriptEngine->registerGlobalObject("GooglePoly", DependencyManager::get<GooglePolyScriptingInterface>().data()); | ||
| 5943 | 5946 | ||
| 5944 | if (auto steamClient = PluginManager::getInstance()->getSteamClientPlugin()) { | 5947 | if (auto steamClient = PluginManager::getInstance()->getSteamClientPlugin()) { |
| 5945 | scriptEngine->registerGlobalObject("Steam", new SteamScriptingInterface(scriptEngine.data(), steamClient.get())); | 5948 | scriptEngine->registerGlobalObject("Steam", new SteamScriptingInterface(scriptEngine.data(), steamClient.get())); |