Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-22 23:03:42 +01:00
Code Issues Projects Releases Packages Wiki Activity

webxr: Update XRFrame to latest spec (#33102)

Browse source 
* Update IDL+naming, add predictedDisplayTime getter stub

Signed-off-by: Daniel Adams <msub2official@gmail.com>

* Surface predicted display time

Signed-off-by: Daniel Adams <msub2official@gmail.com>

* Update WPT expectations

Signed-off-by: Daniel Adams <msub2official@gmail.com>

* Update todo comment

Signed-off-by: Daniel Adams <msub2official@gmail.com>

---------

Signed-off-by: Daniel Adams <msub2official@gmail.com>
This commit is contained in:
Daniel Adams 2024-08-19 22:12:25 -10:00 • committed by GitHub
parent 91adf39de7
commit 7e4979c852
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 20 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

5
components/script/dom/webidls/XRFrame.webidl
View file

@ -6,10 +6,11 @@
[SecureContext, Exposed=Window, Pref="dom.webxr.enabled"]
interface XRFrame {
readonly attribute XRSession session;
[SameObject] readonly attribute XRSession session;
readonly attribute DOMHighResTimeStamp predictedDisplayTime;
[Throws] XRViewerPose? getViewerPose(XRReferenceSpace referenceSpace);
[Throws] XRPose? getPose(XRSpace space, XRSpace relativeTo);
[Throws] XRPose? getPose(XRSpace space, XRSpace baseSpace);
// WebXR Hand Input
[Pref="dom.webxr.hands.enabled", Throws]

25
components/script/dom/xrframe.rs
View file

@ -12,6 +12,7 @@ use webxr_api::{Frame, LayerId, SubImages};
use crate::dom::bindings::codegen::Bindings::XRFrameBinding::XRFrameMethods;
use crate::dom::bindings::error::Error;
use crate::dom::bindings::inheritance::Castable;
use crate::dom::bindings::num::Finite;
use crate::dom::bindings::reflector::{reflect_dom_object, DomObject, Reflector};
use crate::dom::bindings::root::{Dom, DomRoot};
use crate::dom::globalscope::GlobalScope;
@ -79,6 +80,14 @@ impl XRFrameMethods for XRFrame {
DomRoot::from_ref(&self.session)
}
/// <https://www.w3.org/TR/webxr/#dom-xrframe-predicteddisplaytime>
fn PredictedDisplayTime(&self) -> Finite<f64> {
// TODO: If inline, return the same value
// as the timestamp passed to XRFrameRequestCallback
Finite::new(self.data.predicted_display_time)
.expect("Failed to create predictedDisplayTime")
}
/// <https://immersive-web.github.io/webxr/#dom-xrframe-getviewerpose>
fn GetViewerPose(
&self,
@ -114,9 +123,9 @@ impl XRFrameMethods for XRFrame {
fn GetPose(
&self,
space: &XRSpace,
relative_to: &XRSpace,
base_space: &XRSpace,
) -> Result<Option<DomRoot<XRPose>>, Error> {
if self.session != space.session() || self.session != relative_to.session() {
if self.session != space.session() || self.session != base_space.session() {
return Err(Error::InvalidState);
}
if !self.active.get() {
@ -127,12 +136,12 @@ impl XRFrameMethods for XRFrame {
} else {
return Ok(None);
};
let relative_to = if let Some(r) = self.get_pose(relative_to) {
let base_space = if let Some(r) = self.get_pose(base_space) {
r
} else {
return Ok(None);
};
let pose = space.then(&relative_to.inverse());
let pose = space.then(&base_space.inverse());
Ok(Some(XRPose::new(&self.global(), pose)))
}
@ -140,10 +149,10 @@ impl XRFrameMethods for XRFrame {
fn GetJointPose(
&self,
space: &XRJointSpace,
relative_to: &XRSpace,
base_space: &XRSpace,
) -> Result<Option<DomRoot<XRJointPose>>, Error> {
if self.session != space.upcast::<XRSpace>().session() ||
self.session != relative_to.session()
self.session != base_space.session()
{
return Err(Error::InvalidState);
}
@ -155,12 +164,12 @@ impl XRFrameMethods for XRFrame {
} else {
return Ok(None);
};
let relative_to = if let Some(r) = self.get_pose(relative_to) {
let base_space = if let Some(r) = self.get_pose(base_space) {
r
} else {
return Ok(None);
};
let pose = joint_frame.pose.then(&relative_to.inverse());
let pose = joint_frame.pose.then(&base_space.inverse());
Ok(Some(XRJointPose::new(
&self.global(),
pose.cast_unit(),

3
tests/wpt/meta-legacy-layout/webxr/idlharness.https.window.js.ini vendored
View file

@ -350,9 +350,6 @@
[XRSession interface: xrSession must inherit property "onframeratechange" with the proper type]
expected: FAIL
[XRFrame interface: attribute predictedDisplayTime]
expected: FAIL
[XRSession interface: xrSession must inherit property "enabledFeatures" with the proper type]
expected: FAIL

3
tests/wpt/meta/webxr/idlharness.https.window.js.ini vendored
View file

@ -293,9 +293,6 @@
[XRSession interface: xrSession must inherit property "onframeratechange" with the proper type]
expected: FAIL
[XRFrame interface: attribute predictedDisplayTime]
expected: FAIL
[XRSession interface: xrSession must inherit property "enabledFeatures" with the proper type]
expected: FAIL