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

Auto merge of #23557 - Manishearth:xrtest, r=asajeffrey

Browse source 
Test more XR things

This tests all the things that are currently possible and useful to test.

I'm going to avoid expanding rust-webvr's mock functionality for now, instead growing it in rust-webxr

Things that we support which aren't tested yet:

 - viewport values (there's no way in the xrtest api to mock these yet)
 - input (no support in rust-webvr for mocking)
 - floor spaces (no way in the xrtest api to mock these yet)

r? @asajeffrey

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/23557)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2019-06-13 05:54:55 -04:00 • committed by GitHub
commit 8a69cb391f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 771 additions and 2208 deletions
Download patch file Download diff file Expand all files Collapse all files

2882
tests/wpt/mozilla/meta/MANIFEST.json
View file

File diff suppressed because it is too large Load diff

95
tests/wpt/mozilla/tests/webxr/obtain_frame.html
View file

@ -8,54 +8,63 @@
<canvas id="canvas" width="640" height="480"></canvas>
<script>
let session;
let mock;
let canvas = document.getElementById("canvas");
let gl = canvas.getContext('webgl');
promise_test(async function() {
let mock = await navigator.xr.test.simulateDeviceConnection({supportsImmersive: true});
mock.setViewerOrigin({position: [0.5, 0.1, 0.1, 1], orientation: [1, 0, 0, 1] });
mock.setViews(TEST_VIEWS);
let session = await navigator.xr.requestSession({mode: "immersive-vr"});
await session.updateRenderState({"baseLayer": new XRWebGLLayer(session, gl, {})});
let resolve;
promise_test(function() {
return navigator.xr.test.simulateDeviceConnection({supportsImmersive: true}).then((m) => {
mock = m;
mock.setViewerOrigin({position: [0.5, 0, 0, 1], orientation: [0, 0, 0, 1] });
mock.setViews(TEST_VIEWS);
return navigator.xr.requestSession({mode: "immersive-vr"});
})
.then((s) => {
session = s;
return session.updateRenderState({"baseLayer": new XRWebGLLayer(session, gl, {})})
})
.then(() => {
return new Promise(function(resolve, reject) {
session.requestAnimationFrame(function(time, frame) {
session.requestReferenceSpace("local").then((space) => {
let pose = frame.getViewerPose(space);
for (view of pose.views) {
assert_matrix_approx_equals(view.projectionMatrix, VALID_PROJECTION_MATRIX, 0.001, "left projection matrix");
let frame = await new Promise(resolve => {
session.requestAnimationFrame((time, frame) => resolve(frame));
});
if (view.eye == "left") {
assert_matrix_approx_equals(view.transform.matrix, [1,0,0,0, 0,1,0,0, 0,0,1,0, 0.4,0,0,1], 0.001, "left transform");
let position = view.transform.position;
assert_approx_equals(position.x, 0.4, 0.001, "left x value");
assert_approx_equals(position.y, 0, 0.001, "left y value");
assert_approx_equals(position.z, 0, 0.001, "left z value");
assert_approx_equals(position.w, 1, 0.001, "left w value");
} else if (view.eye == "right") {
assert_matrix_approx_equals(view.transform.matrix, [1,0,0,0, 0,1,0,0, 0,0,1,0, 0.6,0,0,1], 0.001, "right transform");
let position = view.transform.position;
assert_approx_equals(position.x, 0.6, 0.001, "left x value");
assert_approx_equals(position.y, 0, 0.001, "left y value");
assert_approx_equals(position.z, 0, 0.001, "left z value");
assert_approx_equals(position.w, 1, 0.001, "left w value");
} else {
reject("got unknown view");
}
}
resolve();
}).catch((e) => reject(e));
});
});
let space = await session.requestReferenceSpace("local");
let pose = frame.getViewerPose(space);
assert_matrix_approx_equals(pose.transform.matrix, [1,0,0,0,0,0,1,0,0,-1,0,0,0.5,0.1,0.1,1], 0.001, "head pose matrix");
for (view of pose.views) {
assert_matrix_approx_equals(view.projectionMatrix, VALID_PROJECTION_MATRIX, 0.001, "projection matrix");
if (view.eye == "left") {
assert_matrix_approx_equals(view.transform.matrix, [1,0,0,0,0,0,1,0,0,-1,0,0,0.4,0.1,0.1,1], 0.001, "left transform");
assert_matrix_approx_equals(view.transform.inverse.matrix, [1,0,0,0,0,0,-1,0,0,1,0,0,-0.4,-0.1,0.1,1], 0.001, "left inverse transform");
let position = view.transform.position;
assert_approx_equals(position.x, 0.4, 0.001, "left x value");
assert_approx_equals(position.y, 0.1, 0.001, "left y value");
assert_approx_equals(position.z, 0.1, 0.001, "left z value");
assert_approx_equals(position.w, 1, 0.001, "left w value");
} else if (view.eye == "right") {
assert_matrix_approx_equals(view.transform.matrix, [1,0,0,0,0,0,1,0,0,-1,0,0,0.6,0.1,0.1,1], 0.001, "right transform");
assert_matrix_approx_equals(view.transform.inverse.matrix, [1,0,0,0,0,0,-1,0,0,1,0,0,-0.6,-0.1,0.1,1], 0.001, "right inverse transform");
let position = view.transform.position;
assert_approx_equals(position.x, 0.6, 0.001, "left x value");
assert_approx_equals(position.y, 0.1, 0.001, "left y value");
assert_approx_equals(position.z, 0.1, 0.001, "left z value");
assert_approx_equals(position.w, 1, 0.001, "left w value");
} else {
throw "got unknown view";
}
}
let offset = space.getOffsetReferenceSpace(new XRRigidTransform({x: 1, y: -1, z: 4}, {x: 0, y: 1, z: 1, w: 1}));
pose = frame.getViewerPose(offset);
for (view of pose.views) {
if (view.eye == "left") {
assert_matrix_approx_equals(view.transform.matrix, [-1/3,-2/3,2/3,0,-2/3,2/3,1/3,0,-2/3,-1/3,-2/3,0,3.4,-1.9,-0.9,1], 0.001, "left offset transform");
} else if (view.eye == "right") {
assert_matrix_approx_equals(view.transform.matrix, [-1/3,-2/3,2/3,0,-2/3,2/3,1/3,0,-2/3,-1/3,-2/3,0,3.6,-1.9,-0.9,1], 0.001, "right offset transform");
} else {
throw "got unknown view";
}
}
let viewer = await session.requestReferenceSpace("viewer");
pose = frame.getViewerPose(viewer);
assert_matrix_approx_equals(pose.transform.matrix, [1,0,0,0,0,1,0,0,0,0,1,0,0,0,0,1], 0.001, "viewerPose of viewer is identity");
assert_matrix_approx_equals(frame.getViewerPose(space).transform.matrix, frame.getPose(viewer, space).transform.matrix, 0.001, "viewerPose(space) == pose(viewer, space)");
assert_matrix_approx_equals(frame.getViewerPose(offset).transform.matrix, frame.getPose(viewer, offset).transform.matrix, 0.001, "viewerPose(offset) == pose(viewer, offset)");
});
});
</script>
</body>

2
tests/wpt/mozilla/tests/webxr/resources/webxr-util.js
View file

@ -7,7 +7,7 @@ const RIGHT_OFFSET = {position: [0.1, 0, 0], orientation: [0,0,0,0]};
let assert_matrix_approx_equals = function(m1, m2, epsilon, prefix = "") {
assert_equals(m1.length, m2.length, prefix + "Matrix lengths should match");
for(var i = 0; i < m1.length; ++i) {
assert_approx_equals(m1[i], m2[i], epsilon, m1 + prefix + "Component number " + i + " should match");
assert_approx_equals(m1[i], m2[i], epsilon, prefix + ": Component number " + i + " should match");
}
}