Commit 82c919ff authored by codeimpl's avatar codeimpl Committed by Commit Bot

Rename XRFrameOfReferenceType enums

The values of the enum was updated in the spec[1].

[1] https://github.com/immersive-web/webxr/pull/370

Bug: 852520
Change-Id: I916943bee355936e7430aa4e36d0eeb6b76607d5
Reviewed-on: https://chromium-review.googlesource.com/1101118Reviewed-by: default avatarBrandon Jones <bajones@chromium.org>
Commit-Queue: Byoungkwon Ko <codeimpl@gmail.com>
Cr-Commit-Position: refs/heads/master@{#567340}
parent 0d6b1f56
...@@ -54,7 +54,7 @@ function onSessionStarted(session) { ...@@ -54,7 +54,7 @@ function onSessionStarted(session) {
} }
session.baseLayer = new XRWebGLLayer(session, gl); session.baseLayer = new XRWebGLLayer(session, gl);
session.requestFrameOfReference('eyeLevel').then( (frameOfRef) => { session.requestFrameOfReference('eye-level').then( (frameOfRef) => {
if (session.exclusive) { if (session.exclusive) {
exclusiveFrameOfRef = frameOfRef; exclusiveFrameOfRef = frameOfRef;
} else { } else {
......
...@@ -60,8 +60,8 @@ callback XRFrameRequestCallback = void (DOMHighResTimeStamp time, XRPresentation ...@@ -60,8 +60,8 @@ callback XRFrameRequestCallback = void (DOMHighResTimeStamp time, XRPresentation
}; };
enum XRFrameOfReferenceType { enum XRFrameOfReferenceType {
"headModel", "head-model",
"eyeLevel", "eye-level",
"stage", "stage",
}; };
......
...@@ -13,7 +13,7 @@ let fakeDevices = fakeXRDevices(); ...@@ -13,7 +13,7 @@ let fakeDevices = fakeXRDevices();
xr_session_promise_test((session, t) => { xr_session_promise_test((session, t) => {
assert_false(session.exclusive); assert_false(session.exclusive);
return session.requestFrameOfReference("eyeLevel").then((frameOfReference) => { return session.requestFrameOfReference("eye-level").then((frameOfReference) => {
let direction = new Float32Array([1.0, 0.0, 0.0]); let direction = new Float32Array([1.0, 0.0, 0.0]);
let origin = new Float32Array([0.0, 0.0, 0.0]); let origin = new Float32Array([0.0, 0.0, 0.0]);
......
...@@ -17,7 +17,7 @@ xr_session_promise_test( (session, t) => { ...@@ -17,7 +17,7 @@ xr_session_promise_test( (session, t) => {
setPose(null); setPose(null);
return session.requestFrameOfReference("eyeLevel") return session.requestFrameOfReference("eye-level")
.then((frameOfRef) => new Promise((resolve, reject) => { .then((frameOfRef) => new Promise((resolve, reject) => {
let expected_pose = VALID_POSE; let expected_pose = VALID_POSE;
let counter = 0; let counter = 0;
......
...@@ -26,9 +26,9 @@ xr_session_promise_test( (session, t) => new Promise((resolve) => { ...@@ -26,9 +26,9 @@ xr_session_promise_test( (session, t) => new Promise((resolve) => {
addInputSource(input_source); addInputSource(input_source);
// Must have a frameOfReference to get input poses. eyeLevel doesn't apply // Must have a frameOfReference to get input poses. eye-level doesn't apply
// any transforms to the given matrix. // any transforms to the given matrix.
session.requestFrameOfReference("eyeLevel").then( (frameOfRef) => { session.requestFrameOfReference("eye-level").then( (frameOfRef) => {
function CheckInvalidGrip(time, xrFrame) { function CheckInvalidGrip(time, xrFrame) {
let source = session.getInputSources()[0]; let source = session.getInputSources()[0];
......
...@@ -14,17 +14,17 @@ let fakeDevices = fakeXRDevices(); ...@@ -14,17 +14,17 @@ let fakeDevices = fakeXRDevices();
xr_session_promise_test( (session, t) => { xr_session_promise_test( (session, t) => {
return promise_rejects(t, new TypeError(), session.requestFrameOfReference("foo")) return promise_rejects(t, new TypeError(), session.requestFrameOfReference("foo"))
.then(() => Promise.all([ .then(() => Promise.all([
session.requestFrameOfReference("headModel").then( (frameOfRef) => { session.requestFrameOfReference("head-model").then( (frameOfRef) => {
assert_true(frameOfRef instanceof XRCoordinateSystem, assert_true(frameOfRef instanceof XRCoordinateSystem,
"headModel frameOfRef is not correct type."); "head-model frameOfRef is not correct type.");
assert_true(frameOfRef instanceof XRFrameOfReference, assert_true(frameOfRef instanceof XRFrameOfReference,
"headModel frameOfRef is not correct type."); "head-model frameOfRef is not correct type.");
}), }),
session.requestFrameOfReference("eyeLevel").then( (frameOfRef) => { session.requestFrameOfReference("eye-level").then( (frameOfRef) => {
assert_true(frameOfRef instanceof XRCoordinateSystem, assert_true(frameOfRef instanceof XRCoordinateSystem,
"eyeLevel frameOfRef is not correct type."); "eye-level frameOfRef is not correct type.");
assert_true(frameOfRef instanceof XRFrameOfReference, assert_true(frameOfRef instanceof XRFrameOfReference,
"eyeLevel frameOfRef is not correct type."); "eye-level frameOfRef is not correct type.");
}), }),
session.requestFrameOfReference("stage").then( (frameOfRef) => { session.requestFrameOfReference("stage").then( (frameOfRef) => {
assert_true(frameOfRef instanceof XRCoordinateSystem, assert_true(frameOfRef instanceof XRCoordinateSystem,
......
...@@ -16,7 +16,7 @@ xr_session_promise_test( (session) => { ...@@ -16,7 +16,7 @@ xr_session_promise_test( (session) => {
let webglLayer = new XRWebGLLayer(session, gl); let webglLayer = new XRWebGLLayer(session, gl);
session.baseLayer = webglLayer; session.baseLayer = webglLayer;
return session.requestFrameOfReference("eyeLevel").then((frameOfRef) => new Promise((resolve) =>{ return session.requestFrameOfReference("eye-level").then((frameOfRef) => new Promise((resolve) =>{
function onFrame(time, xrFrame) { function onFrame(time, xrFrame) {
// Ensure that two views are provided. // Ensure that two views are provided.
assert_not_equals(xrFrame.views, null); assert_not_equals(xrFrame.views, null);
......
...@@ -18,7 +18,7 @@ xr_session_promise_test( (session) => { ...@@ -18,7 +18,7 @@ xr_session_promise_test( (session) => {
// Session must have a baseLayer or frame requests will be ignored. // Session must have a baseLayer or frame requests will be ignored.
session.baseLayer = new XRWebGLLayer(session, gl); session.baseLayer = new XRWebGLLayer(session, gl);
return session.requestFrameOfReference("eyeLevel") return session.requestFrameOfReference("eye-level")
.then((frameOfRef) => new Promise((resolve) =>{ .then((frameOfRef) => new Promise((resolve) =>{
let counter = 0; let counter = 0;
......
...@@ -16,7 +16,7 @@ xr_session_promise_test( (session, t) => { ...@@ -16,7 +16,7 @@ xr_session_promise_test( (session, t) => {
let webglLayer = new XRWebGLLayer(session, gl); let webglLayer = new XRWebGLLayer(session, gl);
session.baseLayer = webglLayer; session.baseLayer = webglLayer;
return session.requestFrameOfReference("eyeLevel") return session.requestFrameOfReference("eye-level")
.then((frameOfRef) => new Promise((resolve) =>{ .then((frameOfRef) => new Promise((resolve) =>{
function onFrame(time, xrFrame) { function onFrame(time, xrFrame) {
let leftView = xrFrame.views[0]; let leftView = xrFrame.views[0];
......
...@@ -115,7 +115,7 @@ std::unique_ptr<TransformationMatrix> XRFrameOfReference::TransformBasePose( ...@@ -115,7 +115,7 @@ std::unique_ptr<TransformationMatrix> XRFrameOfReference::TransformBasePose(
} }
// Serves the same purpose as TransformBasePose, but for input poses. Needs to // Serves the same purpose as TransformBasePose, but for input poses. Needs to
// know the head pose so that cases like the headModel frame of reference can // know the head pose so that cases like the head-model frame of reference can
// properly adjust the input's relative position. // properly adjust the input's relative position.
std::unique_ptr<TransformationMatrix> std::unique_ptr<TransformationMatrix>
XRFrameOfReference::TransformBaseInputPose( XRFrameOfReference::TransformBaseInputPose(
......
...@@ -5,8 +5,8 @@ ...@@ -5,8 +5,8 @@
// https://immersive-web.github.io/webxr/#xrframeofreference-interface // https://immersive-web.github.io/webxr/#xrframeofreference-interface
enum XRFrameOfReferenceType { enum XRFrameOfReferenceType {
"headModel", "head-model",
"eyeLevel", "eye-level",
"stage", "stage",
}; };
......
...@@ -169,10 +169,10 @@ ScriptPromise XRSession::requestFrameOfReference( ...@@ -169,10 +169,10 @@ ScriptPromise XRSession::requestFrameOfReference(
} }
XRFrameOfReference* frameOfRef = nullptr; XRFrameOfReference* frameOfRef = nullptr;
if (type == "headModel") { if (type == "head-model") {
frameOfRef = frameOfRef =
new XRFrameOfReference(this, XRFrameOfReference::kTypeHeadModel); new XRFrameOfReference(this, XRFrameOfReference::kTypeHeadModel);
} else if (type == "eyeLevel") { } else if (type == "eye-level") {
frameOfRef = frameOfRef =
new XRFrameOfReference(this, XRFrameOfReference::kTypeEyeLevel); new XRFrameOfReference(this, XRFrameOfReference::kTypeEyeLevel);
} else if (type == "stage") { } else if (type == "stage") {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment