mirror of
https://github.com/servo/servo.git
synced 2025-08-03 20:50:07 +01:00
Set inlineVerticalFieldOfView to null for immersive sessions
This commit is contained in:
parent
326902220c
commit
f52a6f0e8f
5 changed files with 21 additions and 16 deletions
4
Cargo.lock
generated
4
Cargo.lock
generated
|
@ -6391,7 +6391,7 @@ dependencies = [
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "webxr"
|
name = "webxr"
|
||||||
version = "0.0.1"
|
version = "0.0.1"
|
||||||
source = "git+https://github.com/servo/webxr#48ce33668b2e6cd95507ee909ac02c160ae7bedc"
|
source = "git+https://github.com/servo/webxr#b79870164f518d90268aaaac1fb83059b83dceda"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"bindgen",
|
"bindgen",
|
||||||
"euclid",
|
"euclid",
|
||||||
|
@ -6412,7 +6412,7 @@ dependencies = [
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "webxr-api"
|
name = "webxr-api"
|
||||||
version = "0.0.1"
|
version = "0.0.1"
|
||||||
source = "git+https://github.com/servo/webxr#48ce33668b2e6cd95507ee909ac02c160ae7bedc"
|
source = "git+https://github.com/servo/webxr#b79870164f518d90268aaaac1fb83059b83dceda"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"euclid",
|
"euclid",
|
||||||
"ipc-channel",
|
"ipc-channel",
|
||||||
|
|
|
@ -14,6 +14,6 @@ dictionary XRRenderStateInit {
|
||||||
[SecureContext, Exposed=Window, Pref="dom.webxr.enabled"] interface XRRenderState {
|
[SecureContext, Exposed=Window, Pref="dom.webxr.enabled"] interface XRRenderState {
|
||||||
readonly attribute double depthNear;
|
readonly attribute double depthNear;
|
||||||
readonly attribute double depthFar;
|
readonly attribute double depthFar;
|
||||||
readonly attribute double inlineVerticalFieldOfView;
|
readonly attribute double? inlineVerticalFieldOfView;
|
||||||
readonly attribute XRWebGLLayer? baseLayer;
|
readonly attribute XRWebGLLayer? baseLayer;
|
||||||
};
|
};
|
||||||
|
|
|
@ -17,7 +17,7 @@ pub struct XRRenderState {
|
||||||
reflector_: Reflector,
|
reflector_: Reflector,
|
||||||
depth_near: Cell<f64>,
|
depth_near: Cell<f64>,
|
||||||
depth_far: Cell<f64>,
|
depth_far: Cell<f64>,
|
||||||
inline_vertical_fov: Cell<f64>,
|
inline_vertical_fov: Cell<Option<f64>>,
|
||||||
layer: MutNullableDom<XRWebGLLayer>,
|
layer: MutNullableDom<XRWebGLLayer>,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -25,7 +25,7 @@ impl XRRenderState {
|
||||||
pub fn new_inherited(
|
pub fn new_inherited(
|
||||||
depth_near: f64,
|
depth_near: f64,
|
||||||
depth_far: f64,
|
depth_far: f64,
|
||||||
inline_vertical_fov: f64,
|
inline_vertical_fov: Option<f64>,
|
||||||
layer: Option<&XRWebGLLayer>,
|
layer: Option<&XRWebGLLayer>,
|
||||||
) -> XRRenderState {
|
) -> XRRenderState {
|
||||||
XRRenderState {
|
XRRenderState {
|
||||||
|
@ -41,7 +41,7 @@ impl XRRenderState {
|
||||||
global: &GlobalScope,
|
global: &GlobalScope,
|
||||||
depth_near: f64,
|
depth_near: f64,
|
||||||
depth_far: f64,
|
depth_far: f64,
|
||||||
inline_vertical_fov: f64,
|
inline_vertical_fov: Option<f64>,
|
||||||
layer: Option<&XRWebGLLayer>,
|
layer: Option<&XRWebGLLayer>,
|
||||||
) -> DomRoot<XRRenderState> {
|
) -> DomRoot<XRRenderState> {
|
||||||
reflect_dom_object(
|
reflect_dom_object(
|
||||||
|
@ -73,7 +73,8 @@ impl XRRenderState {
|
||||||
self.depth_far.set(depth)
|
self.depth_far.set(depth)
|
||||||
}
|
}
|
||||||
pub fn set_inline_vertical_fov(&self, fov: f64) {
|
pub fn set_inline_vertical_fov(&self, fov: f64) {
|
||||||
self.inline_vertical_fov.set(fov)
|
debug_assert!(self.inline_vertical_fov.get().is_some());
|
||||||
|
self.inline_vertical_fov.set(Some(fov))
|
||||||
}
|
}
|
||||||
pub fn set_layer(&self, layer: Option<&XRWebGLLayer>) {
|
pub fn set_layer(&self, layer: Option<&XRWebGLLayer>) {
|
||||||
self.layer.set(layer)
|
self.layer.set(layer)
|
||||||
|
@ -92,8 +93,8 @@ impl XRRenderStateMethods for XRRenderState {
|
||||||
}
|
}
|
||||||
|
|
||||||
/// https://immersive-web.github.io/webxr/#dom-xrrenderstate-inlineverticalfieldofview
|
/// https://immersive-web.github.io/webxr/#dom-xrrenderstate-inlineverticalfieldofview
|
||||||
fn InlineVerticalFieldOfView(&self) -> Finite<f64> {
|
fn GetInlineVerticalFieldOfView(&self) -> Option<Finite<f64>> {
|
||||||
Finite::wrap(self.inline_vertical_fov.get())
|
self.inline_vertical_fov.get().map(Finite::wrap)
|
||||||
}
|
}
|
||||||
|
|
||||||
/// https://immersive-web.github.io/webxr/#dom-xrrenderstate-baselayer
|
/// https://immersive-web.github.io/webxr/#dom-xrrenderstate-baselayer
|
||||||
|
|
|
@ -117,7 +117,12 @@ impl XRSession {
|
||||||
|
|
||||||
pub fn new(global: &GlobalScope, session: Session, mode: XRSessionMode) -> DomRoot<XRSession> {
|
pub fn new(global: &GlobalScope, session: Session, mode: XRSessionMode) -> DomRoot<XRSession> {
|
||||||
use std::f64::consts::FRAC_PI_2;
|
use std::f64::consts::FRAC_PI_2;
|
||||||
let render_state = XRRenderState::new(global, 0.1, 1000.0, FRAC_PI_2, None);
|
let ivfov = if mode == XRSessionMode::Inline {
|
||||||
|
Some(FRAC_PI_2)
|
||||||
|
} else {
|
||||||
|
None
|
||||||
|
};
|
||||||
|
let render_state = XRRenderState::new(global, 0.1, 1000.0, ivfov, None);
|
||||||
let input_sources = XRInputSourceArray::new(global);
|
let input_sources = XRInputSourceArray::new(global);
|
||||||
let ret = reflect_dom_object(
|
let ret = reflect_dom_object(
|
||||||
Box::new(XRSession::new_inherited(
|
Box::new(XRSession::new_inherited(
|
||||||
|
@ -379,7 +384,10 @@ impl XRSession {
|
||||||
let near = *render_state.DepthNear() as f32;
|
let near = *render_state.DepthNear() as f32;
|
||||||
let far = *render_state.DepthFar() as f32;
|
let far = *render_state.DepthFar() as f32;
|
||||||
clip_planes.update(near, far);
|
clip_planes.update(near, far);
|
||||||
let top = *render_state.InlineVerticalFieldOfView() / 2.;
|
let top = *render_state
|
||||||
|
.GetInlineVerticalFieldOfView()
|
||||||
|
.expect("IVFOV should be non null for inline sessions") /
|
||||||
|
2.;
|
||||||
let top = near * top.tan() as f32;
|
let top = near * top.tan() as f32;
|
||||||
let bottom = top;
|
let bottom = top;
|
||||||
let left = top * size.width as f32 / size.height as f32;
|
let left = top * size.width as f32 / size.height as f32;
|
||||||
|
@ -454,7 +462,7 @@ impl XRSessionMethods for XRSession {
|
||||||
}
|
}
|
||||||
|
|
||||||
// Step 4:
|
// Step 4:
|
||||||
if init.inlineVerticalFieldOfView.is_some() {
|
if init.inlineVerticalFieldOfView.is_some() && self.is_immersive() {
|
||||||
return Err(Error::InvalidState);
|
return Err(Error::InvalidState);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1,4 +0,0 @@
|
||||||
[render_state_vertical_fov_immersive.https.html]
|
|
||||||
[inlineVerticalFieldOfView is set appropriately on immersively sessions]
|
|
||||||
expected: FAIL
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue