diff options
author | Manish Goregaokar <manishsmail@gmail.com> | 2020-05-14 12:00:02 -0700 |
---|---|---|
committer | Manish Goregaokar <manishsmail@gmail.com> | 2020-05-18 08:20:33 -0700 |
commit | a97dcd9ad6c895d61974317f7ba77f6b6fb48282 (patch) | |
tree | 1a8d8087869fd0f40a35f8d3c7dcce984d7b1fb5 /components/script/dom/xrreferencespace.rs | |
parent | 794624b42b82e549b1992ec41d7fd830a563ba0e (diff) | |
download | servo-a97dcd9ad6c895d61974317f7ba77f6b6fb48282.tar.gz servo-a97dcd9ad6c895d61974317f7ba77f6b6fb48282.zip |
Update to use webxr_api::ViewerPose
Diffstat (limited to 'components/script/dom/xrreferencespace.rs')
-rw-r--r-- | components/script/dom/xrreferencespace.rs | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/components/script/dom/xrreferencespace.rs b/components/script/dom/xrreferencespace.rs index 3d05a59564c..0936b33fe6d 100644 --- a/components/script/dom/xrreferencespace.rs +++ b/components/script/dom/xrreferencespace.rs @@ -113,7 +113,7 @@ impl XRReferenceSpace { // get_viewer_pose(eye_level) = get_pose(eye_level).inverse() * get_pose(viewer_space) // = I * viewer_pose // = viewer_pose - let viewer_pose: ApiViewerPose = cast_transform(base_pose.transform?); + let viewer_pose: ApiViewerPose = cast_transform(base_pose.pose.as_ref()?.transform); // we get viewer poses in eye-level space by default Some(viewer_pose) @@ -122,7 +122,7 @@ impl XRReferenceSpace { // get_viewer_pose(floor_level) = get_pose(floor_level).inverse() * get_pose(viewer_space) // = floor_to_native.inverse() * viewer_pose // = native_to_floor * viewer_pose - let viewer_pose = base_pose.transform?; + let viewer_pose = base_pose.pose.as_ref()?.transform; let native_to_floor = self .upcast::<XRSpace>() .session() @@ -171,7 +171,9 @@ impl XRReferenceSpace { .with_session(|s| s.floor_transform())?; Some(cast_transform(native_to_floor.inverse())) }, - XRReferenceSpaceType::Viewer => base_pose.transform.map(cast_transform), + XRReferenceSpaceType::Viewer => { + Some(cast_transform(base_pose.pose.as_ref()?.transform)) + }, _ => unimplemented!(), } } |