aboutsummaryrefslogtreecommitdiffstats
path: root/components
diff options
context:
space:
mode:
authorManish Goregaokar <manishsmail@gmail.com>2020-04-08 14:52:04 -0700
committerManish Goregaokar <manishsmail@gmail.com>2020-04-19 20:29:14 -0700
commit98ff97783e7bc083b3f0dd461c6743bd34aa1680 (patch)
treecd807c311a173c06855ce76cf2930785dd990fdd /components
parentb6a9e41bb8ebb9640f698d02728f81d77c337b58 (diff)
downloadservo-98ff97783e7bc083b3f0dd461c6743bd34aa1680.tar.gz
servo-98ff97783e7bc083b3f0dd461c6743bd34aa1680.zip
Add origin/direction methods to XRRay
Diffstat (limited to 'components')
-rw-r--r--components/script/dom/bindings/trace.rs2
-rw-r--r--components/script/dom/webidls/XRRay.webidl4
-rw-r--r--components/script/dom/xrray.rs28
3 files changed, 30 insertions, 4 deletions
diff --git a/components/script/dom/bindings/trace.rs b/components/script/dom/bindings/trace.rs
index 02a668f08e0..2b6058e826b 100644
--- a/components/script/dom/bindings/trace.rs
+++ b/components/script/dom/bindings/trace.rs
@@ -157,8 +157,8 @@ use webgpu::{
WebGPUPipelineLayout, WebGPUQueue, WebGPUShaderModule,
};
use webrender_api::{DocumentId, ImageKey};
-use webxr_api::SwapChainId as WebXRSwapChainId;
use webxr_api::Ray;
+use webxr_api::SwapChainId as WebXRSwapChainId;
unsafe_no_jsmanaged_fields!(Tm);
diff --git a/components/script/dom/webidls/XRRay.webidl b/components/script/dom/webidls/XRRay.webidl
index 74b45e5bab8..43963b7020d 100644
--- a/components/script/dom/webidls/XRRay.webidl
+++ b/components/script/dom/webidls/XRRay.webidl
@@ -8,7 +8,7 @@
interface XRRay {
// constructor(optional DOMPointInit origin, optional DOMPointInit direction);
// constructor(XRRigidTransform transform);
- // [SameObject] readonly attribute DOMPointReadOnly origin;
- // [SameObject] readonly attribute DOMPointReadOnly direction;
+ [SameObject] readonly attribute DOMPointReadOnly origin;
+ [SameObject] readonly attribute DOMPointReadOnly direction;
// [SameObject] readonly attribute Float32Array matrix;
};
diff --git a/components/script/dom/xrray.rs b/components/script/dom/xrray.rs
index f850e00e906..30327ea0a15 100644
--- a/components/script/dom/xrray.rs
+++ b/components/script/dom/xrray.rs
@@ -2,8 +2,10 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at https://mozilla.org/MPL/2.0/. */
-use crate::dom::bindings::reflector::{reflect_dom_object, Reflector};
+use crate::dom::bindings::codegen::Bindings::XRRayBinding::XRRayMethods;
+use crate::dom::bindings::reflector::{reflect_dom_object, DomObject, Reflector};
use crate::dom::bindings::root::DomRoot;
+use crate::dom::dompointreadonly::DOMPointReadOnly;
use crate::dom::globalscope::GlobalScope;
use dom_struct::dom_struct;
use webxr_api::{ApiSpace, Ray};
@@ -27,3 +29,27 @@ impl XRRay {
reflect_dom_object(Box::new(XRRay::new_inherited(ray)), global)
}
}
+
+impl XRRayMethods for XRRay {
+ /// https://immersive-web.github.io/hit-test/#dom-xrray-origin
+ fn Origin(&self) -> DomRoot<DOMPointReadOnly> {
+ DOMPointReadOnly::new(
+ &self.global(),
+ self.ray.origin.x as f64,
+ self.ray.origin.y as f64,
+ self.ray.origin.z as f64,
+ 1.,
+ )
+ }
+
+ /// https://immersive-web.github.io/hit-test/#dom-xrray-direction
+ fn Direction(&self) -> DomRoot<DOMPointReadOnly> {
+ DOMPointReadOnly::new(
+ &self.global(),
+ self.ray.direction.x as f64,
+ self.ray.direction.y as f64,
+ self.ray.direction.z as f64,
+ 0.,
+ )
+ }
+}