From 64a64a8d6d9dc2f5dc173ab21813c578757dc094 Mon Sep 17 00:00:00 2001 From: Manish Goregaokar Date: Sat, 22 Dec 2018 22:26:11 -0800 Subject: [PATCH] Properly support depthNear and depthFar --- components/script/dom/xrsession.rs | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/components/script/dom/xrsession.rs b/components/script/dom/xrsession.rs index 8432603e4e7a..449d4acf8fc3 100644 --- a/components/script/dom/xrsession.rs +++ b/components/script/dom/xrsession.rs @@ -2,6 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ +use crate::dom::bindings::codegen::Bindings::VRDisplayBinding::VRDisplayMethods; use crate::dom::bindings::codegen::Bindings::XRBinding::XRSessionMode; use crate::dom::bindings::codegen::Bindings::XRSessionBinding; use crate::dom::bindings::codegen::Bindings::XRSessionBinding::XRFrameRequestCallback; @@ -17,15 +18,12 @@ use crate::dom::vrdisplay::VRDisplay; use crate::dom::xrlayer::XRLayer; use crate::dom::xrwebgllayer::XRWebGLLayer; use dom_struct::dom_struct; -use std::cell::Cell; use std::rc::Rc; #[dom_struct] pub struct XRSession { eventtarget: EventTarget, display: Dom, - depth_near: Cell, - depth_far: Cell, base_layer: MutNullableDom, } @@ -34,8 +32,6 @@ impl XRSession { XRSession { eventtarget: EventTarget::new_inherited(), display: Dom::from_ref(display), - depth_near: Cell::new(0.1), - depth_far: Cell::new(1000.), base_layer: Default::default(), } } @@ -52,22 +48,22 @@ impl XRSession { impl XRSessionMethods for XRSession { /// https://immersive-web.github.io/webxr/#dom-xrsession-depthnear fn DepthNear(&self) -> Finite { - Finite::wrap(self.depth_near.get()) + self.display.DepthNear() } /// https://immersive-web.github.io/webxr/#dom-xrsession-depthfar fn DepthFar(&self) -> Finite { - Finite::wrap(self.depth_far.get()) + self.display.DepthFar() } /// https://immersive-web.github.io/webxr/#dom-xrsession-depthnear fn SetDepthNear(&self, d: Finite) { - self.depth_near.set(*d) + self.display.SetDepthNear(d) } /// https://immersive-web.github.io/webxr/#dom-xrsession-depthfar fn SetDepthFar(&self, d: Finite) { - self.depth_far.set(*d) + self.display.SetDepthFar(d) } /// https://immersive-web.github.io/webxr/#dom-xrsession-mode