History

Merge pull request #15562 from jherico/bugz-133

Sam Gateau committed 7 years ago

Commit 6b370782 parents cf5869f 6a0b4798 files · +160 −55Browse files

Showing the changes to interface/src/scripting/WindowScriptingInterface.cpp (1 of 8 files). Show all

Unified · Split

interface/src/scripting/WindowScriptingInterface.cpp+29−0
@@ -19,6 +19,7 @@ · 18 unmodified lines
19#include <shared/QtHelpers.h>19#include <shared/QtHelpers.h>
20#include <SettingHandle.h>20#include <SettingHandle.h>
21 21
22#include <plugins/PluginManager.h>
22#include <display-plugins/CompositorHelper.h>23#include <display-plugins/CompositorHelper.h>
23#include <AddressManager.h>24#include <AddressManager.h>
24#include "AndroidHelper.h"25#include "AndroidHelper.h"
@@ -609,3 +610,31 @@ void WindowScriptingInterface::onMessageBoxSelected(int button) { · 584 unmodified lines
609float WindowScriptingInterface::domainLoadingProgress() {610float WindowScriptingInterface::domainLoadingProgress() {
610 return qApp->getOctreePacketProcessor().domainLoadingProgress();611 return qApp->getOctreePacketProcessor().domainLoadingProgress();
611}612}
613
614int WindowScriptingInterface::getDisplayPluginCount() {
615 return (int)PluginManager::getInstance()->getDisplayPlugins().size();
616}
617
618QString WindowScriptingInterface::getDisplayPluginName(int index) {
619 return PluginManager::getInstance()->getDisplayPlugins().at(index)->getName();
620}
621
622bool WindowScriptingInterface::isDisplayPluginHmd(int index) {
623 return PluginManager::getInstance()->getDisplayPlugins().at(index)->isHmd();
624}
625
626int WindowScriptingInterface::getActiveDisplayPlugin() {
627 auto active = qApp->getActiveDisplayPlugin();
628 auto size = getDisplayPluginCount();
629 for (int i = 0; i < size; ++i) {
630 if (PluginManager::getInstance()->getDisplayPlugins().at(i) == active) {
631 return i;
632 }
633 }
634 return -1;
635}
636
637void WindowScriptingInterface::setActiveDisplayPlugin(int index) {
638 auto name = PluginManager::getInstance()->getDisplayPlugins().at(index)->getName();
639 qApp->setActiveDisplayPlugin(name);
640}