Merge pull request #14650 from NissimHadar/20301-addPlatformInfo

Case 20301 - add platform info

Shannon Romano committed 7 years ago

Commit 9855e9b2 parents 10e969f 65d975f11 files · +263 −100Browse files

Showing the changes to interface/src/Application.cpp (1 of 11 files). Show all

Unified · Split

 #include "scripting/Audio.h"
 #include "networking/CloseEventSender.h"
 #include "scripting/TestScriptingInterface.h"
+#include "scripting/PlatformInfoScriptingInterface.h"
 #include "scripting/AssetMappingsScriptingInterface.h"
 #include "scripting/ClipboardScriptingInterface.h"
 #include "scripting/DesktopScriptingInterface.h"
         scriptEngine->registerGlobalObject("Test", TestScriptingInterface::getInstance());
     }
+    scriptEngine->registerGlobalObject("PlatformInfo", PlatformInfoScriptingInterface::getInstance());
     scriptEngine->registerGlobalObject("Rates", new RatesScriptingInterface(this));
     // hook our avatar and avatar hash map object into this script engine
     }
 }
+bool Application::hasRiftControllers() {
+    return PluginUtils::isOculusTouchControllerAvailable();
+}
+bool Application::hasViveControllers() {
+    return PluginUtils::isViveControllerAvailable();
+}
 void Application::onDismissedLoginDialog() {
     _loginDialogPoppedUp = false;
     loginDialogPoppedUp.set(false);
     QApplication::clipboard()->setText(text);
 }
+QString Application::getGraphicsCardType() {
+    return GPUIdent::getInstance()->getName();
+}
 #if defined(Q_OS_ANDROID)
 void Application::beforeEnterBackground() {
     auto nodeList = DependencyManager::get<NodeList>();

Keyboard shortcuts