Showing the changes to interface/src/scripting/WindowScriptingInterface.cpp (1 of 1 file). Show all
Unified · Split
| @@ -611,28 +611,23 @@ float WindowScriptingInterface::domainLoadingProgress() { · 610 unmodified lines | |||
| 611 | return qApp->getOctreePacketProcessor().domainLoadingProgress(); | 611 | return qApp->getOctreePacketProcessor().domainLoadingProgress(); |
| 612 | } | 612 | } |
| 613 | 613 | ||
| 614 | const DisplayPluginList& getDisplayPlugins() { | ||
| 615 | static const auto& list = PluginManager::getInstance()->getDisplayPlugins(); | ||
| 616 | return list; | ||
| 617 | } | ||
| 618 | |||
| 619 | int WindowScriptingInterface::getDisplayPluginCount() { | 614 | int WindowScriptingInterface::getDisplayPluginCount() { |
| 620 | return getDisplayPlugins().size(); | 615 | return (int)PluginManager::getInstance()->getDisplayPlugins().size(); |
| 621 | } | 616 | } |
| 622 | 617 | ||
| 623 | QString WindowScriptingInterface::getDisplayPluginName(int index) { | 618 | QString WindowScriptingInterface::getDisplayPluginName(int index) { |
| 624 | return getDisplayPlugins().at(index)->getName(); | 619 | return PluginManager::getInstance()->getDisplayPlugins().at(index)->getName(); |
| 625 | } | 620 | } |
| 626 | 621 | ||
| 627 | bool WindowScriptingInterface::isDisplayPluginHmd(int index) { | 622 | bool WindowScriptingInterface::isDisplayPluginHmd(int index) { |
| 628 | return getDisplayPlugins().at(index)->isHmd(); | 623 | return PluginManager::getInstance()->getDisplayPlugins().at(index)->isHmd(); |
| 629 | } | 624 | } |
| 630 | 625 | ||
| 631 | int WindowScriptingInterface::getActiveDisplayPlugin() { | 626 | int WindowScriptingInterface::getActiveDisplayPlugin() { |
| 632 | auto active = qApp->getActiveDisplayPlugin(); | 627 | auto active = qApp->getActiveDisplayPlugin(); |
| 633 | auto size = getDisplayPluginCount(); | 628 | auto size = getDisplayPluginCount(); |
| 634 | for (int i = 0; i < size; ++i) { | 629 | for (int i = 0; i < size; ++i) { |
| 635 | if (getDisplayPlugins().at(i) == active) { | 630 | if (PluginManager::getInstance()->getDisplayPlugins().at(i) == active) { |
| 636 | return i; | 631 | return i; |
| 637 | } | 632 | } |
| 638 | } | 633 | } |
| @@ -640,5 +635,6 @@ int WindowScriptingInterface::getActiveDisplayPlugin() { · 1 unmodified line | |||
| 640 | } | 635 | } |
| 641 | 636 | ||
| 642 | void WindowScriptingInterface::setActiveDisplayPlugin(int index) { | 637 | void WindowScriptingInterface::setActiveDisplayPlugin(int index) { |
| 643 | qApp->setActiveDisplayPlugin(getDisplayPlugins().at(index)->getName()); | 638 | auto name = PluginManager::getInstance()->getDisplayPlugins().at(index)->getName(); |
| 639 | qApp->setActiveDisplayPlugin(name); | ||
| 644 | } | 640 | } |