aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/dom/xrview.rs
diff options
context:
space:
mode:
authorManish Goregaokar <manishsmail@gmail.com>2018-12-21 15:20:51 -0800
committerManish Goregaokar <manishsmail@gmail.com>2018-12-21 15:47:28 -0800
commit28dff81dbf3f24ae470e1a0004f0813a3247e08f (patch)
tree3147e3ffd8047cbb22521224e8d6edd2012c6420 /components/script/dom/xrview.rs
parent7e043a33f17c5a084bb6e34ab3497932a285028a (diff)
downloadservo-28dff81dbf3f24ae470e1a0004f0813a3247e08f.tar.gz
servo-28dff81dbf3f24ae470e1a0004f0813a3247e08f.zip
Fill in XR frame/pose/view implementations
Diffstat (limited to 'components/script/dom/xrview.rs')
-rw-r--r--components/script/dom/xrview.rs46
1 files changed, 41 insertions, 5 deletions
diff --git a/components/script/dom/xrview.rs b/components/script/dom/xrview.rs
index f9d538cb946..5fd7dfcae2e 100644
--- a/components/script/dom/xrview.rs
+++ b/components/script/dom/xrview.rs
@@ -7,14 +7,20 @@ use crate::dom::bindings::codegen::Bindings::XRViewBinding::{XREye, XRViewMethod
use crate::dom::bindings::reflector::{reflect_dom_object, Reflector};
use crate::dom::bindings::root::{Dom, DomRoot};
use crate::dom::globalscope::GlobalScope;
+use crate::dom::vrframedata::create_typed_array;
use crate::dom::xrsession::XRSession;
use dom_struct::dom_struct;
+use js::jsapi::{Heap, JSContext, JSObject};
+use std::ptr::NonNull;
+use webvr_traits::WebVRFrameData;
#[dom_struct]
pub struct XRView {
reflector_: Reflector,
session: Dom<XRSession>,
eye: XREye,
+ proj: Heap<*mut JSObject>,
+ view: Heap<*mut JSObject>,
}
impl XRView {
@@ -22,16 +28,34 @@ impl XRView {
XRView {
reflector_: Reflector::new(),
session: Dom::from_ref(session),
- eye
+ eye,
+ proj: Heap::default(),
+ view: Heap::default(),
}
}
- pub fn new(global: &GlobalScope, session: &XRSession, eye: XREye) -> DomRoot<XRView> {
- reflect_dom_object(
+ pub fn new(
+ global: &GlobalScope,
+ session: &XRSession,
+ eye: XREye,
+ data: &WebVRFrameData,
+ ) -> DomRoot<XRView> {
+ let ret = reflect_dom_object(
Box::new(XRView::new_inherited(session, eye)),
global,
XRViewBinding::Wrap,
- )
+ );
+
+ let (proj, view) = if eye == XREye::Left {
+ (&data.left_projection_matrix, &data.left_view_matrix)
+ } else {
+ (&data.right_projection_matrix, &data.right_view_matrix)
+ };
+
+ let cx = global.get_cx();
+ create_typed_array(cx, proj, &ret.proj);
+ create_typed_array(cx, view, &ret.view);
+ ret
}
pub fn session(&self) -> &XRSession {
@@ -44,4 +68,16 @@ impl XRViewMethods for XRView {
fn Eye(&self) -> XREye {
self.eye
}
-} \ No newline at end of file
+
+ #[allow(unsafe_code)]
+ /// https://immersive-web.github.io/webxr/#dom-xrview-projectionmatrix
+ unsafe fn ProjectionMatrix(&self, _cx: *mut JSContext) -> NonNull<JSObject> {
+ NonNull::new_unchecked(self.proj.get())
+ }
+
+ #[allow(unsafe_code)]
+ /// https://immersive-web.github.io/webxr/#dom-xrview-projectionmatrix
+ unsafe fn ViewMatrix(&self, _cx: *mut JSContext) -> NonNull<JSObject> {
+ NonNull::new_unchecked(self.view.get())
+ }
+}