Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(168)

Side by Side Diff: third_party/WebKit/Source/modules/vr/VRDisplay.cpp

Issue 1918143007: Updated Blink WebVR interfaces to WebVR v1 spec (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@webvr_mojo
Patch Set: Fixed layout test Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
(Empty)
1 // Copyright 2016 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file.
4
5 #include "modules/vr/VRDisplay.h"
6
7 #include "core/dom/DOMException.h"
8 #include "core/inspector/ConsoleMessage.h"
9 #include "modules/vr/NavigatorVR.h"
10 #include "modules/vr/VRController.h"
11 #include "modules/vr/VRDisplayCapabilities.h"
12 #include "modules/vr/VREyeParameters.h"
13 #include "modules/vr/VRLayer.h"
14 #include "modules/vr/VRPose.h"
15 #include "modules/vr/VRStageParameters.h"
16 #include "modules/webgl/WebGLRenderingContextBase.h"
17 #include "public/platform/Platform.h"
18
19 namespace blink {
20
21 namespace {
22
23 VREye stringToVREye(const String& whichEye)
24 {
25 if (whichEye == "left")
26 return VREyeLeft;
27 if (whichEye == "right")
28 return VREyeRight;
29 return VREyeNone;
30 }
31
32 } // namepspace
33
34 VRDisplay::VRDisplay(NavigatorVR* navigatorVR)
35 : m_navigatorVR(navigatorVR)
36 , m_displayId(0)
37 , m_isConnected(false)
38 , m_isPresenting(false)
39 , m_canUpdateFramePose(true)
40 , m_capabilities(new VRDisplayCapabilities())
41 , m_eyeParametersLeft(new VREyeParameters())
42 , m_eyeParametersRight(new VREyeParameters())
43 {
44 }
45
46 VRDisplay::~VRDisplay()
47 {
48 }
49
50 VRController* VRDisplay::controller()
51 {
52 return m_navigatorVR->controller();
53 }
54
55 void VRDisplay::updateFromWebVRDevice(const WebVRDevice& device)
56 {
57 m_displayId = device.index;
58 m_displayName = device.deviceName;
59 m_isConnected = true;
60
61 // Defaults until the VR service has been update to query these.
62 m_capabilities->setHasOrientation(true);
63 m_capabilities->setHasPosition(false);
64 m_capabilities->setHasExternalDisplay(false);
65 m_capabilities->setCanPresent(false);
66 m_capabilities->setMaxLayers(0);
67
68 if (device.flags & WebVRDeviceTypeHMD) {
69 m_eyeParametersLeft->update(device.hmdInfo.leftEye);
70 m_eyeParametersRight->update(device.hmdInfo.rightEye);
71 }
72
73 m_stageParameters = nullptr;
74 }
75
76 VRPose* VRDisplay::getPose()
77 {
78 if (m_canUpdateFramePose) {
79 m_framePose = getImmediatePose();
80 Platform::current()->currentThread()->addTaskObserver(this);
81 m_canUpdateFramePose = false;
82 }
83
84 return m_framePose;
85 }
86
87 VRPose* VRDisplay::getImmediatePose()
88 {
89 WebHMDSensorState webPose;
90 controller()->getSensorState(m_displayId, webPose);
91
92 VRPose* pose = VRPose::create();
93 pose->setPose(webPose);
94 return pose;
95 }
96
97 void VRDisplay::resetPose()
98 {
99 controller()->resetSensor(m_displayId);
100 }
101
102 VREyeParameters* VRDisplay::getEyeParameters(const String& whichEye)
103 {
104 switch (stringToVREye(whichEye)) {
105 case VREyeLeft:
106 return m_eyeParametersLeft;
107 case VREyeRight:
108 return m_eyeParametersRight;
109 default:
110 return nullptr;
111 }
112 }
113
114 int VRDisplay::requestAnimationFrame(FrameRequestCallback* callback)
115 {
116 // TODO: Use HMD-specific rAF when an external display is present.
117 callback->m_useLegacyTimeBase = false;
118 if (Document* doc = m_navigatorVR->document())
119 return doc->requestAnimationFrame(callback);
120 return 0;
121 }
122
123 void VRDisplay::cancelAnimationFrame(int id)
124 {
125 if (Document* document = m_navigatorVR->document())
126 document->cancelAnimationFrame(id);
127 }
128
129 ScriptPromise VRDisplay::requestPresent(ScriptState* scriptState, const HeapVect or<VRLayer>& layers)
130 {
131 ScriptPromiseResolver* resolver = ScriptPromiseResolver::create(scriptState) ;
132 ScriptPromise promise = resolver->promise();
133
134 if (!m_capabilities->canPresent()) {
135 DOMException* exception = DOMException::create(InvalidStateError, "VRDis play cannot present");
136 resolver->reject(exception);
137 return promise;
138 }
139
140 if (layers.size() == 0 || layers.size() > m_capabilities->maxLayers()) {
141 DOMException* exception = DOMException::create(InvalidStateError, "Inval id number of layers.");
142 if (m_isPresenting) {
143 exitPresent(scriptState);
144 }
145 resolver->reject(exception);
146 return promise;
147 }
148
149 // TODO: Implement VR presentation
150 NOTIMPLEMENTED();
151
152 DOMException* exception = DOMException::create(InvalidStateError, "VR Presen tation not implemented");
153 resolver->reject(exception);
154
155 return promise;
156 }
157
158 ScriptPromise VRDisplay::exitPresent(ScriptState* scriptState)
159 {
160 ScriptPromiseResolver* resolver = ScriptPromiseResolver::create(scriptState) ;
161 ScriptPromise promise = resolver->promise();
162
163 // Can't stop presenting if we're not presenting.
164 DOMException* exception = DOMException::create(InvalidStateError, "VRDisplay is not presenting");
165 resolver->reject(exception);
166 return promise;
167 }
168
169 HeapVector<VRLayer> VRDisplay::getLayers()
170 {
171 HeapVector<VRLayer> layers;
172 return layers;
173 }
174
175 void VRDisplay::submitFrame(VRPose* pose)
176 {
177 NOTIMPLEMENTED();
178 }
179
180 void VRDisplay::didProcessTask()
181 {
182 // Pose should be stable until control is returned to the user agent.
183 if (!m_canUpdateFramePose) {
184 Platform::current()->currentThread()->removeTaskObserver(this);
185 m_canUpdateFramePose = true;
186 }
187 }
188
189 DEFINE_TRACE(VRDisplay)
190 {
191 visitor->trace(m_navigatorVR);
192 visitor->trace(m_capabilities);
193 visitor->trace(m_stageParameters);
194 visitor->trace(m_eyeParametersLeft);
195 visitor->trace(m_eyeParametersRight);
196 visitor->trace(m_framePose);
197 }
198
199 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/modules/vr/VRDisplay.h ('k') | third_party/WebKit/Source/modules/vr/VRDisplay.idl » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698