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
13 13
14#include <QtScript/QScriptContext>14#include <QtScript/QScriptContext>
15 15
16#include <avatar/AvatarManager.h>
16#include <display-plugins/DisplayPlugin.h>17#include <display-plugins/DisplayPlugin.h>
17#include <display-plugins/CompositorHelper.h>18#include <display-plugins/CompositorHelper.h>
18#include <OffscreenUi.h>19#include <OffscreenUi.h>
19#include <avatar/AvatarManager.h>20#include <plugins/PluginUtils.h>
21
20#include "Application.h"22#include "Application.h"
21 23
22HMDScriptingInterface::HMDScriptingInterface() {24HMDScriptingInterface::HMDScriptingInterface() {
@@ -47,6 +49,14 @@ glm::vec2 HMDScriptingInterface::overlayToSpherical(const glm::vec2 & position) · 24 unmodified lines
47 return qApp->getApplicationCompositor().overlayToSpherical(position);49 return qApp->getApplicationCompositor().overlayToSpherical(position);
48}50}
49 51
52bool HMDScriptingInterface::isHMDAvailable() {
53 return PluginUtils::isHMDAvailable();
54}
55
56bool HMDScriptingInterface::isHandControllerAvailable() {
57 return PluginUtils::isHandControllerAvailable();
58}
59
50QScriptValue HMDScriptingInterface::getHUDLookAtPosition2D(QScriptContext* context, QScriptEngine* engine) {60QScriptValue HMDScriptingInterface::getHUDLookAtPosition2D(QScriptContext* context, QScriptEngine* engine) {
51 glm::vec3 hudIntersection;61 glm::vec3 hudIntersection;
52 auto instance = DependencyManager::get<HMDScriptingInterface>();62 auto instance = DependencyManager::get<HMDScriptingInterface>();