Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-03 12:40:06 +01:00
Code Issues Projects Releases Packages Wiki Activity

Correctly clamp ivfov and depth values

Browse source
This commit is contained in:
Manish Goregaokar 2019-12-11 21:08:02 -08:00
parent f52a6f0e8f
commit 3414c8d22d
2 changed files with 23 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

26
components/script/dom/xrsession.rs
View file

@ -46,6 +46,7 @@ use ipc_channel::router::ROUTER;
use metrics::ToMs;
use profile_traits::ipc;
use std::cell::Cell;
use std::f64::consts::{FRAC_PI_2, PI};
use std::mem;
use std::rc::Rc;
use webxr_api::{
@ -116,7 +117,6 @@ impl XRSession {
}
pub fn new(global: &GlobalScope, session: Session, mode: XRSessionMode) -> DomRoot<XRSession> {
use std::f64::consts::FRAC_PI_2;
let ivfov = if mode == XRSessionMode::Inline {
Some(FRAC_PI_2)
} else {
@ -470,13 +470,33 @@ impl XRSessionMethods for XRSession {
.pending_render_state
.or_init(|| self.active_render_state.get().clone_object());
if let Some(near) = init.depthNear {
pending.set_depth_near(*near);
let mut near = *near;
// Step 8 from #apply-the-pending-render-state
// this may need to be changed if backends wish to impose
// further constraints
if near < 0. {
near = 0.;
}
pending.set_depth_near(near);
}
if let Some(far) = init.depthFar {
// Step 9 from #apply-the-pending-render-state
// this may need to be changed if backends wish to impose
// further constraints
// currently the maximum is infinity, so we do nothing
pending.set_depth_far(*far);
}
if let Some(fov) = init.inlineVerticalFieldOfView {
pending.set_inline_vertical_fov(*fov);
let mut fov = *fov;
// Step 10 from #apply-the-pending-render-state
// this may need to be changed if backends wish to impose
// further constraints
if fov < 0. {
fov = 0.0001;
} else if fov > PI {
fov = PI - 0.0001;
}
pending.set_inline_vertical_fov(fov);
}
if let Some(ref layer) = init.baseLayer {
pending.set_layer(Some(&layer))

4
tests/wpt/metadata/webxr/render_state_vertical_fov_inline.https.html.ini
View file

@ -1,4 +0,0 @@
[render_state_vertical_fov_inline.https.html]
[inlineVerticalFieldOfView is set appropriately on inline sessions]
expected: FAIL