StageParameters must be updated after a ResetPose and display change …

…events
MortimerGoro · Nov 29, 2016 · 1c8505d · 1c8505d
1 parent 45081d4
commit 1c8505d
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 2 deletions.
diff --git a/components/script/dom/vrdisplay.rs b/components/script/dom/vrdisplay.rs
@@ -391,7 +391,18 @@ impl VRDisplay {
     }
 
     pub fn update_display(&self, display: &webvr::VRDisplayData) {
-        self.display.borrow_mut().0 = display.clone()
+        self.display.borrow_mut().0 = display.clone();
+        if let Some(ref stage) = display.stage_parameters {
+            if self.stage_params.get().is_none() {
+                let params = Some(VRStageParameters::new(&stage, &self.global()));
+                self.stage_params.set(params.as_ref().map(|v| v.deref()));
+            } else {
+                self.stage_params.get().unwrap().update(&stage);
+            }
+        } else {
+            self.stage_params.set(None);
+        }
+
     }
 
     pub fn handle_webvr_event(&self, event: &webvr::VRDisplayEvent) {

diff --git a/components/script/dom/vrstageparameters.rs b/components/script/dom/vrstageparameters.rs
@@ -6,7 +6,7 @@ use core::nonzero::NonZero;
 use dom::bindings::cell::DOMRefCell;
 use dom::bindings::codegen::Bindings::VRStageParametersBinding;
 use dom::bindings::codegen::Bindings::VRStageParametersBinding::VRStageParametersMethods;
-use dom::bindings::conversions::slice_to_array_buffer_view;
+use dom::bindings::conversions::{slice_to_array_buffer_view, update_array_buffer_view};
 use dom::bindings::js::Root;
 use dom::bindings::reflector::{Reflector, reflect_dom_object};
 use dom::bindings::num::Finite;
@@ -46,6 +46,14 @@ impl VRStageParameters {
                            global,
                            VRStageParametersBinding::Wrap)
     }
+
+    #[allow(unsafe_code)]
+    pub fn update(&self, parameters: &webvr::VRStageParameters) {
+        unsafe {
+            update_array_buffer_view(self.transform.get(), &parameters.sitting_to_standing_transform);
+        }
+        self.parameters.borrow_mut().0 = parameters.clone();
+    }
 }
 
 impl VRStageParametersMethods for VRStageParameters {