Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-06 22:15:33 +01:00
Code Issues Projects Releases Packages Wiki Activity

Update XRRay semantics

Browse source 
Implements changes from https://github.com/immersive-web/hit-test/pull/85
This commit is contained in:
Manish Goregaokar 2020-04-10 14:25:02 -07:00
parent 7dd2a71d6d
commit 83f92a3181
2 changed files with 27 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

11
components/script/dom/webidls/XRRay.webidl
View file

@ -4,10 +4,17 @@
// https://immersive-web.github.io/hit-test/#xrray-interface
dictionary XRRayDirectionInit {
double x = 0;
double y = 0;
double z = -1;
double w = 0;
};
[SecureContext, Exposed=Window, Pref="dom.webxr.enabled"]
interface XRRay {
constructor(optional DOMPointInit origin = {}, optional DOMPointInit direction = {});
constructor(XRRigidTransform transform);
[Throws] constructor(optional DOMPointInit origin = {}, optional XRRayDirectionInit direction = {});
[Throws] constructor(XRRigidTransform transform);
[SameObject] readonly attribute DOMPointReadOnly origin;
[SameObject] readonly attribute DOMPointReadOnly direction;
[SameObject] readonly attribute Float32Array matrix;

25
components/script/dom/xrray.rs
View file

@ -3,7 +3,8 @@
* file, You can obtain one at https://mozilla.org/MPL/2.0/. */
use crate::dom::bindings::codegen::Bindings::DOMPointBinding::DOMPointInit;
use crate::dom::bindings::codegen::Bindings::XRRayBinding::XRRayMethods;
use crate::dom::bindings::codegen::Bindings::XRRayBinding::{XRRayDirectionInit, XRRayMethods};
use crate::dom::bindings::error::{Error, Fallible};
use crate::dom::bindings::reflector::{reflect_dom_object, DomObject, Reflector};
use crate::dom::bindings::root::DomRoot;
use crate::dom::bindings::utils::create_typed_array;
@ -45,25 +46,35 @@ impl XRRay {
pub fn Constructor(
window: &Window,
origin: &DOMPointInit,
direction: &DOMPointInit,
) -> DomRoot<Self> {
direction: &XRRayDirectionInit,
) -> Fallible<DomRoot<Self>> {
if origin.w != 1.0 {
return Err(Error::Type("Origin w coordinate must be 1".into()));
}
if *direction.w != 0.0 {
return Err(Error::Type("Direction w coordinate must be 0".into()));
}
if *direction.x == 0.0 && *direction.y == 0.0 && *direction.z == 0.0 {
return Err(Error::Type("Direction vector cannot have zero length".into()));
}
let origin = Vector3D::new(origin.x as f32, origin.y as f32, origin.z as f32);
let direction =
Vector3D::new(direction.x as f32, direction.y as f32, direction.z as f32).normalize();
Vector3D::new(*direction.x as f32, *direction.y as f32, *direction.z as f32).normalize();
Self::new(&window.global(), Ray { origin, direction })
Ok(Self::new(&window.global(), Ray { origin, direction }))
}
#[allow(non_snake_case)]
/// https://immersive-web.github.io/hit-test/#dom-xrray-xrray-transform
pub fn Constructor_(window: &Window, transform: &XRRigidTransform) -> DomRoot<Self> {
pub fn Constructor_(window: &Window, transform: &XRRigidTransform) -> Fallible<DomRoot<Self>> {
let transform = transform.transform();
let origin = transform.translation;
let direction = transform
.rotation
.transform_vector3d(Vector3D::new(0., 0., -1.));
Self::new(&window.global(), Ray { origin, direction })
Ok(Self::new(&window.global(), Ray { origin, direction }))
}
}