aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/dom/xrstationaryreferencespace.rs
diff options
context:
space:
mode:
Diffstat (limited to 'components/script/dom/xrstationaryreferencespace.rs')
-rw-r--r--components/script/dom/xrstationaryreferencespace.rs17
1 files changed, 8 insertions, 9 deletions
diff --git a/components/script/dom/xrstationaryreferencespace.rs b/components/script/dom/xrstationaryreferencespace.rs
index e8349ef3581..ddba9aaa20b 100644
--- a/components/script/dom/xrstationaryreferencespace.rs
+++ b/components/script/dom/xrstationaryreferencespace.rs
@@ -6,12 +6,12 @@ use crate::dom::bindings::codegen::Bindings::XRStationaryReferenceSpaceBinding;
use crate::dom::bindings::codegen::Bindings::XRStationaryReferenceSpaceBinding::XRStationaryReferenceSpaceSubtype;
use crate::dom::bindings::reflector::reflect_dom_object;
use crate::dom::bindings::root::DomRoot;
-use crate::dom::window::Window;
+use crate::dom::globalscope::GlobalScope;
use crate::dom::xrreferencespace::XRReferenceSpace;
use crate::dom::xrrigidtransform::XRRigidTransform;
use crate::dom::xrsession::XRSession;
use dom_struct::dom_struct;
-use euclid::{Rotation3D, Transform3D};
+use euclid::{RigidTransform3D, Rotation3D, Vector3D};
use webvr_traits::WebVRFrameData;
#[dom_struct]
@@ -34,16 +34,16 @@ impl XRStationaryReferenceSpace {
}
pub fn new(
- window: &Window,
+ global: &GlobalScope,
session: &XRSession,
ty: XRStationaryReferenceSpaceSubtype,
) -> DomRoot<XRStationaryReferenceSpace> {
- let transform = XRRigidTransform::identity(window);
+ let transform = XRRigidTransform::identity(global);
reflect_dom_object(
Box::new(XRStationaryReferenceSpace::new_inherited(
session, ty, &transform,
)),
- window,
+ global,
XRStationaryReferenceSpaceBinding::Wrap,
)
}
@@ -53,11 +53,10 @@ impl XRStationaryReferenceSpace {
/// Gets pose represented by this space
///
/// Does not apply originOffset, use get_viewer_pose instead
- pub fn get_pose(&self, base_pose: &WebVRFrameData) -> Transform3D<f64> {
+ pub fn get_pose(&self, base_pose: &WebVRFrameData) -> RigidTransform3D<f64> {
// XXXManishearth add floor-level transform for floor-level and disable position in position-disabled
let pos = base_pose.pose.position.unwrap_or([0., 0., 0.]);
- let translation =
- Transform3D::create_translation(pos[0] as f64, pos[1] as f64, pos[2] as f64);
+ let translation = Vector3D::new(pos[0] as f64, pos[1] as f64, pos[2] as f64);
let orient = base_pose.pose.orientation.unwrap_or([0., 0., 0., 0.]);
let rotation = Rotation3D::quaternion(
orient[0] as f64,
@@ -65,6 +64,6 @@ impl XRStationaryReferenceSpace {
orient[2] as f64,
orient[3] as f64,
);
- translation.pre_mul(&rotation.to_transform())
+ RigidTransform3D::new(rotation, translation)
}
}