Skip to content
Permalink
Browse files

Auto merge of #25025 - Manishearth:originOffset, r=jdm

Origin offset fixes

immersive-web/webxr#567 was closed out. We were computing offset spaces of already-offset spaces incorrectly, but otherwise our math is correct. I improved our comments around this with more math, so I never have to do this math again.

Chrome's math isn't, which is why we fail some tests around this: https://bugs.chromium.org/p/chromium/issues/detail?id=1030049 . I'm planning to wait for them to fix and upstream the tests, I've already verified that we pass the corrected test.

r? @jdm
  • Loading branch information
bors-servo committed Dec 3, 2019
2 parents 87c1019 + ba3689e commit 7aa68c8fe7ca0865a7323ab1e5b9526efa588ca2
Showing with 6 additions and 7 deletions.
  1. +6 −7 components/script/dom/xrreferencespace.rs
@@ -64,7 +64,7 @@ impl XRReferenceSpace {
impl XRReferenceSpaceMethods for XRReferenceSpace {
/// https://immersive-web.github.io/webxr/#dom-xrreferencespace-getoffsetreferencespace
fn GetOffsetReferenceSpace(&self, new: &XRRigidTransform) -> DomRoot<Self> {
let offset = new.transform().pre_transform(&self.offset.transform());
let offset = self.offset.transform().pre_transform(&new.transform());
let offset = XRRigidTransform::new(&self.global(), offset);
Self::new_offset(
&self.global(),
@@ -82,9 +82,6 @@ impl XRReferenceSpace {
/// however we specialize it to be efficient
pub fn get_viewer_pose(&self, base_pose: &Frame) -> ApiViewerPose {
let pose = self.get_unoffset_viewer_pose(base_pose);

// This may change, see https://github.com/immersive-web/webxr/issues/567

// in column-vector notation,
// get_viewer_pose(space) = get_pose(space).inverse() * get_pose(viewer_space)
// = (get_unoffset_pose(space) * offset).inverse() * get_pose(viewer_space)
@@ -139,10 +136,12 @@ impl XRReferenceSpace {
/// with other spaces
pub fn get_pose(&self, base_pose: &Frame) -> ApiPose {
let pose = self.get_unoffset_pose(base_pose);

// This may change, see https://github.com/immersive-web/webxr/issues/567
let offset = self.offset.transform();
offset.post_transform(&pose)
// pose is a transform from the unoffset space to native space,
// offset is a transform from offset space to unoffset space,
// we want a transform from unoffset space to native space,
// which is pose * offset in column vector notation
pose.pre_transform(&offset)
}

/// Gets pose represented by this space

0 comments on commit 7aa68c8

Please sign in to comment.
You can’t perform that action at this time.