History

Merge 'master' into 'out-of-body-experience'

Andrew Meadows committed 10 years ago

Commit d54c07e2 parents 77e8082 58d4eb7101 files · +3904 −271Browse files

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

Unified · Split

interface/src/scripting/HMDScriptingInterface.cpp+11−1
@@ -13,10 +13,12 @@ · 12 unmodified lines
1313
1414 #include <QtScript/QScriptContext>
1515
16+#include <avatar/AvatarManager.h>
1617 #include <display-plugins/DisplayPlugin.h>
1718 #include <display-plugins/CompositorHelper.h>
1819 #include <OffscreenUi.h>
19−#include <avatar/AvatarManager.h>
20+#include <plugins/PluginUtils.h>
21+
2022 #include "Application.h"
2123
2224 HMDScriptingInterface::HMDScriptingInterface() {
@@ -47,6 +49,14 @@ glm::vec2 HMDScriptingInterface::overlayToSpherical(const glm::vec2 & position) · 24 unmodified lines
4749 return qApp->getApplicationCompositor().overlayToSpherical(position);
4850 }
4951
52+bool HMDScriptingInterface::isHMDAvailable() {
53+ return PluginUtils::isHMDAvailable();
54+}
55+
56+bool HMDScriptingInterface::isHandControllerAvailable() {
57+ return PluginUtils::isHandControllerAvailable();
58+}
59+
5060 QScriptValue HMDScriptingInterface::getHUDLookAtPosition2D(QScriptContext* context, QScriptEngine* engine) {
5161 glm::vec3 hudIntersection;
5262 auto instance = DependencyManager::get<HMDScriptingInterface>();