Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-11 05:28:41 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix warning and build failures

Browse source
This commit is contained in:
Brad Davis 2019-05-16 10:48:18 -07:00
parent 9bcc23f0c4
commit 6a0b479041
1 changed files with 6 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
interface/src/scripting/WindowScriptingInterface.cpp
View file

@ -611,28 +611,23 @@ float WindowScriptingInterface::domainLoadingProgress() {
return qApp->getOctreePacketProcessor().domainLoadingProgress(); return qApp->getOctreePacketProcessor().domainLoadingProgress();
} }
const DisplayPluginList& getDisplayPlugins() {
static const auto& list = PluginManager::getInstance()->getDisplayPlugins();
return list;
}
int WindowScriptingInterface::getDisplayPluginCount() { int WindowScriptingInterface::getDisplayPluginCount() {
return getDisplayPlugins().size(); return (int)PluginManager::getInstance()->getDisplayPlugins().size();
} }
QString WindowScriptingInterface::getDisplayPluginName(int index) { QString WindowScriptingInterface::getDisplayPluginName(int index) {
return getDisplayPlugins().at(index)->getName(); return PluginManager::getInstance()->getDisplayPlugins().at(index)->getName();
} }
bool WindowScriptingInterface::isDisplayPluginHmd(int index) { bool WindowScriptingInterface::isDisplayPluginHmd(int index) {
return getDisplayPlugins().at(index)->isHmd(); return PluginManager::getInstance()->getDisplayPlugins().at(index)->isHmd();
} }
int WindowScriptingInterface::getActiveDisplayPlugin() { int WindowScriptingInterface::getActiveDisplayPlugin() {
auto active = qApp->getActiveDisplayPlugin(); auto active = qApp->getActiveDisplayPlugin();
auto size = getDisplayPluginCount(); auto size = getDisplayPluginCount();
for (int i = 0; i < size; ++i) { for (int i = 0; i < size; ++i) {
if (getDisplayPlugins().at(i) == active) { if (PluginManager::getInstance()->getDisplayPlugins().at(i) == active) {
return i; return i;
} }
} }
@ -640,5 +635,6 @@ int WindowScriptingInterface::getActiveDisplayPlugin() {
} }
void WindowScriptingInterface::setActiveDisplayPlugin(int index) { void WindowScriptingInterface::setActiveDisplayPlugin(int index) {
qApp->setActiveDisplayPlugin(getDisplayPlugins().at(index)->getName()); auto name = PluginManager::getInstance()->getDisplayPlugins().at(index)->getName();
qApp->setActiveDisplayPlugin(name);
} }