Update bounded space handling, add support in mock (#244)

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

webxr-api/device.rs

@@ -24,8 +24,7 @@ use crate::SessionInit;
 use crate::SessionMode;
 use crate::Viewports;
 
-use euclid::Box2D;
-use euclid::RigidTransform3D;
+use euclid::{Point2D, RigidTransform3D};
 
 /// A trait for discovering XR devices
 pub trait DiscoveryAPI<GL>: 'static {
@@ -94,7 +93,7 @@ pub trait DeviceAPI: 'static {
         Vec::new()
     }
 
-    fn reference_space_bounds(&self) -> Option<Box2D<f32, Floor>> {
+    fn reference_space_bounds(&self) -> Option<Vec<Point2D<f32, Floor>>> {
         None
     }
 }

webxr-api/mock.rs

@@ -24,7 +24,7 @@ use crate::Viewer;
 use crate::Viewport;
 use crate::Visibility;
 
-use euclid::{Rect, RigidTransform3D, Transform3D};
+use euclid::{Point2D, Rect, RigidTransform3D, Transform3D};
 
 #[cfg(feature = "ipc")]
 use serde::{Deserialize, Serialize};
@@ -80,6 +80,7 @@ pub enum MockDeviceMsg {
     SetWorld(MockWorld),
     ClearWorld,
     Disconnect(Sender<()>),
+    SetBoundsGeometry(Vec<Point2D<f32, Floor>>),
 }
 
 #[derive(Clone, Debug)]

webxr-api/session.rs

@@ -22,7 +22,7 @@ use crate::Sender;
 use crate::Viewport;
 use crate::Viewports;
 
-use euclid::Box2D;
+use euclid::Point2D;
 use euclid::Rect;
 use euclid::RigidTransform3D;
 use euclid::Size2D;
@@ -120,6 +120,7 @@ enum SessionMsg {
     CancelHitTest(HitTestId),
     UpdateFrameRate(f32, Sender<f32>),
     Quit,
+    GetBoundsGeometry(Sender<Option<Vec<Point2D<f32, Floor>>>>),
 }
 
 #[cfg_attr(feature = "ipc", derive(Serialize, Deserialize))]
@@ -147,7 +148,6 @@ pub struct Session {
     granted_features: Vec<String>,
     id: SessionId,
     supported_frame_rates: Vec<f32>,
-    reference_space_bounds: Option<Box2D<f32, Floor>>,
 }
 
 #[derive(Clone, Copy, Debug, Eq, Hash, PartialEq)]
@@ -163,8 +163,10 @@ impl Session {
         self.floor_transform.clone()
     }
 
-    pub fn reference_space_bounds(&self) -> Option<Box2D<f32, Floor>> {
-        self.reference_space_bounds.clone()
+    pub fn reference_space_bounds(&self) -> Option<Vec<Point2D<f32, Floor>>> {
+        let (sender, receiver) = channel().ok()?;
+        let _ = self.sender.send(SessionMsg::GetBoundsGeometry(sender));
+        receiver.recv().ok()?
     }
 
     pub fn initial_inputs(&self) -> &[InputSource] {
@@ -320,7 +322,6 @@ where
         let environment_blend_mode = self.device.environment_blend_mode();
         let granted_features = self.device.granted_features().into();
         let supported_frame_rates = self.device.supported_frame_rates();
-        let reference_space_bounds = self.device.reference_space_bounds();
         Session {
             floor_transform,
             viewports,
@@ -330,7 +331,6 @@ where
             granted_features,
             id: self.id,
             supported_frame_rates,
-            reference_space_bounds,
         }
     }
 
@@ -421,6 +421,10 @@ where
                     self.render_state = RenderState::PendingQuit;
                 }
             }
+            SessionMsg::GetBoundsGeometry(sender) => {
+                let bounds = self.device.reference_space_bounds();
+                let _ = sender.send(bounds);
+            }
         }
         true
     }

webxr/headless/mod.rs

@@ -4,7 +4,7 @@
 
 use crate::SurfmanGL;
 use crate::SurfmanLayerManager;
-use euclid::RigidTransform3D;
+use euclid::{Point2D, RigidTransform3D};
 use std::sync::{Arc, Mutex};
 use std::thread;
 use surfman::chains::SwapChains;
@@ -64,6 +64,7 @@ struct HeadlessDeviceData {
     disconnected: bool,
     world: Option<MockWorld>,
     next_id: u32,
+    bounds_geometry: Vec<Point2D<f32, Floor>>,
 }
 
 impl MockDiscoveryAPI<SurfmanGL> for HeadlessMockDiscovery {
@@ -86,6 +87,7 @@ impl MockDiscoveryAPI<SurfmanGL> for HeadlessMockDiscovery {
             disconnected: false,
             world: init.world,
             next_id: 0,
+            bounds_geometry: vec![],
         };
         let data = Arc::new(Mutex::new(data));
         let data_ = data.clone();
@@ -305,6 +307,11 @@ impl DeviceAPI for HeadlessDevice {
     fn cancel_hit_test(&mut self, id: HitTestId) {
         self.hit_tests.cancel_hit_test(id)
     }
+
+    fn reference_space_bounds(&self) -> Option<Vec<Point2D<f32, Floor>>> {
+        let bounds = self.data.lock().unwrap().bounds_geometry.clone();
+        Some(bounds)
+    }
 }
 
 impl HeadlessMockDiscovery {
@@ -495,6 +502,9 @@ impl HeadlessDeviceData {
                 let _ = s.send(());
                 return false;
             }
+            MockDeviceMsg::SetBoundsGeometry(g) => {
+                self.bounds_geometry = g;
+            }
         }
         true
     }

webxr/openxr/mod.rs

@@ -1523,7 +1523,7 @@ impl DeviceAPI for OpenXrDevice {
         }
     }
 
-    fn reference_space_bounds(&self) -> Option<Box2D<f32, Floor>> {
+    fn reference_space_bounds(&self) -> Option<Vec<Point2D<f32, Floor>>> {
         match self
             .session
             .reference_space_bounds_rect(ReferenceSpaceType::STAGE)
@@ -1534,7 +1534,7 @@ impl DeviceAPI for OpenXrDevice {
                     let point2 = Point2D::new(-bounds.width / 2., bounds.height / 2.);
                     let point3 = Point2D::new(bounds.width / 2., bounds.height / 2.);
                     let point4 = Point2D::new(bounds.width / 2., -bounds.height / 2.);
-                    Some(Box2D::from_points([point1, point2, point3, point4]))
+                    Some(vec![point1, point2, point3, point4])
                 } else {
                     None
                 }