mirror of
https://github.com/servo/servo.git
synced 2025-08-03 20:50:07 +01:00
Rename incorrectly-named get_pose methods
This commit is contained in:
parent
f1b82f8573
commit
d2e2b8da4d
3 changed files with 21 additions and 10 deletions
|
@ -54,9 +54,9 @@ impl XRReferenceSpaceMethods for XRReferenceSpace {
|
||||||
}
|
}
|
||||||
|
|
||||||
impl XRReferenceSpace {
|
impl XRReferenceSpace {
|
||||||
/// Gets viewer pose represented by this space
|
/// Gets pose of the viewer with respect to this space
|
||||||
pub fn get_viewer_pose(&self, base_pose: &WebVRFrameData) -> RigidTransform3D<f64> {
|
pub fn get_viewer_pose(&self, base_pose: &WebVRFrameData) -> RigidTransform3D<f64> {
|
||||||
let pose = self.get_pose(base_pose);
|
let pose = self.get_unoffset_viewer_pose(base_pose);
|
||||||
|
|
||||||
// This may change, see https://github.com/immersive-web/webxr/issues/567
|
// This may change, see https://github.com/immersive-web/webxr/issues/567
|
||||||
let offset = self.transform.get().transform();
|
let offset = self.transform.get().transform();
|
||||||
|
@ -64,16 +64,25 @@ impl XRReferenceSpace {
|
||||||
inverse.pre_mul(&pose)
|
inverse.pre_mul(&pose)
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Gets pose represented by this space
|
/// Gets pose of the viewer with respect to this space
|
||||||
///
|
///
|
||||||
/// Does not apply originOffset, use get_viewer_pose instead if you need it
|
/// Does not apply originOffset, use get_viewer_pose instead if you need it
|
||||||
pub fn get_pose(&self, base_pose: &WebVRFrameData) -> RigidTransform3D<f64> {
|
pub fn get_unoffset_viewer_pose(&self, base_pose: &WebVRFrameData) -> RigidTransform3D<f64> {
|
||||||
if let Some(stationary) = self.downcast::<XRStationaryReferenceSpace>() {
|
if let Some(stationary) = self.downcast::<XRStationaryReferenceSpace>() {
|
||||||
stationary.get_pose(base_pose)
|
stationary.get_unoffset_viewer_pose(base_pose)
|
||||||
} else {
|
} else {
|
||||||
// non-subclassed XRReferenceSpaces exist, obtained via the "identity"
|
// non-subclassed XRReferenceSpaces exist, obtained via the "identity"
|
||||||
// type. The pose does not depend on the base pose.
|
// type. The pose does not depend on the base pose.
|
||||||
RigidTransform3D::identity()
|
RigidTransform3D::identity()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Gets pose represented by this space
|
||||||
|
///
|
||||||
|
/// The reference origin used is common between all
|
||||||
|
/// get_pose calls for spaces from the same device, so this can be used to compare
|
||||||
|
/// with other spaces
|
||||||
|
pub fn get_pose(&self, _: &WebVRFrameData) -> RigidTransform3D<f64> {
|
||||||
|
unimplemented!()
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -39,7 +39,7 @@ impl XRSpace {
|
||||||
}
|
}
|
||||||
|
|
||||||
impl XRSpace {
|
impl XRSpace {
|
||||||
/// Gets viewer pose represented by this space
|
/// Gets pose of the viewer with respect to this space
|
||||||
#[allow(unused)]
|
#[allow(unused)]
|
||||||
pub fn get_viewer_pose(&self, base_pose: &WebVRFrameData) -> RigidTransform3D<f64> {
|
pub fn get_viewer_pose(&self, base_pose: &WebVRFrameData) -> RigidTransform3D<f64> {
|
||||||
if let Some(reference) = self.downcast::<XRReferenceSpace>() {
|
if let Some(reference) = self.downcast::<XRReferenceSpace>() {
|
||||||
|
@ -51,7 +51,9 @@ impl XRSpace {
|
||||||
|
|
||||||
/// Gets pose represented by this space
|
/// Gets pose represented by this space
|
||||||
///
|
///
|
||||||
/// Does not apply originOffset, use get_viewer_pose instead if you need it
|
/// The reference origin used is common between all
|
||||||
|
/// get_pose calls for spaces from the same device, so this can be used to compare
|
||||||
|
/// with other spaces
|
||||||
#[allow(unused)]
|
#[allow(unused)]
|
||||||
pub fn get_pose(&self, base_pose: &WebVRFrameData) -> RigidTransform3D<f64> {
|
pub fn get_pose(&self, base_pose: &WebVRFrameData) -> RigidTransform3D<f64> {
|
||||||
if let Some(reference) = self.downcast::<XRReferenceSpace>() {
|
if let Some(reference) = self.downcast::<XRReferenceSpace>() {
|
||||||
|
|
|
@ -50,10 +50,10 @@ impl XRStationaryReferenceSpace {
|
||||||
}
|
}
|
||||||
|
|
||||||
impl XRStationaryReferenceSpace {
|
impl XRStationaryReferenceSpace {
|
||||||
/// Gets pose represented by this space
|
/// Gets pose of the viewer with respect to this space
|
||||||
///
|
///
|
||||||
/// Does not apply originOffset, use get_viewer_pose instead
|
/// Does not apply originOffset, use get_viewer_pose on XRReferenceSpace instead
|
||||||
pub fn get_pose(&self, base_pose: &WebVRFrameData) -> RigidTransform3D<f64> {
|
pub fn get_unoffset_viewer_pose(&self, base_pose: &WebVRFrameData) -> RigidTransform3D<f64> {
|
||||||
// XXXManishearth add floor-level transform for floor-level and disable position in position-disabled
|
// 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 pos = base_pose.pose.position.unwrap_or([0., 0., 0.]);
|
||||||
let translation = Vector3D::new(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);
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue