Update polyfill to v0.10.10
Fixes issue #105 (rapid spinning), and adds Pixel 2/3 + more devices.
diff --git a/samples/js/third-party/webvr-polyfill.js b/samples/js/third-party/webvr-polyfill.js
index f9dd11e..db8f3f5 100644
--- a/samples/js/third-party/webvr-polyfill.js
+++ b/samples/js/third-party/webvr-polyfill.js
@@ -73,6 +73,30 @@
* THE SOFTWARE.
*/
+/**
+ * @license
+ * nosleep.js
+ * Copyright (c) 2017, Rich Tibbett
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
(function (global, factory) {
typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :
typeof define === 'function' && define.amd ? define(factory) :
@@ -81,34 +105,26 @@
var commonjsGlobal = typeof window !== 'undefined' ? window : typeof global !== 'undefined' ? global : typeof self !== 'undefined' ? self : {};
-var Util = window.Util || {};
-Util.clamp = function (value, min, max) {
- return Math.min(Math.max(min, value), max);
-};
-Util.race = function (promises) {
- if (Promise.race) {
- return Promise.race(promises);
- }
- return new Promise(function (resolve, reject) {
- for (var i = 0; i < promises.length; i++) {
- promises[i].then(resolve, reject);
- }
- });
-};
-Util.isIOS = function () {
- return (/iPad|iPhone|iPod/.test(navigator.platform)
- );
-};
-Util.isMobile = function () {
+
+
+function unwrapExports (x) {
+ return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, 'default') ? x['default'] : x;
+}
+
+function createCommonjsModule(fn, module) {
+ return module = { exports: {} }, fn(module, module.exports), module.exports;
+}
+
+var isMobile = function isMobile() {
return (/Android/i.test(navigator.userAgent) || /iPhone|iPad|iPod/i.test(navigator.userAgent)
);
};
-Util.copyArray = function (source, dest) {
+var copyArray = function copyArray(source, dest) {
for (var i = 0, n = source.length; i < n; i++) {
dest[i] = source[i];
}
};
-Util.extend = function (dest, src) {
+var extend = function extend(dest, src) {
for (var key in src) {
if (src.hasOwnProperty(key)) {
dest[key] = src[key];
@@ -116,93 +132,230 @@
}
return dest;
};
-Util.isFullScreenAvailable = function () {
- return document.fullscreenEnabled || document.mozFullScreenEnabled || document.webkitFullscreenEnabled || false;
-};
-var util = Util;
-var Util$1 = window.Util || {};
-Util$1.MIN_TIMESTEP = 0.001;
-Util$1.MAX_TIMESTEP = 1;
-Util$1.base64 = function(mimeType, base64) {
- return 'data:' + mimeType + ';base64,' + base64;
-};
-Util$1.clamp = function(value, min, max) {
- return Math.min(Math.max(min, value), max);
-};
-Util$1.lerp = function(a, b, t) {
- return a + ((b - a) * t);
-};
-Util$1.race = function(promises) {
- if (Promise.race) {
- return Promise.race(promises);
+var cardboardVrDisplay = createCommonjsModule(function (module, exports) {
+/**
+ * @license
+ * cardboard-vr-display
+ * Copyright (c) 2015-2017 Google
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/**
+ * @license
+ * gl-preserve-state
+ * Copyright (c) 2016, Brandon Jones.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+/**
+ * @license
+ * webvr-polyfill-dpdb
+ * Copyright (c) 2015-2017 Google
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/**
+ * @license
+ * nosleep.js
+ * Copyright (c) 2017, Rich Tibbett
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+(function (global, factory) {
+ module.exports = factory();
+}(commonjsGlobal, (function () { var classCallCheck = function (instance, Constructor) {
+ if (!(instance instanceof Constructor)) {
+ throw new TypeError("Cannot call a class as a function");
}
- return new Promise(function (resolve, reject) {
- for (var i = 0; i < promises.length; i++) {
- promises[i].then(resolve, reject);
- }
- });
};
-Util$1.isIOS = (function() {
+var createClass = function () {
+ function defineProperties(target, props) {
+ for (var i = 0; i < props.length; i++) {
+ var descriptor = props[i];
+ descriptor.enumerable = descriptor.enumerable || false;
+ descriptor.configurable = true;
+ if ("value" in descriptor) descriptor.writable = true;
+ Object.defineProperty(target, descriptor.key, descriptor);
+ }
+ }
+ return function (Constructor, protoProps, staticProps) {
+ if (protoProps) defineProperties(Constructor.prototype, protoProps);
+ if (staticProps) defineProperties(Constructor, staticProps);
+ return Constructor;
+ };
+}();
+var slicedToArray = function () {
+ function sliceIterator(arr, i) {
+ var _arr = [];
+ var _n = true;
+ var _d = false;
+ var _e = undefined;
+ try {
+ for (var _i = arr[Symbol.iterator](), _s; !(_n = (_s = _i.next()).done); _n = true) {
+ _arr.push(_s.value);
+ if (i && _arr.length === i) break;
+ }
+ } catch (err) {
+ _d = true;
+ _e = err;
+ } finally {
+ try {
+ if (!_n && _i["return"]) _i["return"]();
+ } finally {
+ if (_d) throw _e;
+ }
+ }
+ return _arr;
+ }
+ return function (arr, i) {
+ if (Array.isArray(arr)) {
+ return arr;
+ } else if (Symbol.iterator in Object(arr)) {
+ return sliceIterator(arr, i);
+ } else {
+ throw new TypeError("Invalid attempt to destructure non-iterable instance");
+ }
+ };
+}();
+var MIN_TIMESTEP = 0.001;
+var MAX_TIMESTEP = 1;
+var dataUri = function dataUri(mimeType, svg) {
+ return 'data:' + mimeType + ',' + encodeURIComponent(svg);
+};
+var lerp = function lerp(a, b, t) {
+ return a + (b - a) * t;
+};
+var isIOS = function () {
var isIOS = /iPad|iPhone|iPod/.test(navigator.platform);
- return function() {
+ return function () {
return isIOS;
};
-})();
-Util$1.isWebViewAndroid = (function() {
- var isWebViewAndroid = navigator.userAgent.indexOf('Version') !== -1 &&
- navigator.userAgent.indexOf('Android') !== -1 &&
- navigator.userAgent.indexOf('Chrome') !== -1;
- return function() {
+}();
+var isWebViewAndroid = function () {
+ var isWebViewAndroid = navigator.userAgent.indexOf('Version') !== -1 && navigator.userAgent.indexOf('Android') !== -1 && navigator.userAgent.indexOf('Chrome') !== -1;
+ return function () {
return isWebViewAndroid;
};
-})();
-Util$1.isSafari = (function() {
+}();
+var isSafari = function () {
var isSafari = /^((?!chrome|android).)*safari/i.test(navigator.userAgent);
- return function() {
+ return function () {
return isSafari;
};
-})();
-Util$1.isFirefoxAndroid = (function() {
- var isFirefoxAndroid = navigator.userAgent.indexOf('Firefox') !== -1 &&
- navigator.userAgent.indexOf('Android') !== -1;
- return function() {
+}();
+var isFirefoxAndroid = function () {
+ var isFirefoxAndroid = navigator.userAgent.indexOf('Firefox') !== -1 && navigator.userAgent.indexOf('Android') !== -1;
+ return function () {
return isFirefoxAndroid;
};
-})();
-Util$1.isR7 = (function() {
+}();
+var getChromeVersion = function () {
+ var match = navigator.userAgent.match(/.*Chrome\/([0-9]+)/);
+ var value = match ? parseInt(match[1], 10) : null;
+ return function () {
+ return value;
+ };
+}();
+var isChromeWithoutDeviceMotion = function () {
+ var value = false;
+ if (getChromeVersion() === 65) {
+ var match = navigator.userAgent.match(/.*Chrome\/([0-9\.]*)/);
+ if (match) {
+ var _match$1$split = match[1].split('.'),
+ _match$1$split2 = slicedToArray(_match$1$split, 4),
+ major = _match$1$split2[0],
+ minor = _match$1$split2[1],
+ branch = _match$1$split2[2],
+ build = _match$1$split2[3];
+ value = parseInt(branch, 10) === 3325 && parseInt(build, 10) < 148;
+ }
+ }
+ return function () {
+ return value;
+ };
+}();
+var isR7 = function () {
var isR7 = navigator.userAgent.indexOf('R7 Build') !== -1;
- return function() {
+ return function () {
return isR7;
};
-})();
-Util$1.isLandscapeMode = function() {
- var rtn = (window.orientation == 90 || window.orientation == -90);
- return Util$1.isR7() ? !rtn : rtn;
+}();
+var isLandscapeMode = function isLandscapeMode() {
+ var rtn = window.orientation == 90 || window.orientation == -90;
+ return isR7() ? !rtn : rtn;
};
-Util$1.isTimestampDeltaValid = function(timestampDeltaS) {
+var isTimestampDeltaValid = function isTimestampDeltaValid(timestampDeltaS) {
if (isNaN(timestampDeltaS)) {
return false;
}
- if (timestampDeltaS <= Util$1.MIN_TIMESTEP) {
+ if (timestampDeltaS <= MIN_TIMESTEP) {
return false;
}
- if (timestampDeltaS > Util$1.MAX_TIMESTEP) {
+ if (timestampDeltaS > MAX_TIMESTEP) {
return false;
}
return true;
};
-Util$1.getScreenWidth = function() {
- return Math.max(window.screen.width, window.screen.height) *
- window.devicePixelRatio;
+var getScreenWidth = function getScreenWidth() {
+ return Math.max(window.screen.width, window.screen.height) * window.devicePixelRatio;
};
-Util$1.getScreenHeight = function() {
- return Math.min(window.screen.width, window.screen.height) *
- window.devicePixelRatio;
+var getScreenHeight = function getScreenHeight() {
+ return Math.min(window.screen.width, window.screen.height) * window.devicePixelRatio;
};
-Util$1.requestFullscreen = function(element) {
- if (Util$1.isWebViewAndroid()) {
- return false;
+var requestFullscreen = function requestFullscreen(element) {
+ if (isWebViewAndroid()) {
+ return false;
}
if (element.requestFullscreen) {
element.requestFullscreen();
@@ -217,7 +370,7 @@
}
return true;
};
-Util$1.exitFullscreen = function() {
+var exitFullscreen = function exitFullscreen() {
if (document.exitFullscreen) {
document.exitFullscreen();
} else if (document.webkitExitFullscreen) {
@@ -231,13 +384,10 @@
}
return true;
};
-Util$1.getFullscreenElement = function() {
- return document.fullscreenElement ||
- document.webkitFullscreenElement ||
- document.mozFullScreenElement ||
- document.msFullscreenElement;
+var getFullscreenElement = function getFullscreenElement() {
+ return document.fullscreenElement || document.webkitFullscreenElement || document.mozFullScreenElement || document.msFullscreenElement;
};
-Util$1.linkProgram = function(gl, vertexSource, fragmentSource, attribLocationMap) {
+var linkProgram = function linkProgram(gl, vertexSource, fragmentSource, attribLocationMap) {
var vertexShader = gl.createShader(gl.VERTEX_SHADER);
gl.shaderSource(vertexShader, vertexSource);
gl.compileShader(vertexShader);
@@ -247,14 +397,14 @@
var program = gl.createProgram();
gl.attachShader(program, vertexShader);
gl.attachShader(program, fragmentShader);
- for (var attribName in attribLocationMap)
+ for (var attribName in attribLocationMap) {
gl.bindAttribLocation(program, attribLocationMap[attribName], attribName);
- gl.linkProgram(program);
+ }gl.linkProgram(program);
gl.deleteShader(vertexShader);
gl.deleteShader(fragmentShader);
return program;
};
-Util$1.getProgramUniforms = function(gl, program) {
+var getProgramUniforms = function getProgramUniforms(gl, program) {
var uniforms = {};
var uniformCount = gl.getProgramParameter(program, gl.ACTIVE_UNIFORMS);
var uniformName = '';
@@ -265,7 +415,7 @@
}
return uniforms;
};
-Util$1.orthoMatrix = function (out, left, right, bottom, top, near, far) {
+var orthoMatrix = function orthoMatrix(out, left, right, bottom, top, near, far) {
var lr = 1 / (left - right),
bt = 1 / (bottom - top),
nf = 1 / (near - far);
@@ -287,17 +437,14 @@
out[15] = 1;
return out;
};
-Util$1.copyArray = function (source, dest) {
- for (var i = 0, n = source.length; i < n; i++) {
- dest[i] = source[i];
- }
-};
-Util$1.isMobile = function() {
+var isMobile = function isMobile() {
var check = false;
- (function(a){if(/(android|bb\d+|meego).+mobile|avantgo|bada\/|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)|iris|kindle|lge |maemo|midp|mmp|mobile.+firefox|netfront|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\/|plucker|pocket|psp|series(4|6)0|symbian|treo|up\.(browser|link)|vodafone|wap|windows ce|xda|xiino/i.test(a)||/1207|6310|6590|3gso|4thp|50[1-6]i|770s|802s|a wa|abac|ac(er|oo|s\-)|ai(ko|rn)|al(av|ca|co)|amoi|an(ex|ny|yw)|aptu|ar(ch|go)|as(te|us)|attw|au(di|\-m|r |s )|avan|be(ck|ll|nq)|bi(lb|rd)|bl(ac|az)|br(e|v)w|bumb|bw\-(n|u)|c55\/|capi|ccwa|cdm\-|cell|chtm|cldc|cmd\-|co(mp|nd)|craw|da(it|ll|ng)|dbte|dc\-s|devi|dica|dmob|do(c|p)o|ds(12|\-d)|el(49|ai)|em(l2|ul)|er(ic|k0)|esl8|ez([4-7]0|os|wa|ze)|fetc|fly(\-|_)|g1 u|g560|gene|gf\-5|g\-mo|go(\.w|od)|gr(ad|un)|haie|hcit|hd\-(m|p|t)|hei\-|hi(pt|ta)|hp( i|ip)|hs\-c|ht(c(\-| |_|a|g|p|s|t)|tp)|hu(aw|tc)|i\-(20|go|ma)|i230|iac( |\-|\/)|ibro|idea|ig01|ikom|im1k|inno|ipaq|iris|ja(t|v)a|jbro|jemu|jigs|kddi|keji|kgt( |\/)|klon|kpt |kwc\-|kyo(c|k)|le(no|xi)|lg( g|\/(k|l|u)|50|54|\-[a-w])|libw|lynx|m1\-w|m3ga|m50\/|ma(te|ui|xo)|mc(01|21|ca)|m\-cr|me(rc|ri)|mi(o8|oa|ts)|mmef|mo(01|02|bi|de|do|t(\-| |o|v)|zz)|mt(50|p1|v )|mwbp|mywa|n10[0-2]|n20[2-3]|n30(0|2)|n50(0|2|5)|n7(0(0|1)|10)|ne((c|m)\-|on|tf|wf|wg|wt)|nok(6|i)|nzph|o2im|op(ti|wv)|oran|owg1|p800|pan(a|d|t)|pdxg|pg(13|\-([1-8]|c))|phil|pire|pl(ay|uc)|pn\-2|po(ck|rt|se)|prox|psio|pt\-g|qa\-a|qc(07|12|21|32|60|\-[2-7]|i\-)|qtek|r380|r600|raks|rim9|ro(ve|zo)|s55\/|sa(ge|ma|mm|ms|ny|va)|sc(01|h\-|oo|p\-)|sdk\/|se(c(\-|0|1)|47|mc|nd|ri)|sgh\-|shar|sie(\-|m)|sk\-0|sl(45|id)|sm(al|ar|b3|it|t5)|so(ft|ny)|sp(01|h\-|v\-|v )|sy(01|mb)|t2(18|50)|t6(00|10|18)|ta(gt|lk)|tcl\-|tdg\-|tel(i|m)|tim\-|t\-mo|to(pl|sh)|ts(70|m\-|m3|m5)|tx\-9|up(\.b|g1|si)|utst|v400|v750|veri|vi(rg|te)|vk(40|5[0-3]|\-v)|vm40|voda|vulc|vx(52|53|60|61|70|80|81|83|85|98)|w3c(\-| )|webc|whit|wi(g |nc|nw)|wmlb|wonu|x700|yas\-|your|zeto|zte\-/i.test(a.substr(0,4)))check = true;})(navigator.userAgent||navigator.vendor||window.opera);
+ (function (a) {
+ if (/(android|bb\d+|meego).+mobile|avantgo|bada\/|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)|iris|kindle|lge |maemo|midp|mmp|mobile.+firefox|netfront|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\/|plucker|pocket|psp|series(4|6)0|symbian|treo|up\.(browser|link)|vodafone|wap|windows ce|xda|xiino/i.test(a) || /1207|6310|6590|3gso|4thp|50[1-6]i|770s|802s|a wa|abac|ac(er|oo|s\-)|ai(ko|rn)|al(av|ca|co)|amoi|an(ex|ny|yw)|aptu|ar(ch|go)|as(te|us)|attw|au(di|\-m|r |s )|avan|be(ck|ll|nq)|bi(lb|rd)|bl(ac|az)|br(e|v)w|bumb|bw\-(n|u)|c55\/|capi|ccwa|cdm\-|cell|chtm|cldc|cmd\-|co(mp|nd)|craw|da(it|ll|ng)|dbte|dc\-s|devi|dica|dmob|do(c|p)o|ds(12|\-d)|el(49|ai)|em(l2|ul)|er(ic|k0)|esl8|ez([4-7]0|os|wa|ze)|fetc|fly(\-|_)|g1 u|g560|gene|gf\-5|g\-mo|go(\.w|od)|gr(ad|un)|haie|hcit|hd\-(m|p|t)|hei\-|hi(pt|ta)|hp( i|ip)|hs\-c|ht(c(\-| |_|a|g|p|s|t)|tp)|hu(aw|tc)|i\-(20|go|ma)|i230|iac( |\-|\/)|ibro|idea|ig01|ikom|im1k|inno|ipaq|iris|ja(t|v)a|jbro|jemu|jigs|kddi|keji|kgt( |\/)|klon|kpt |kwc\-|kyo(c|k)|le(no|xi)|lg( g|\/(k|l|u)|50|54|\-[a-w])|libw|lynx|m1\-w|m3ga|m50\/|ma(te|ui|xo)|mc(01|21|ca)|m\-cr|me(rc|ri)|mi(o8|oa|ts)|mmef|mo(01|02|bi|de|do|t(\-| |o|v)|zz)|mt(50|p1|v )|mwbp|mywa|n10[0-2]|n20[2-3]|n30(0|2)|n50(0|2|5)|n7(0(0|1)|10)|ne((c|m)\-|on|tf|wf|wg|wt)|nok(6|i)|nzph|o2im|op(ti|wv)|oran|owg1|p800|pan(a|d|t)|pdxg|pg(13|\-([1-8]|c))|phil|pire|pl(ay|uc)|pn\-2|po(ck|rt|se)|prox|psio|pt\-g|qa\-a|qc(07|12|21|32|60|\-[2-7]|i\-)|qtek|r380|r600|raks|rim9|ro(ve|zo)|s55\/|sa(ge|ma|mm|ms|ny|va)|sc(01|h\-|oo|p\-)|sdk\/|se(c(\-|0|1)|47|mc|nd|ri)|sgh\-|shar|sie(\-|m)|sk\-0|sl(45|id)|sm(al|ar|b3|it|t5)|so(ft|ny)|sp(01|h\-|v\-|v )|sy(01|mb)|t2(18|50)|t6(00|10|18)|ta(gt|lk)|tcl\-|tdg\-|tel(i|m)|tim\-|t\-mo|to(pl|sh)|ts(70|m\-|m3|m5)|tx\-9|up(\.b|g1|si)|utst|v400|v750|veri|vi(rg|te)|vk(40|5[0-3]|\-v)|vm40|voda|vulc|vx(52|53|60|61|70|80|81|83|85|98)|w3c(\-| )|webc|whit|wi(g |nc|nw)|wmlb|wonu|x700|yas\-|your|zeto|zte\-/i.test(a.substr(0, 4))) check = true;
+ })(navigator.userAgent || navigator.vendor || window.opera);
return check;
};
-Util$1.extend = function(dest, src) {
+var extend = function extend(dest, src) {
for (var key in src) {
if (src.hasOwnProperty(key)) {
dest[key] = src[key];
@@ -305,30 +452,29 @@
}
return dest;
};
-Util$1.safariCssSizeWorkaround = function(canvas) {
- if (Util$1.isIOS()) {
+var safariCssSizeWorkaround = function safariCssSizeWorkaround(canvas) {
+ if (isIOS()) {
var width = canvas.style.width;
var height = canvas.style.height;
- canvas.style.width = (parseInt(width) + 1) + 'px';
- canvas.style.height = (parseInt(height)) + 'px';
- setTimeout(function() {
+ canvas.style.width = parseInt(width) + 1 + 'px';
+ canvas.style.height = parseInt(height) + 'px';
+ setTimeout(function () {
canvas.style.width = width;
canvas.style.height = height;
}, 100);
}
- window.Util = Util$1;
window.canvas = canvas;
};
-Util$1.frameDataFromPose = (function() {
+var frameDataFromPose = function () {
var piOver180 = Math.PI / 180.0;
var rad45 = Math.PI * 0.25;
function mat4_perspectiveFromFieldOfView(out, fov, near, far) {
- var upTan = Math.tan(fov ? (fov.upDegrees * piOver180) : rad45),
- downTan = Math.tan(fov ? (fov.downDegrees * piOver180) : rad45),
- leftTan = Math.tan(fov ? (fov.leftDegrees * piOver180) : rad45),
- rightTan = Math.tan(fov ? (fov.rightDegrees * piOver180) : rad45),
- xScale = 2.0 / (leftTan + rightTan),
- yScale = 2.0 / (upTan + downTan);
+ var upTan = Math.tan(fov ? fov.upDegrees * piOver180 : rad45),
+ downTan = Math.tan(fov ? fov.downDegrees * piOver180 : rad45),
+ leftTan = Math.tan(fov ? fov.leftDegrees * piOver180 : rad45),
+ rightTan = Math.tan(fov ? fov.rightDegrees * piOver180 : rad45),
+ xScale = 2.0 / (leftTan + rightTan),
+ yScale = 2.0 / (upTan + downTan);
out[0] = xScale;
out[1] = 0.0;
out[2] = 0.0;
@@ -338,17 +484,20 @@
out[6] = 0.0;
out[7] = 0.0;
out[8] = -((leftTan - rightTan) * xScale * 0.5);
- out[9] = ((upTan - downTan) * yScale * 0.5);
+ out[9] = (upTan - downTan) * yScale * 0.5;
out[10] = far / (near - far);
out[11] = -1.0;
out[12] = 0.0;
out[13] = 0.0;
- out[14] = (far * near) / (near - far);
+ out[14] = far * near / (near - far);
out[15] = 0.0;
return out;
}
function mat4_fromRotationTranslation(out, q, v) {
- var x = q[0], y = q[1], z = q[2], w = q[3],
+ var x = q[0],
+ y = q[1],
+ z = q[2],
+ w = q[3],
x2 = x + x,
y2 = y + y,
z2 = z + z,
@@ -380,22 +529,33 @@
return out;
}
function mat4_translate(out, a, v) {
- var x = v[0], y = v[1], z = v[2],
- a00, a01, a02, a03,
- a10, a11, a12, a13,
- a20, a21, a22, a23;
+ var x = v[0],
+ y = v[1],
+ z = v[2],
+ a00,
+ a01,
+ a02,
+ a03,
+ a10,
+ a11,
+ a12,
+ a13,
+ a20,
+ a21,
+ a22,
+ a23;
if (a === out) {
out[12] = a[0] * x + a[4] * y + a[8] * z + a[12];
out[13] = a[1] * x + a[5] * y + a[9] * z + a[13];
out[14] = a[2] * x + a[6] * y + a[10] * z + a[14];
out[15] = a[3] * x + a[7] * y + a[11] * z + a[15];
} else {
- a00 = a[0]; a01 = a[1]; a02 = a[2]; a03 = a[3];
- a10 = a[4]; a11 = a[5]; a12 = a[6]; a13 = a[7];
- a20 = a[8]; a21 = a[9]; a22 = a[10]; a23 = a[11];
- out[0] = a00; out[1] = a01; out[2] = a02; out[3] = a03;
- out[4] = a10; out[5] = a11; out[6] = a12; out[7] = a13;
- out[8] = a20; out[9] = a21; out[10] = a22; out[11] = a23;
+ a00 = a[0];a01 = a[1];a02 = a[2];a03 = a[3];
+ a10 = a[4];a11 = a[5];a12 = a[6];a13 = a[7];
+ a20 = a[8];a21 = a[9];a22 = a[10];a23 = a[11];
+ out[0] = a00;out[1] = a01;out[2] = a02;out[3] = a03;
+ out[4] = a10;out[5] = a11;out[6] = a12;out[7] = a13;
+ out[8] = a20;out[9] = a21;out[10] = a22;out[11] = a23;
out[12] = a00 * x + a10 * y + a20 * z + a[12];
out[13] = a01 * x + a11 * y + a21 * z + a[13];
out[14] = a02 * x + a12 * y + a22 * z + a[14];
@@ -404,10 +564,22 @@
return out;
}
function mat4_invert(out, a) {
- var a00 = a[0], a01 = a[1], a02 = a[2], a03 = a[3],
- a10 = a[4], a11 = a[5], a12 = a[6], a13 = a[7],
- a20 = a[8], a21 = a[9], a22 = a[10], a23 = a[11],
- a30 = a[12], a31 = a[13], a32 = a[14], a33 = a[15],
+ var a00 = a[0],
+ a01 = a[1],
+ a02 = a[2],
+ a03 = a[3],
+ a10 = a[4],
+ a11 = a[5],
+ a12 = a[6],
+ a13 = a[7],
+ a20 = a[8],
+ a21 = a[9],
+ a22 = a[10],
+ a23 = a[11],
+ a30 = a[12],
+ a31 = a[13],
+ a32 = a[14],
+ a33 = a[15],
b00 = a00 * a11 - a01 * a10,
b01 = a00 * a12 - a02 * a10,
b02 = a00 * a13 - a03 * a10,
@@ -420,7 +592,7 @@
b09 = a21 * a32 - a22 * a31,
b10 = a21 * a33 - a23 * a31,
b11 = a22 * a33 - a23 * a32,
- det = b00 * b11 - b01 * b10 + b02 * b09 + b03 * b08 - b04 * b07 + b05 * b06;
+ det = b00 * b11 - b01 * b10 + b02 * b09 + b03 * b08 - b04 * b07 + b05 * b06;
if (!det) {
return null;
}
@@ -445,47 +617,44 @@
}
var defaultOrientation = new Float32Array([0, 0, 0, 1]);
var defaultPosition = new Float32Array([0, 0, 0]);
- function updateEyeMatrices(projection, view, pose, parameters, vrDisplay) {
- mat4_perspectiveFromFieldOfView(projection, parameters ? parameters.fieldOfView : null, vrDisplay.depthNear, vrDisplay.depthFar);
+ function updateEyeMatrices(projection, view, pose, fov, offset, vrDisplay) {
+ mat4_perspectiveFromFieldOfView(projection, fov || null, vrDisplay.depthNear, vrDisplay.depthFar);
var orientation = pose.orientation || defaultOrientation;
var position = pose.position || defaultPosition;
mat4_fromRotationTranslation(view, orientation, position);
- if (parameters)
- mat4_translate(view, view, parameters.offset);
+ if (offset) mat4_translate(view, view, offset);
mat4_invert(view, view);
}
- return function(frameData, pose, vrDisplay) {
- if (!frameData || !pose)
- return false;
+ return function (frameData, pose, vrDisplay) {
+ if (!frameData || !pose) return false;
frameData.pose = pose;
frameData.timestamp = pose.timestamp;
- updateEyeMatrices(
- frameData.leftProjectionMatrix, frameData.leftViewMatrix,
- pose, vrDisplay.getEyeParameters("left"), vrDisplay);
- updateEyeMatrices(
- frameData.rightProjectionMatrix, frameData.rightViewMatrix,
- pose, vrDisplay.getEyeParameters("right"), vrDisplay);
+ updateEyeMatrices(frameData.leftProjectionMatrix, frameData.leftViewMatrix, pose, vrDisplay._getFieldOfView("left"), vrDisplay._getEyeOffset("left"), vrDisplay);
+ updateEyeMatrices(frameData.rightProjectionMatrix, frameData.rightViewMatrix, pose, vrDisplay._getFieldOfView("right"), vrDisplay._getEyeOffset("right"), vrDisplay);
return true;
};
-})();
-Util$1.isInsideCrossDomainIFrame = function() {
- var isFramed = (window.self !== window.top);
- var refDomain = Util$1.getDomainFromUrl(document.referrer);
- var thisDomain = Util$1.getDomainFromUrl(window.location.href);
- return isFramed && (refDomain !== thisDomain);
+}();
+var isInsideCrossOriginIFrame = function isInsideCrossOriginIFrame() {
+ var isFramed = window.self !== window.top;
+ var refOrigin = getOriginFromUrl(document.referrer);
+ var thisOrigin = getOriginFromUrl(window.location.href);
+ return isFramed && refOrigin !== thisOrigin;
};
-Util$1.getDomainFromUrl = function(url) {
- var domain;
- if (url.indexOf("://") > -1) {
- domain = url.split('/')[2];
+var getOriginFromUrl = function getOriginFromUrl(url) {
+ var domainIdx;
+ var protoSepIdx = url.indexOf("://");
+ if (protoSepIdx !== -1) {
+ domainIdx = protoSepIdx + 3;
+ } else {
+ domainIdx = 0;
}
- else {
- domain = url.split('/')[0];
+ var domainEndIdx = url.indexOf('/', domainIdx);
+ if (domainEndIdx === -1) {
+ domainEndIdx = url.length;
}
- domain = domain.split(':')[0];
- return domain;
+ return url.substring(0, domainEndIdx);
};
-Util$1.getQuaternionAngle = function(quat) {
+var getQuaternionAngle = function getQuaternionAngle(quat) {
if (quat.w > 1) {
console.warn('getQuaternionAngle: w > 1');
return 0;
@@ -493,8 +662,19 @@
var angle = 2 * Math.acos(quat.w);
return angle;
};
-var util$2 = Util$1;
-
+var warnOnce = function () {
+ var observedWarnings = {};
+ return function (key, message) {
+ if (observedWarnings[key] === undefined) {
+ console.warn('webvr-polyfill: ' + message);
+ observedWarnings[key] = true;
+ }
+ };
+}();
+var deprecateWarning = function deprecateWarning(deprecated, suggested) {
+ var alternative = suggested ? 'Please use ' + suggested + ' instead.' : '';
+ warnOnce(deprecated, deprecated + ' has been deprecated. ' + 'This may not work on native WebVR displays. ' + alternative);
+};
function WGLUPreserveGLState(gl, bindings, callback) {
if (!bindings) {
callback(gl);
@@ -594,26 +774,8 @@
}
}
var glPreserveState = WGLUPreserveGLState;
-
-var distortionVS = [
- 'attribute vec2 position;',
- 'attribute vec3 texCoord;',
- 'varying vec2 vTexCoord;',
- 'uniform vec4 viewportOffsetScale[2];',
- 'void main() {',
- ' vec4 viewport = viewportOffsetScale[int(texCoord.z)];',
- ' vTexCoord = (texCoord.xy * viewport.zw) + viewport.xy;',
- ' gl_Position = vec4( position, 1.0, 1.0 );',
- '}',
-].join('\n');
-var distortionFS = [
- 'precision mediump float;',
- 'uniform sampler2D diffuse;',
- 'varying vec2 vTexCoord;',
- 'void main() {',
- ' gl_FragColor = texture2D(diffuse, vTexCoord);',
- '}',
-].join('\n');
+var distortionVS = ['attribute vec2 position;', 'attribute vec3 texCoord;', 'varying vec2 vTexCoord;', 'uniform vec4 viewportOffsetScale[2];', 'void main() {', ' vec4 viewport = viewportOffsetScale[int(texCoord.z)];', ' vTexCoord = (texCoord.xy * viewport.zw) + viewport.xy;', ' gl_Position = vec4( position, 1.0, 1.0 );', '}'].join('\n');
+var distortionFS = ['precision mediump float;', 'uniform sampler2D diffuse;', 'varying vec2 vTexCoord;', 'void main() {', ' gl_FragColor = texture2D(diffuse, vTexCoord);', '}'].join('\n');
function CardboardDistorter(gl, cardboardUI, bufferScale, dirtySubmitFrameBindings) {
this.gl = gl;
this.cardboardUI = cardboardUI;
@@ -630,7 +792,7 @@
this.realColorMask = gl.colorMask;
this.realClearColor = gl.clearColor;
this.realViewport = gl.viewport;
- if (!util$2.isIOS()) {
+ if (!isIOS()) {
this.realCanvasWidth = Object.getOwnPropertyDescriptor(gl.canvas.__proto__, 'width');
this.realCanvasHeight = Object.getOwnPropertyDescriptor(gl.canvas.__proto__, 'height');
}
@@ -648,8 +810,8 @@
position: 0,
texCoord: 1
};
- this.program = util$2.linkProgram(gl, distortionVS, distortionFS, this.attribs);
- this.uniforms = util$2.getProgramUniforms(gl, this.program);
+ this.program = linkProgram(gl, distortionVS, distortionFS, this.attribs);
+ this.uniforms = getProgramUniforms(gl, this.program);
this.viewportOffsetScale = new Float32Array(8);
this.setTextureBounds();
this.vertexBuffer = gl.createBuffer();
@@ -670,7 +832,7 @@
this.patch();
this.onResize();
}
-CardboardDistorter.prototype.destroy = function() {
+CardboardDistorter.prototype.destroy = function () {
var gl = this.gl;
this.unpatch();
gl.deleteProgram(this.program);
@@ -691,25 +853,22 @@
this.cardboardUI.destroy();
}
};
-CardboardDistorter.prototype.onResize = function() {
+CardboardDistorter.prototype.onResize = function () {
var gl = this.gl;
var self = this;
- var glState = [
- gl.RENDERBUFFER_BINDING,
- gl.TEXTURE_BINDING_2D, gl.TEXTURE0
- ];
- glPreserveState(gl, glState, function(gl) {
+ var glState = [gl.RENDERBUFFER_BINDING, gl.TEXTURE_BINDING_2D, gl.TEXTURE0];
+ glPreserveState(gl, glState, function (gl) {
self.realBindFramebuffer.call(gl, gl.FRAMEBUFFER, null);
- if (self.scissorTest) { self.realDisable.call(gl, gl.SCISSOR_TEST); }
+ if (self.scissorTest) {
+ self.realDisable.call(gl, gl.SCISSOR_TEST);
+ }
self.realColorMask.call(gl, true, true, true, true);
self.realViewport.call(gl, 0, 0, gl.drawingBufferWidth, gl.drawingBufferHeight);
self.realClearColor.call(gl, 0, 0, 0, 1);
gl.clear(gl.COLOR_BUFFER_BIT);
self.realBindFramebuffer.call(gl, gl.FRAMEBUFFER, self.framebuffer);
gl.bindTexture(gl.TEXTURE_2D, self.renderTarget);
- gl.texImage2D(gl.TEXTURE_2D, 0, self.ctxAttribs.alpha ? gl.RGBA : gl.RGB,
- self.bufferWidth, self.bufferHeight, 0,
- self.ctxAttribs.alpha ? gl.RGBA : gl.RGB, gl.UNSIGNED_BYTE, null);
+ gl.texImage2D(gl.TEXTURE_2D, 0, self.ctxAttribs.alpha ? gl.RGBA : gl.RGB, self.bufferWidth, self.bufferHeight, 0, self.ctxAttribs.alpha ? gl.RGBA : gl.RGB, gl.UNSIGNED_BYTE, null);
gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_MAG_FILTER, gl.LINEAR);
gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_MIN_FILTER, gl.LINEAR);
gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_WRAP_S, gl.CLAMP_TO_EDGE);
@@ -717,28 +876,24 @@
gl.framebufferTexture2D(gl.FRAMEBUFFER, gl.COLOR_ATTACHMENT0, gl.TEXTURE_2D, self.renderTarget, 0);
if (self.ctxAttribs.depth && self.ctxAttribs.stencil) {
gl.bindRenderbuffer(gl.RENDERBUFFER, self.depthStencilBuffer);
- gl.renderbufferStorage(gl.RENDERBUFFER, gl.DEPTH_STENCIL,
- self.bufferWidth, self.bufferHeight);
- gl.framebufferRenderbuffer(gl.FRAMEBUFFER, gl.DEPTH_STENCIL_ATTACHMENT,
- gl.RENDERBUFFER, self.depthStencilBuffer);
+ gl.renderbufferStorage(gl.RENDERBUFFER, gl.DEPTH_STENCIL, self.bufferWidth, self.bufferHeight);
+ gl.framebufferRenderbuffer(gl.FRAMEBUFFER, gl.DEPTH_STENCIL_ATTACHMENT, gl.RENDERBUFFER, self.depthStencilBuffer);
} else if (self.ctxAttribs.depth) {
gl.bindRenderbuffer(gl.RENDERBUFFER, self.depthBuffer);
- gl.renderbufferStorage(gl.RENDERBUFFER, gl.DEPTH_COMPONENT16,
- self.bufferWidth, self.bufferHeight);
- gl.framebufferRenderbuffer(gl.FRAMEBUFFER, gl.DEPTH_ATTACHMENT,
- gl.RENDERBUFFER, self.depthBuffer);
+ gl.renderbufferStorage(gl.RENDERBUFFER, gl.DEPTH_COMPONENT16, self.bufferWidth, self.bufferHeight);
+ gl.framebufferRenderbuffer(gl.FRAMEBUFFER, gl.DEPTH_ATTACHMENT, gl.RENDERBUFFER, self.depthBuffer);
} else if (self.ctxAttribs.stencil) {
gl.bindRenderbuffer(gl.RENDERBUFFER, self.stencilBuffer);
- gl.renderbufferStorage(gl.RENDERBUFFER, gl.STENCIL_INDEX8,
- self.bufferWidth, self.bufferHeight);
- gl.framebufferRenderbuffer(gl.FRAMEBUFFER, gl.STENCIL_ATTACHMENT,
- gl.RENDERBUFFER, self.stencilBuffer);
+ gl.renderbufferStorage(gl.RENDERBUFFER, gl.STENCIL_INDEX8, self.bufferWidth, self.bufferHeight);
+ gl.framebufferRenderbuffer(gl.FRAMEBUFFER, gl.STENCIL_ATTACHMENT, gl.RENDERBUFFER, self.stencilBuffer);
}
if (!gl.checkFramebufferStatus(gl.FRAMEBUFFER) === gl.FRAMEBUFFER_COMPLETE) {
console.error('Framebuffer incomplete!');
}
self.realBindFramebuffer.call(gl, gl.FRAMEBUFFER, self.lastBoundFramebuffer);
- if (self.scissorTest) { self.realEnable.call(gl, gl.SCISSOR_TEST); }
+ if (self.scissorTest) {
+ self.realEnable.call(gl, gl.SCISSOR_TEST);
+ }
self.realColorMask.apply(gl, self.colorMask);
self.realViewport.apply(gl, self.viewport);
self.realClearColor.apply(gl, self.clearColor);
@@ -747,23 +902,23 @@
this.cardboardUI.onResize();
}
};
-CardboardDistorter.prototype.patch = function() {
+CardboardDistorter.prototype.patch = function () {
if (this.isPatched) {
return;
}
var self = this;
var canvas = this.gl.canvas;
var gl = this.gl;
- if (!util$2.isIOS()) {
- canvas.width = util$2.getScreenWidth() * this.bufferScale;
- canvas.height = util$2.getScreenHeight() * this.bufferScale;
+ if (!isIOS()) {
+ canvas.width = getScreenWidth() * this.bufferScale;
+ canvas.height = getScreenHeight() * this.bufferScale;
Object.defineProperty(canvas, 'width', {
configurable: true,
enumerable: true,
- get: function() {
+ get: function get() {
return self.bufferWidth;
},
- set: function(value) {
+ set: function set(value) {
self.bufferWidth = value;
self.realCanvasWidth.set.call(canvas, value);
self.onResize();
@@ -772,10 +927,10 @@
Object.defineProperty(canvas, 'height', {
configurable: true,
enumerable: true,
- get: function() {
+ get: function get() {
return self.bufferHeight;
},
- set: function(value) {
+ set: function set(value) {
self.bufferHeight = value;
self.realCanvasHeight.set.call(canvas, value);
self.onResize();
@@ -787,7 +942,7 @@
this.lastBoundFramebuffer = this.framebuffer;
this.gl.bindFramebuffer(gl.FRAMEBUFFER, this.framebuffer);
}
- this.gl.bindFramebuffer = function(target, framebuffer) {
+ this.gl.bindFramebuffer = function (target, framebuffer) {
self.lastBoundFramebuffer = framebuffer ? framebuffer : self.framebuffer;
self.realBindFramebuffer.call(gl, target, self.lastBoundFramebuffer);
};
@@ -796,28 +951,38 @@
this.blend = gl.getParameter(gl.BLEND);
this.scissorTest = gl.getParameter(gl.SCISSOR_TEST);
this.stencilTest = gl.getParameter(gl.STENCIL_TEST);
- gl.enable = function(pname) {
+ gl.enable = function (pname) {
switch (pname) {
- case gl.CULL_FACE: self.cullFace = true; break;
- case gl.DEPTH_TEST: self.depthTest = true; break;
- case gl.BLEND: self.blend = true; break;
- case gl.SCISSOR_TEST: self.scissorTest = true; break;
- case gl.STENCIL_TEST: self.stencilTest = true; break;
+ case gl.CULL_FACE:
+ self.cullFace = true;break;
+ case gl.DEPTH_TEST:
+ self.depthTest = true;break;
+ case gl.BLEND:
+ self.blend = true;break;
+ case gl.SCISSOR_TEST:
+ self.scissorTest = true;break;
+ case gl.STENCIL_TEST:
+ self.stencilTest = true;break;
}
self.realEnable.call(gl, pname);
};
- gl.disable = function(pname) {
+ gl.disable = function (pname) {
switch (pname) {
- case gl.CULL_FACE: self.cullFace = false; break;
- case gl.DEPTH_TEST: self.depthTest = false; break;
- case gl.BLEND: self.blend = false; break;
- case gl.SCISSOR_TEST: self.scissorTest = false; break;
- case gl.STENCIL_TEST: self.stencilTest = false; break;
+ case gl.CULL_FACE:
+ self.cullFace = false;break;
+ case gl.DEPTH_TEST:
+ self.depthTest = false;break;
+ case gl.BLEND:
+ self.blend = false;break;
+ case gl.SCISSOR_TEST:
+ self.scissorTest = false;break;
+ case gl.STENCIL_TEST:
+ self.stencilTest = false;break;
}
self.realDisable.call(gl, pname);
};
this.colorMask = gl.getParameter(gl.COLOR_WRITEMASK);
- gl.colorMask = function(r, g, b, a) {
+ gl.colorMask = function (r, g, b, a) {
self.colorMask[0] = r;
self.colorMask[1] = g;
self.colorMask[2] = b;
@@ -825,7 +990,7 @@
self.realColorMask.call(gl, r, g, b, a);
};
this.clearColor = gl.getParameter(gl.COLOR_CLEAR_VALUE);
- gl.clearColor = function(r, g, b, a) {
+ gl.clearColor = function (r, g, b, a) {
self.clearColor[0] = r;
self.clearColor[1] = g;
self.clearColor[2] = b;
@@ -833,7 +998,7 @@
self.realClearColor.call(gl, r, g, b, a);
};
this.viewport = gl.getParameter(gl.VIEWPORT);
- gl.viewport = function(x, y, w, h) {
+ gl.viewport = function (x, y, w, h) {
self.viewport[0] = x;
self.viewport[1] = y;
self.viewport[2] = w;
@@ -841,15 +1006,15 @@
self.realViewport.call(gl, x, y, w, h);
};
this.isPatched = true;
- util$2.safariCssSizeWorkaround(canvas);
+ safariCssSizeWorkaround(canvas);
};
-CardboardDistorter.prototype.unpatch = function() {
+CardboardDistorter.prototype.unpatch = function () {
if (!this.isPatched) {
return;
}
var gl = this.gl;
var canvas = this.gl.canvas;
- if (!util$2.isIOS()) {
+ if (!isIOS()) {
Object.defineProperty(canvas, 'width', this.realCanvasWidth);
Object.defineProperty(canvas, 'height', this.realCanvasHeight);
}
@@ -865,11 +1030,11 @@
gl.bindFramebuffer(gl.FRAMEBUFFER, null);
}
this.isPatched = false;
- setTimeout(function() {
- util$2.safariCssSizeWorkaround(canvas);
+ setTimeout(function () {
+ safariCssSizeWorkaround(canvas);
}, 1);
};
-CardboardDistorter.prototype.setTextureBounds = function(leftBounds, rightBounds) {
+CardboardDistorter.prototype.setTextureBounds = function (leftBounds, rightBounds) {
if (!leftBounds) {
leftBounds = [0, 0, 0.5, 1];
}
@@ -885,28 +1050,33 @@
this.viewportOffsetScale[6] = rightBounds[2];
this.viewportOffsetScale[7] = rightBounds[3];
};
-CardboardDistorter.prototype.submitFrame = function() {
+CardboardDistorter.prototype.submitFrame = function () {
var gl = this.gl;
var self = this;
var glState = [];
if (!this.dirtySubmitFrameBindings) {
- glState.push(
- gl.CURRENT_PROGRAM,
- gl.ARRAY_BUFFER_BINDING,
- gl.ELEMENT_ARRAY_BUFFER_BINDING,
- gl.TEXTURE_BINDING_2D, gl.TEXTURE0
- );
+ glState.push(gl.CURRENT_PROGRAM, gl.ARRAY_BUFFER_BINDING, gl.ELEMENT_ARRAY_BUFFER_BINDING, gl.TEXTURE_BINDING_2D, gl.TEXTURE0);
}
- glPreserveState(gl, glState, function(gl) {
+ glPreserveState(gl, glState, function (gl) {
self.realBindFramebuffer.call(gl, gl.FRAMEBUFFER, null);
- if (self.cullFace) { self.realDisable.call(gl, gl.CULL_FACE); }
- if (self.depthTest) { self.realDisable.call(gl, gl.DEPTH_TEST); }
- if (self.blend) { self.realDisable.call(gl, gl.BLEND); }
- if (self.scissorTest) { self.realDisable.call(gl, gl.SCISSOR_TEST); }
- if (self.stencilTest) { self.realDisable.call(gl, gl.STENCIL_TEST); }
+ if (self.cullFace) {
+ self.realDisable.call(gl, gl.CULL_FACE);
+ }
+ if (self.depthTest) {
+ self.realDisable.call(gl, gl.DEPTH_TEST);
+ }
+ if (self.blend) {
+ self.realDisable.call(gl, gl.BLEND);
+ }
+ if (self.scissorTest) {
+ self.realDisable.call(gl, gl.SCISSOR_TEST);
+ }
+ if (self.stencilTest) {
+ self.realDisable.call(gl, gl.STENCIL_TEST);
+ }
self.realColorMask.call(gl, true, true, true, true);
self.realViewport.call(gl, 0, 0, gl.drawingBufferWidth, gl.drawingBufferHeight);
- if (self.ctxAttribs.alpha || util$2.isIOS()) {
+ if (self.ctxAttribs.alpha || isIOS()) {
self.realClearColor.call(gl, 0, 0, 0, 1);
gl.clear(gl.COLOR_BUFFER_BIT);
}
@@ -933,18 +1103,28 @@
if (!self.dirtySubmitFrameBindings) {
self.realBindFramebuffer.call(gl, gl.FRAMEBUFFER, self.lastBoundFramebuffer);
}
- if (self.cullFace) { self.realEnable.call(gl, gl.CULL_FACE); }
- if (self.depthTest) { self.realEnable.call(gl, gl.DEPTH_TEST); }
- if (self.blend) { self.realEnable.call(gl, gl.BLEND); }
- if (self.scissorTest) { self.realEnable.call(gl, gl.SCISSOR_TEST); }
- if (self.stencilTest) { self.realEnable.call(gl, gl.STENCIL_TEST); }
+ if (self.cullFace) {
+ self.realEnable.call(gl, gl.CULL_FACE);
+ }
+ if (self.depthTest) {
+ self.realEnable.call(gl, gl.DEPTH_TEST);
+ }
+ if (self.blend) {
+ self.realEnable.call(gl, gl.BLEND);
+ }
+ if (self.scissorTest) {
+ self.realEnable.call(gl, gl.SCISSOR_TEST);
+ }
+ if (self.stencilTest) {
+ self.realEnable.call(gl, gl.STENCIL_TEST);
+ }
self.realColorMask.apply(gl, self.colorMask);
self.realViewport.apply(gl, self.viewport);
if (self.ctxAttribs.alpha || !self.ctxAttribs.preserveDrawingBuffer) {
self.realClearColor.apply(gl, self.clearColor);
}
});
- if (util$2.isIOS()) {
+ if (isIOS()) {
var canvas = gl.canvas;
if (canvas.width != self.bufferWidth || canvas.height != self.bufferHeight) {
self.bufferWidth = canvas.width;
@@ -953,11 +1133,11 @@
}
}
};
-CardboardDistorter.prototype.updateDeviceInfo = function(deviceInfo) {
+CardboardDistorter.prototype.updateDeviceInfo = function (deviceInfo) {
var gl = this.gl;
var self = this;
var glState = [gl.ARRAY_BUFFER_BINDING, gl.ELEMENT_ARRAY_BUFFER_BINDING];
- glPreserveState(gl, glState, function(gl) {
+ glPreserveState(gl, glState, function (gl) {
var vertices = self.computeMeshVertices_(self.meshWidth, self.meshHeight, deviceInfo);
gl.bindBuffer(gl.ARRAY_BUFFER, self.vertexBuffer);
gl.bufferData(gl.ARRAY_BUFFER, vertices, gl.STATIC_DRAW);
@@ -969,7 +1149,7 @@
}
});
};
-CardboardDistorter.prototype.computeMeshVertices_ = function(width, height, deviceInfo) {
+CardboardDistorter.prototype.computeMeshVertices_ = function (width, height, deviceInfo) {
var vertices = new Float32Array(2 * width * height * 5);
var lensFrustum = deviceInfo.getLeftEyeVisibleTanAngles();
var noLensFrustum = deviceInfo.getLeftEyeNoLensTanAngles();
@@ -982,22 +1162,21 @@
var v = j / (height - 1);
var s = u;
var t = v;
- var x = util$2.lerp(lensFrustum[0], lensFrustum[2], u);
- var y = util$2.lerp(lensFrustum[3], lensFrustum[1], v);
+ var x = lerp(lensFrustum[0], lensFrustum[2], u);
+ var y = lerp(lensFrustum[3], lensFrustum[1], v);
var d = Math.sqrt(x * x + y * y);
var r = deviceInfo.distortion.distortInverse(d);
var p = x * r / d;
var q = y * r / d;
u = (p - noLensFrustum[0]) / (noLensFrustum[2] - noLensFrustum[0]);
v = (q - noLensFrustum[3]) / (noLensFrustum[1] - noLensFrustum[3]);
- var aspect = deviceInfo.device.widthMeters / deviceInfo.device.heightMeters;
u = (viewport.x + u * viewport.width - 0.5) * 2.0;
v = (viewport.y + v * viewport.height - 0.5) * 2.0;
- vertices[(vidx * 5) + 0] = u;
- vertices[(vidx * 5) + 1] = v;
- vertices[(vidx * 5) + 2] = s;
- vertices[(vidx * 5) + 3] = t;
- vertices[(vidx * 5) + 4] = e;
+ vertices[vidx * 5 + 0] = u;
+ vertices[vidx * 5 + 1] = v;
+ vertices[vidx * 5 + 2] = s;
+ vertices[vidx * 5 + 3] = t;
+ vertices[vidx * 5 + 4] = e;
}
}
var w = lensFrustum[2] - lensFrustum[0];
@@ -1010,7 +1189,7 @@
}
return vertices;
};
-CardboardDistorter.prototype.computeMeshIndices_ = function(width, height) {
+CardboardDistorter.prototype.computeMeshIndices_ = function (width, height) {
var indices = new Uint16Array(2 * (width - 1) * (height - 1) * 6);
var halfwidth = width / 2;
var halfheight = height / 2;
@@ -1019,9 +1198,8 @@
for (var e = 0; e < 2; e++) {
for (var j = 0; j < height; j++) {
for (var i = 0; i < width; i++, vidx++) {
- if (i == 0 || j == 0)
- continue;
- if ((i <= halfwidth) == (j <= halfheight)) {
+ if (i == 0 || j == 0) continue;
+ if (i <= halfwidth == j <= halfheight) {
indices[iidx++] = vidx;
indices[iidx++] = vidx - width - 1;
indices[iidx++] = vidx - width;
@@ -1041,37 +1219,23 @@
}
return indices;
};
-CardboardDistorter.prototype.getOwnPropertyDescriptor_ = function(proto, attrName) {
+CardboardDistorter.prototype.getOwnPropertyDescriptor_ = function (proto, attrName) {
var descriptor = Object.getOwnPropertyDescriptor(proto, attrName);
if (descriptor.get === undefined || descriptor.set === undefined) {
descriptor.configurable = true;
descriptor.enumerable = true;
- descriptor.get = function() {
+ descriptor.get = function () {
return this.getAttribute(attrName);
};
- descriptor.set = function(val) {
+ descriptor.set = function (val) {
this.setAttribute(attrName, val);
};
}
return descriptor;
};
-var cardboardDistorter = CardboardDistorter;
-
-var uiVS = [
- 'attribute vec2 position;',
- 'uniform mat4 projectionMat;',
- 'void main() {',
- ' gl_Position = projectionMat * vec4( position, -1.0, 1.0 );',
- '}',
-].join('\n');
-var uiFS = [
- 'precision mediump float;',
- 'uniform vec4 color;',
- 'void main() {',
- ' gl_FragColor = color;',
- '}',
-].join('\n');
-var DEG2RAD = Math.PI/180.0;
+var uiVS = ['attribute vec2 position;', 'uniform mat4 projectionMat;', 'void main() {', ' gl_Position = projectionMat * vec4( position, -1.0, 1.0 );', '}'].join('\n');
+var uiFS = ['precision mediump float;', 'uniform vec4 color;', 'void main() {', ' gl_FragColor = color;', '}'].join('\n');
+var DEG2RAD = Math.PI / 180.0;
var kAnglePerGearSection = 60;
var kOuterRimEndAngle = 12;
var kInnerRimBeginAngle = 20;
@@ -1086,8 +1250,8 @@
this.attribs = {
position: 0
};
- this.program = util$2.linkProgram(gl, uiVS, uiFS, this.attribs);
- this.uniforms = util$2.getProgramUniforms(gl, this.program);
+ this.program = linkProgram(gl, uiVS, uiFS, this.attribs);
+ this.uniforms = getProgramUniforms(gl, this.program);
this.vertexBuffer = gl.createBuffer();
this.gearOffset = 0;
this.gearVertexCount = 0;
@@ -1097,7 +1261,7 @@
this.listener = null;
this.onResize();
}
-CardboardUI.prototype.destroy = function() {
+CardboardUI.prototype.destroy = function () {
var gl = this.gl;
if (this.listener) {
gl.canvas.removeEventListener('click', this.listener, false);
@@ -1105,43 +1269,39 @@
gl.deleteProgram(this.program);
gl.deleteBuffer(this.vertexBuffer);
};
-CardboardUI.prototype.listen = function(optionsCallback, backCallback) {
+CardboardUI.prototype.listen = function (optionsCallback, backCallback) {
var canvas = this.gl.canvas;
- this.listener = function(event) {
+ this.listener = function (event) {
var midline = canvas.clientWidth / 2;
var buttonSize = kButtonWidthDp * kTouchSlopFactor;
- if (event.clientX > midline - buttonSize &&
- event.clientX < midline + buttonSize &&
- event.clientY > canvas.clientHeight - buttonSize) {
+ if (event.clientX > midline - buttonSize && event.clientX < midline + buttonSize && event.clientY > canvas.clientHeight - buttonSize) {
optionsCallback(event);
}
else if (event.clientX < buttonSize && event.clientY < buttonSize) {
- backCallback(event);
- }
+ backCallback(event);
+ }
};
canvas.addEventListener('click', this.listener, false);
};
-CardboardUI.prototype.onResize = function() {
+CardboardUI.prototype.onResize = function () {
var gl = this.gl;
var self = this;
- var glState = [
- gl.ARRAY_BUFFER_BINDING
- ];
- glPreserveState(gl, glState, function(gl) {
+ var glState = [gl.ARRAY_BUFFER_BINDING];
+ glPreserveState(gl, glState, function (gl) {
var vertices = [];
var midline = gl.drawingBufferWidth / 2;
var physicalPixels = Math.max(screen.width, screen.height) * window.devicePixelRatio;
var scalingRatio = gl.drawingBufferWidth / physicalPixels;
- var dps = scalingRatio * window.devicePixelRatio;
+ var dps = scalingRatio * window.devicePixelRatio;
var lineWidth = kCenterLineThicknessDp * dps / 2;
var buttonSize = kButtonWidthDp * kTouchSlopFactor * dps;
var buttonScale = kButtonWidthDp * dps / 2;
- var buttonBorder = ((kButtonWidthDp * kTouchSlopFactor) - kButtonWidthDp) * dps;
+ var buttonBorder = (kButtonWidthDp * kTouchSlopFactor - kButtonWidthDp) * dps;
vertices.push(midline - lineWidth, buttonSize);
vertices.push(midline - lineWidth, gl.drawingBufferHeight);
vertices.push(midline + lineWidth, buttonSize);
vertices.push(midline + lineWidth, gl.drawingBufferHeight);
- self.gearOffset = (vertices.length / 2);
+ self.gearOffset = vertices.length / 2;
function addGearSegment(theta, r) {
var angle = (90 - theta) * DEG2RAD;
var x = Math.cos(angle);
@@ -1157,8 +1317,8 @@
addGearSegment(segmentTheta + (kAnglePerGearSection - kInnerRimBeginAngle), kMiddleRadius);
addGearSegment(segmentTheta + (kAnglePerGearSection - kOuterRimEndAngle), kOuterRadius);
}
- self.gearVertexCount = (vertices.length / 2) - self.gearOffset;
- self.arrowOffset = (vertices.length / 2);
+ self.gearVertexCount = vertices.length / 2 - self.gearOffset;
+ self.arrowOffset = vertices.length / 2;
function addArrowVertex(x, y) {
vertices.push(buttonBorder + x, gl.drawingBufferHeight - buttonBorder - y);
}
@@ -1170,33 +1330,23 @@
addArrowVertex(angledLineWidth, buttonScale - angledLineWidth);
addArrowVertex(0, buttonScale);
addArrowVertex(buttonScale, buttonScale * 2);
- addArrowVertex(buttonScale + angledLineWidth, (buttonScale * 2) - angledLineWidth);
+ addArrowVertex(buttonScale + angledLineWidth, buttonScale * 2 - angledLineWidth);
addArrowVertex(angledLineWidth, buttonScale - angledLineWidth);
addArrowVertex(0, buttonScale);
addArrowVertex(angledLineWidth, buttonScale - lineWidth);
addArrowVertex(kButtonWidthDp * dps, buttonScale - lineWidth);
addArrowVertex(angledLineWidth, buttonScale + lineWidth);
addArrowVertex(kButtonWidthDp * dps, buttonScale + lineWidth);
- self.arrowVertexCount = (vertices.length / 2) - self.arrowOffset;
+ self.arrowVertexCount = vertices.length / 2 - self.arrowOffset;
gl.bindBuffer(gl.ARRAY_BUFFER, self.vertexBuffer);
gl.bufferData(gl.ARRAY_BUFFER, new Float32Array(vertices), gl.STATIC_DRAW);
});
};
-CardboardUI.prototype.render = function() {
+CardboardUI.prototype.render = function () {
var gl = this.gl;
var self = this;
- var glState = [
- gl.CULL_FACE,
- gl.DEPTH_TEST,
- gl.BLEND,
- gl.SCISSOR_TEST,
- gl.STENCIL_TEST,
- gl.COLOR_WRITEMASK,
- gl.VIEWPORT,
- gl.CURRENT_PROGRAM,
- gl.ARRAY_BUFFER_BINDING
- ];
- glPreserveState(gl, glState, function(gl) {
+ var glState = [gl.CULL_FACE, gl.DEPTH_TEST, gl.BLEND, gl.SCISSOR_TEST, gl.STENCIL_TEST, gl.COLOR_WRITEMASK, gl.VIEWPORT, gl.CURRENT_PROGRAM, gl.ARRAY_BUFFER_BINDING];
+ glPreserveState(gl, glState, function (gl) {
gl.disable(gl.CULL_FACE);
gl.disable(gl.DEPTH_TEST);
gl.disable(gl.BLEND);
@@ -1207,25 +1357,23 @@
self.renderNoState();
});
};
-CardboardUI.prototype.renderNoState = function() {
+CardboardUI.prototype.renderNoState = function () {
var gl = this.gl;
gl.useProgram(this.program);
gl.bindBuffer(gl.ARRAY_BUFFER, this.vertexBuffer);
gl.enableVertexAttribArray(this.attribs.position);
gl.vertexAttribPointer(this.attribs.position, 2, gl.FLOAT, false, 8, 0);
gl.uniform4f(this.uniforms.color, 1.0, 1.0, 1.0, 1.0);
- util$2.orthoMatrix(this.projMat, 0, gl.drawingBufferWidth, 0, gl.drawingBufferHeight, 0.1, 1024.0);
+ orthoMatrix(this.projMat, 0, gl.drawingBufferWidth, 0, gl.drawingBufferHeight, 0.1, 1024.0);
gl.uniformMatrix4fv(this.uniforms.projectionMat, false, this.projMat);
gl.drawArrays(gl.TRIANGLE_STRIP, 0, 4);
gl.drawArrays(gl.TRIANGLE_STRIP, this.gearOffset, this.gearVertexCount);
gl.drawArrays(gl.TRIANGLE_STRIP, this.arrowOffset, this.arrowVertexCount);
};
-var cardboardUi = CardboardUI;
-
function Distortion(coefficients) {
this.coefficients = coefficients;
}
-Distortion.prototype.distortInverse = function(radius) {
+Distortion.prototype.distortInverse = function (radius) {
var r0 = 0;
var r1 = 1;
var dr0 = radius - this.distort(r0);
@@ -1238,7 +1386,7 @@
}
return r1;
};
-Distortion.prototype.distort = function(radius) {
+Distortion.prototype.distort = function (radius) {
var r2 = radius * radius;
var ret = 0;
for (var i = 0; i < this.coefficients.length; i++) {
@@ -1246,58 +1394,33 @@
}
return (ret + 1) * radius;
};
-var distortion = Distortion;
-
-var MathUtil = window.MathUtil || {};
-MathUtil.degToRad = Math.PI / 180;
-MathUtil.radToDeg = 180 / Math.PI;
-MathUtil.Vector2 = function ( x, y ) {
- this.x = x || 0;
- this.y = y || 0;
-};
-MathUtil.Vector2.prototype = {
- constructor: MathUtil.Vector2,
- set: function ( x, y ) {
- this.x = x;
- this.y = y;
- return this;
- },
- copy: function ( v ) {
- this.x = v.x;
- this.y = v.y;
- return this;
- },
- subVectors: function ( a, b ) {
- this.x = a.x - b.x;
- this.y = a.y - b.y;
- return this;
- },
-};
-MathUtil.Vector3 = function ( x, y, z ) {
+var degToRad = Math.PI / 180;
+var radToDeg = 180 / Math.PI;
+var Vector3 = function Vector3(x, y, z) {
this.x = x || 0;
this.y = y || 0;
this.z = z || 0;
};
-MathUtil.Vector3.prototype = {
- constructor: MathUtil.Vector3,
- set: function ( x, y, z ) {
+Vector3.prototype = {
+ constructor: Vector3,
+ set: function set(x, y, z) {
this.x = x;
this.y = y;
this.z = z;
return this;
},
- copy: function ( v ) {
+ copy: function copy(v) {
this.x = v.x;
this.y = v.y;
this.z = v.z;
return this;
},
- length: function () {
- return Math.sqrt( this.x * this.x + this.y * this.y + this.z * this.z );
+ length: function length() {
+ return Math.sqrt(this.x * this.x + this.y * this.y + this.z * this.z);
},
- normalize: function () {
+ normalize: function normalize() {
var scalar = this.length();
- if ( scalar !== 0 ) {
+ if (scalar !== 0) {
var invScalar = 1 / scalar;
this.multiplyScalar(invScalar);
} else {
@@ -1307,12 +1430,12 @@
}
return this;
},
- multiplyScalar: function ( scalar ) {
+ multiplyScalar: function multiplyScalar(scalar) {
this.x *= scalar;
this.y *= scalar;
this.z *= scalar;
},
- applyQuaternion: function ( q ) {
+ applyQuaternion: function applyQuaternion(q) {
var x = this.x;
var y = this.y;
var z = this.z;
@@ -1320,105 +1443,116 @@
var qy = q.y;
var qz = q.z;
var qw = q.w;
- var ix = qw * x + qy * z - qz * y;
- var iy = qw * y + qz * x - qx * z;
- var iz = qw * z + qx * y - qy * x;
- var iw = - qx * x - qy * y - qz * z;
- this.x = ix * qw + iw * - qx + iy * - qz - iz * - qy;
- this.y = iy * qw + iw * - qy + iz * - qx - ix * - qz;
- this.z = iz * qw + iw * - qz + ix * - qy - iy * - qx;
+ var ix = qw * x + qy * z - qz * y;
+ var iy = qw * y + qz * x - qx * z;
+ var iz = qw * z + qx * y - qy * x;
+ var iw = -qx * x - qy * y - qz * z;
+ this.x = ix * qw + iw * -qx + iy * -qz - iz * -qy;
+ this.y = iy * qw + iw * -qy + iz * -qx - ix * -qz;
+ this.z = iz * qw + iw * -qz + ix * -qy - iy * -qx;
return this;
},
- dot: function ( v ) {
+ dot: function dot(v) {
return this.x * v.x + this.y * v.y + this.z * v.z;
},
- crossVectors: function ( a, b ) {
- var ax = a.x, ay = a.y, az = a.z;
- var bx = b.x, by = b.y, bz = b.z;
+ crossVectors: function crossVectors(a, b) {
+ var ax = a.x,
+ ay = a.y,
+ az = a.z;
+ var bx = b.x,
+ by = b.y,
+ bz = b.z;
this.x = ay * bz - az * by;
this.y = az * bx - ax * bz;
this.z = ax * by - ay * bx;
return this;
- },
+ }
};
-MathUtil.Quaternion = function ( x, y, z, w ) {
+var Quaternion = function Quaternion(x, y, z, w) {
this.x = x || 0;
this.y = y || 0;
this.z = z || 0;
- this.w = ( w !== undefined ) ? w : 1;
+ this.w = w !== undefined ? w : 1;
};
-MathUtil.Quaternion.prototype = {
- constructor: MathUtil.Quaternion,
- set: function ( x, y, z, w ) {
+Quaternion.prototype = {
+ constructor: Quaternion,
+ set: function set(x, y, z, w) {
this.x = x;
this.y = y;
this.z = z;
this.w = w;
return this;
},
- copy: function ( quaternion ) {
+ copy: function copy(quaternion) {
this.x = quaternion.x;
this.y = quaternion.y;
this.z = quaternion.z;
this.w = quaternion.w;
return this;
},
- setFromEulerXYZ: function( x, y, z ) {
- var c1 = Math.cos( x / 2 );
- var c2 = Math.cos( y / 2 );
- var c3 = Math.cos( z / 2 );
- var s1 = Math.sin( x / 2 );
- var s2 = Math.sin( y / 2 );
- var s3 = Math.sin( z / 2 );
+ setFromEulerXYZ: function setFromEulerXYZ(x, y, z) {
+ var c1 = Math.cos(x / 2);
+ var c2 = Math.cos(y / 2);
+ var c3 = Math.cos(z / 2);
+ var s1 = Math.sin(x / 2);
+ var s2 = Math.sin(y / 2);
+ var s3 = Math.sin(z / 2);
this.x = s1 * c2 * c3 + c1 * s2 * s3;
this.y = c1 * s2 * c3 - s1 * c2 * s3;
this.z = c1 * c2 * s3 + s1 * s2 * c3;
this.w = c1 * c2 * c3 - s1 * s2 * s3;
return this;
},
- setFromEulerYXZ: function( x, y, z ) {
- var c1 = Math.cos( x / 2 );
- var c2 = Math.cos( y / 2 );
- var c3 = Math.cos( z / 2 );
- var s1 = Math.sin( x / 2 );
- var s2 = Math.sin( y / 2 );
- var s3 = Math.sin( z / 2 );
+ setFromEulerYXZ: function setFromEulerYXZ(x, y, z) {
+ var c1 = Math.cos(x / 2);
+ var c2 = Math.cos(y / 2);
+ var c3 = Math.cos(z / 2);
+ var s1 = Math.sin(x / 2);
+ var s2 = Math.sin(y / 2);
+ var s3 = Math.sin(z / 2);
this.x = s1 * c2 * c3 + c1 * s2 * s3;
this.y = c1 * s2 * c3 - s1 * c2 * s3;
this.z = c1 * c2 * s3 - s1 * s2 * c3;
this.w = c1 * c2 * c3 + s1 * s2 * s3;
return this;
},
- setFromAxisAngle: function ( axis, angle ) {
- var halfAngle = angle / 2, s = Math.sin( halfAngle );
+ setFromAxisAngle: function setFromAxisAngle(axis, angle) {
+ var halfAngle = angle / 2,
+ s = Math.sin(halfAngle);
this.x = axis.x * s;
this.y = axis.y * s;
this.z = axis.z * s;
- this.w = Math.cos( halfAngle );
+ this.w = Math.cos(halfAngle);
return this;
},
- multiply: function ( q ) {
- return this.multiplyQuaternions( this, q );
+ multiply: function multiply(q) {
+ return this.multiplyQuaternions(this, q);
},
- multiplyQuaternions: function ( a, b ) {
- var qax = a.x, qay = a.y, qaz = a.z, qaw = a.w;
- var qbx = b.x, qby = b.y, qbz = b.z, qbw = b.w;
+ multiplyQuaternions: function multiplyQuaternions(a, b) {
+ var qax = a.x,
+ qay = a.y,
+ qaz = a.z,
+ qaw = a.w;
+ var qbx = b.x,
+ qby = b.y,
+ qbz = b.z,
+ qbw = b.w;
this.x = qax * qbw + qaw * qbx + qay * qbz - qaz * qby;
this.y = qay * qbw + qaw * qby + qaz * qbx - qax * qbz;
this.z = qaz * qbw + qaw * qbz + qax * qby - qay * qbx;
this.w = qaw * qbw - qax * qbx - qay * qby - qaz * qbz;
return this;
},
- inverse: function () {
+ inverse: function inverse() {
this.x *= -1;
this.y *= -1;
this.z *= -1;
this.normalize();
return this;
},
- normalize: function () {
- var l = Math.sqrt( this.x * this.x + this.y * this.y + this.z * this.z + this.w * this.w );
- if ( l === 0 ) {
+ normalize: function normalize() {
+ var l = Math.sqrt(this.x * this.x + this.y * this.y + this.z * this.z + this.w * this.w);
+ if (l === 0) {
this.x = 0;
this.y = 0;
this.z = 0;
@@ -1432,59 +1566,62 @@
}
return this;
},
- slerp: function ( qb, t ) {
- if ( t === 0 ) return this;
- if ( t === 1 ) return this.copy( qb );
- var x = this.x, y = this.y, z = this.z, w = this.w;
+ slerp: function slerp(qb, t) {
+ if (t === 0) return this;
+ if (t === 1) return this.copy(qb);
+ var x = this.x,
+ y = this.y,
+ z = this.z,
+ w = this.w;
var cosHalfTheta = w * qb.w + x * qb.x + y * qb.y + z * qb.z;
- if ( cosHalfTheta < 0 ) {
- this.w = - qb.w;
- this.x = - qb.x;
- this.y = - qb.y;
- this.z = - qb.z;
- cosHalfTheta = - cosHalfTheta;
+ if (cosHalfTheta < 0) {
+ this.w = -qb.w;
+ this.x = -qb.x;
+ this.y = -qb.y;
+ this.z = -qb.z;
+ cosHalfTheta = -cosHalfTheta;
} else {
- this.copy( qb );
+ this.copy(qb);
}
- if ( cosHalfTheta >= 1.0 ) {
+ if (cosHalfTheta >= 1.0) {
this.w = w;
this.x = x;
this.y = y;
this.z = z;
return this;
}
- var halfTheta = Math.acos( cosHalfTheta );
- var sinHalfTheta = Math.sqrt( 1.0 - cosHalfTheta * cosHalfTheta );
- if ( Math.abs( sinHalfTheta ) < 0.001 ) {
- this.w = 0.5 * ( w + this.w );
- this.x = 0.5 * ( x + this.x );
- this.y = 0.5 * ( y + this.y );
- this.z = 0.5 * ( z + this.z );
+ var halfTheta = Math.acos(cosHalfTheta);
+ var sinHalfTheta = Math.sqrt(1.0 - cosHalfTheta * cosHalfTheta);
+ if (Math.abs(sinHalfTheta) < 0.001) {
+ this.w = 0.5 * (w + this.w);
+ this.x = 0.5 * (x + this.x);
+ this.y = 0.5 * (y + this.y);
+ this.z = 0.5 * (z + this.z);
return this;
}
- var ratioA = Math.sin( ( 1 - t ) * halfTheta ) / sinHalfTheta,
- ratioB = Math.sin( t * halfTheta ) / sinHalfTheta;
- this.w = ( w * ratioA + this.w * ratioB );
- this.x = ( x * ratioA + this.x * ratioB );
- this.y = ( y * ratioA + this.y * ratioB );
- this.z = ( z * ratioA + this.z * ratioB );
+ var ratioA = Math.sin((1 - t) * halfTheta) / sinHalfTheta,
+ ratioB = Math.sin(t * halfTheta) / sinHalfTheta;
+ this.w = w * ratioA + this.w * ratioB;
+ this.x = x * ratioA + this.x * ratioB;
+ this.y = y * ratioA + this.y * ratioB;
+ this.z = z * ratioA + this.z * ratioB;
return this;
},
setFromUnitVectors: function () {
var v1, r;
var EPS = 0.000001;
- return function ( vFrom, vTo ) {
- if ( v1 === undefined ) v1 = new MathUtil.Vector3();
- r = vFrom.dot( vTo ) + 1;
- if ( r < EPS ) {
+ return function (vFrom, vTo) {
+ if (v1 === undefined) v1 = new Vector3();
+ r = vFrom.dot(vTo) + 1;
+ if (r < EPS) {
r = 0;
- if ( Math.abs( vFrom.x ) > Math.abs( vFrom.z ) ) {
- v1.set( - vFrom.y, vFrom.x, 0 );
+ if (Math.abs(vFrom.x) > Math.abs(vFrom.z)) {
+ v1.set(-vFrom.y, vFrom.x, 0);
} else {
- v1.set( 0, - vFrom.z, vFrom.y );
+ v1.set(0, -vFrom.z, vFrom.y);
}
} else {
- v1.crossVectors( vFrom, vTo );
+ v1.crossVectors(vFrom, vTo);
}
this.x = v1.x;
this.y = v1.y;
@@ -1492,14 +1629,12 @@
this.w = r;
this.normalize();
return this;
- }
- }(),
+ };
+ }()
};
-var mathUtil = MathUtil;
-
function Device(params) {
- this.width = params.width || util$2.getScreenWidth();
- this.height = params.height || util$2.getScreenHeight();
+ this.width = params.width || getScreenWidth();
+ this.height = params.height || getScreenHeight();
this.widthMeters = params.widthMeters;
this.heightMeters = params.heightMeters;
this.bevelMeters = params.bevelMeters;
@@ -1523,9 +1658,7 @@
baselineLensDistance: 0.035,
screenLensDistance: 0.042,
distortionCoefficients: [0.441, 0.156],
- inverseCoefficients: [-0.4410035, 0.42756155, -0.4804439, 0.5460139,
- -0.58821183, 0.5733938, -0.48303202, 0.33299083, -0.17573841,
- 0.0651772, -0.01488963, 0.001559834]
+ inverseCoefficients: [-0.4410035, 0.42756155, -0.4804439, 0.5460139, -0.58821183, 0.5733938, -0.48303202, 0.33299083, -0.17573841, 0.0651772, -0.01488963, 0.001559834]
}),
CardboardV2: new CardboardViewer({
id: 'CardboardV2',
@@ -1535,29 +1668,31 @@
baselineLensDistance: 0.035,
screenLensDistance: 0.039,
distortionCoefficients: [0.34, 0.55],
- inverseCoefficients: [-0.33836704, -0.18162185, 0.862655, -1.2462051,
- 1.0560602, -0.58208317, 0.21609078, -0.05444823, 0.009177956,
- -9.904169E-4, 6.183535E-5, -1.6981803E-6]
+ inverseCoefficients: [-0.33836704, -0.18162185, 0.862655, -1.2462051, 1.0560602, -0.58208317, 0.21609078, -0.05444823, 0.009177956, -9.904169E-4, 6.183535E-5, -1.6981803E-6]
})
};
-function DeviceInfo(deviceParams) {
+function DeviceInfo(deviceParams, additionalViewers) {
this.viewer = Viewers.CardboardV2;
this.updateDeviceParams(deviceParams);
- this.distortion = new distortion(this.viewer.distortionCoefficients);
+ this.distortion = new Distortion(this.viewer.distortionCoefficients);
+ for (var i = 0; i < additionalViewers.length; i++) {
+ var viewer = additionalViewers[i];
+ Viewers[viewer.id] = new CardboardViewer(viewer);
+ }
}
-DeviceInfo.prototype.updateDeviceParams = function(deviceParams) {
+DeviceInfo.prototype.updateDeviceParams = function (deviceParams) {
this.device = this.determineDevice_(deviceParams) || this.device;
};
-DeviceInfo.prototype.getDevice = function() {
+DeviceInfo.prototype.getDevice = function () {
return this.device;
};
-DeviceInfo.prototype.setViewer = function(viewer) {
+DeviceInfo.prototype.setViewer = function (viewer) {
this.viewer = viewer;
- this.distortion = new distortion(this.viewer.distortionCoefficients);
+ this.distortion = new Distortion(this.viewer.distortionCoefficients);
};
-DeviceInfo.prototype.determineDevice_ = function(deviceParams) {
+DeviceInfo.prototype.determineDevice_ = function (deviceParams) {
if (!deviceParams) {
- if (util$2.isIOS()) {
+ if (isIOS()) {
console.warn('Using fallback iOS device measurements.');
return DEFAULT_IOS;
} else {
@@ -1568,31 +1703,27 @@
var METERS_PER_INCH = 0.0254;
var metersPerPixelX = METERS_PER_INCH / deviceParams.xdpi;
var metersPerPixelY = METERS_PER_INCH / deviceParams.ydpi;
- var width = util$2.getScreenWidth();
- var height = util$2.getScreenHeight();
+ var width = getScreenWidth();
+ var height = getScreenHeight();
return new Device({
widthMeters: metersPerPixelX * width,
heightMeters: metersPerPixelY * height,
- bevelMeters: deviceParams.bevelMm * 0.001,
+ bevelMeters: deviceParams.bevelMm * 0.001
});
};
-DeviceInfo.prototype.getDistortedFieldOfViewLeftEye = function() {
+DeviceInfo.prototype.getDistortedFieldOfViewLeftEye = function () {
var viewer = this.viewer;
var device = this.device;
- var distortion$$1 = this.distortion;
+ var distortion = this.distortion;
var eyeToScreenDistance = viewer.screenLensDistance;
var outerDist = (device.widthMeters - viewer.interLensDistance) / 2;
var innerDist = viewer.interLensDistance / 2;
var bottomDist = viewer.baselineLensDistance - device.bevelMeters;
var topDist = device.heightMeters - bottomDist;
- var outerAngle = mathUtil.radToDeg * Math.atan(
- distortion$$1.distort(outerDist / eyeToScreenDistance));
- var innerAngle = mathUtil.radToDeg * Math.atan(
- distortion$$1.distort(innerDist / eyeToScreenDistance));
- var bottomAngle = mathUtil.radToDeg * Math.atan(
- distortion$$1.distort(bottomDist / eyeToScreenDistance));
- var topAngle = mathUtil.radToDeg * Math.atan(
- distortion$$1.distort(topDist / eyeToScreenDistance));
+ var outerAngle = radToDeg * Math.atan(distortion.distort(outerDist / eyeToScreenDistance));
+ var innerAngle = radToDeg * Math.atan(distortion.distort(innerDist / eyeToScreenDistance));
+ var bottomAngle = radToDeg * Math.atan(distortion.distort(bottomDist / eyeToScreenDistance));
+ var topAngle = radToDeg * Math.atan(distortion.distort(topDist / eyeToScreenDistance));
return {
leftDegrees: Math.min(outerAngle, viewer.fov),
rightDegrees: Math.min(innerAngle, viewer.fov),
@@ -1600,24 +1731,24 @@
upDegrees: Math.min(topAngle, viewer.fov)
};
};
-DeviceInfo.prototype.getLeftEyeVisibleTanAngles = function() {
+DeviceInfo.prototype.getLeftEyeVisibleTanAngles = function () {
var viewer = this.viewer;
var device = this.device;
- var distortion$$1 = this.distortion;
- var fovLeft = Math.tan(-mathUtil.degToRad * viewer.fov);
- var fovTop = Math.tan(mathUtil.degToRad * viewer.fov);
- var fovRight = Math.tan(mathUtil.degToRad * viewer.fov);
- var fovBottom = Math.tan(-mathUtil.degToRad * viewer.fov);
+ var distortion = this.distortion;
+ var fovLeft = Math.tan(-degToRad * viewer.fov);
+ var fovTop = Math.tan(degToRad * viewer.fov);
+ var fovRight = Math.tan(degToRad * viewer.fov);
+ var fovBottom = Math.tan(-degToRad * viewer.fov);
var halfWidth = device.widthMeters / 4;
var halfHeight = device.heightMeters / 2;
- var verticalLensOffset = (viewer.baselineLensDistance - device.bevelMeters - halfHeight);
+ var verticalLensOffset = viewer.baselineLensDistance - device.bevelMeters - halfHeight;
var centerX = viewer.interLensDistance / 2 - halfWidth;
var centerY = -verticalLensOffset;
var centerZ = viewer.screenLensDistance;
- var screenLeft = distortion$$1.distort((centerX - halfWidth) / centerZ);
- var screenTop = distortion$$1.distort((centerY + halfHeight) / centerZ);
- var screenRight = distortion$$1.distort((centerX + halfWidth) / centerZ);
- var screenBottom = distortion$$1.distort((centerY - halfHeight) / centerZ);
+ var screenLeft = distortion.distort((centerX - halfWidth) / centerZ);
+ var screenTop = distortion.distort((centerY + halfHeight) / centerZ);
+ var screenRight = distortion.distort((centerX + halfWidth) / centerZ);
+ var screenBottom = distortion.distort((centerY - halfHeight) / centerZ);
var result = new Float32Array(4);
result[0] = Math.max(fovLeft, screenLeft);
result[1] = Math.min(fovTop, screenTop);
@@ -1625,18 +1756,18 @@
result[3] = Math.max(fovBottom, screenBottom);
return result;
};
-DeviceInfo.prototype.getLeftEyeNoLensTanAngles = function() {
+DeviceInfo.prototype.getLeftEyeNoLensTanAngles = function () {
var viewer = this.viewer;
var device = this.device;
- var distortion$$1 = this.distortion;
+ var distortion = this.distortion;
var result = new Float32Array(4);
- var fovLeft = distortion$$1.distortInverse(Math.tan(-mathUtil.degToRad * viewer.fov));
- var fovTop = distortion$$1.distortInverse(Math.tan(mathUtil.degToRad * viewer.fov));
- var fovRight = distortion$$1.distortInverse(Math.tan(mathUtil.degToRad * viewer.fov));
- var fovBottom = distortion$$1.distortInverse(Math.tan(-mathUtil.degToRad * viewer.fov));
+ var fovLeft = distortion.distortInverse(Math.tan(-degToRad * viewer.fov));
+ var fovTop = distortion.distortInverse(Math.tan(degToRad * viewer.fov));
+ var fovRight = distortion.distortInverse(Math.tan(degToRad * viewer.fov));
+ var fovBottom = distortion.distortInverse(Math.tan(-degToRad * viewer.fov));
var halfWidth = device.widthMeters / 4;
var halfHeight = device.heightMeters / 2;
- var verticalLensOffset = (viewer.baselineLensDistance - device.bevelMeters - halfHeight);
+ var verticalLensOffset = viewer.baselineLensDistance - device.bevelMeters - halfHeight;
var centerX = viewer.interLensDistance / 2 - halfWidth;
var centerY = -verticalLensOffset;
var centerZ = viewer.screenLensDistance;
@@ -1650,7 +1781,7 @@
result[3] = Math.max(fovBottom, screenBottom);
return result;
};
-DeviceInfo.prototype.getLeftEyeVisibleScreenRect = function(undistortedFrustum) {
+DeviceInfo.prototype.getLeftEyeVisibleScreenRect = function (undistortedFrustum) {
var viewer = this.viewer;
var device = this.device;
var dist = viewer.screenLensDistance;
@@ -1667,11 +1798,10 @@
height: top - bottom
};
};
-DeviceInfo.prototype.getFieldOfViewLeftEye = function(opt_isUndistorted) {
- return opt_isUndistorted ? this.getUndistortedFieldOfViewLeftEye() :
- this.getDistortedFieldOfViewLeftEye();
+DeviceInfo.prototype.getFieldOfViewLeftEye = function (opt_isUndistorted) {
+ return opt_isUndistorted ? this.getUndistortedFieldOfViewLeftEye() : this.getDistortedFieldOfViewLeftEye();
};
-DeviceInfo.prototype.getFieldOfViewRightEye = function(opt_isUndistorted) {
+DeviceInfo.prototype.getFieldOfViewRightEye = function (opt_isUndistorted) {
var fov = this.getFieldOfViewLeftEye(opt_isUndistorted);
return {
leftDegrees: fov.rightDegrees,
@@ -1680,16 +1810,16 @@
downDegrees: fov.downDegrees
};
};
-DeviceInfo.prototype.getUndistortedFieldOfViewLeftEye = function() {
+DeviceInfo.prototype.getUndistortedFieldOfViewLeftEye = function () {
var p = this.getUndistortedParams_();
return {
- leftDegrees: mathUtil.radToDeg * Math.atan(p.outerDist),
- rightDegrees: mathUtil.radToDeg * Math.atan(p.innerDist),
- downDegrees: mathUtil.radToDeg * Math.atan(p.bottomDist),
- upDegrees: mathUtil.radToDeg * Math.atan(p.topDist)
+ leftDegrees: radToDeg * Math.atan(p.outerDist),
+ rightDegrees: radToDeg * Math.atan(p.innerDist),
+ downDegrees: radToDeg * Math.atan(p.bottomDist),
+ upDegrees: radToDeg * Math.atan(p.topDist)
};
};
-DeviceInfo.prototype.getUndistortedViewportLeftEye = function() {
+DeviceInfo.prototype.getUndistortedViewportLeftEye = function () {
var p = this.getUndistortedParams_();
var viewer = this.viewer;
var device = this.device;
@@ -1707,10 +1837,10 @@
height: Math.round((p.eyePosY + p.topDist) * yPxPerTanAngle) - y
};
};
-DeviceInfo.prototype.getUndistortedParams_ = function() {
+DeviceInfo.prototype.getUndistortedParams_ = function () {
var viewer = this.viewer;
var device = this.device;
- var distortion$$1 = this.distortion;
+ var distortion = this.distortion;
var eyeToScreenDistance = viewer.screenLensDistance;
var halfLensDistance = viewer.interLensDistance / 2 / eyeToScreenDistance;
var screenWidth = device.widthMeters / eyeToScreenDistance;
@@ -1718,7 +1848,7 @@
var eyePosX = screenWidth / 2 - halfLensDistance;
var eyePosY = (viewer.baselineLensDistance - device.bevelMeters) / eyeToScreenDistance;
var maxFov = viewer.fov;
- var viewerMax = distortion$$1.distortInverse(Math.tan(mathUtil.degToRad * maxFov));
+ var viewerMax = distortion.distortInverse(Math.tan(degToRad * maxFov));
var outerDist = Math.min(eyePosX, viewerMax);
var innerDist = Math.min(halfLensDistance, viewerMax);
var bottomDist = Math.min(eyePosY, viewerMax);
@@ -1743,26 +1873,14 @@
this.inverseCoefficients = params.inverseCoefficients;
}
DeviceInfo.Viewers = Viewers;
-var deviceInfo = DeviceInfo;
-
var format = 1;
-var last_updated = "2017-10-12T17:44:41Z";
-var devices = [{"type":"android","rules":[{"mdmh":"asus/*/Nexus 7/*"},{"ua":"Nexus 7"}],"dpi":[320.8,323],"bw":3,"ac":500},{"type":"android","rules":[{"mdmh":"asus/*/ASUS_Z00AD/*"},{"ua":"ASUS_Z00AD"}],"dpi":[403,404.6],"bw":3,"ac":1000},{"type":"android","rules":[{"mdmh":"Google/*/Pixel XL/*"},{"ua":"Pixel XL"}],"dpi":[537.9,533],"bw":3,"ac":1000},{"type":"android","rules":[{"mdmh":"Google/*/Pixel/*"},{"ua":"Pixel"}],"dpi":[432.6,436.7],"bw":3,"ac":1000},{"type":"android","rules":[{"mdmh":"HTC/*/HTC6435LVW/*"},{"ua":"HTC6435LVW"}],"dpi":[449.7,443.3],"bw":3,"ac":1000},{"type":"android","rules":[{"mdmh":"HTC/*/HTC One XL/*"},{"ua":"HTC One XL"}],"dpi":[315.3,314.6],"bw":3,"ac":1000},{"type":"android","rules":[{"mdmh":"htc/*/Nexus 9/*"},{"ua":"Nexus 9"}],"dpi":289,"bw":3,"ac":500},{"type":"android","rules":[{"mdmh":"HTC/*/HTC One M9/*"},{"ua":"HTC One M9"}],"dpi":[442.5,443.3],"bw":3,"ac":500},{"type":"android","rules":[{"mdmh":"HTC/*/HTC One_M8/*"},{"ua":"HTC One_M8"}],"dpi":[449.7,447.4],"bw":3,"ac":500},{"type":"android","rules":[{"mdmh":"HTC/*/HTC One/*"},{"ua":"HTC One"}],"dpi":472.8,"bw":3,"ac":1000},{"type":"android","rules":[{"mdmh":"Huawei/*/Nexus 6P/*"},{"ua":"Nexus 6P"}],"dpi":[515.1,518],"bw":3,"ac":1000},{"type":"android","rules":[{"mdmh":"LENOVO/*/Lenovo PB2-690Y/*"},{"ua":"Lenovo PB2-690Y"}],"dpi":[457.2,454.713],"bw":3,"ac":500},{"type":"android","rules":[{"mdmh":"LGE/*/Nexus 5X/*"},{"ua":"Nexus 5X"}],"dpi":[422,419.9],"bw":3,"ac":1000},{"type":"android","rules":[{"mdmh":"LGE/*/LGMS345/*"},{"ua":"LGMS345"}],"dpi":[221.7,219.1],"bw":3,"ac":500},{"type":"android","rules":[{"mdmh":"LGE/*/LG-D800/*"},{"ua":"LG-D800"}],"dpi":[422,424.1],"bw":3,"ac":500},{"type":"android","rules":[{"mdmh":"LGE/*/LG-D850/*"},{"ua":"LG-D850"}],"dpi":[537.9,541.9],"bw":3,"ac":500},{"type":"android","rules":[{"mdmh":"LGE/*/VS985 4G/*"},{"ua":"VS985 4G"}],"dpi":[537.9,535.6],"bw":3,"ac":1000},{"type":"android","rules":[{"mdmh":"LGE/*/Nexus 5/*"},{"ua":"Nexus 5 B"}],"dpi":[442.4,444.8],"bw":3,"ac":1000},{"type":"android","rules":[{"mdmh":"LGE/*/Nexus 4/*"},{"ua":"Nexus 4"}],"dpi":[319.8,318.4],"bw":3,"ac":1000},{"type":"android","rules":[{"mdmh":"LGE/*/LG-P769/*"},{"ua":"LG-P769"}],"dpi":[240.6,247.5],"bw":3,"ac":1000},{"type":"android","rules":[{"mdmh":"LGE/*/LGMS323/*"},{"ua":"LGMS323"}],"dpi":[206.6,204.6],"bw":3,"ac":1000},{"type":"android","rules":[{"mdmh":"LGE/*/LGLS996/*"},{"ua":"LGLS996"}],"dpi":[403.4,401.5],"bw":3,"ac":1000},{"type":"android","rules":[{"mdmh":"Micromax/*/4560MMX/*"},{"ua":"4560MMX"}],"dpi":[240,219.4],"bw":3,"ac":1000},{"type":"android","rules":[{"mdmh":"Micromax/*/A250/*"},{"ua":"Micromax A250"}],"dpi":[480,446.4],"bw":3,"ac":1000},{"type":"android","rules":[{"mdmh":"Micromax/*/Micromax AQ4501/*"},{"ua":"Micromax AQ4501"}],"dpi":240,"bw":3,"ac":500},{"type":"android","rules":[{"mdmh":"motorola/*/G5/*"},{"ua":"Moto G (5) Plus"}],"dpi":[403.4,403],"bw":3,"ac":1000},{"type":"android","rules":[{"mdmh":"motorola/*/DROID RAZR/*"},{"ua":"DROID RAZR"}],"dpi":[368.1,256.7],"bw":3,"ac":1000},{"type":"android","rules":[{"mdmh":"motorola/*/XT830C/*"},{"ua":"XT830C"}],"dpi":[254,255.9],"bw":3,"ac":1000},{"type":"android","rules":[{"mdmh":"motorola/*/XT1021/*"},{"ua":"XT1021"}],"dpi":[254,256.7],"bw":3,"ac":500},{"type":"android","rules":[{"mdmh":"motorola/*/XT1023/*"},{"ua":"XT1023"}],"dpi":[254,256.7],"bw":3,"ac":500},{"type":"android","rules":[{"mdmh":"motorola/*/XT1028/*"},{"ua":"XT1028"}],"dpi":[326.6,327.6],"bw":3,"ac":1000},{"type":"android","rules":[{"mdmh":"motorola/*/XT1034/*"},{"ua":"XT1034"}],"dpi":[326.6,328.4],"bw":3,"ac":500},{"type":"android","rules":[{"mdmh":"motorola/*/XT1053/*"},{"ua":"XT1053"}],"dpi":[315.3,316.1],"bw":3,"ac":1000},{"type":"android","rules":[{"mdmh":"motorola/*/XT1562/*"},{"ua":"XT1562"}],"dpi":[403.4,402.7],"bw":3,"ac":1000},{"type":"android","rules":[{"mdmh":"motorola/*/Nexus 6/*"},{"ua":"Nexus 6 B"}],"dpi":[494.3,489.7],"bw":3,"ac":1000},{"type":"android","rules":[{"mdmh":"motorola/*/XT1063/*"},{"ua":"XT1063"}],"dpi":[295,296.6],"bw":3,"ac":1000},{"type":"android","rules":[{"mdmh":"motorola/*/XT1064/*"},{"ua":"XT1064"}],"dpi":[295,295.6],"bw":3,"ac":500},{"type":"android","rules":[{"mdmh":"motorola/*/XT1092/*"},{"ua":"XT1092"}],"dpi":[422,424.1],"bw":3,"ac":500},{"type":"android","rules":[{"mdmh":"motorola/*/XT1095/*"},{"ua":"XT1095"}],"dpi":[422,423.4],"bw":3,"ac":1000},{"type":"android","rules":[{"mdmh":"motorola/*/G4/*"},{"ua":"Moto G (4)"}],"dpi":401,"bw":4,"ac":1000},{"type":"android","rules":[{"mdmh":"OnePlus/*/A0001/*"},{"ua":"A0001"}],"dpi":[403.4,401],"bw":3,"ac":1000},{"type":"android","rules":[{"mdmh":"OnePlus/*/ONE E1005/*"},{"ua":"ONE E1005"}],"dpi":[442.4,441.4],"bw":3,"ac":1000},{"type":"android","rules":[{"mdmh":"OnePlus/*/ONE A2005/*"},{"ua":"ONE A2005"}],"dpi":[391.9,405.4],"bw":3,"ac":1000},{"type":"android","rules":[{"mdmh":"OPPO/*/X909/*"},{"ua":"X909"}],"dpi":[442.4,444.1],"bw":3,"ac":1000},{"type":"android","rules":[{"mdmh":"samsung/*/GT-I9082/*"},{"ua":"GT-I9082"}],"dpi":[184.7,185.4],"bw":3,"ac":1000},{"type":"android","rules":[{"mdmh":"samsung/*/SM-G360P/*"},{"ua":"SM-G360P"}],"dpi":[196.7,205.4],"bw":3,"ac":1000},{"type":"android","rules":[{"mdmh":"samsung/*/Nexus S/*"},{"ua":"Nexus S"}],"dpi":[234.5,229.8],"bw":3,"ac":1000},{"type":"android","rules":[{"mdmh":"samsung/*/GT-I9300/*"},{"ua":"GT-I9300"}],"dpi":[304.8,303.9],"bw":5,"ac":500},{"type":"android","rules":[{"mdmh":"samsung/*/SM-T230NU/*"},{"ua":"SM-T230NU"}],"dpi":216,"bw":3,"ac":500},{"type":"android","rules":[{"mdmh":"samsung/*/SGH-T399/*"},{"ua":"SGH-T399"}],"dpi":[217.7,231.4],"bw":3,"ac":1000},{"type":"android","rules":[{"mdmh":"samsung/*/SGH-M919/*"},{"ua":"SGH-M919"}],"dpi":[440.8,437.7],"bw":3,"ac":1000},{"type":"android","rules":[{"mdmh":"samsung/*/SM-N9005/*"},{"ua":"SM-N9005"}],"dpi":[386.4,387],"bw":3,"ac":500},{"type":"android","rules":[{"mdmh":"samsung/*/SAMSUNG-SM-N900A/*"},{"ua":"SAMSUNG-SM-N900A"}],"dpi":[386.4,387.7],"bw":3,"ac":1000},{"type":"android","rules":[{"mdmh":"samsung/*/GT-I9500/*"},{"ua":"GT-I9500"}],"dpi":[442.5,443.3],"bw":3,"ac":500},{"type":"android","rules":[{"mdmh":"samsung/*/GT-I9505/*"},{"ua":"GT-I9505"}],"dpi":439.4,"bw":4,"ac":1000},{"type":"android","rules":[{"mdmh":"samsung/*/SM-G900F/*"},{"ua":"SM-G900F"}],"dpi":[415.6,431.6],"bw":5,"ac":1000},{"type":"android","rules":[{"mdmh":"samsung/*/SM-G900M/*"},{"ua":"SM-G900M"}],"dpi":[415.6,431.6],"bw":5,"ac":1000},{"type":"android","rules":[{"mdmh":"samsung/*/SM-G800F/*"},{"ua":"SM-G800F"}],"dpi":326.8,"bw":3,"ac":1000},{"type":"android","rules":[{"mdmh":"samsung/*/SM-G906S/*"},{"ua":"SM-G906S"}],"dpi":[562.7,572.4],"bw":3,"ac":1000},{"type":"android","rules":[{"mdmh":"samsung/*/GT-I9300/*"},{"ua":"GT-I9300"}],"dpi":[306.7,304.8],"bw":5,"ac":1000},{"type":"android","rules":[{"mdmh":"samsung/*/SM-T535/*"},{"ua":"SM-T535"}],"dpi":[142.6,136.4],"bw":3,"ac":500},{"type":"android","rules":[{"mdmh":"samsung/*/SM-N920C/*"},{"ua":"SM-N920C"}],"dpi":[515.1,518.4],"bw":3,"ac":1000},{"type":"android","rules":[{"mdmh":"samsung/*/SM-N920P/*"},{"ua":"SM-N920P"}],"dpi":[386.3655,390.144],"bw":3,"ac":1000},{"type":"android","rules":[{"mdmh":"samsung/*/SM-N920W8/*"},{"ua":"SM-N920W8"}],"dpi":[515.1,518.4],"bw":3,"ac":1000},{"type":"android","rules":[{"mdmh":"samsung/*/GT-I9300I/*"},{"ua":"GT-I9300I"}],"dpi":[304.8,305.8],"bw":3,"ac":1000},{"type":"android","rules":[{"mdmh":"samsung/*/GT-I9195/*"},{"ua":"GT-I9195"}],"dpi":[249.4,256.7],"bw":3,"ac":500},{"type":"android","rules":[{"mdmh":"samsung/*/SPH-L520/*"},{"ua":"SPH-L520"}],"dpi":[249.4,255.9],"bw":3,"ac":1000},{"type":"android","rules":[{"mdmh":"samsung/*/SAMSUNG-SGH-I717/*"},{"ua":"SAMSUNG-SGH-I717"}],"dpi":285.8,"bw":3,"ac":1000},{"type":"android","rules":[{"mdmh":"samsung/*/SPH-D710/*"},{"ua":"SPH-D710"}],"dpi":[217.7,204.2],"bw":3,"ac":1000},{"type":"android","rules":[{"mdmh":"samsung/*/GT-N7100/*"},{"ua":"GT-N7100"}],"dpi":265.1,"bw":3,"ac":1000},{"type":"android","rules":[{"mdmh":"samsung/*/SCH-I605/*"},{"ua":"SCH-I605"}],"dpi":265.1,"bw":3,"ac":1000},{"type":"android","rules":[{"mdmh":"samsung/*/Galaxy Nexus/*"},{"ua":"Galaxy Nexus"}],"dpi":[315.3,314.2],"bw":3,"ac":1000},{"type":"android","rules":[{"mdmh":"samsung/*/SM-N910H/*"},{"ua":"SM-N910H"}],"dpi":[515.1,518],"bw":3,"ac":1000},{"type":"android","rules":[{"mdmh":"samsung/*/SM-N910C/*"},{"ua":"SM-N910C"}],"dpi":[515.2,520.2],"bw":3,"ac":500},{"type":"android","rules":[{"mdmh":"samsung/*/SM-G130M/*"},{"ua":"SM-G130M"}],"dpi":[165.9,164.8],"bw":3,"ac":500},{"type":"android","rules":[{"mdmh":"samsung/*/SM-G928I/*"},{"ua":"SM-G928I"}],"dpi":[515.1,518.4],"bw":3,"ac":1000},{"type":"android","rules":[{"mdmh":"samsung/*/SM-G920F/*"},{"ua":"SM-G920F"}],"dpi":580.6,"bw":3,"ac":500},{"type":"android","rules":[{"mdmh":"samsung/*/SM-G920P/*"},{"ua":"SM-G920P"}],"dpi":[522.5,577],"bw":3,"ac":1000},{"type":"android","rules":[{"mdmh":"samsung/*/SM-G925F/*"},{"ua":"SM-G925F"}],"dpi":580.6,"bw":3,"ac":500},{"type":"android","rules":[{"mdmh":"samsung/*/SM-G925V/*"},{"ua":"SM-G925V"}],"dpi":[522.5,576.6],"bw":3,"ac":1000},{"type":"android","rules":[{"mdmh":"samsung/*/SM-G930F/*"},{"ua":"SM-G930F"}],"dpi":576.6,"bw":3,"ac":1000},{"type":"android","rules":[{"mdmh":"samsung/*/SM-G935F/*"},{"ua":"SM-G935F"}],"dpi":533,"bw":3,"ac":500},{"type":"android","rules":[{"mdmh":"samsung/*/SM-G950F/*"},{"ua":"SM-G950F"}],"dpi":[562.707,565.293],"bw":3,"ac":500},{"type":"android","rules":[{"mdmh":"samsung/*/SM-G955U/*"},{"ua":"SM-G955U"}],"dpi":[522.514,525.762],"bw":3,"ac":500},{"type":"android","rules":[{"mdmh":"Sony/*/C6903/*"},{"ua":"C6903"}],"dpi":[442.5,443.3],"bw":3,"ac":500},{"type":"android","rules":[{"mdmh":"Sony/*/D6653/*"},{"ua":"D6653"}],"dpi":[428.6,427.6],"bw":3,"ac":1000},{"type":"android","rules":[{"mdmh":"Sony/*/E6653/*"},{"ua":"E6653"}],"dpi":[428.6,425.7],"bw":3,"ac":1000},{"type":"android","rules":[{"mdmh":"Sony/*/E6853/*"},{"ua":"E6853"}],"dpi":[403.4,401.9],"bw":3,"ac":1000},{"type":"android","rules":[{"mdmh":"Sony/*/SGP321/*"},{"ua":"SGP321"}],"dpi":[224.7,224.1],"bw":3,"ac":500},{"type":"android","rules":[{"mdmh":"TCT/*/ALCATEL ONE TOUCH Fierce/*"},{"ua":"ALCATEL ONE TOUCH Fierce"}],"dpi":[240,247.5],"bw":3,"ac":1000},{"type":"android","rules":[{"mdmh":"THL/*/thl 5000/*"},{"ua":"thl 5000"}],"dpi":[480,443.3],"bw":3,"ac":1000},{"type":"android","rules":[{"mdmh":"Fly/*/IQ4412/*"},{"ua":"IQ4412"}],"dpi":307.9,"bw":3,"ac":1000},{"type":"android","rules":[{"mdmh":"ZTE/*/ZTE Blade L2/*"},{"ua":"ZTE Blade L2"}],"dpi":240,"bw":3,"ac":500},{"type":"ios","rules":[{"res":[640,960]}],"dpi":[325.1,328.4],"bw":4,"ac":1000},{"type":"ios","rules":[{"res":[640,1136]}],"dpi":[317.1,320.2],"bw":3,"ac":1000},{"type":"ios","rules":[{"res":[750,1334]}],"dpi":326.4,"bw":4,"ac":1000},{"type":"ios","rules":[{"res":[1242,2208]}],"dpi":[453.6,458.4],"bw":4,"ac":1000},{"type":"ios","rules":[{"res":[1125,2001]}],"dpi":[410.9,415.4],"bw":4,"ac":1000}];
-var dpdb$2 = {
+var last_updated = "2018-12-10T17:01:42Z";
+var devices = [{"type":"android","rules":[{"mdmh":"asus/*/Nexus 7/*"},{"ua":"Nexus 7"}],"dpi":[320.8,323],"bw":3,"ac":500},{"type":"android","rules":[{"mdmh":"asus/*/ASUS_Z00AD/*"},{"ua":"ASUS_Z00AD"}],"dpi":[403,404.6],"bw":3,"ac":1000},{"type":"android","rules":[{"mdmh":"Google/*/Pixel 2 XL/*"},{"ua":"Pixel 2 XL"}],"dpi":537.9,"bw":3,"ac":1000},{"type":"android","rules":[{"mdmh":"Google/*/Pixel 3 XL/*"},{"ua":"Pixel 3 XL"}],"dpi":[558.5,553.8],"bw":3,"ac":1000},{"type":"android","rules":[{"mdmh":"Google/*/Pixel XL/*"},{"ua":"Pixel XL"}],"dpi":[537.9,533],"bw":3,"ac":1000},{"type":"android","rules":[{"mdmh":"Google/*/Pixel 3/*"},{"ua":"Pixel 3"}],"dpi":442.4,"bw":3,"ac":1000},{"type":"android","rules":[{"mdmh":"Google/*/Pixel 2/*"},{"ua":"Pixel 2"}],"dpi":441,"bw":3,"ac":500},{"type":"android","rules":[{"mdmh":"Google/*/Pixel/*"},{"ua":"Pixel"}],"dpi":[432.6,436.7],"bw":3,"ac":1000},{"type":"android","rules":[{"mdmh":"HTC/*/HTC6435LVW/*"},{"ua":"HTC6435LVW"}],"dpi":[449.7,443.3],"bw":3,"ac":1000},{"type":"android","rules":[{"mdmh":"HTC/*/HTC One XL/*"},{"ua":"HTC One XL"}],"dpi":[315.3,314.6],"bw":3,"ac":1000},{"type":"android","rules":[{"mdmh":"htc/*/Nexus 9/*"},{"ua":"Nexus 9"}],"dpi":289,"bw":3,"ac":500},{"type":"android","rules":[{"mdmh":"HTC/*/HTC One M9/*"},{"ua":"HTC One M9"}],"dpi":[442.5,443.3],"bw":3,"ac":500},{"type":"android","rules":[{"mdmh":"HTC/*/HTC One_M8/*"},{"ua":"HTC One_M8"}],"dpi":[449.7,447.4],"bw":3,"ac":500},{"type":"android","rules":[{"mdmh":"HTC/*/HTC One/*"},{"ua":"HTC One"}],"dpi":472.8,"bw":3,"ac":1000},{"type":"android","rules":[{"mdmh":"Huawei/*/Nexus 6P/*"},{"ua":"Nexus 6P"}],"dpi":[515.1,518],"bw":3,"ac":1000},{"type":"android","rules":[{"mdmh":"Huawei/*/BLN-L24/*"},{"ua":"HONORBLN-L24"}],"dpi":480,"bw":4,"ac":500},{"type":"android","rules":[{"mdmh":"Huawei/*/BKL-L09/*"},{"ua":"BKL-L09"}],"dpi":403,"bw":3.47,"ac":500},{"type":"android","rules":[{"mdmh":"LENOVO/*/Lenovo PB2-690Y/*"},{"ua":"Lenovo PB2-690Y"}],"dpi":[457.2,454.713],"bw":3,"ac":500},{"type":"android","rules":[{"mdmh":"LGE/*/Nexus 5X/*"},{"ua":"Nexus 5X"}],"dpi":[422,419.9],"bw":3,"ac":1000},{"type":"android","rules":[{"mdmh":"LGE/*/LGMS345/*"},{"ua":"LGMS345"}],"dpi":[221.7,219.1],"bw":3,"ac":500},{"type":"android","rules":[{"mdmh":"LGE/*/LG-D800/*"},{"ua":"LG-D800"}],"dpi":[422,424.1],"bw":3,"ac":500},{"type":"android","rules":[{"mdmh":"LGE/*/LG-D850/*"},{"ua":"LG-D850"}],"dpi":[537.9,541.9],"bw":3,"ac":500},{"type":"android","rules":[{"mdmh":"LGE/*/VS985 4G/*"},{"ua":"VS985 4G"}],"dpi":[537.9,535.6],"bw":3,"ac":1000},{"type":"android","rules":[{"mdmh":"LGE/*/Nexus 5/*"},{"ua":"Nexus 5 B"}],"dpi":[442.4,444.8],"bw":3,"ac":1000},{"type":"android","rules":[{"mdmh":"LGE/*/Nexus 4/*"},{"ua":"Nexus 4"}],"dpi":[319.8,318.4],"bw":3,"ac":1000},{"type":"android","rules":[{"mdmh":"LGE/*/LG-P769/*"},{"ua":"LG-P769"}],"dpi":[240.6,247.5],"bw":3,"ac":1000},{"type":"android","rules":[{"mdmh":"LGE/*/LGMS323/*"},{"ua":"LGMS323"}],"dpi":[206.6,204.6],"bw":3,"ac":1000},{"type":"android","rules":[{"mdmh":"LGE/*/LGLS996/*"},{"ua":"LGLS996"}],"dpi":[403.4,401.5],"bw":3,"ac":1000},{"type":"android","rules":[{"mdmh":"Micromax/*/4560MMX/*"},{"ua":"4560MMX"}],"dpi":[240,219.4],"bw":3,"ac":1000},{"type":"android","rules":[{"mdmh":"Micromax/*/A250/*"},{"ua":"Micromax A250"}],"dpi":[480,446.4],"bw":3,"ac":1000},{"type":"android","rules":[{"mdmh":"Micromax/*/Micromax AQ4501/*"},{"ua":"Micromax AQ4501"}],"dpi":240,"bw":3,"ac":500},{"type":"android","rules":[{"mdmh":"motorola/*/G5/*"},{"ua":"Moto G (5) Plus"}],"dpi":[403.4,403],"bw":3,"ac":1000},{"type":"android","rules":[{"mdmh":"motorola/*/DROID RAZR/*"},{"ua":"DROID RAZR"}],"dpi":[368.1,256.7],"bw":3,"ac":1000},{"type":"android","rules":[{"mdmh":"motorola/*/XT830C/*"},{"ua":"XT830C"}],"dpi":[254,255.9],"bw":3,"ac":1000},{"type":"android","rules":[{"mdmh":"motorola/*/XT1021/*"},{"ua":"XT1021"}],"dpi":[254,256.7],"bw":3,"ac":500},{"type":"android","rules":[{"mdmh":"motorola/*/XT1023/*"},{"ua":"XT1023"}],"dpi":[254,256.7],"bw":3,"ac":500},{"type":"android","rules":[{"mdmh":"motorola/*/XT1028/*"},{"ua":"XT1028"}],"dpi":[326.6,327.6],"bw":3,"ac":1000},{"type":"android","rules":[{"mdmh":"motorola/*/XT1034/*"},{"ua":"XT1034"}],"dpi":[326.6,328.4],"bw":3,"ac":500},{"type":"android","rules":[{"mdmh":"motorola/*/XT1053/*"},{"ua":"XT1053"}],"dpi":[315.3,316.1],"bw":3,"ac":1000},{"type":"android","rules":[{"mdmh":"motorola/*/XT1562/*"},{"ua":"XT1562"}],"dpi":[403.4,402.7],"bw":3,"ac":1000},{"type":"android","rules":[{"mdmh":"motorola/*/Nexus 6/*"},{"ua":"Nexus 6 B"}],"dpi":[494.3,489.7],"bw":3,"ac":1000},{"type":"android","rules":[{"mdmh":"motorola/*/XT1063/*"},{"ua":"XT1063"}],"dpi":[295,296.6],"bw":3,"ac":1000},{"type":"android","rules":[{"mdmh":"motorola/*/XT1064/*"},{"ua":"XT1064"}],"dpi":[295,295.6],"bw":3,"ac":500},{"type":"android","rules":[{"mdmh":"motorola/*/XT1092/*"},{"ua":"XT1092"}],"dpi":[422,424.1],"bw":3,"ac":500},{"type":"android","rules":[{"mdmh":"motorola/*/XT1095/*"},{"ua":"XT1095"}],"dpi":[422,423.4],"bw":3,"ac":1000},{"type":"android","rules":[{"mdmh":"motorola/*/G4/*"},{"ua":"Moto G (4)"}],"dpi":401,"bw":4,"ac":1000},{"type":"android","rules":[{"mdmh":"OnePlus/*/A0001/*"},{"ua":"A0001"}],"dpi":[403.4,401],"bw":3,"ac":1000},{"type":"android","rules":[{"mdmh":"OnePlus/*/ONE E1005/*"},{"ua":"ONE E1005"}],"dpi":[442.4,441.4],"bw":3,"ac":1000},{"type":"android","rules":[{"mdmh":"OnePlus/*/ONE A2005/*"},{"ua":"ONE A2005"}],"dpi":[391.9,405.4],"bw":3,"ac":1000},{"type":"android","rules":[{"mdmh":"OnePlus/*/ONEPLUS A5000/*"},{"ua":"ONEPLUS A5000 "}],"dpi":[403.411,399.737],"bw":3,"ac":1000},{"type":"android","rules":[{"mdmh":"OnePlus/*/ONE A5010/*"},{"ua":"ONEPLUS A5010"}],"dpi":[403,400],"bw":2,"ac":1000},{"type":"android","rules":[{"mdmh":"OPPO/*/X909/*"},{"ua":"X909"}],"dpi":[442.4,444.1],"bw":3,"ac":1000},{"type":"android","rules":[{"mdmh":"samsung/*/GT-I9082/*"},{"ua":"GT-I9082"}],"dpi":[184.7,185.4],"bw":3,"ac":1000},{"type":"android","rules":[{"mdmh":"samsung/*/SM-G360P/*"},{"ua":"SM-G360P"}],"dpi":[196.7,205.4],"bw":3,"ac":1000},{"type":"android","rules":[{"mdmh":"samsung/*/Nexus S/*"},{"ua":"Nexus S"}],"dpi":[234.5,229.8],"bw":3,"ac":1000},{"type":"android","rules":[{"mdmh":"samsung/*/GT-I9300/*"},{"ua":"GT-I9300"}],"dpi":[304.8,303.9],"bw":5,"ac":500},{"type":"android","rules":[{"mdmh":"samsung/*/SM-T230NU/*"},{"ua":"SM-T230NU"}],"dpi":216,"bw":3,"ac":500},{"type":"android","rules":[{"mdmh":"samsung/*/SGH-T399/*"},{"ua":"SGH-T399"}],"dpi":[217.7,231.4],"bw":3,"ac":1000},{"type":"android","rules":[{"mdmh":"samsung/*/SGH-M919/*"},{"ua":"SGH-M919"}],"dpi":[440.8,437.7],"bw":3,"ac":1000},{"type":"android","rules":[{"mdmh":"samsung/*/SM-N9005/*"},{"ua":"SM-N9005"}],"dpi":[386.4,387],"bw":3,"ac":500},{"type":"android","rules":[{"mdmh":"samsung/*/SAMSUNG-SM-N900A/*"},{"ua":"SAMSUNG-SM-N900A"}],"dpi":[386.4,387.7],"bw":3,"ac":1000},{"type":"android","rules":[{"mdmh":"samsung/*/GT-I9500/*"},{"ua":"GT-I9500"}],"dpi":[442.5,443.3],"bw":3,"ac":500},{"type":"android","rules":[{"mdmh":"samsung/*/GT-I9505/*"},{"ua":"GT-I9505"}],"dpi":439.4,"bw":4,"ac":1000},{"type":"android","rules":[{"mdmh":"samsung/*/SM-G900F/*"},{"ua":"SM-G900F"}],"dpi":[415.6,431.6],"bw":5,"ac":1000},{"type":"android","rules":[{"mdmh":"samsung/*/SM-G900M/*"},{"ua":"SM-G900M"}],"dpi":[415.6,431.6],"bw":5,"ac":1000},{"type":"android","rules":[{"mdmh":"samsung/*/SM-G800F/*"},{"ua":"SM-G800F"}],"dpi":326.8,"bw":3,"ac":1000},{"type":"android","rules":[{"mdmh":"samsung/*/SM-G906S/*"},{"ua":"SM-G906S"}],"dpi":[562.7,572.4],"bw":3,"ac":1000},{"type":"android","rules":[{"mdmh":"samsung/*/GT-I9300/*"},{"ua":"GT-I9300"}],"dpi":[306.7,304.8],"bw":5,"ac":1000},{"type":"android","rules":[{"mdmh":"samsung/*/SM-T535/*"},{"ua":"SM-T535"}],"dpi":[142.6,136.4],"bw":3,"ac":500},{"type":"android","rules":[{"mdmh":"samsung/*/SM-N920C/*"},{"ua":"SM-N920C"}],"dpi":[515.1,518.4],"bw":3,"ac":1000},{"type":"android","rules":[{"mdmh":"samsung/*/SM-N920P/*"},{"ua":"SM-N920P"}],"dpi":[386.3655,390.144],"bw":3,"ac":1000},{"type":"android","rules":[{"mdmh":"samsung/*/SM-N920W8/*"},{"ua":"SM-N920W8"}],"dpi":[515.1,518.4],"bw":3,"ac":1000},{"type":"android","rules":[{"mdmh":"samsung/*/GT-I9300I/*"},{"ua":"GT-I9300I"}],"dpi":[304.8,305.8],"bw":3,"ac":1000},{"type":"android","rules":[{"mdmh":"samsung/*/GT-I9195/*"},{"ua":"GT-I9195"}],"dpi":[249.4,256.7],"bw":3,"ac":500},{"type":"android","rules":[{"mdmh":"samsung/*/SPH-L520/*"},{"ua":"SPH-L520"}],"dpi":[249.4,255.9],"bw":3,"ac":1000},{"type":"android","rules":[{"mdmh":"samsung/*/SAMSUNG-SGH-I717/*"},{"ua":"SAMSUNG-SGH-I717"}],"dpi":285.8,"bw":3,"ac":1000},{"type":"android","rules":[{"mdmh":"samsung/*/SPH-D710/*"},{"ua":"SPH-D710"}],"dpi":[217.7,204.2],"bw":3,"ac":1000},{"type":"android","rules":[{"mdmh":"samsung/*/GT-N7100/*"},{"ua":"GT-N7100"}],"dpi":265.1,"bw":3,"ac":1000},{"type":"android","rules":[{"mdmh":"samsung/*/SCH-I605/*"},{"ua":"SCH-I605"}],"dpi":265.1,"bw":3,"ac":1000},{"type":"android","rules":[{"mdmh":"samsung/*/Galaxy Nexus/*"},{"ua":"Galaxy Nexus"}],"dpi":[315.3,314.2],"bw":3,"ac":1000},{"type":"android","rules":[{"mdmh":"samsung/*/SM-N910H/*"},{"ua":"SM-N910H"}],"dpi":[515.1,518],"bw":3,"ac":1000},{"type":"android","rules":[{"mdmh":"samsung/*/SM-N910C/*"},{"ua":"SM-N910C"}],"dpi":[515.2,520.2],"bw":3,"ac":500},{"type":"android","rules":[{"mdmh":"samsung/*/SM-G130M/*"},{"ua":"SM-G130M"}],"dpi":[165.9,164.8],"bw":3,"ac":500},{"type":"android","rules":[{"mdmh":"samsung/*/SM-G928I/*"},{"ua":"SM-G928I"}],"dpi":[515.1,518.4],"bw":3,"ac":1000},{"type":"android","rules":[{"mdmh":"samsung/*/SM-G920F/*"},{"ua":"SM-G920F"}],"dpi":580.6,"bw":3,"ac":500},{"type":"android","rules":[{"mdmh":"samsung/*/SM-G920P/*"},{"ua":"SM-G920P"}],"dpi":[522.5,577],"bw":3,"ac":1000},{"type":"android","rules":[{"mdmh":"samsung/*/SM-G925F/*"},{"ua":"SM-G925F"}],"dpi":580.6,"bw":3,"ac":500},{"type":"android","rules":[{"mdmh":"samsung/*/SM-G925V/*"},{"ua":"SM-G925V"}],"dpi":[522.5,576.6],"bw":3,"ac":1000},{"type":"android","rules":[{"mdmh":"samsung/*/SM-G930F/*"},{"ua":"SM-G930F"}],"dpi":576.6,"bw":3,"ac":1000},{"type":"android","rules":[{"mdmh":"samsung/*/SM-G935F/*"},{"ua":"SM-G935F"}],"dpi":533,"bw":3,"ac":500},{"type":"android","rules":[{"mdmh":"samsung/*/SM-G950F/*"},{"ua":"SM-G950F"}],"dpi":[562.707,565.293],"bw":3,"ac":500},{"type":"android","rules":[{"mdmh":"samsung/*/SM-G955U/*"},{"ua":"SM-G955U"}],"dpi":[522.514,525.762],"bw":3,"ac":500},{"type":"android","rules":[{"mdmh":"samsung/*/SM-G955F/*"},{"ua":"SM-G955F"}],"dpi":[522.514,525.762],"bw":3,"ac":500},{"type":"android","rules":[{"mdmh":"Sony/*/C6903/*"},{"ua":"C6903"}],"dpi":[442.5,443.3],"bw":3,"ac":500},{"type":"android","rules":[{"mdmh":"Sony/*/D6653/*"},{"ua":"D6653"}],"dpi":[428.6,427.6],"bw":3,"ac":1000},{"type":"android","rules":[{"mdmh":"Sony/*/E6653/*"},{"ua":"E6653"}],"dpi":[428.6,425.7],"bw":3,"ac":1000},{"type":"android","rules":[{"mdmh":"Sony/*/E6853/*"},{"ua":"E6853"}],"dpi":[403.4,401.9],"bw":3,"ac":1000},{"type":"android","rules":[{"mdmh":"Sony/*/SGP321/*"},{"ua":"SGP321"}],"dpi":[224.7,224.1],"bw":3,"ac":500},{"type":"android","rules":[{"mdmh":"TCT/*/ALCATEL ONE TOUCH Fierce/*"},{"ua":"ALCATEL ONE TOUCH Fierce"}],"dpi":[240,247.5],"bw":3,"ac":1000},{"type":"android","rules":[{"mdmh":"THL/*/thl 5000/*"},{"ua":"thl 5000"}],"dpi":[480,443.3],"bw":3,"ac":1000},{"type":"android","rules":[{"mdmh":"Fly/*/IQ4412/*"},{"ua":"IQ4412"}],"dpi":307.9,"bw":3,"ac":1000},{"type":"android","rules":[{"mdmh":"ZTE/*/ZTE Blade L2/*"},{"ua":"ZTE Blade L2"}],"dpi":240,"bw":3,"ac":500},{"type":"android","rules":[{"mdmh":"BENEVE/*/VR518/*"},{"ua":"VR518"}],"dpi":480,"bw":3,"ac":500},{"type":"ios","rules":[{"res":[640,960]}],"dpi":[325.1,328.4],"bw":4,"ac":1000},{"type":"ios","rules":[{"res":[640,1136]}],"dpi":[317.1,320.2],"bw":3,"ac":1000},{"type":"ios","rules":[{"res":[750,1334]}],"dpi":326.4,"bw":4,"ac":1000},{"type":"ios","rules":[{"res":[1242,2208]}],"dpi":[453.6,458.4],"bw":4,"ac":1000},{"type":"ios","rules":[{"res":[1125,2001]}],"dpi":[410.9,415.4],"bw":4,"ac":1000},{"type":"ios","rules":[{"res":[1125,2436]}],"dpi":458,"bw":4,"ac":1000}];
+var DPDB_CACHE = {
format: format,
last_updated: last_updated,
devices: devices
};
-
-var dpdb$3 = Object.freeze({
- format: format,
- last_updated: last_updated,
- devices: devices,
- default: dpdb$2
-});
-
-var DPDB_CACHE = ( dpdb$3 && dpdb$2 ) || dpdb$3;
-
function Dpdb(url, onDeviceParamsUpdated) {
this.dpdb = DPDB_CACHE;
this.recalculateDeviceParams_();
@@ -1771,7 +1889,7 @@
var xhr = new XMLHttpRequest();
var obj = this;
xhr.open('GET', url, true);
- xhr.addEventListener('load', function() {
+ xhr.addEventListener('load', function () {
obj.loading = false;
if (xhr.status >= 200 && xhr.status <= 299) {
obj.dpdb = JSON.parse(xhr.response);
@@ -1783,10 +1901,10 @@
xhr.send();
}
}
-Dpdb.prototype.getDeviceParams = function() {
+Dpdb.prototype.getDeviceParams = function () {
return this.deviceParams;
};
-Dpdb.prototype.recalculateDeviceParams_ = function() {
+Dpdb.prototype.recalculateDeviceParams_ = function () {
var newDeviceParams = this.calcDeviceParams_();
if (newDeviceParams) {
this.deviceParams = newDeviceParams;
@@ -1797,7 +1915,7 @@
console.error('Failed to recalculate device parameters.');
}
};
-Dpdb.prototype.calcDeviceParams_ = function() {
+Dpdb.prototype.calcDeviceParams_ = function () {
var db = this.dpdb;
if (!db) {
console.error('DPDB not available.');
@@ -1812,8 +1930,8 @@
return null;
}
var userAgent = navigator.userAgent || navigator.vendor || window.opera;
- var width = util$2.getScreenWidth();
- var height = util$2.getScreenHeight();
+ var width = getScreenWidth();
+ var height = getScreenHeight();
if (!db.devices) {
console.error('DPDB has no devices section.');
return null;
@@ -1828,11 +1946,11 @@
console.warn('Device[' + i + '] has invalid type.');
continue;
}
- if (util$2.isIOS() != (device.type == 'ios')) continue;
+ if (isIOS() != (device.type == 'ios')) continue;
var matched = false;
for (var j = 0; j < device.rules.length; j++) {
var rule = device.rules[j];
- if (this.matchRule_(rule, userAgent, width, height)) {
+ if (this.ruleMatches_(rule, userAgent, width, height)) {
matched = true;
break;
}
@@ -1845,15 +1963,15 @@
console.warn('No DPDB device match.');
return null;
};
-Dpdb.prototype.matchRule_ = function(rule, ua, screenWidth, screenHeight) {
+Dpdb.prototype.ruleMatches_ = function (rule, ua, screenWidth, screenHeight) {
if (!rule.ua && !rule.res) return false;
+ if (rule.ua && rule.ua.substring(0, 2) === 'SM') rule.ua = rule.ua.substring(0, 7);
if (rule.ua && ua.indexOf(rule.ua) < 0) return false;
if (rule.res) {
if (!rule.res[0] || !rule.res[1]) return false;
var resX = rule.res[0];
var resY = rule.res[1];
- if (Math.min(screenWidth, screenHeight) != Math.min(resX, resY) ||
- (Math.max(screenWidth, screenHeight) != Math.max(resX, resY))) {
+ if (Math.min(screenWidth, screenHeight) != Math.min(resX, resY) || Math.max(screenWidth, screenHeight) != Math.max(resX, resY)) {
return false;
}
}
@@ -1864,64 +1982,59 @@
this.ydpi = params.ydpi;
this.bevelMm = params.bevelMm;
}
-var dpdb = Dpdb;
-
function SensorSample(sample, timestampS) {
this.set(sample, timestampS);
}
-SensorSample.prototype.set = function(sample, timestampS) {
+SensorSample.prototype.set = function (sample, timestampS) {
this.sample = sample;
this.timestampS = timestampS;
};
-SensorSample.prototype.copy = function(sensorSample) {
+SensorSample.prototype.copy = function (sensorSample) {
this.set(sensorSample.sample, sensorSample.timestampS);
};
-var sensorSample = SensorSample;
-
function ComplementaryFilter(kFilter, isDebug) {
this.kFilter = kFilter;
this.isDebug = isDebug;
- this.currentAccelMeasurement = new sensorSample();
- this.currentGyroMeasurement = new sensorSample();
- this.previousGyroMeasurement = new sensorSample();
- if (util$2.isIOS()) {
- this.filterQ = new mathUtil.Quaternion(-1, 0, 0, 1);
+ this.currentAccelMeasurement = new SensorSample();
+ this.currentGyroMeasurement = new SensorSample();
+ this.previousGyroMeasurement = new SensorSample();
+ if (isIOS()) {
+ this.filterQ = new Quaternion(-1, 0, 0, 1);
} else {
- this.filterQ = new mathUtil.Quaternion(1, 0, 0, 1);
+ this.filterQ = new Quaternion(1, 0, 0, 1);
}
- this.previousFilterQ = new mathUtil.Quaternion();
+ this.previousFilterQ = new Quaternion();
this.previousFilterQ.copy(this.filterQ);
- this.accelQ = new mathUtil.Quaternion();
+ this.accelQ = new Quaternion();
this.isOrientationInitialized = false;
- this.estimatedGravity = new mathUtil.Vector3();
- this.measuredGravity = new mathUtil.Vector3();
- this.gyroIntegralQ = new mathUtil.Quaternion();
+ this.estimatedGravity = new Vector3();
+ this.measuredGravity = new Vector3();
+ this.gyroIntegralQ = new Quaternion();
}
-ComplementaryFilter.prototype.addAccelMeasurement = function(vector, timestampS) {
+ComplementaryFilter.prototype.addAccelMeasurement = function (vector, timestampS) {
this.currentAccelMeasurement.set(vector, timestampS);
};
-ComplementaryFilter.prototype.addGyroMeasurement = function(vector, timestampS) {
+ComplementaryFilter.prototype.addGyroMeasurement = function (vector, timestampS) {
this.currentGyroMeasurement.set(vector, timestampS);
var deltaT = timestampS - this.previousGyroMeasurement.timestampS;
- if (util$2.isTimestampDeltaValid(deltaT)) {
+ if (isTimestampDeltaValid(deltaT)) {
this.run_();
}
this.previousGyroMeasurement.copy(this.currentGyroMeasurement);
};
-ComplementaryFilter.prototype.run_ = function() {
+ComplementaryFilter.prototype.run_ = function () {
if (!this.isOrientationInitialized) {
this.accelQ = this.accelToQuaternion_(this.currentAccelMeasurement.sample);
this.previousFilterQ.copy(this.accelQ);
this.isOrientationInitialized = true;
return;
}
- var deltaT = this.currentGyroMeasurement.timestampS -
- this.previousGyroMeasurement.timestampS;
+ var deltaT = this.currentGyroMeasurement.timestampS - this.previousGyroMeasurement.timestampS;
var gyroDeltaQ = this.gyroToQuaternionDelta_(this.currentGyroMeasurement.sample, deltaT);
this.gyroIntegralQ.multiply(gyroDeltaQ);
this.filterQ.copy(this.previousFilterQ);
this.filterQ.multiply(gyroDeltaQ);
- var invFilterQ = new mathUtil.Quaternion();
+ var invFilterQ = new Quaternion();
invFilterQ.copy(this.filterQ);
invFilterQ.inverse();
this.estimatedGravity.set(0, 0, -1);
@@ -1929,75 +2042,64 @@
this.estimatedGravity.normalize();
this.measuredGravity.copy(this.currentAccelMeasurement.sample);
this.measuredGravity.normalize();
- var deltaQ = new mathUtil.Quaternion();
+ var deltaQ = new Quaternion();
deltaQ.setFromUnitVectors(this.estimatedGravity, this.measuredGravity);
deltaQ.inverse();
if (this.isDebug) {
- console.log('Delta: %d deg, G_est: (%s, %s, %s), G_meas: (%s, %s, %s)',
- mathUtil.radToDeg * util$2.getQuaternionAngle(deltaQ),
- (this.estimatedGravity.x).toFixed(1),
- (this.estimatedGravity.y).toFixed(1),
- (this.estimatedGravity.z).toFixed(1),
- (this.measuredGravity.x).toFixed(1),
- (this.measuredGravity.y).toFixed(1),
- (this.measuredGravity.z).toFixed(1));
+ console.log('Delta: %d deg, G_est: (%s, %s, %s), G_meas: (%s, %s, %s)', radToDeg * getQuaternionAngle(deltaQ), this.estimatedGravity.x.toFixed(1), this.estimatedGravity.y.toFixed(1), this.estimatedGravity.z.toFixed(1), this.measuredGravity.x.toFixed(1), this.measuredGravity.y.toFixed(1), this.measuredGravity.z.toFixed(1));
}
- var targetQ = new mathUtil.Quaternion();
+ var targetQ = new Quaternion();
targetQ.copy(this.filterQ);
targetQ.multiply(deltaQ);
this.filterQ.slerp(targetQ, 1 - this.kFilter);
this.previousFilterQ.copy(this.filterQ);
};
-ComplementaryFilter.prototype.getOrientation = function() {
+ComplementaryFilter.prototype.getOrientation = function () {
return this.filterQ;
};
-ComplementaryFilter.prototype.accelToQuaternion_ = function(accel) {
- var normAccel = new mathUtil.Vector3();
+ComplementaryFilter.prototype.accelToQuaternion_ = function (accel) {
+ var normAccel = new Vector3();
normAccel.copy(accel);
normAccel.normalize();
- var quat = new mathUtil.Quaternion();
- quat.setFromUnitVectors(new mathUtil.Vector3(0, 0, -1), normAccel);
+ var quat = new Quaternion();
+ quat.setFromUnitVectors(new Vector3(0, 0, -1), normAccel);
quat.inverse();
return quat;
};
-ComplementaryFilter.prototype.gyroToQuaternionDelta_ = function(gyro, dt) {
- var quat = new mathUtil.Quaternion();
- var axis = new mathUtil.Vector3();
+ComplementaryFilter.prototype.gyroToQuaternionDelta_ = function (gyro, dt) {
+ var quat = new Quaternion();
+ var axis = new Vector3();
axis.copy(gyro);
axis.normalize();
quat.setFromAxisAngle(axis, gyro.length() * dt);
return quat;
};
-var complementaryFilter = ComplementaryFilter;
-
function PosePredictor(predictionTimeS, isDebug) {
this.predictionTimeS = predictionTimeS;
this.isDebug = isDebug;
- this.previousQ = new mathUtil.Quaternion();
+ this.previousQ = new Quaternion();
this.previousTimestampS = null;
- this.deltaQ = new mathUtil.Quaternion();
- this.outQ = new mathUtil.Quaternion();
+ this.deltaQ = new Quaternion();
+ this.outQ = new Quaternion();
}
-PosePredictor.prototype.getPrediction = function(currentQ, gyro, timestampS) {
+PosePredictor.prototype.getPrediction = function (currentQ, gyro, timestampS) {
if (!this.previousTimestampS) {
this.previousQ.copy(currentQ);
this.previousTimestampS = timestampS;
return currentQ;
}
- var axis = new mathUtil.Vector3();
+ var axis = new Vector3();
axis.copy(gyro);
axis.normalize();
var angularSpeed = gyro.length();
- if (angularSpeed < mathUtil.degToRad * 20) {
+ if (angularSpeed < degToRad * 20) {
if (this.isDebug) {
- console.log('Moving slowly, at %s deg/s: no prediction',
- (mathUtil.radToDeg * angularSpeed).toFixed(1));
+ console.log('Moving slowly, at %s deg/s: no prediction', (radToDeg * angularSpeed).toFixed(1));
}
this.outQ.copy(currentQ);
this.previousQ.copy(currentQ);
return this.outQ;
}
- var deltaT = timestampS - this.previousTimestampS;
var predictAngle = angularSpeed * this.predictionTimeS;
this.deltaQ.setFromAxisAngle(axis, predictAngle);
this.outQ.copy(this.previousQ);
@@ -2006,96 +2108,81 @@
this.previousTimestampS = timestampS;
return this.outQ;
};
-var posePredictor = PosePredictor;
-
-var ROTATE_SPEED = 0.5;
-function TouchPanner() {
- window.addEventListener('touchstart', this.onTouchStart_.bind(this));
- window.addEventListener('touchmove', this.onTouchMove_.bind(this));
- window.addEventListener('touchend', this.onTouchEnd_.bind(this));
- this.isTouching = false;
- this.rotateStart = new mathUtil.Vector2();
- this.rotateEnd = new mathUtil.Vector2();
- this.rotateDelta = new mathUtil.Vector2();
- this.theta = 0;
- this.orientation = new mathUtil.Quaternion();
-}
-TouchPanner.prototype.getOrientation = function() {
- this.orientation.setFromEulerXYZ(0, 0, this.theta);
- return this.orientation;
-};
-TouchPanner.prototype.resetSensor = function() {
- this.theta = 0;
-};
-TouchPanner.prototype.onTouchStart_ = function(e) {
- if (!e.touches || e.touches.length != 1) {
- return;
- }
- this.rotateStart.set(e.touches[0].pageX, e.touches[0].pageY);
- this.isTouching = true;
-};
-TouchPanner.prototype.onTouchMove_ = function(e) {
- if (!this.isTouching) {
- return;
- }
- this.rotateEnd.set(e.touches[0].pageX, e.touches[0].pageY);
- this.rotateDelta.subVectors(this.rotateEnd, this.rotateStart);
- this.rotateStart.copy(this.rotateEnd);
- if (util$2.isIOS()) {
- this.rotateDelta.x *= -1;
- }
- var element = document.body;
- this.theta += 2 * Math.PI * this.rotateDelta.x / element.clientWidth * ROTATE_SPEED;
-};
-TouchPanner.prototype.onTouchEnd_ = function(e) {
- this.isTouching = false;
-};
-var touchPanner = TouchPanner;
-
-function FusionPoseSensor(kFilter, predictionTime, touchPannerDisabled, yawOnly, isDebug) {
- this.deviceId = 'webvr-polyfill:fused';
- this.deviceName = 'VR Position Device (webvr-polyfill:fused)';
- this.touchPannerDisabled = touchPannerDisabled;
+function FusionPoseSensor(kFilter, predictionTime, yawOnly, isDebug) {
this.yawOnly = yawOnly;
- this.accelerometer = new mathUtil.Vector3();
- this.gyroscope = new mathUtil.Vector3();
- this.start();
- this.filter = new complementaryFilter(kFilter, isDebug);
- this.posePredictor = new posePredictor(predictionTime, isDebug);
- this.touchPanner = new touchPanner();
- this.filterToWorldQ = new mathUtil.Quaternion();
- if (util$2.isIOS()) {
- this.filterToWorldQ.setFromAxisAngle(new mathUtil.Vector3(1, 0, 0), Math.PI / 2);
+ this.accelerometer = new Vector3();
+ this.gyroscope = new Vector3();
+ this.filter = new ComplementaryFilter(kFilter, isDebug);
+ this.posePredictor = new PosePredictor(predictionTime, isDebug);
+ this.isFirefoxAndroid = isFirefoxAndroid();
+ this.isIOS = isIOS();
+ var chromeVersion = getChromeVersion();
+ this.isDeviceMotionInRadians = !this.isIOS && chromeVersion && chromeVersion < 66;
+ this.isWithoutDeviceMotion = isChromeWithoutDeviceMotion();
+ this.filterToWorldQ = new Quaternion();
+ if (isIOS()) {
+ this.filterToWorldQ.setFromAxisAngle(new Vector3(1, 0, 0), Math.PI / 2);
} else {
- this.filterToWorldQ.setFromAxisAngle(new mathUtil.Vector3(1, 0, 0), -Math.PI / 2);
+ this.filterToWorldQ.setFromAxisAngle(new Vector3(1, 0, 0), -Math.PI / 2);
}
- this.inverseWorldToScreenQ = new mathUtil.Quaternion();
- this.worldToScreenQ = new mathUtil.Quaternion();
- this.originalPoseAdjustQ = new mathUtil.Quaternion();
- this.originalPoseAdjustQ.setFromAxisAngle(new mathUtil.Vector3(0, 0, 1),
- -window.orientation * Math.PI / 180);
+ this.inverseWorldToScreenQ = new Quaternion();
+ this.worldToScreenQ = new Quaternion();
+ this.originalPoseAdjustQ = new Quaternion();
+ this.originalPoseAdjustQ.setFromAxisAngle(new Vector3(0, 0, 1), -window.orientation * Math.PI / 180);
this.setScreenTransform_();
- if (util$2.isLandscapeMode()) {
+ if (isLandscapeMode()) {
this.filterToWorldQ.multiply(this.inverseWorldToScreenQ);
}
- this.resetQ = new mathUtil.Quaternion();
- this.isFirefoxAndroid = util$2.isFirefoxAndroid();
- this.isIOS = util$2.isIOS();
+ this.resetQ = new Quaternion();
this.orientationOut_ = new Float32Array(4);
+ this.start();
}
-FusionPoseSensor.prototype.getPosition = function() {
+FusionPoseSensor.prototype.getPosition = function () {
return null;
};
-FusionPoseSensor.prototype.getOrientation = function() {
- var orientation = this.filter.getOrientation();
- this.predictedQ = this.posePredictor.getPrediction(orientation, this.gyroscope, this.previousTimestampS);
- var out = new mathUtil.Quaternion();
+FusionPoseSensor.prototype.getOrientation = function () {
+ var orientation = void 0;
+ if (this.isWithoutDeviceMotion && this._deviceOrientationQ) {
+ this.deviceOrientationFixQ = this.deviceOrientationFixQ || function () {
+ var z = new Quaternion().setFromAxisAngle(new Vector3(0, 0, -1), 0);
+ var y = new Quaternion();
+ if (window.orientation === -90) {
+ y.setFromAxisAngle(new Vector3(0, 1, 0), Math.PI / -2);
+ } else {
+ y.setFromAxisAngle(new Vector3(0, 1, 0), Math.PI / 2);
+ }
+ return z.multiply(y);
+ }();
+ this.deviceOrientationFilterToWorldQ = this.deviceOrientationFilterToWorldQ || function () {
+ var q = new Quaternion();
+ q.setFromAxisAngle(new Vector3(1, 0, 0), -Math.PI / 2);
+ return q;
+ }();
+ orientation = this._deviceOrientationQ;
+ var out = new Quaternion();
+ out.copy(orientation);
+ out.multiply(this.deviceOrientationFilterToWorldQ);
+ out.multiply(this.resetQ);
+ out.multiply(this.worldToScreenQ);
+ out.multiplyQuaternions(this.deviceOrientationFixQ, out);
+ if (this.yawOnly) {
+ out.x = 0;
+ out.z = 0;
+ out.normalize();
+ }
+ this.orientationOut_[0] = out.x;
+ this.orientationOut_[1] = out.y;
+ this.orientationOut_[2] = out.z;
+ this.orientationOut_[3] = out.w;
+ return this.orientationOut_;
+ } else {
+ var filterOrientation = this.filter.getOrientation();
+ orientation = this.posePredictor.getPrediction(filterOrientation, this.gyroscope, this.previousTimestampS);
+ }
+ var out = new Quaternion();
out.copy(this.filterToWorldQ);
out.multiply(this.resetQ);
- if (!this.touchPannerDisabled) {
- out.multiply(this.touchPanner.getOrientation());
- }
- out.multiply(this.predictedQ);
+ out.multiply(orientation);
out.multiply(this.worldToScreenQ);
if (this.yawOnly) {
out.x = 0;
@@ -2108,51 +2195,61 @@
this.orientationOut_[3] = out.w;
return this.orientationOut_;
};
-FusionPoseSensor.prototype.resetPose = function() {
+FusionPoseSensor.prototype.resetPose = function () {
this.resetQ.copy(this.filter.getOrientation());
this.resetQ.x = 0;
this.resetQ.y = 0;
this.resetQ.z *= -1;
this.resetQ.normalize();
- if (util$2.isLandscapeMode()) {
+ if (isLandscapeMode()) {
this.resetQ.multiply(this.inverseWorldToScreenQ);
}
this.resetQ.multiply(this.originalPoseAdjustQ);
- if (!this.touchPannerDisabled) {
- this.touchPanner.resetSensor();
- }
};
-FusionPoseSensor.prototype.onDeviceMotion_ = function(deviceMotion) {
+FusionPoseSensor.prototype.onDeviceOrientation_ = function (e) {
+ this._deviceOrientationQ = this._deviceOrientationQ || new Quaternion();
+ var alpha = e.alpha,
+ beta = e.beta,
+ gamma = e.gamma;
+ alpha = (alpha || 0) * Math.PI / 180;
+ beta = (beta || 0) * Math.PI / 180;
+ gamma = (gamma || 0) * Math.PI / 180;
+ this._deviceOrientationQ.setFromEulerYXZ(beta, alpha, -gamma);
+};
+FusionPoseSensor.prototype.onDeviceMotion_ = function (deviceMotion) {
this.updateDeviceMotion_(deviceMotion);
};
-FusionPoseSensor.prototype.updateDeviceMotion_ = function(deviceMotion) {
+FusionPoseSensor.prototype.updateDeviceMotion_ = function (deviceMotion) {
var accGravity = deviceMotion.accelerationIncludingGravity;
var rotRate = deviceMotion.rotationRate;
var timestampS = deviceMotion.timeStamp / 1000;
var deltaS = timestampS - this.previousTimestampS;
- if (deltaS <= util$2.MIN_TIMESTEP || deltaS > util$2.MAX_TIMESTEP) {
- console.warn('Invalid timestamps detected. Time step between successive ' +
- 'gyroscope sensor samples is very small or not monotonic');
+ if (deltaS < 0) {
+ warnOnce('fusion-pose-sensor:invalid:non-monotonic', 'Invalid timestamps detected: non-monotonic timestamp from devicemotion');
+ this.previousTimestampS = timestampS;
+ return;
+ } else if (deltaS <= MIN_TIMESTEP || deltaS > MAX_TIMESTEP) {
+ warnOnce('fusion-pose-sensor:invalid:outside-threshold', 'Invalid timestamps detected: Timestamp from devicemotion outside expected range.');
this.previousTimestampS = timestampS;
return;
}
this.accelerometer.set(-accGravity.x, -accGravity.y, -accGravity.z);
- if (util$2.isR7()) {
+ if (isR7()) {
this.gyroscope.set(-rotRate.beta, rotRate.alpha, rotRate.gamma);
} else {
this.gyroscope.set(rotRate.alpha, rotRate.beta, rotRate.gamma);
}
- if (this.isIOS || this.isFirefoxAndroid) {
+ if (!this.isDeviceMotionInRadians) {
this.gyroscope.multiplyScalar(Math.PI / 180);
}
this.filter.addAccelMeasurement(this.accelerometer, timestampS);
this.filter.addGyroMeasurement(this.gyroscope, timestampS);
this.previousTimestampS = timestampS;
};
-FusionPoseSensor.prototype.onOrientationChange_ = function(screenOrientation) {
+FusionPoseSensor.prototype.onOrientationChange_ = function (screenOrientation) {
this.setScreenTransform_();
};
-FusionPoseSensor.prototype.onMessage_ = function(event) {
+FusionPoseSensor.prototype.onMessage_ = function (event) {
var message = event.data;
if (!message || !message.type) {
return;
@@ -2163,16 +2260,16 @@
}
this.updateDeviceMotion_(message.deviceMotionEvent);
};
-FusionPoseSensor.prototype.setScreenTransform_ = function() {
+FusionPoseSensor.prototype.setScreenTransform_ = function () {
this.worldToScreenQ.set(0, 0, 0, 1);
switch (window.orientation) {
case 0:
break;
case 90:
- this.worldToScreenQ.setFromAxisAngle(new mathUtil.Vector3(0, 0, 1), -Math.PI / 2);
+ this.worldToScreenQ.setFromAxisAngle(new Vector3(0, 0, 1), -Math.PI / 2);
break;
case -90:
- this.worldToScreenQ.setFromAxisAngle(new mathUtil.Vector3(0, 0, 1), Math.PI / 2);
+ this.worldToScreenQ.setFromAxisAngle(new Vector3(0, 0, 1), Math.PI / 2);
break;
case 180:
break;
@@ -2180,23 +2277,134 @@
this.inverseWorldToScreenQ.copy(this.worldToScreenQ);
this.inverseWorldToScreenQ.inverse();
};
-FusionPoseSensor.prototype.start = function() {
+FusionPoseSensor.prototype.start = function () {
this.onDeviceMotionCallback_ = this.onDeviceMotion_.bind(this);
this.onOrientationChangeCallback_ = this.onOrientationChange_.bind(this);
this.onMessageCallback_ = this.onMessage_.bind(this);
- if (util$2.isIOS() && util$2.isInsideCrossDomainIFrame()) {
+ this.onDeviceOrientationCallback_ = this.onDeviceOrientation_.bind(this);
+ if (isIOS() && isInsideCrossOriginIFrame()) {
window.addEventListener('message', this.onMessageCallback_);
}
window.addEventListener('orientationchange', this.onOrientationChangeCallback_);
- window.addEventListener('devicemotion', this.onDeviceMotionCallback_);
+ if (this.isWithoutDeviceMotion) {
+ window.addEventListener('deviceorientation', this.onDeviceOrientationCallback_);
+ } else {
+ window.addEventListener('devicemotion', this.onDeviceMotionCallback_);
+ }
};
-FusionPoseSensor.prototype.stop = function() {
+FusionPoseSensor.prototype.stop = function () {
window.removeEventListener('devicemotion', this.onDeviceMotionCallback_);
+ window.removeEventListener('deviceorientation', this.onDeviceOrientationCallback_);
window.removeEventListener('orientationchange', this.onOrientationChangeCallback_);
window.removeEventListener('message', this.onMessageCallback_);
};
-var fusionPoseSensor = FusionPoseSensor;
-
+var SENSOR_FREQUENCY = 60;
+var X_AXIS = new Vector3(1, 0, 0);
+var Z_AXIS = new Vector3(0, 0, 1);
+var SENSOR_TO_VR = new Quaternion();
+SENSOR_TO_VR.setFromAxisAngle(X_AXIS, -Math.PI / 2);
+SENSOR_TO_VR.multiply(new Quaternion().setFromAxisAngle(Z_AXIS, Math.PI / 2));
+var PoseSensor = function () {
+ function PoseSensor(config) {
+ classCallCheck(this, PoseSensor);
+ this.config = config;
+ this.sensor = null;
+ this.fusionSensor = null;
+ this._out = new Float32Array(4);
+ this.api = null;
+ this.errors = [];
+ this._sensorQ = new Quaternion();
+ this._outQ = new Quaternion();
+ this._onSensorRead = this._onSensorRead.bind(this);
+ this._onSensorError = this._onSensorError.bind(this);
+ this.init();
+ }
+ createClass(PoseSensor, [{
+ key: 'init',
+ value: function init() {
+ var sensor = null;
+ try {
+ sensor = new RelativeOrientationSensor({
+ frequency: SENSOR_FREQUENCY,
+ referenceFrame: 'screen'
+ });
+ sensor.addEventListener('error', this._onSensorError);
+ } catch (error) {
+ this.errors.push(error);
+ if (error.name === 'SecurityError') {
+ console.error('Cannot construct sensors due to the Feature Policy');
+ console.warn('Attempting to fall back using "devicemotion"; however this will ' + 'fail in the future without correct permissions.');
+ this.useDeviceMotion();
+ } else if (error.name === 'ReferenceError') {
+ this.useDeviceMotion();
+ } else {
+ console.error(error);
+ }
+ }
+ if (sensor) {
+ this.api = 'sensor';
+ this.sensor = sensor;
+ this.sensor.addEventListener('reading', this._onSensorRead);
+ this.sensor.start();
+ }
+ }
+ }, {
+ key: 'useDeviceMotion',
+ value: function useDeviceMotion() {
+ this.api = 'devicemotion';
+ this.fusionSensor = new FusionPoseSensor(this.config.K_FILTER, this.config.PREDICTION_TIME_S, this.config.YAW_ONLY, this.config.DEBUG);
+ if (this.sensor) {
+ this.sensor.removeEventListener('reading', this._onSensorRead);
+ this.sensor.removeEventListener('error', this._onSensorError);
+ this.sensor = null;
+ }
+ }
+ }, {
+ key: 'getOrientation',
+ value: function getOrientation() {
+ if (this.fusionSensor) {
+ return this.fusionSensor.getOrientation();
+ }
+ if (!this.sensor || !this.sensor.quaternion) {
+ this._out[0] = this._out[1] = this._out[2] = 0;
+ this._out[3] = 1;
+ return this._out;
+ }
+ var q = this.sensor.quaternion;
+ this._sensorQ.set(q[0], q[1], q[2], q[3]);
+ var out = this._outQ;
+ out.copy(SENSOR_TO_VR);
+ out.multiply(this._sensorQ);
+ if (this.config.YAW_ONLY) {
+ out.x = out.z = 0;
+ out.normalize();
+ }
+ this._out[0] = out.x;
+ this._out[1] = out.y;
+ this._out[2] = out.z;
+ this._out[3] = out.w;
+ return this._out;
+ }
+ }, {
+ key: '_onSensorError',
+ value: function _onSensorError(event) {
+ this.errors.push(event.error);
+ if (event.error.name === 'NotAllowedError') {
+ console.error('Permission to access sensor was denied');
+ } else if (event.error.name === 'NotReadableError') {
+ console.error('Sensor could not be read');
+ } else {
+ console.error(event.error);
+ }
+ this.useDeviceMotion();
+ }
+ }, {
+ key: '_onSensorRead',
+ value: function _onSensorRead() {}
+ }]);
+ return PoseSensor;
+}();
+var rotateInstructionsAsset = "<svg width='198' height='240' viewBox='0 0 198 240' xmlns='http://www.w3.org/2000/svg'><g fill='none' fill-rule='evenodd'><path d='M149.625 109.527l6.737 3.891v.886c0 .177.013.36.038.549.01.081.02.162.027.242.14 1.415.974 2.998 2.105 3.999l5.72 5.062.081-.09s4.382-2.53 5.235-3.024l25.97 14.993v54.001c0 .771-.386 1.217-.948 1.217-.233 0-.495-.076-.772-.236l-23.967-13.838-.014.024-27.322 15.775-.85-1.323c-4.731-1.529-9.748-2.74-14.951-3.61a.27.27 0 0 0-.007.024l-5.067 16.961-7.891 4.556-.037-.063v27.59c0 .772-.386 1.217-.948 1.217-.232 0-.495-.076-.772-.236l-42.473-24.522c-.95-.549-1.72-1.877-1.72-2.967v-1.035l-.021.047a5.111 5.111 0 0 0-1.816-.399 5.682 5.682 0 0 0-.546.001 13.724 13.724 0 0 1-1.918-.041c-1.655-.153-3.2-.6-4.404-1.296l-46.576-26.89.005.012-10.278-18.75c-1.001-1.827-.241-4.216 1.698-5.336l56.011-32.345a4.194 4.194 0 0 1 2.099-.572c1.326 0 2.572.659 3.227 1.853l.005-.003.227.413-.006.004a9.63 9.63 0 0 0 1.477 2.018l.277.27c1.914 1.85 4.468 2.801 7.113 2.801 1.949 0 3.948-.517 5.775-1.572.013 0 7.319-4.219 7.319-4.219a4.194 4.194 0 0 1 2.099-.572c1.326 0 2.572.658 3.226 1.853l3.25 5.928.022-.018 6.785 3.917-.105-.182 46.881-26.965m0-1.635c-.282 0-.563.073-.815.218l-46.169 26.556-5.41-3.124-3.005-5.481c-.913-1.667-2.699-2.702-4.66-2.703-1.011 0-2.02.274-2.917.792a3825 3825 0 0 1-7.275 4.195l-.044.024a9.937 9.937 0 0 1-4.957 1.353c-2.292 0-4.414-.832-5.976-2.342l-.252-.245a7.992 7.992 0 0 1-1.139-1.534 1.379 1.379 0 0 0-.06-.122l-.227-.414a1.718 1.718 0 0 0-.095-.154c-.938-1.574-2.673-2.545-4.571-2.545-1.011 0-2.02.274-2.917.792L3.125 155.502c-2.699 1.559-3.738 4.94-2.314 7.538l10.278 18.75c.177.323.448.563.761.704l46.426 26.804c1.403.81 3.157 1.332 5.072 1.508a15.661 15.661 0 0 0 2.146.046 4.766 4.766 0 0 1 .396 0c.096.004.19.011.283.022.109 1.593 1.159 3.323 2.529 4.114l42.472 24.522c.524.302 1.058.455 1.59.455 1.497 0 2.583-1.2 2.583-2.852v-26.562l7.111-4.105a1.64 1.64 0 0 0 .749-.948l4.658-15.593c4.414.797 8.692 1.848 12.742 3.128l.533.829a1.634 1.634 0 0 0 2.193.531l26.532-15.317L193 192.433c.523.302 1.058.455 1.59.455 1.497 0 2.583-1.199 2.583-2.852v-54.001c0-.584-.312-1.124-.818-1.416l-25.97-14.993a1.633 1.633 0 0 0-1.636.001c-.606.351-2.993 1.73-4.325 2.498l-4.809-4.255c-.819-.725-1.461-1.933-1.561-2.936a7.776 7.776 0 0 0-.033-.294 2.487 2.487 0 0 1-.023-.336v-.886c0-.584-.312-1.123-.817-1.416l-6.739-3.891a1.633 1.633 0 0 0-.817-.219' fill='#455A64'/><path d='M96.027 132.636l46.576 26.891c1.204.695 1.979 1.587 2.242 2.541l-.01.007-81.374 46.982h-.001c-1.654-.152-3.199-.6-4.403-1.295l-46.576-26.891 83.546-48.235' fill='#FAFAFA'/><path d='M63.461 209.174c-.008 0-.015 0-.022-.002-1.693-.156-3.228-.609-4.441-1.309l-46.576-26.89a.118.118 0 0 1 0-.203l83.546-48.235a.117.117 0 0 1 .117 0l46.576 26.891c1.227.708 2.021 1.612 2.296 2.611a.116.116 0 0 1-.042.124l-.021.016-81.375 46.981a.11.11 0 0 1-.058.016zm-50.747-28.303l46.401 26.79c1.178.68 2.671 1.121 4.32 1.276l81.272-46.922c-.279-.907-1.025-1.73-2.163-2.387l-46.517-26.857-83.313 48.1z' fill='#607D8B'/><path d='M148.327 165.471a5.85 5.85 0 0 1-.546.001c-1.894-.083-3.302-1.038-3.145-2.132a2.693 2.693 0 0 0-.072-1.105l-81.103 46.822c.628.058 1.272.073 1.918.042.182-.009.364-.009.546-.001 1.894.083 3.302 1.038 3.145 2.132l79.257-45.759' fill='#FFF'/><path d='M69.07 211.347a.118.118 0 0 1-.115-.134c.045-.317-.057-.637-.297-.925-.505-.61-1.555-1.022-2.738-1.074a5.966 5.966 0 0 0-.535.001 14.03 14.03 0 0 1-1.935-.041.117.117 0 0 1-.103-.092.116.116 0 0 1 .055-.126l81.104-46.822a.117.117 0 0 1 .171.07c.104.381.129.768.074 1.153-.045.316.057.637.296.925.506.61 1.555 1.021 2.739 1.073.178.008.357.008.535-.001a.117.117 0 0 1 .064.218l-79.256 45.759a.114.114 0 0 1-.059.016zm-3.405-2.372c.089 0 .177.002.265.006 1.266.056 2.353.488 2.908 1.158.227.274.35.575.36.882l78.685-45.429c-.036 0-.072-.001-.107-.003-1.267-.056-2.354-.489-2.909-1.158-.282-.34-.402-.724-.347-1.107a2.604 2.604 0 0 0-.032-.91L63.846 208.97a13.91 13.91 0 0 0 1.528.012c.097-.005.194-.007.291-.007z' fill='#607D8B'/><path d='M2.208 162.134c-1.001-1.827-.241-4.217 1.698-5.337l56.011-32.344c1.939-1.12 4.324-.546 5.326 1.281l.232.41a9.344 9.344 0 0 0 1.47 2.021l.278.27c3.325 3.214 8.583 3.716 12.888 1.23l7.319-4.22c1.94-1.119 4.324-.546 5.325 1.282l3.25 5.928-83.519 48.229-10.278-18.75z' fill='#FAFAFA'/><path d='M12.486 181.001a.112.112 0 0 1-.031-.005.114.114 0 0 1-.071-.056L2.106 162.19c-1.031-1.88-.249-4.345 1.742-5.494l56.01-32.344a4.328 4.328 0 0 1 2.158-.588c1.415 0 2.65.702 3.311 1.882.01.008.018.017.024.028l.227.414a.122.122 0 0 1 .013.038 9.508 9.508 0 0 0 1.439 1.959l.275.266c1.846 1.786 4.344 2.769 7.031 2.769 1.977 0 3.954-.538 5.717-1.557a.148.148 0 0 1 .035-.013l7.284-4.206a4.321 4.321 0 0 1 2.157-.588c1.427 0 2.672.716 3.329 1.914l3.249 5.929a.116.116 0 0 1-.044.157l-83.518 48.229a.116.116 0 0 1-.059.016zm49.53-57.004c-.704 0-1.41.193-2.041.557l-56.01 32.345c-1.882 1.086-2.624 3.409-1.655 5.179l10.221 18.645 83.317-48.112-3.195-5.829c-.615-1.122-1.783-1.792-3.124-1.792a4.08 4.08 0 0 0-2.04.557l-7.317 4.225a.148.148 0 0 1-.035.013 11.7 11.7 0 0 1-5.801 1.569c-2.748 0-5.303-1.007-7.194-2.835l-.278-.27a9.716 9.716 0 0 1-1.497-2.046.096.096 0 0 1-.013-.037l-.191-.347a.11.11 0 0 1-.023-.029c-.615-1.123-1.783-1.793-3.124-1.793z' fill='#607D8B'/><path d='M42.434 155.808c-2.51-.001-4.697-1.258-5.852-3.365-1.811-3.304-.438-7.634 3.059-9.654l12.291-7.098a7.599 7.599 0 0 1 3.789-1.033c2.51 0 4.697 1.258 5.852 3.365 1.811 3.304.439 7.634-3.059 9.654l-12.291 7.098a7.606 7.606 0 0 1-3.789 1.033zm13.287-20.683a7.128 7.128 0 0 0-3.555.971l-12.291 7.098c-3.279 1.893-4.573 5.942-2.883 9.024 1.071 1.955 3.106 3.122 5.442 3.122a7.13 7.13 0 0 0 3.556-.97l12.291-7.098c3.279-1.893 4.572-5.942 2.883-9.024-1.072-1.955-3.106-3.123-5.443-3.123z' fill='#607D8B'/><path d='M149.588 109.407l6.737 3.89v.887c0 .176.013.36.037.549.011.081.02.161.028.242.14 1.415.973 2.998 2.105 3.999l7.396 6.545c.177.156.358.295.541.415 1.579 1.04 2.95.466 3.062-1.282.049-.784.057-1.595.023-2.429l-.003-.16v-1.151l25.987 15.003v54c0 1.09-.77 1.53-1.72.982l-42.473-24.523c-.95-.548-1.72-1.877-1.72-2.966v-34.033' fill='#FAFAFA'/><path d='M194.553 191.25c-.257 0-.54-.085-.831-.253l-42.472-24.521c-.981-.567-1.779-1.943-1.779-3.068v-34.033h.234v34.033c0 1.051.745 2.336 1.661 2.866l42.473 24.521c.424.245.816.288 1.103.122.285-.164.442-.52.442-1.002v-53.933l-25.753-14.868.003 1.106c.034.832.026 1.654-.024 2.439-.054.844-.396 1.464-.963 1.746-.619.309-1.45.173-2.28-.373a5.023 5.023 0 0 1-.553-.426l-7.397-6.544c-1.158-1.026-1.999-2.625-2.143-4.076a9.624 9.624 0 0 0-.027-.238 4.241 4.241 0 0 1-.038-.564v-.82l-6.68-3.856.117-.202 6.738 3.89.058.034v.954c0 .171.012.351.036.533.011.083.021.165.029.246.138 1.395.948 2.935 2.065 3.923l7.397 6.545c.173.153.35.289.527.406.758.499 1.504.63 2.047.359.49-.243.786-.795.834-1.551.05-.778.057-1.591.024-2.417l-.004-.163v-1.355l.175.1 25.987 15.004.059.033v54.068c0 .569-.198.996-.559 1.204a1.002 1.002 0 0 1-.506.131' fill='#607D8B'/><path d='M145.685 163.161l24.115 13.922-25.978 14.998-1.462-.307c-6.534-2.17-13.628-3.728-21.019-4.616-4.365-.524-8.663 1.096-9.598 3.62a2.746 2.746 0 0 0-.011 1.928c1.538 4.267 4.236 8.363 7.995 12.135l.532.845-25.977 14.997-24.115-13.922 75.518-43.6' fill='#FFF'/><path d='M94.282 220.818l-.059-.033-24.29-14.024.175-.101 75.577-43.634.058.033 24.29 14.024-26.191 15.122-.045-.01-1.461-.307c-6.549-2.174-13.613-3.725-21.009-4.614a13.744 13.744 0 0 0-1.638-.097c-3.758 0-7.054 1.531-7.837 3.642a2.62 2.62 0 0 0-.01 1.848c1.535 4.258 4.216 8.326 7.968 12.091l.016.021.526.835.006.01.064.102-.105.061-25.977 14.998-.058.033zm-23.881-14.057l23.881 13.788 24.802-14.32c.546-.315.846-.489 1.017-.575l-.466-.74c-3.771-3.787-6.467-7.881-8.013-12.168a2.851 2.851 0 0 1 .011-2.008c.815-2.199 4.203-3.795 8.056-3.795.557 0 1.117.033 1.666.099 7.412.891 14.491 2.445 21.041 4.621.836.175 1.215.254 1.39.304l25.78-14.884-23.881-13.788-75.284 43.466z' fill='#607D8B'/><path d='M167.23 125.979v50.871l-27.321 15.773-6.461-14.167c-.91-1.996-3.428-1.738-5.624.574a10.238 10.238 0 0 0-2.33 4.018l-6.46 21.628-27.322 15.774v-50.871l75.518-43.6' fill='#FFF'/><path d='M91.712 220.567a.127.127 0 0 1-.059-.016.118.118 0 0 1-.058-.101v-50.871c0-.042.023-.08.058-.101l75.519-43.6a.117.117 0 0 1 .175.101v50.871c0 .041-.023.08-.059.1l-27.321 15.775a.118.118 0 0 1-.094.01.12.12 0 0 1-.071-.063l-6.46-14.168c-.375-.822-1.062-1.275-1.934-1.275-1.089 0-2.364.686-3.5 1.881a10.206 10.206 0 0 0-2.302 3.972l-6.46 21.627a.118.118 0 0 1-.054.068L91.77 220.551a.12.12 0 0 1-.058.016zm.117-50.92v50.601l27.106-15.65 6.447-21.583a10.286 10.286 0 0 1 2.357-4.065c1.18-1.242 2.517-1.954 3.669-1.954.969 0 1.731.501 2.146 1.411l6.407 14.051 27.152-15.676v-50.601l-75.284 43.466z' fill='#607D8B'/><path d='M168.543 126.213v50.87l-27.322 15.774-6.46-14.168c-.91-1.995-3.428-1.738-5.624.574a10.248 10.248 0 0 0-2.33 4.019l-6.461 21.627-27.321 15.774v-50.87l75.518-43.6' fill='#FFF'/><path d='M93.025 220.8a.123.123 0 0 1-.059-.015.12.12 0 0 1-.058-.101v-50.871c0-.042.023-.08.058-.101l75.518-43.6a.112.112 0 0 1 .117 0c.036.02.059.059.059.1v50.871a.116.116 0 0 1-.059.101l-27.321 15.774a.111.111 0 0 1-.094.01.115.115 0 0 1-.071-.062l-6.46-14.168c-.375-.823-1.062-1.275-1.935-1.275-1.088 0-2.363.685-3.499 1.881a10.19 10.19 0 0 0-2.302 3.971l-6.461 21.628a.108.108 0 0 1-.053.067l-27.322 15.775a.12.12 0 0 1-.058.015zm.117-50.919v50.6l27.106-15.649 6.447-21.584a10.293 10.293 0 0 1 2.357-4.065c1.179-1.241 2.516-1.954 3.668-1.954.969 0 1.732.502 2.147 1.412l6.407 14.051 27.152-15.676v-50.601l-75.284 43.466z' fill='#607D8B'/><path d='M169.8 177.083l-27.322 15.774-6.46-14.168c-.91-1.995-3.428-1.738-5.625.574a10.246 10.246 0 0 0-2.329 4.019l-6.461 21.627-27.321 15.774v-50.87l75.518-43.6v50.87z' fill='#FAFAFA'/><path d='M94.282 220.917a.234.234 0 0 1-.234-.233v-50.871c0-.083.045-.161.117-.202l75.518-43.601a.234.234 0 1 1 .35.202v50.871a.233.233 0 0 1-.116.202l-27.322 15.775a.232.232 0 0 1-.329-.106l-6.461-14.168c-.36-.789-.992-1.206-1.828-1.206-1.056 0-2.301.672-3.415 1.844a10.099 10.099 0 0 0-2.275 3.924l-6.46 21.628a.235.235 0 0 1-.107.136l-27.322 15.774a.23.23 0 0 1-.116.031zm.233-50.969v50.331l26.891-15.525 6.434-21.539a10.41 10.41 0 0 1 2.384-4.112c1.201-1.265 2.569-1.991 3.753-1.991 1.018 0 1.818.526 2.253 1.48l6.354 13.934 26.982-15.578v-50.331l-75.051 43.331z' fill='#607D8B'/><path d='M109.894 199.943c-1.774 0-3.241-.725-4.244-2.12a.224.224 0 0 1 .023-.294.233.233 0 0 1 .301-.023c.78.547 1.705.827 2.75.827 1.323 0 2.754-.439 4.256-1.306 5.311-3.067 9.631-10.518 9.631-16.611 0-1.927-.442-3.56-1.278-4.724a.232.232 0 0 1 .323-.327c1.671 1.172 2.591 3.381 2.591 6.219 0 6.242-4.426 13.863-9.865 17.003-1.574.908-3.084 1.356-4.488 1.356zm-2.969-1.542c.813.651 1.82.877 2.968.877h.001c1.321 0 2.753-.327 4.254-1.194 5.311-3.067 9.632-10.463 9.632-16.556 0-1.979-.463-3.599-1.326-4.761.411 1.035.625 2.275.625 3.635 0 6.243-4.426 13.883-9.865 17.023-1.574.909-3.084 1.317-4.49 1.317-.641 0-1.243-.149-1.799-.341z' fill='#607D8B'/><path d='M113.097 197.23c5.384-3.108 9.748-10.636 9.748-16.814 0-2.051-.483-3.692-1.323-4.86-1.784-1.252-4.374-1.194-7.257.47-5.384 3.108-9.748 10.636-9.748 16.814 0 2.051.483 3.692 1.323 4.86 1.784 1.252 4.374 1.194 7.257-.47' fill='#FAFAFA'/><path d='M108.724 198.614c-1.142 0-2.158-.213-3.019-.817-.021-.014-.04.014-.055-.007-.894-1.244-1.367-2.948-1.367-4.973 0-6.242 4.426-13.864 9.865-17.005 1.574-.908 3.084-1.363 4.49-1.363 1.142 0 2.158.309 3.018.913a.23.23 0 0 1 .056.056c.894 1.244 1.367 2.972 1.367 4.997 0 6.243-4.426 13.783-9.865 16.923-1.574.909-3.084 1.276-4.49 1.276zm-2.718-1.109c.774.532 1.688.776 2.718.776 1.323 0 2.754-.413 4.256-1.28 5.311-3.066 9.631-10.505 9.631-16.598 0-1.909-.434-3.523-1.255-4.685-.774-.533-1.688-.799-2.718-.799-1.323 0-2.755.441-4.256 1.308-5.311 3.066-9.631 10.506-9.631 16.599 0 1.909.434 3.517 1.255 4.679z' fill='#607D8B'/><path d='M149.318 114.262l-9.984 8.878 15.893 11.031 5.589-6.112-11.498-13.797' fill='#FAFAFA'/><path d='M169.676 120.84l-9.748 5.627c-3.642 2.103-9.528 2.113-13.147.024-3.62-2.089-3.601-5.488.041-7.591l9.495-5.608-6.729-3.885-81.836 47.071 45.923 26.514 3.081-1.779c.631-.365.869-.898.618-1.39-2.357-4.632-2.593-9.546-.683-14.262 5.638-13.92 24.509-24.815 48.618-28.07 8.169-1.103 16.68-.967 24.704.394.852.145 1.776.008 2.407-.357l3.081-1.778-25.825-14.91' fill='#FAFAFA'/><path d='M113.675 183.459a.47.47 0 0 1-.233-.062l-45.924-26.515a.468.468 0 0 1 .001-.809l81.836-47.071a.467.467 0 0 1 .466 0l6.729 3.885a.467.467 0 0 1-.467.809l-6.496-3.75-80.9 46.533 44.988 25.973 2.848-1.644c.192-.111.62-.409.435-.773-2.416-4.748-2.658-9.814-.7-14.65 2.806-6.927 8.885-13.242 17.582-18.263 8.657-4.998 19.518-8.489 31.407-10.094 8.198-1.107 16.79-.97 24.844.397.739.125 1.561.007 2.095-.301l2.381-1.374-25.125-14.506a.467.467 0 0 1 .467-.809l25.825 14.91a.467.467 0 0 1 0 .809l-3.081 1.779c-.721.417-1.763.575-2.718.413-7.963-1.351-16.457-1.486-24.563-.392-11.77 1.589-22.512 5.039-31.065 9.977-8.514 4.916-14.456 11.073-17.183 17.805-1.854 4.578-1.623 9.376.666 13.875.37.725.055 1.513-.8 2.006l-3.081 1.78a.476.476 0 0 1-.234.062' fill='#455A64'/><path d='M153.316 128.279c-2.413 0-4.821-.528-6.652-1.586-1.818-1.049-2.82-2.461-2.82-3.975 0-1.527 1.016-2.955 2.861-4.02l9.493-5.607a.233.233 0 1 1 .238.402l-9.496 5.609c-1.696.979-2.628 2.263-2.628 3.616 0 1.34.918 2.608 2.585 3.571 3.549 2.049 9.343 2.038 12.914-.024l9.748-5.628a.234.234 0 0 1 .234.405l-9.748 5.628c-1.858 1.072-4.296 1.609-6.729 1.609' fill='#607D8B'/><path d='M113.675 182.992l-45.913-26.508M113.675 183.342a.346.346 0 0 1-.175-.047l-45.913-26.508a.35.35 0 1 1 .35-.607l45.913 26.508a.35.35 0 0 1-.175.654' fill='#455A64'/><path d='M67.762 156.484v54.001c0 1.09.77 2.418 1.72 2.967l42.473 24.521c.95.549 1.72.11 1.72-.98v-54.001' fill='#FAFAFA'/><path d='M112.727 238.561c-.297 0-.62-.095-.947-.285l-42.473-24.521c-1.063-.613-1.895-2.05-1.895-3.27v-54.001a.35.35 0 1 1 .701 0v54.001c0 .96.707 2.18 1.544 2.663l42.473 24.522c.344.198.661.243.87.122.206-.119.325-.411.325-.799v-54.001a.35.35 0 1 1 .7 0v54.001c0 .655-.239 1.154-.675 1.406a1.235 1.235 0 0 1-.623.162' fill='#455A64'/><path d='M112.86 147.512h-.001c-2.318 0-4.499-.522-6.142-1.471-1.705-.984-2.643-2.315-2.643-3.749 0-1.445.952-2.791 2.68-3.788l12.041-6.953c1.668-.962 3.874-1.493 6.212-1.493 2.318 0 4.499.523 6.143 1.472 1.704.984 2.643 2.315 2.643 3.748 0 1.446-.952 2.791-2.68 3.789l-12.042 6.952c-1.668.963-3.874 1.493-6.211 1.493zm12.147-16.753c-2.217 0-4.298.497-5.861 1.399l-12.042 6.952c-1.502.868-2.33 1.998-2.33 3.182 0 1.173.815 2.289 2.293 3.142 1.538.889 3.596 1.378 5.792 1.378h.001c2.216 0 4.298-.497 5.861-1.399l12.041-6.953c1.502-.867 2.33-1.997 2.33-3.182 0-1.172-.814-2.288-2.292-3.142-1.539-.888-3.596-1.377-5.793-1.377z' fill='#607D8B'/><path d='M165.63 123.219l-5.734 3.311c-3.167 1.828-8.286 1.837-11.433.02-3.147-1.817-3.131-4.772.036-6.601l5.734-3.31 11.397 6.58' fill='#FAFAFA'/><path d='M154.233 117.448l9.995 5.771-4.682 2.704c-1.434.827-3.352 1.283-5.399 1.283-2.029 0-3.923-.449-5.333-1.263-1.29-.744-2-1.694-2-2.674 0-.991.723-1.955 2.036-2.713l5.383-3.108m0-.809l-5.734 3.31c-3.167 1.829-3.183 4.784-.036 6.601 1.568.905 3.623 1.357 5.684 1.357 2.077 0 4.159-.46 5.749-1.377l5.734-3.311-11.397-6.58M145.445 179.667c-1.773 0-3.241-.85-4.243-2.245-.067-.092-.057-.275.023-.356.08-.081.207-.12.3-.055.781.548 1.706.812 2.751.811 1.322 0 2.754-.446 4.256-1.313 5.31-3.066 9.631-10.522 9.631-16.615 0-1.927-.442-3.562-1.279-4.726a.235.235 0 0 1 .024-.301.232.232 0 0 1 .3-.027c1.67 1.172 2.59 3.38 2.59 6.219 0 6.242-4.425 13.987-9.865 17.127-1.573.908-3.083 1.481-4.488 1.481zM142.476 178c.814.651 1.82 1.002 2.969 1.002 1.322 0 2.753-.452 4.255-1.32 5.31-3.065 9.631-10.523 9.631-16.617 0-1.98-.463-3.63-1.325-4.793.411 1.035.624 2.26.624 3.62 0 6.242-4.425 13.875-9.865 17.015-1.573.909-3.084 1.376-4.489 1.376a5.49 5.49 0 0 1-1.8-.283z' fill='#607D8B'/><path d='M148.648 176.704c5.384-3.108 9.748-10.636 9.748-16.813 0-2.052-.483-3.693-1.322-4.861-1.785-1.252-4.375-1.194-7.258.471-5.383 3.108-9.748 10.636-9.748 16.813 0 2.051.484 3.692 1.323 4.86 1.785 1.253 4.374 1.195 7.257-.47' fill='#FAFAFA'/><path d='M144.276 178.276c-1.143 0-2.158-.307-3.019-.911a.217.217 0 0 1-.055-.054c-.895-1.244-1.367-2.972-1.367-4.997 0-6.241 4.425-13.875 9.865-17.016 1.573-.908 3.084-1.369 4.489-1.369 1.143 0 2.158.307 3.019.91a.24.24 0 0 1 .055.055c.894 1.244 1.367 2.971 1.367 4.997 0 6.241-4.425 13.875-9.865 17.016-1.573.908-3.084 1.369-4.489 1.369zm-2.718-1.172c.773.533 1.687.901 2.718.901 1.322 0 2.754-.538 4.256-1.405 5.31-3.066 9.631-10.567 9.631-16.661 0-1.908-.434-3.554-1.256-4.716-.774-.532-1.688-.814-2.718-.814-1.322 0-2.754.433-4.256 1.3-5.31 3.066-9.631 10.564-9.631 16.657 0 1.91.434 3.576 1.256 4.738z' fill='#607D8B'/><path d='M150.72 172.361l-.363-.295a24.105 24.105 0 0 0 2.148-3.128 24.05 24.05 0 0 0 1.977-4.375l.443.149a24.54 24.54 0 0 1-2.015 4.46 24.61 24.61 0 0 1-2.19 3.189M115.917 191.514l-.363-.294a24.174 24.174 0 0 0 2.148-3.128 24.038 24.038 0 0 0 1.976-4.375l.443.148a24.48 24.48 0 0 1-2.015 4.461 24.662 24.662 0 0 1-2.189 3.188M114 237.476V182.584 237.476' fill='#607D8B'/><g><path d='M81.822 37.474c.017-.135-.075-.28-.267-.392-.327-.188-.826-.21-1.109-.045l-6.012 3.471c-.131.076-.194.178-.191.285.002.132.002.461.002.578v.043l-.007.128-6.591 3.779c-.001 0-2.077 1.046-2.787 5.192 0 0-.912 6.961-.898 19.745.015 12.57.606 17.07 1.167 21.351.22 1.684 3.001 2.125 3.001 2.125.331.04.698-.027 1.08-.248l75.273-43.551c1.808-1.069 2.667-3.719 3.056-6.284 1.213-7.99 1.675-32.978-.275-39.878-.196-.693-.51-1.083-.868-1.282l-2.086-.79c-.727.028-1.416.467-1.534.535L82.032 37.072l-.21.402' fill='#FFF'/><path d='M144.311 1.701l2.085.79c.358.199.672.589.868 1.282 1.949 6.9 1.487 31.887.275 39.878-.39 2.565-1.249 5.215-3.056 6.284L69.21 93.486a1.78 1.78 0 0 1-.896.258l-.183-.011c0 .001-2.782-.44-3.003-2.124-.56-4.282-1.151-8.781-1.165-21.351-.015-12.784.897-19.745.897-19.745.71-4.146 2.787-5.192 2.787-5.192l6.591-3.779.007-.128v-.043c0-.117 0-.446-.002-.578-.003-.107.059-.21.191-.285l6.012-3.472a.98.98 0 0 1 .481-.11c.218 0 .449.053.627.156.193.112.285.258.268.392l.211-.402 60.744-34.836c.117-.068.806-.507 1.534-.535m0-.997l-.039.001c-.618.023-1.283.244-1.974.656l-.021.012-60.519 34.706a2.358 2.358 0 0 0-.831-.15c-.365 0-.704.084-.98.244l-6.012 3.471c-.442.255-.699.69-.689 1.166l.001.15-6.08 3.487c-.373.199-2.542 1.531-3.29 5.898l-.006.039c-.009.07-.92 7.173-.906 19.875.014 12.62.603 17.116 1.172 21.465l.002.015c.308 2.355 3.475 2.923 3.836 2.98l.034.004c.101.013.204.019.305.019a2.77 2.77 0 0 0 1.396-.392l75.273-43.552c1.811-1.071 2.999-3.423 3.542-6.997 1.186-7.814 1.734-33.096-.301-40.299-.253-.893-.704-1.527-1.343-1.882l-.132-.062-2.085-.789a.973.973 0 0 0-.353-.065' fill='#455A64'/><path d='M128.267 11.565l1.495.434-56.339 32.326' fill='#FFF'/><path d='M74.202 90.545a.5.5 0 0 1-.25-.931l18.437-10.645a.499.499 0 1 1 .499.864L74.451 90.478l-.249.067M75.764 42.654l-.108-.062.046-.171 5.135-2.964.17.045-.045.171-5.135 2.964-.063.017M70.52 90.375V46.421l.063-.036L137.84 7.554v43.954l-.062.036L70.52 90.375zm.25-43.811v43.38l66.821-38.579V7.985L70.77 46.564z' fill='#607D8B'/><path d='M86.986 83.182c-.23.149-.612.384-.849.523l-11.505 6.701c-.237.139-.206.252.068.252h.565c.275 0 .693-.113.93-.252L87.7 83.705c.237-.139.428-.253.425-.256a11.29 11.29 0 0 1-.006-.503c0-.274-.188-.377-.418-.227l-.715.463' fill='#607D8B'/><path d='M75.266 90.782H74.7c-.2 0-.316-.056-.346-.166-.03-.11.043-.217.215-.317l11.505-6.702c.236-.138.615-.371.844-.519l.715-.464a.488.488 0 0 1 .266-.089c.172 0 .345.13.345.421 0 .214.001.363.003.437l.006.004-.004.069c-.003.075-.003.075-.486.356l-11.505 6.702a2.282 2.282 0 0 1-.992.268zm-.6-.25l.034.001h.566c.252 0 .649-.108.866-.234l11.505-6.702c.168-.098.294-.173.361-.214-.004-.084-.004-.218-.004-.437l-.095-.171-.131.049-.714.463c-.232.15-.616.386-.854.525l-11.505 6.702-.029.018z' fill='#607D8B'/><path d='M75.266 89.871H74.7c-.2 0-.316-.056-.346-.166-.03-.11.043-.217.215-.317l11.505-6.702c.258-.151.694-.268.993-.268h.565c.2 0 .316.056.346.166.03.11-.043.217-.215.317l-11.505 6.702a2.282 2.282 0 0 1-.992.268zm-.6-.25l.034.001h.566c.252 0 .649-.107.866-.234l11.505-6.702.03-.018-.035-.001h-.565c-.252 0-.649.108-.867.234l-11.505 6.702-.029.018zM74.37 90.801v-1.247 1.247' fill='#607D8B'/><path d='M68.13 93.901c-.751-.093-1.314-.737-1.439-1.376-.831-4.238-1.151-8.782-1.165-21.352-.015-12.784.897-19.745.897-19.745.711-4.146 2.787-5.192 2.787-5.192l74.859-43.219c.223-.129 2.487-1.584 3.195.923 1.95 6.9 1.488 31.887.275 39.878-.389 2.565-1.248 5.215-3.056 6.283L69.21 93.653c-.382.221-.749.288-1.08.248 0 0-2.781-.441-3.001-2.125-.561-4.281-1.152-8.781-1.167-21.351-.014-12.784.898-19.745.898-19.745.71-4.146 2.787-5.191 2.787-5.191l6.598-3.81.871-.119 6.599-3.83.046-.461L68.13 93.901' fill='#FAFAFA'/><path d='M68.317 94.161l-.215-.013h-.001l-.244-.047c-.719-.156-2.772-.736-2.976-2.292-.568-4.34-1.154-8.813-1.168-21.384-.014-12.654.891-19.707.9-19.777.725-4.231 2.832-5.338 2.922-5.382l6.628-3.827.87-.119 6.446-3.742.034-.334a.248.248 0 0 1 .273-.223.248.248 0 0 1 .223.272l-.059.589-6.752 3.919-.87.118-6.556 3.785c-.031.016-1.99 1.068-2.666 5.018-.007.06-.908 7.086-.894 19.702.014 12.539.597 16.996 1.161 21.305.091.691.689 1.154 1.309 1.452a1.95 1.95 0 0 1-.236-.609c-.781-3.984-1.155-8.202-1.17-21.399-.014-12.653.891-19.707.9-19.777.725-4.231 2.832-5.337 2.922-5.382-.004.001 74.444-42.98 74.846-43.212l.028-.017c.904-.538 1.72-.688 2.36-.433.555.221.949.733 1.172 1.52 2.014 7.128 1.46 32.219.281 39.983-.507 3.341-1.575 5.515-3.175 6.462L69.335 93.869a2.023 2.023 0 0 1-1.018.292zm-.147-.507c.293.036.604-.037.915-.217l75.273-43.551c1.823-1.078 2.602-3.915 2.934-6.106 1.174-7.731 1.731-32.695-.268-39.772-.178-.631-.473-1.032-.876-1.192-.484-.193-1.166-.052-1.921.397l-.034.021-74.858 43.218c-.031.017-1.989 1.069-2.666 5.019-.007.059-.908 7.085-.894 19.702.015 13.155.386 17.351 1.161 21.303.09.461.476.983 1.037 1.139.114.025.185.037.196.039h.001z' fill='#455A64'/><path d='M69.317 68.982c.489-.281.885-.056.885.505 0 .56-.396 1.243-.885 1.525-.488.282-.884.057-.884-.504 0-.56.396-1.243.884-1.526' fill='#FFF'/><path d='M68.92 71.133c-.289 0-.487-.228-.487-.625 0-.56.396-1.243.884-1.526a.812.812 0 0 1 .397-.121c.289 0 .488.229.488.626 0 .56-.396 1.243-.885 1.525a.812.812 0 0 1-.397.121m.794-2.459a.976.976 0 0 0-.49.147c-.548.317-.978 1.058-.978 1.687 0 .486.271.812.674.812a.985.985 0 0 0 .491-.146c.548-.317.978-1.057.978-1.687 0-.486-.272-.813-.675-.813' fill='#8097A2'/><path d='M68.92 70.947c-.271 0-.299-.307-.299-.439 0-.491.361-1.116.79-1.363a.632.632 0 0 1 .303-.096c.272 0 .301.306.301.438 0 .491-.363 1.116-.791 1.364a.629.629 0 0 1-.304.096m.794-2.086a.812.812 0 0 0-.397.121c-.488.283-.884.966-.884 1.526 0 .397.198.625.487.625a.812.812 0 0 0 .397-.121c.489-.282.885-.965.885-1.525 0-.397-.199-.626-.488-.626' fill='#8097A2'/><path d='M69.444 85.35c.264-.152.477-.031.477.272 0 .303-.213.67-.477.822-.263.153-.477.031-.477-.271 0-.302.214-.671.477-.823' fill='#FFF'/><path d='M69.23 86.51c-.156 0-.263-.123-.263-.337 0-.302.214-.671.477-.823a.431.431 0 0 1 .214-.066c.156 0 .263.124.263.338 0 .303-.213.67-.477.822a.431.431 0 0 1-.214.066m.428-1.412c-.1 0-.203.029-.307.09-.32.185-.57.618-.57.985 0 .309.185.524.449.524a.63.63 0 0 0 .308-.09c.32-.185.57-.618.57-.985 0-.309-.185-.524-.45-.524' fill='#8097A2'/><path d='M69.23 86.322l-.076-.149c0-.235.179-.544.384-.661l.12-.041.076.151c0 .234-.179.542-.383.66l-.121.04m.428-1.038a.431.431 0 0 0-.214.066c-.263.152-.477.521-.477.823 0 .214.107.337.263.337a.431.431 0 0 0 .214-.066c.264-.152.477-.519.477-.822 0-.214-.107-.338-.263-.338' fill='#8097A2'/><path d='M139.278 7.769v43.667L72.208 90.16V46.493l67.07-38.724' fill='#455A64'/><path d='M72.083 90.375V46.421l.063-.036 67.257-38.831v43.954l-.062.036-67.258 38.831zm.25-43.811v43.38l66.821-38.579V7.985L72.333 46.564z' fill='#607D8B'/></g><path d='M125.737 88.647l-7.639 3.334V84l-11.459 4.713v8.269L99 100.315l13.369 3.646 13.368-15.314' fill='#455A64'/></g></svg>";
function RotateInstructions() {
this.loadIcon_();
var overlay = document.createElement('div');
@@ -2257,18 +2465,17 @@
this.text = text;
this.hide();
}
-RotateInstructions.prototype.show = function(parent) {
+RotateInstructions.prototype.show = function (parent) {
if (!parent && !this.overlay.parentElement) {
document.body.appendChild(this.overlay);
} else if (parent) {
- if (this.overlay.parentElement && this.overlay.parentElement != parent)
- this.overlay.parentElement.removeChild(this.overlay);
+ if (this.overlay.parentElement && this.overlay.parentElement != parent) this.overlay.parentElement.removeChild(this.overlay);
parent.appendChild(this.overlay);
}
this.overlay.style.display = 'block';
var img = this.overlay.querySelector('img');
var s = img.style;
- if (util$2.isLandscapeMode()) {
+ if (isLandscapeMode()) {
s.width = '20%';
s.marginLeft = '40%';
s.marginTop = '3%';
@@ -2278,91 +2485,89 @@
s.marginTop = '25%';
}
};
-RotateInstructions.prototype.hide = function() {
+RotateInstructions.prototype.hide = function () {
this.overlay.style.display = 'none';
};
-RotateInstructions.prototype.showTemporarily = function(ms, parent) {
+RotateInstructions.prototype.showTemporarily = function (ms, parent) {
this.show(parent);
this.timer = setTimeout(this.hide.bind(this), ms);
};
-RotateInstructions.prototype.disableShowTemporarily = function() {
+RotateInstructions.prototype.disableShowTemporarily = function () {
clearTimeout(this.timer);
};
-RotateInstructions.prototype.update = function() {
+RotateInstructions.prototype.update = function () {
this.disableShowTemporarily();
- if (!util$2.isLandscapeMode() && util$2.isMobile()) {
+ if (!isLandscapeMode() && isMobile()) {
this.show();
} else {
this.hide();
}
};
-RotateInstructions.prototype.loadIcon_ = function() {
- this.icon = util$2.base64('image/svg+xml', '<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg width="198px" height="240px" viewBox="0 0 198 240" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
    <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
    <title>transition</title>
    <desc>Created with Sketch.</desc>
    <defs></defs>
    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
        <g id="transition" sketch:type="MSArtboardGroup">
            <g id="Imported-Layers-Copy-4-+-Imported-Layers-Copy-+-Imported-Layers-Copy-2-Copy" sketch:type="MSLayerGroup">
                <g id="Imported-Layers-Copy-4" transform="translate(0.000000, 107.000000)" sketch:type="MSShapeGroup">
                    <path d="M149.625,2.527 C149.625,2.527 155.805,6.096 156.362,6.418 L156.362,7.304 C156.362,7.481 156.375,7.664 156.4,7.853 C156.41,7.934 156.42,8.015 156.427,8.095 C156.567,9.51 157.401,11.093 158.532,12.094 L164.252,17.156 L164.333,17.066 C164.333,17.066 168.715,14.536 169.568,14.042 C171.025,14.883 195.538,29.035 195.538,29.035 L195.538,83.036 C195.538,83.807 195.152,84.253 194.59,84.253 C194.357,84.253 194.095,84.177 193.818,84.017 L169.851,70.179 L169.837,70.203 L142.515,85.978 L141.665,84.655 C136.934,83.126 131.917,81.915 126.714,81.045 C126.709,81.06 126.707,81.069 126.707,81.069 L121.64,98.03 L113.749,102.586 L113.712,102.523 L113.712,130.113 C113.712,130.885 113.326,131.33 112.764,131.33 C112.532,131.33 112.269,131.254 111.992,131.094 L69.519,106.572 C68.569,106.023 67.799,104.695 67.799,103.605 L67.799,102.57 L67.778,102.617 C67.27,102.393 66.648,102.249 65.962,102.218 C65.875,102.214 65.788,102.212 65.701,102.212 C65.606,102.212 65.511,102.215 65.416,102.219 C65.195,102.229 64.974,102.235 64.754,102.235 C64.331,102.235 63.911,102.216 63.498,102.178 C61.843,102.025 60.298,101.578 59.094,100.882 L12.518,73.992 L12.523,74.004 L2.245,55.254 C1.244,53.427 2.004,51.038 3.943,49.918 L59.954,17.573 C60.626,17.185 61.35,17.001 62.053,17.001 C63.379,17.001 64.625,17.66 65.28,18.854 L65.285,18.851 L65.512,19.264 L65.506,19.268 C65.909,20.003 66.405,20.68 66.983,21.286 L67.26,21.556 C69.174,23.406 71.728,24.357 74.373,24.357 C76.322,24.357 78.321,23.84 80.148,22.785 C80.161,22.785 87.467,18.566 87.467,18.566 C88.139,18.178 88.863,17.994 89.566,17.994 C90.892,17.994 92.138,18.652 92.792,19.847 L96.042,25.775 L96.064,25.757 L102.849,29.674 L102.744,29.492 L149.625,2.527 M149.625,0.892 C149.343,0.892 149.062,0.965 148.81,1.11 L102.641,27.666 L97.231,24.542 L94.226,19.061 C93.313,17.394 91.527,16.359 89.566,16.358 C88.555,16.358 87.546,16.632 86.649,17.15 C83.878,18.75 79.687,21.169 79.374,21.345 C79.359,21.353 79.345,21.361 79.33,21.369 C77.798,22.254 76.084,22.722 74.373,22.722 C72.081,22.722 69.959,21.89 68.397,20.38 L68.145,20.135 C67.706,19.672 67.323,19.156 67.006,18.601 C66.988,18.559 66.968,18.519 66.946,18.479 L66.719,18.065 C66.69,18.012 66.658,17.96 66.624,17.911 C65.686,16.337 63.951,15.366 62.053,15.366 C61.042,15.366 60.033,15.64 59.136,16.158 L3.125,48.502 C0.426,50.061 -0.613,53.442 0.811,56.04 L11.089,74.79 C11.266,75.113 11.537,75.353 11.85,75.494 L58.276,102.298 C59.679,103.108 61.433,103.63 63.348,103.806 C63.812,103.848 64.285,103.87 64.754,103.87 C65,103.87 65.249,103.864 65.494,103.852 C65.563,103.849 65.632,103.847 65.701,103.847 C65.764,103.847 65.828,103.849 65.89,103.852 C65.986,103.856 66.08,103.863 66.173,103.874 C66.282,105.467 67.332,107.197 68.702,107.988 L111.174,132.51 C111.698,132.812 112.232,132.965 112.764,132.965 C114.261,132.965 115.347,131.765 115.347,130.113 L115.347,103.551 L122.458,99.446 C122.819,99.237 123.087,98.898 123.207,98.498 L127.865,82.905 C132.279,83.702 136.557,84.753 140.607,86.033 L141.14,86.862 C141.451,87.346 141.977,87.613 142.516,87.613 C142.794,87.613 143.076,87.542 143.333,87.393 L169.865,72.076 L193,85.433 C193.523,85.735 194.058,85.888 194.59,85.888 C196.087,85.888 197.173,84.689 197.173,83.036 L197.173,29.035 C197.173,28.451 196.861,27.911 196.355,27.619 C196.355,27.619 171.843,13.467 170.385,12.626 C170.132,12.48 169.85,12.407 169.568,12.407 C169.285,12.407 169.002,12.481 168.749,12.627 C168.143,12.978 165.756,14.357 164.424,15.125 L159.615,10.87 C158.796,10.145 158.154,8.937 158.054,7.934 C158.045,7.837 158.034,7.739 158.021,7.64 C158.005,7.523 157.998,7.41 157.998,7.304 L157.998,6.418 C157.998,5.834 157.686,5.295 157.181,5.002 C156.624,4.68 150.442,1.111 150.442,1.111 C150.189,0.965 149.907,0.892 149.625,0.892" id="Fill-1" fill="#455A64"></path>
                    <path d="M96.027,25.636 L142.603,52.527 C143.807,53.222 144.582,54.114 144.845,55.068 L144.835,55.075 L63.461,102.057 L63.46,102.057 C61.806,101.905 60.261,101.457 59.057,100.762 L12.481,73.871 L96.027,25.636" id="Fill-2" fill="#FAFAFA"></path>
                    <path d="M63.461,102.174 C63.453,102.174 63.446,102.174 63.439,102.172 C61.746,102.016 60.211,101.563 58.998,100.863 L12.422,73.973 C12.386,73.952 12.364,73.914 12.364,73.871 C12.364,73.83 12.386,73.791 12.422,73.77 L95.968,25.535 C96.004,25.514 96.049,25.514 96.085,25.535 L142.661,52.426 C143.888,53.134 144.682,54.038 144.957,55.037 C144.97,55.083 144.953,55.133 144.915,55.161 C144.911,55.165 144.898,55.174 144.894,55.177 L63.519,102.158 C63.501,102.169 63.481,102.174 63.461,102.174 L63.461,102.174 Z M12.714,73.871 L59.115,100.661 C60.293,101.341 61.786,101.782 63.435,101.937 L144.707,55.015 C144.428,54.108 143.682,53.285 142.544,52.628 L96.027,25.771 L12.714,73.871 L12.714,73.871 Z" id="Fill-3" fill="#607D8B"></path>
                    <path d="M148.327,58.471 C148.145,58.48 147.962,58.48 147.781,58.472 C145.887,58.389 144.479,57.434 144.636,56.34 C144.689,55.967 144.664,55.597 144.564,55.235 L63.461,102.057 C64.089,102.115 64.733,102.13 65.379,102.099 C65.561,102.09 65.743,102.09 65.925,102.098 C67.819,102.181 69.227,103.136 69.07,104.23 L148.327,58.471" id="Fill-4" fill="#FFFFFF"></path>
                    <path d="M69.07,104.347 C69.048,104.347 69.025,104.34 69.005,104.327 C68.968,104.301 68.948,104.257 68.955,104.213 C69,103.896 68.898,103.576 68.658,103.288 C68.153,102.678 67.103,102.266 65.92,102.214 C65.742,102.206 65.563,102.207 65.385,102.215 C64.742,102.246 64.087,102.232 63.45,102.174 C63.399,102.169 63.358,102.132 63.347,102.082 C63.336,102.033 63.358,101.981 63.402,101.956 L144.506,55.134 C144.537,55.116 144.575,55.113 144.609,55.127 C144.642,55.141 144.668,55.17 144.677,55.204 C144.781,55.585 144.806,55.972 144.751,56.357 C144.706,56.673 144.808,56.994 145.047,57.282 C145.553,57.892 146.602,58.303 147.786,58.355 C147.964,58.363 148.143,58.363 148.321,58.354 C148.377,58.352 148.424,58.387 148.439,58.438 C148.454,58.49 148.432,58.545 148.385,58.572 L69.129,104.331 C69.111,104.342 69.09,104.347 69.07,104.347 L69.07,104.347 Z M65.665,101.975 C65.754,101.975 65.842,101.977 65.93,101.981 C67.196,102.037 68.283,102.469 68.838,103.139 C69.065,103.413 69.188,103.714 69.198,104.021 L147.883,58.592 C147.847,58.592 147.811,58.591 147.776,58.589 C146.509,58.533 145.422,58.1 144.867,57.431 C144.585,57.091 144.465,56.707 144.52,56.324 C144.563,56.021 144.552,55.716 144.488,55.414 L63.846,101.97 C64.353,102.002 64.867,102.006 65.374,101.982 C65.471,101.977 65.568,101.975 65.665,101.975 L65.665,101.975 Z" id="Fill-5" fill="#607D8B"></path>
                    <path d="M2.208,55.134 C1.207,53.307 1.967,50.917 3.906,49.797 L59.917,17.453 C61.856,16.333 64.241,16.907 65.243,18.734 L65.475,19.144 C65.872,19.882 66.368,20.56 66.945,21.165 L67.223,21.435 C70.548,24.649 75.806,25.151 80.111,22.665 L87.43,18.445 C89.37,17.326 91.754,17.899 92.755,19.727 L96.005,25.655 L12.486,73.884 L2.208,55.134 Z" id="Fill-6" fill="#FAFAFA"></path>
                    <path d="M12.486,74.001 C12.476,74.001 12.465,73.999 12.455,73.996 C12.424,73.988 12.399,73.967 12.384,73.94 L2.106,55.19 C1.075,53.31 1.857,50.845 3.848,49.696 L59.858,17.352 C60.525,16.967 61.271,16.764 62.016,16.764 C63.431,16.764 64.666,17.466 65.327,18.646 C65.337,18.654 65.345,18.663 65.351,18.674 L65.578,19.088 C65.584,19.1 65.589,19.112 65.591,19.126 C65.985,19.838 66.469,20.497 67.03,21.085 L67.305,21.351 C69.151,23.137 71.649,24.12 74.336,24.12 C76.313,24.12 78.29,23.582 80.053,22.563 C80.064,22.557 80.076,22.553 80.088,22.55 L87.372,18.344 C88.038,17.959 88.784,17.756 89.529,17.756 C90.956,17.756 92.201,18.472 92.858,19.67 L96.107,25.599 C96.138,25.654 96.118,25.724 96.063,25.756 L12.545,73.985 C12.526,73.996 12.506,74.001 12.486,74.001 L12.486,74.001 Z M62.016,16.997 C61.312,16.997 60.606,17.19 59.975,17.554 L3.965,49.899 C2.083,50.985 1.341,53.308 2.31,55.078 L12.531,73.723 L95.848,25.611 L92.653,19.782 C92.038,18.66 90.87,17.99 89.529,17.99 C88.825,17.99 88.119,18.182 87.489,18.547 L80.172,22.772 C80.161,22.778 80.149,22.782 80.137,22.785 C78.346,23.811 76.341,24.354 74.336,24.354 C71.588,24.354 69.033,23.347 67.142,21.519 L66.864,21.249 C66.277,20.634 65.774,19.947 65.367,19.203 C65.36,19.192 65.356,19.179 65.354,19.166 L65.163,18.819 C65.154,18.811 65.146,18.801 65.14,18.79 C64.525,17.667 63.357,16.997 62.016,16.997 L62.016,16.997 Z" id="Fill-7" fill="#607D8B"></path>
                    <path d="M42.434,48.808 L42.434,48.808 C39.924,48.807 37.737,47.55 36.582,45.443 C34.771,42.139 36.144,37.809 39.641,35.789 L51.932,28.691 C53.103,28.015 54.413,27.658 55.721,27.658 C58.231,27.658 60.418,28.916 61.573,31.023 C63.384,34.327 62.012,38.657 58.514,40.677 L46.223,47.775 C45.053,48.45 43.742,48.808 42.434,48.808 L42.434,48.808 Z M55.721,28.125 C54.495,28.125 53.265,28.461 52.166,29.096 L39.875,36.194 C36.596,38.087 35.302,42.136 36.992,45.218 C38.063,47.173 40.098,48.34 42.434,48.34 C43.661,48.34 44.89,48.005 45.99,47.37 L58.281,40.272 C61.56,38.379 62.853,34.33 61.164,31.248 C60.092,29.293 58.058,28.125 55.721,28.125 L55.721,28.125 Z" id="Fill-8" fill="#607D8B"></path>
                    <path d="M149.588,2.407 C149.588,2.407 155.768,5.975 156.325,6.297 L156.325,7.184 C156.325,7.36 156.338,7.544 156.362,7.733 C156.373,7.814 156.382,7.894 156.39,7.975 C156.53,9.39 157.363,10.973 158.495,11.974 L165.891,18.519 C166.068,18.675 166.249,18.814 166.432,18.934 C168.011,19.974 169.382,19.4 169.494,17.652 C169.543,16.868 169.551,16.057 169.517,15.223 L169.514,15.063 L169.514,13.912 C170.78,14.642 195.501,28.915 195.501,28.915 L195.501,82.915 C195.501,84.005 194.731,84.445 193.781,83.897 L151.308,59.374 C150.358,58.826 149.588,57.497 149.588,56.408 L149.588,22.375" id="Fill-9" fill="#FAFAFA"></path>
                    <path d="M194.553,84.25 C194.296,84.25 194.013,84.165 193.722,83.997 L151.25,59.476 C150.269,58.909 149.471,57.533 149.471,56.408 L149.471,22.375 L149.705,22.375 L149.705,56.408 C149.705,57.459 150.45,58.744 151.366,59.274 L193.839,83.795 C194.263,84.04 194.655,84.083 194.942,83.917 C195.227,83.753 195.384,83.397 195.384,82.915 L195.384,28.982 C194.102,28.242 172.104,15.542 169.631,14.114 L169.634,15.22 C169.668,16.052 169.66,16.874 169.61,17.659 C169.556,18.503 169.214,19.123 168.647,19.405 C168.028,19.714 167.197,19.578 166.367,19.032 C166.181,18.909 165.995,18.766 165.814,18.606 L158.417,12.062 C157.259,11.036 156.418,9.437 156.274,7.986 C156.266,7.907 156.257,7.827 156.247,7.748 C156.221,7.555 156.209,7.365 156.209,7.184 L156.209,6.364 C155.375,5.883 149.529,2.508 149.529,2.508 L149.646,2.306 C149.646,2.306 155.827,5.874 156.384,6.196 L156.442,6.23 L156.442,7.184 C156.442,7.355 156.454,7.535 156.478,7.717 C156.489,7.8 156.499,7.882 156.507,7.963 C156.645,9.358 157.455,10.898 158.572,11.886 L165.969,18.431 C166.142,18.584 166.319,18.72 166.496,18.837 C167.254,19.336 168,19.467 168.543,19.196 C169.033,18.953 169.329,18.401 169.377,17.645 C169.427,16.867 169.434,16.054 169.401,15.228 L169.397,15.065 L169.397,13.71 L169.572,13.81 C170.839,14.541 195.559,28.814 195.559,28.814 L195.618,28.847 L195.618,82.915 C195.618,83.484 195.42,83.911 195.059,84.119 C194.908,84.206 194.737,84.25 194.553,84.25" id="Fill-10" fill="#607D8B"></path>
                    <path d="M145.685,56.161 L169.8,70.083 L143.822,85.081 L142.36,84.774 C135.826,82.604 128.732,81.046 121.341,80.158 C116.976,79.634 112.678,81.254 111.743,83.778 C111.506,84.414 111.503,85.071 111.732,85.706 C113.27,89.973 115.968,94.069 119.727,97.841 L120.259,98.686 C120.26,98.685 94.282,113.683 94.282,113.683 L70.167,99.761 L145.685,56.161" id="Fill-11" fill="#FFFFFF"></path>
                    <path d="M94.282,113.818 L94.223,113.785 L69.933,99.761 L70.108,99.66 L145.685,56.026 L145.743,56.059 L170.033,70.083 L143.842,85.205 L143.797,85.195 C143.772,85.19 142.336,84.888 142.336,84.888 C135.787,82.714 128.723,81.163 121.327,80.274 C120.788,80.209 120.236,80.177 119.689,80.177 C115.931,80.177 112.635,81.708 111.852,83.819 C111.624,84.432 111.621,85.053 111.842,85.667 C113.377,89.925 116.058,93.993 119.81,97.758 L119.826,97.779 L120.352,98.614 C120.354,98.617 120.356,98.62 120.358,98.624 L120.422,98.726 L120.317,98.787 C120.264,98.818 94.599,113.635 94.34,113.785 L94.282,113.818 L94.282,113.818 Z M70.401,99.761 L94.282,113.549 L119.084,99.229 C119.63,98.914 119.93,98.74 120.101,98.654 L119.635,97.914 C115.864,94.127 113.168,90.033 111.622,85.746 C111.382,85.079 111.386,84.404 111.633,83.738 C112.448,81.539 115.836,79.943 119.689,79.943 C120.246,79.943 120.806,79.976 121.355,80.042 C128.767,80.933 135.846,82.487 142.396,84.663 C143.232,84.838 143.611,84.917 143.786,84.967 L169.566,70.083 L145.685,56.295 L70.401,99.761 L70.401,99.761 Z" id="Fill-12" fill="#607D8B"></path>
                    <path d="M167.23,18.979 L167.23,69.85 L139.909,85.623 L133.448,71.456 C132.538,69.46 130.02,69.718 127.824,72.03 C126.769,73.14 125.931,74.585 125.494,76.048 L119.034,97.676 L91.712,113.45 L91.712,62.579 L167.23,18.979" id="Fill-13" fill="#FFFFFF"></path>
                    <path d="M91.712,113.567 C91.692,113.567 91.672,113.561 91.653,113.551 C91.618,113.53 91.595,113.492 91.595,113.45 L91.595,62.579 C91.595,62.537 91.618,62.499 91.653,62.478 L167.172,18.878 C167.208,18.857 167.252,18.857 167.288,18.878 C167.324,18.899 167.347,18.937 167.347,18.979 L167.347,69.85 C167.347,69.891 167.324,69.93 167.288,69.95 L139.967,85.725 C139.939,85.741 139.905,85.745 139.873,85.735 C139.842,85.725 139.816,85.702 139.802,85.672 L133.342,71.504 C132.967,70.682 132.28,70.229 131.408,70.229 C130.319,70.229 129.044,70.915 127.908,72.11 C126.874,73.2 126.034,74.647 125.606,76.082 L119.146,97.709 C119.137,97.738 119.118,97.762 119.092,97.777 L91.77,113.551 C91.752,113.561 91.732,113.567 91.712,113.567 L91.712,113.567 Z M91.829,62.647 L91.829,113.248 L118.935,97.598 L125.382,76.015 C125.827,74.525 126.664,73.081 127.739,71.95 C128.919,70.708 130.256,69.996 131.408,69.996 C132.377,69.996 133.139,70.497 133.554,71.407 L139.961,85.458 L167.113,69.782 L167.113,19.181 L91.829,62.647 L91.829,62.647 Z" id="Fill-14" fill="#607D8B"></path>
                    <path d="M168.543,19.213 L168.543,70.083 L141.221,85.857 L134.761,71.689 C133.851,69.694 131.333,69.951 129.137,72.263 C128.082,73.374 127.244,74.819 126.807,76.282 L120.346,97.909 L93.025,113.683 L93.025,62.813 L168.543,19.213" id="Fill-15" fill="#FFFFFF"></path>
                    <path d="M93.025,113.8 C93.005,113.8 92.984,113.795 92.966,113.785 C92.931,113.764 92.908,113.725 92.908,113.684 L92.908,62.813 C92.908,62.771 92.931,62.733 92.966,62.712 L168.484,19.112 C168.52,19.09 168.565,19.09 168.601,19.112 C168.637,19.132 168.66,19.171 168.66,19.212 L168.66,70.083 C168.66,70.125 168.637,70.164 168.601,70.184 L141.28,85.958 C141.251,85.975 141.217,85.979 141.186,85.968 C141.154,85.958 141.129,85.936 141.115,85.906 L134.655,71.738 C134.28,70.915 133.593,70.463 132.72,70.463 C131.632,70.463 130.357,71.148 129.221,72.344 C128.186,73.433 127.347,74.881 126.919,76.315 L120.458,97.943 C120.45,97.972 120.431,97.996 120.405,98.01 L93.083,113.785 C93.065,113.795 93.045,113.8 93.025,113.8 L93.025,113.8 Z M93.142,62.881 L93.142,113.481 L120.248,97.832 L126.695,76.248 C127.14,74.758 127.977,73.315 129.052,72.183 C130.231,70.942 131.568,70.229 132.72,70.229 C133.689,70.229 134.452,70.731 134.867,71.641 L141.274,85.692 L168.426,70.016 L168.426,19.415 L93.142,62.881 L93.142,62.881 Z" id="Fill-16" fill="#607D8B"></path>
                    <path d="M169.8,70.083 L142.478,85.857 L136.018,71.689 C135.108,69.694 132.59,69.951 130.393,72.263 C129.339,73.374 128.5,74.819 128.064,76.282 L121.603,97.909 L94.282,113.683 L94.282,62.813 L169.8,19.213 L169.8,70.083 Z" id="Fill-17" fill="#FAFAFA"></path>
                    <path d="M94.282,113.917 C94.241,113.917 94.201,113.907 94.165,113.886 C94.093,113.845 94.048,113.767 94.048,113.684 L94.048,62.813 C94.048,62.73 94.093,62.652 94.165,62.611 L169.683,19.01 C169.755,18.969 169.844,18.969 169.917,19.01 C169.989,19.052 170.033,19.129 170.033,19.212 L170.033,70.083 C170.033,70.166 169.989,70.244 169.917,70.285 L142.595,86.06 C142.538,86.092 142.469,86.1 142.407,86.08 C142.344,86.06 142.293,86.014 142.266,85.954 L135.805,71.786 C135.445,70.997 134.813,70.58 133.977,70.58 C132.921,70.58 131.676,71.252 130.562,72.424 C129.54,73.501 128.711,74.931 128.287,76.348 L121.827,97.976 C121.81,98.034 121.771,98.082 121.72,98.112 L94.398,113.886 C94.362,113.907 94.322,113.917 94.282,113.917 L94.282,113.917 Z M94.515,62.948 L94.515,113.279 L121.406,97.754 L127.84,76.215 C128.29,74.708 129.137,73.247 130.224,72.103 C131.425,70.838 132.793,70.112 133.977,70.112 C134.995,70.112 135.795,70.638 136.23,71.592 L142.584,85.526 L169.566,69.948 L169.566,19.617 L94.515,62.948 L94.515,62.948 Z" id="Fill-18" fill="#607D8B"></path>
                    <path d="M109.894,92.943 L109.894,92.943 C108.12,92.943 106.653,92.218 105.65,90.823 C105.583,90.731 105.593,90.61 105.673,90.529 C105.753,90.448 105.88,90.44 105.974,90.506 C106.754,91.053 107.679,91.333 108.724,91.333 C110.047,91.333 111.478,90.894 112.98,90.027 C118.291,86.96 122.611,79.509 122.611,73.416 C122.611,71.489 122.169,69.856 121.333,68.692 C121.266,68.6 121.276,68.473 121.356,68.392 C121.436,68.311 121.563,68.299 121.656,68.365 C123.327,69.537 124.247,71.746 124.247,74.584 C124.247,80.826 119.821,88.447 114.382,91.587 C112.808,92.495 111.298,92.943 109.894,92.943 L109.894,92.943 Z M106.925,91.401 C107.738,92.052 108.745,92.278 109.893,92.278 L109.894,92.278 C111.215,92.278 112.647,91.951 114.148,91.084 C119.459,88.017 123.78,80.621 123.78,74.528 C123.78,72.549 123.317,70.929 122.454,69.767 C122.865,70.802 123.079,72.042 123.079,73.402 C123.079,79.645 118.653,87.285 113.214,90.425 C111.64,91.334 110.13,91.742 108.724,91.742 C108.083,91.742 107.481,91.593 106.925,91.401 L106.925,91.401 Z" id="Fill-19" fill="#607D8B"></path>
                    <path d="M113.097,90.23 C118.481,87.122 122.845,79.594 122.845,73.416 C122.845,71.365 122.362,69.724 121.522,68.556 C119.738,67.304 117.148,67.362 114.265,69.026 C108.881,72.134 104.517,79.662 104.517,85.84 C104.517,87.891 105,89.532 105.84,90.7 C107.624,91.952 110.214,91.894 113.097,90.23" id="Fill-20" fill="#FAFAFA"></path>
                    <path d="M108.724,91.614 L108.724,91.614 C107.582,91.614 106.566,91.401 105.705,90.797 C105.684,90.783 105.665,90.811 105.65,90.79 C104.756,89.546 104.283,87.842 104.283,85.817 C104.283,79.575 108.709,71.953 114.148,68.812 C115.722,67.904 117.232,67.449 118.638,67.449 C119.78,67.449 120.796,67.758 121.656,68.362 C121.678,68.377 121.697,68.397 121.712,68.418 C122.606,69.662 123.079,71.39 123.079,73.415 C123.079,79.658 118.653,87.198 113.214,90.338 C111.64,91.247 110.13,91.614 108.724,91.614 L108.724,91.614 Z M106.006,90.505 C106.78,91.037 107.694,91.281 108.724,91.281 C110.047,91.281 111.478,90.868 112.98,90.001 C118.291,86.935 122.611,79.496 122.611,73.403 C122.611,71.494 122.177,69.88 121.356,68.718 C120.582,68.185 119.668,67.919 118.638,67.919 C117.315,67.919 115.883,68.36 114.382,69.227 C109.071,72.293 104.751,79.733 104.751,85.826 C104.751,87.735 105.185,89.343 106.006,90.505 L106.006,90.505 Z" id="Fill-21" fill="#607D8B"></path>
                    <path d="M149.318,7.262 L139.334,16.14 L155.227,27.171 L160.816,21.059 L149.318,7.262" id="Fill-22" fill="#FAFAFA"></path>
                    <path d="M169.676,13.84 L159.928,19.467 C156.286,21.57 150.4,21.58 146.781,19.491 C143.161,17.402 143.18,14.003 146.822,11.9 L156.317,6.292 L149.588,2.407 L67.752,49.478 L113.675,75.992 L116.756,74.213 C117.387,73.848 117.625,73.315 117.374,72.823 C115.017,68.191 114.781,63.277 116.691,58.561 C122.329,44.641 141.2,33.746 165.309,30.491 C173.478,29.388 181.989,29.524 190.013,30.885 C190.865,31.03 191.789,30.893 192.42,30.528 L195.501,28.75 L169.676,13.84" id="Fill-23" fill="#FAFAFA"></path>
                    <path d="M113.675,76.459 C113.594,76.459 113.514,76.438 113.442,76.397 L67.518,49.882 C67.374,49.799 67.284,49.645 67.285,49.478 C67.285,49.311 67.374,49.157 67.519,49.073 L149.355,2.002 C149.499,1.919 149.677,1.919 149.821,2.002 L156.55,5.887 C156.774,6.017 156.85,6.302 156.722,6.526 C156.592,6.749 156.307,6.826 156.083,6.696 L149.587,2.946 L68.687,49.479 L113.675,75.452 L116.523,73.808 C116.715,73.697 117.143,73.399 116.958,73.035 C114.542,68.287 114.3,63.221 116.258,58.385 C119.064,51.458 125.143,45.143 133.84,40.122 C142.497,35.124 153.358,31.633 165.247,30.028 C173.445,28.921 182.037,29.058 190.091,30.425 C190.83,30.55 191.652,30.432 192.186,30.124 L194.567,28.75 L169.442,14.244 C169.219,14.115 169.142,13.829 169.271,13.606 C169.4,13.382 169.685,13.306 169.909,13.435 L195.734,28.345 C195.879,28.428 195.968,28.583 195.968,28.75 C195.968,28.916 195.879,29.071 195.734,29.154 L192.653,30.933 C191.932,31.35 190.89,31.508 189.935,31.346 C181.972,29.995 173.478,29.86 165.372,30.954 C153.602,32.543 142.86,35.993 134.307,40.931 C125.793,45.847 119.851,52.004 117.124,58.736 C115.27,63.314 115.501,68.112 117.79,72.611 C118.16,73.336 117.845,74.124 116.99,74.617 L113.909,76.397 C113.836,76.438 113.756,76.459 113.675,76.459" id="Fill-24" fill="#455A64"></path>
                    <path d="M153.316,21.279 C150.903,21.279 148.495,20.751 146.664,19.693 C144.846,18.644 143.844,17.232 143.844,15.718 C143.844,14.191 144.86,12.763 146.705,11.698 L156.198,6.091 C156.309,6.025 156.452,6.062 156.518,6.173 C156.583,6.284 156.547,6.427 156.436,6.493 L146.94,12.102 C145.244,13.081 144.312,14.365 144.312,15.718 C144.312,17.058 145.23,18.326 146.897,19.289 C150.446,21.338 156.24,21.327 159.811,19.265 L169.559,13.637 C169.67,13.573 169.813,13.611 169.878,13.723 C169.943,13.834 169.904,13.977 169.793,14.042 L160.045,19.67 C158.187,20.742 155.749,21.279 153.316,21.279" id="Fill-25" fill="#607D8B"></path>
                    <path d="M113.675,75.992 L67.762,49.484" id="Fill-26" fill="#455A64"></path>
                    <path d="M113.675,76.342 C113.615,76.342 113.555,76.327 113.5,76.295 L67.587,49.787 C67.419,49.69 67.362,49.476 67.459,49.309 C67.556,49.141 67.77,49.083 67.937,49.18 L113.85,75.688 C114.018,75.785 114.075,76 113.978,76.167 C113.914,76.279 113.796,76.342 113.675,76.342" id="Fill-27" fill="#455A64"></path>
                    <path d="M67.762,49.484 L67.762,103.485 C67.762,104.575 68.532,105.903 69.482,106.452 L111.955,130.973 C112.905,131.522 113.675,131.083 113.675,129.993 L113.675,75.992" id="Fill-28" fill="#FAFAFA"></path>
                    <path d="M112.727,131.561 C112.43,131.561 112.107,131.466 111.78,131.276 L69.307,106.755 C68.244,106.142 67.412,104.705 67.412,103.485 L67.412,49.484 C67.412,49.29 67.569,49.134 67.762,49.134 C67.956,49.134 68.113,49.29 68.113,49.484 L68.113,103.485 C68.113,104.445 68.82,105.665 69.657,106.148 L112.13,130.67 C112.474,130.868 112.791,130.913 113,130.792 C113.206,130.673 113.325,130.381 113.325,129.993 L113.325,75.992 C113.325,75.798 113.482,75.641 113.675,75.641 C113.869,75.641 114.025,75.798 114.025,75.992 L114.025,129.993 C114.025,130.648 113.786,131.147 113.35,131.399 C113.162,131.507 112.952,131.561 112.727,131.561" id="Fill-29" fill="#455A64"></path>
                    <path d="M112.86,40.512 C112.86,40.512 112.86,40.512 112.859,40.512 C110.541,40.512 108.36,39.99 106.717,39.041 C105.012,38.057 104.074,36.726 104.074,35.292 C104.074,33.847 105.026,32.501 106.754,31.504 L118.795,24.551 C120.463,23.589 122.669,23.058 125.007,23.058 C127.325,23.058 129.506,23.581 131.15,24.53 C132.854,25.514 133.793,26.845 133.793,28.278 C133.793,29.724 132.841,31.069 131.113,32.067 L119.071,39.019 C117.403,39.982 115.197,40.512 112.86,40.512 L112.86,40.512 Z M125.007,23.759 C122.79,23.759 120.709,24.256 119.146,25.158 L107.104,32.11 C105.602,32.978 104.774,34.108 104.774,35.292 C104.774,36.465 105.589,37.581 107.067,38.434 C108.605,39.323 110.663,39.812 112.859,39.812 L112.86,39.812 C115.076,39.812 117.158,39.315 118.721,38.413 L130.762,31.46 C132.264,30.593 133.092,29.463 133.092,28.278 C133.092,27.106 132.278,25.99 130.8,25.136 C129.261,24.248 127.204,23.759 125.007,23.759 L125.007,23.759 Z" id="Fill-30" fill="#607D8B"></path>
                    <path d="M165.63,16.219 L159.896,19.53 C156.729,21.358 151.61,21.367 148.463,19.55 C145.316,17.733 145.332,14.778 148.499,12.949 L154.233,9.639 L165.63,16.219" id="Fill-31" fill="#FAFAFA"></path>
                    <path d="M154.233,10.448 L164.228,16.219 L159.546,18.923 C158.112,19.75 156.194,20.206 154.147,20.206 C152.118,20.206 150.224,19.757 148.814,18.943 C147.524,18.199 146.814,17.249 146.814,16.269 C146.814,15.278 147.537,14.314 148.85,13.556 L154.233,10.448 M154.233,9.639 L148.499,12.949 C145.332,14.778 145.316,17.733 148.463,19.55 C150.031,20.455 152.086,20.907 154.147,20.907 C156.224,20.907 158.306,20.447 159.896,19.53 L165.63,16.219 L154.233,9.639" id="Fill-32" fill="#607D8B"></path>
                    <path d="M145.445,72.667 L145.445,72.667 C143.672,72.667 142.204,71.817 141.202,70.422 C141.135,70.33 141.145,70.147 141.225,70.066 C141.305,69.985 141.432,69.946 141.525,70.011 C142.306,70.559 143.231,70.823 144.276,70.822 C145.598,70.822 147.03,70.376 148.532,69.509 C153.842,66.443 158.163,58.987 158.163,52.894 C158.163,50.967 157.721,49.332 156.884,48.168 C156.818,48.076 156.828,47.948 156.908,47.867 C156.988,47.786 157.114,47.774 157.208,47.84 C158.878,49.012 159.798,51.22 159.798,54.059 C159.798,60.301 155.373,68.046 149.933,71.186 C148.36,72.094 146.85,72.667 145.445,72.667 L145.445,72.667 Z M142.476,71 C143.29,71.651 144.296,72.002 145.445,72.002 C146.767,72.002 148.198,71.55 149.7,70.682 C155.01,67.617 159.331,60.159 159.331,54.065 C159.331,52.085 158.868,50.435 158.006,49.272 C158.417,50.307 158.63,51.532 158.63,52.892 C158.63,59.134 154.205,66.767 148.765,69.907 C147.192,70.816 145.681,71.283 144.276,71.283 C143.634,71.283 143.033,71.192 142.476,71 L142.476,71 Z" id="Fill-33" fill="#607D8B"></path>
                    <path d="M148.648,69.704 C154.032,66.596 158.396,59.068 158.396,52.891 C158.396,50.839 157.913,49.198 157.074,48.03 C155.289,46.778 152.699,46.836 149.816,48.501 C144.433,51.609 140.068,59.137 140.068,65.314 C140.068,67.365 140.552,69.006 141.391,70.174 C143.176,71.427 145.765,71.369 148.648,69.704" id="Fill-34" fill="#FAFAFA"></path>
                    <path d="M144.276,71.276 L144.276,71.276 C143.133,71.276 142.118,70.969 141.257,70.365 C141.236,70.351 141.217,70.332 141.202,70.311 C140.307,69.067 139.835,67.339 139.835,65.314 C139.835,59.073 144.26,51.439 149.7,48.298 C151.273,47.39 152.784,46.929 154.189,46.929 C155.332,46.929 156.347,47.236 157.208,47.839 C157.229,47.854 157.248,47.873 157.263,47.894 C158.157,49.138 158.63,50.865 158.63,52.891 C158.63,59.132 154.205,66.766 148.765,69.907 C147.192,70.815 145.681,71.276 144.276,71.276 L144.276,71.276 Z M141.558,70.104 C142.331,70.637 143.245,71.005 144.276,71.005 C145.598,71.005 147.03,70.467 148.532,69.6 C153.842,66.534 158.163,59.033 158.163,52.939 C158.163,51.031 157.729,49.385 156.907,48.223 C156.133,47.691 155.219,47.409 154.189,47.409 C152.867,47.409 151.435,47.842 149.933,48.709 C144.623,51.775 140.302,59.273 140.302,65.366 C140.302,67.276 140.736,68.942 141.558,70.104 L141.558,70.104 Z" id="Fill-35" fill="#607D8B"></path>
                    <path d="M150.72,65.361 L150.357,65.066 C151.147,64.092 151.869,63.04 152.505,61.938 C153.313,60.539 153.978,59.067 154.482,57.563 L154.925,57.712 C154.412,59.245 153.733,60.745 152.91,62.172 C152.262,63.295 151.525,64.368 150.72,65.361" id="Fill-36" fill="#607D8B"></path>
                    <path d="M115.917,84.514 L115.554,84.22 C116.344,83.245 117.066,82.194 117.702,81.092 C118.51,79.692 119.175,78.22 119.678,76.717 L120.121,76.865 C119.608,78.398 118.93,79.899 118.106,81.326 C117.458,82.448 116.722,83.521 115.917,84.514" id="Fill-37" fill="#607D8B"></path>
                    <path d="M114,130.476 L114,130.008 L114,76.052 L114,75.584 L114,76.052 L114,130.008 L114,130.476" id="Fill-38" fill="#607D8B"></path>
                </g>
                <g id="Imported-Layers-Copy" transform="translate(62.000000, 0.000000)" sketch:type="MSShapeGroup">
                    <path d="M19.822,37.474 C19.839,37.339 19.747,37.194 19.555,37.082 C19.228,36.894 18.729,36.872 18.446,37.037 L12.434,40.508 C12.303,40.584 12.24,40.686 12.243,40.793 C12.245,40.925 12.245,41.254 12.245,41.371 L12.245,41.414 L12.238,41.542 C8.148,43.887 5.647,45.321 5.647,45.321 C5.646,45.321 3.57,46.367 2.86,50.513 C2.86,50.513 1.948,57.474 1.962,70.258 C1.977,82.828 2.568,87.328 3.129,91.609 C3.349,93.293 6.13,93.734 6.13,93.734 C6.461,93.774 6.828,93.707 7.21,93.486 L82.483,49.935 C84.291,48.866 85.15,46.216 85.539,43.651 C86.752,35.661 87.214,10.673 85.264,3.773 C85.068,3.08 84.754,2.69 84.396,2.491 L82.31,1.701 C81.583,1.729 80.894,2.168 80.776,2.236 C80.636,2.317 41.807,24.585 20.032,37.072 L19.822,37.474" id="Fill-1" fill="#FFFFFF"></path>
                    <path d="M82.311,1.701 L84.396,2.491 C84.754,2.69 85.068,3.08 85.264,3.773 C87.213,10.673 86.751,35.66 85.539,43.651 C85.149,46.216 84.29,48.866 82.483,49.935 L7.21,93.486 C6.897,93.667 6.595,93.744 6.314,93.744 L6.131,93.733 C6.131,93.734 3.349,93.293 3.128,91.609 C2.568,87.327 1.977,82.828 1.963,70.258 C1.948,57.474 2.86,50.513 2.86,50.513 C3.57,46.367 5.647,45.321 5.647,45.321 C5.647,45.321 8.148,43.887 12.238,41.542 L12.245,41.414 L12.245,41.371 C12.245,41.254 12.245,40.925 12.243,40.793 C12.24,40.686 12.302,40.583 12.434,40.508 L18.446,37.036 C18.574,36.962 18.746,36.926 18.927,36.926 C19.145,36.926 19.376,36.979 19.554,37.082 C19.747,37.194 19.839,37.34 19.822,37.474 L20.033,37.072 C41.806,24.585 80.636,2.318 80.777,2.236 C80.894,2.168 81.583,1.729 82.311,1.701 M82.311,0.704 L82.272,0.705 C81.654,0.728 80.989,0.949 80.298,1.361 L80.277,1.373 C80.129,1.458 59.768,13.135 19.758,36.079 C19.5,35.981 19.214,35.929 18.927,35.929 C18.562,35.929 18.223,36.013 17.947,36.173 L11.935,39.644 C11.493,39.899 11.236,40.334 11.246,40.81 L11.247,40.96 L5.167,44.447 C4.794,44.646 2.625,45.978 1.877,50.345 L1.871,50.384 C1.862,50.454 0.951,57.557 0.965,70.259 C0.979,82.879 1.568,87.375 2.137,91.724 L2.139,91.739 C2.447,94.094 5.614,94.662 5.975,94.719 L6.009,94.723 C6.11,94.736 6.213,94.742 6.314,94.742 C6.79,94.742 7.26,94.61 7.71,94.35 L82.983,50.798 C84.794,49.727 85.982,47.375 86.525,43.801 C87.711,35.987 88.259,10.705 86.224,3.502 C85.971,2.609 85.52,1.975 84.881,1.62 L84.749,1.558 L82.664,0.769 C82.551,0.725 82.431,0.704 82.311,0.704" id="Fill-2" fill="#455A64"></path>
                    <path d="M66.267,11.565 L67.762,11.999 L11.423,44.325" id="Fill-3" fill="#FFFFFF"></path>
                    <path d="M12.202,90.545 C12.029,90.545 11.862,90.455 11.769,90.295 C11.632,90.057 11.713,89.752 11.952,89.614 L30.389,78.969 C30.628,78.831 30.933,78.913 31.071,79.152 C31.208,79.39 31.127,79.696 30.888,79.833 L12.451,90.478 L12.202,90.545" id="Fill-4" fill="#607D8B"></path>
                    <path d="M13.764,42.654 L13.656,42.592 L13.702,42.421 L18.837,39.457 L19.007,39.502 L18.962,39.673 L13.827,42.637 L13.764,42.654" id="Fill-5" fill="#607D8B"></path>
                    <path d="M8.52,90.375 L8.52,46.421 L8.583,46.385 L75.84,7.554 L75.84,51.508 L75.778,51.544 L8.52,90.375 L8.52,90.375 Z M8.77,46.564 L8.77,89.944 L75.591,51.365 L75.591,7.985 L8.77,46.564 L8.77,46.564 Z" id="Fill-6" fill="#607D8B"></path>
                    <path d="M24.986,83.182 C24.756,83.331 24.374,83.566 24.137,83.705 L12.632,90.406 C12.395,90.545 12.426,90.658 12.7,90.658 L13.265,90.658 C13.54,90.658 13.958,90.545 14.195,90.406 L25.7,83.705 C25.937,83.566 26.128,83.452 26.125,83.449 C26.122,83.447 26.119,83.22 26.119,82.946 C26.119,82.672 25.931,82.569 25.701,82.719 L24.986,83.182" id="Fill-7" fill="#607D8B"></path>
                    <path d="M13.266,90.782 L12.7,90.782 C12.5,90.782 12.384,90.726 12.354,90.616 C12.324,90.506 12.397,90.399 12.569,90.299 L24.074,83.597 C24.31,83.459 24.689,83.226 24.918,83.078 L25.633,82.614 C25.723,82.555 25.813,82.525 25.899,82.525 C26.071,82.525 26.244,82.655 26.244,82.946 C26.244,83.16 26.245,83.309 26.247,83.383 L26.253,83.387 L26.249,83.456 C26.246,83.531 26.246,83.531 25.763,83.812 L14.258,90.514 C14,90.665 13.564,90.782 13.266,90.782 L13.266,90.782 Z M12.666,90.532 L12.7,90.533 L13.266,90.533 C13.518,90.533 13.915,90.425 14.132,90.299 L25.637,83.597 C25.805,83.499 25.931,83.424 25.998,83.383 C25.994,83.299 25.994,83.165 25.994,82.946 L25.899,82.775 L25.768,82.824 L25.054,83.287 C24.822,83.437 24.438,83.673 24.2,83.812 L12.695,90.514 L12.666,90.532 L12.666,90.532 Z" id="Fill-8" fill="#607D8B"></path>
                    <path d="M13.266,89.871 L12.7,89.871 C12.5,89.871 12.384,89.815 12.354,89.705 C12.324,89.595 12.397,89.488 12.569,89.388 L24.074,82.686 C24.332,82.535 24.768,82.418 25.067,82.418 L25.632,82.418 C25.832,82.418 25.948,82.474 25.978,82.584 C26.008,82.694 25.935,82.801 25.763,82.901 L14.258,89.603 C14,89.754 13.564,89.871 13.266,89.871 L13.266,89.871 Z M12.666,89.621 L12.7,89.622 L13.266,89.622 C13.518,89.622 13.915,89.515 14.132,89.388 L25.637,82.686 L25.667,82.668 L25.632,82.667 L25.067,82.667 C24.815,82.667 24.418,82.775 24.2,82.901 L12.695,89.603 L12.666,89.621 L12.666,89.621 Z" id="Fill-9" fill="#607D8B"></path>
                    <path d="M12.37,90.801 L12.37,89.554 L12.37,90.801" id="Fill-10" fill="#607D8B"></path>
                    <path d="M6.13,93.901 C5.379,93.808 4.816,93.164 4.691,92.525 C3.86,88.287 3.54,83.743 3.526,71.173 C3.511,58.389 4.423,51.428 4.423,51.428 C5.134,47.282 7.21,46.236 7.21,46.236 C7.21,46.236 81.667,3.25 82.069,3.017 C82.292,2.888 84.556,1.433 85.264,3.94 C87.214,10.84 86.752,35.827 85.539,43.818 C85.15,46.383 84.291,49.033 82.483,50.101 L7.21,93.653 C6.828,93.874 6.461,93.941 6.13,93.901 C6.13,93.901 3.349,93.46 3.129,91.776 C2.568,87.495 1.977,82.995 1.962,70.425 C1.948,57.641 2.86,50.68 2.86,50.68 C3.57,46.534 5.647,45.489 5.647,45.489 C5.646,45.489 8.065,44.092 12.245,41.679 L13.116,41.56 L19.715,37.73 L19.761,37.269 L6.13,93.901" id="Fill-11" fill="#FAFAFA"></path>
                    <path d="M6.317,94.161 L6.102,94.148 L6.101,94.148 L5.857,94.101 C5.138,93.945 3.085,93.365 2.881,91.809 C2.313,87.469 1.727,82.996 1.713,70.425 C1.699,57.771 2.604,50.718 2.613,50.648 C3.338,46.417 5.445,45.31 5.535,45.266 L12.163,41.439 L13.033,41.32 L19.479,37.578 L19.513,37.244 C19.526,37.107 19.647,37.008 19.786,37.021 C19.922,37.034 20.023,37.156 20.009,37.293 L19.95,37.882 L13.198,41.801 L12.328,41.919 L5.772,45.704 C5.741,45.72 3.782,46.772 3.106,50.722 C3.099,50.782 2.198,57.808 2.212,70.424 C2.226,82.963 2.809,87.42 3.373,91.729 C3.464,92.42 4.062,92.883 4.682,93.181 C4.566,92.984 4.486,92.776 4.446,92.572 C3.665,88.588 3.291,84.37 3.276,71.173 C3.262,58.52 4.167,51.466 4.176,51.396 C4.901,47.165 7.008,46.059 7.098,46.014 C7.094,46.015 81.542,3.034 81.944,2.802 L81.972,2.785 C82.876,2.247 83.692,2.097 84.332,2.352 C84.887,2.573 85.281,3.085 85.504,3.872 C87.518,11 86.964,36.091 85.785,43.855 C85.278,47.196 84.21,49.37 82.61,50.317 L7.335,93.869 C6.999,94.063 6.658,94.161 6.317,94.161 L6.317,94.161 Z M6.17,93.654 C6.463,93.69 6.774,93.617 7.085,93.437 L82.358,49.886 C84.181,48.808 84.96,45.971 85.292,43.78 C86.466,36.049 87.023,11.085 85.024,4.008 C84.846,3.377 84.551,2.976 84.148,2.816 C83.664,2.623 82.982,2.764 82.227,3.213 L82.193,3.234 C81.791,3.466 7.335,46.452 7.335,46.452 C7.304,46.469 5.346,47.521 4.669,51.471 C4.662,51.53 3.761,58.556 3.775,71.173 C3.79,84.328 4.161,88.524 4.936,92.476 C5.026,92.937 5.412,93.459 5.973,93.615 C6.087,93.64 6.158,93.652 6.169,93.654 L6.17,93.654 L6.17,93.654 Z" id="Fill-12" fill="#455A64"></path>
                    <path d="M7.317,68.982 C7.806,68.701 8.202,68.926 8.202,69.487 C8.202,70.047 7.806,70.73 7.317,71.012 C6.829,71.294 6.433,71.069 6.433,70.508 C6.433,69.948 6.829,69.265 7.317,68.982" id="Fill-13" fill="#FFFFFF"></path>
                    <path d="M6.92,71.133 C6.631,71.133 6.433,70.905 6.433,70.508 C6.433,69.948 6.829,69.265 7.317,68.982 C7.46,68.9 7.595,68.861 7.714,68.861 C8.003,68.861 8.202,69.09 8.202,69.487 C8.202,70.047 7.806,70.73 7.317,71.012 C7.174,71.094 7.039,71.133 6.92,71.133 M7.714,68.674 C7.557,68.674 7.392,68.723 7.224,68.821 C6.676,69.138 6.246,69.879 6.246,70.508 C6.246,70.994 6.517,71.32 6.92,71.32 C7.078,71.32 7.243,71.271 7.411,71.174 C7.959,70.857 8.389,70.117 8.389,69.487 C8.389,69.001 8.117,68.674 7.714,68.674" id="Fill-14" fill="#8097A2"></path>
                    <path d="M6.92,70.947 C6.649,70.947 6.621,70.64 6.621,70.508 C6.621,70.017 6.982,69.392 7.411,69.145 C7.521,69.082 7.625,69.049 7.714,69.049 C7.986,69.049 8.015,69.355 8.015,69.487 C8.015,69.978 7.652,70.603 7.224,70.851 C7.115,70.914 7.01,70.947 6.92,70.947 M7.714,68.861 C7.595,68.861 7.46,68.9 7.317,68.982 C6.829,69.265 6.433,69.948 6.433,70.508 C6.433,70.905 6.631,71.133 6.92,71.133 C7.039,71.133 7.174,71.094 7.317,71.012 C7.806,70.73 8.202,70.047 8.202,69.487 C8.202,69.09 8.003,68.861 7.714,68.861" id="Fill-15" fill="#8097A2"></path>
                    <path d="M7.444,85.35 C7.708,85.198 7.921,85.319 7.921,85.622 C7.921,85.925 7.708,86.292 7.444,86.444 C7.181,86.597 6.967,86.475 6.967,86.173 C6.967,85.871 7.181,85.502 7.444,85.35" id="Fill-16" fill="#FFFFFF"></path>
                    <path d="M7.23,86.51 C7.074,86.51 6.967,86.387 6.967,86.173 C6.967,85.871 7.181,85.502 7.444,85.35 C7.521,85.305 7.594,85.284 7.658,85.284 C7.814,85.284 7.921,85.408 7.921,85.622 C7.921,85.925 7.708,86.292 7.444,86.444 C7.367,86.489 7.294,86.51 7.23,86.51 M7.658,85.098 C7.558,85.098 7.455,85.127 7.351,85.188 C7.031,85.373 6.781,85.806 6.781,86.173 C6.781,86.482 6.966,86.697 7.23,86.697 C7.33,86.697 7.433,86.666 7.538,86.607 C7.858,86.422 8.108,85.989 8.108,85.622 C8.108,85.313 7.923,85.098 7.658,85.098" id="Fill-17" fill="#8097A2"></path>
                    <path d="M7.23,86.322 L7.154,86.173 C7.154,85.938 7.333,85.629 7.538,85.512 L7.658,85.471 L7.734,85.622 C7.734,85.856 7.555,86.164 7.351,86.282 L7.23,86.322 M7.658,85.284 C7.594,85.284 7.521,85.305 7.444,85.35 C7.181,85.502 6.967,85.871 6.967,86.173 C6.967,86.387 7.074,86.51 7.23,86.51 C7.294,86.51 7.367,86.489 7.444,86.444 C7.708,86.292 7.921,85.925 7.921,85.622 C7.921,85.408 7.814,85.284 7.658,85.284" id="Fill-18" fill="#8097A2"></path>
                    <path d="M77.278,7.769 L77.278,51.436 L10.208,90.16 L10.208,46.493 L77.278,7.769" id="Fill-19" fill="#455A64"></path>
                    <path d="M10.083,90.375 L10.083,46.421 L10.146,46.385 L77.403,7.554 L77.403,51.508 L77.341,51.544 L10.083,90.375 L10.083,90.375 Z M10.333,46.564 L10.333,89.944 L77.154,51.365 L77.154,7.985 L10.333,46.564 L10.333,46.564 Z" id="Fill-20" fill="#607D8B"></path>
                </g>
                <path d="M125.737,88.647 L118.098,91.981 L118.098,84 L106.639,88.713 L106.639,96.982 L99,100.315 L112.369,103.961 L125.737,88.647" id="Imported-Layers-Copy-2" fill="#455A64" sketch:type="MSShapeGroup"></path>
            </g>
        </g>
    </g>
</svg>');
+RotateInstructions.prototype.loadIcon_ = function () {
+ this.icon = dataUri('image/svg+xml', rotateInstructionsAsset);
};
-var rotateInstructions = RotateInstructions;
-
var DEFAULT_VIEWER = 'CardboardV1';
var VIEWER_KEY = 'WEBVR_CARDBOARD_VIEWER';
var CLASS_NAME = 'webvr-polyfill-viewer-selector';
-function ViewerSelector() {
+function ViewerSelector(defaultViewer) {
try {
this.selectedKey = localStorage.getItem(VIEWER_KEY);
} catch (error) {
console.error('Failed to load viewer profile: %s', error);
}
if (!this.selectedKey) {
- this.selectedKey = DEFAULT_VIEWER;
+ this.selectedKey = defaultViewer || DEFAULT_VIEWER;
}
- this.dialog = this.createDialog_(deviceInfo.Viewers);
+ this.dialog = this.createDialog_(DeviceInfo.Viewers);
this.root = null;
this.onChangeCallbacks_ = [];
}
-ViewerSelector.prototype.show = function(root) {
+ViewerSelector.prototype.show = function (root) {
this.root = root;
root.appendChild(this.dialog);
var selected = this.dialog.querySelector('#' + this.selectedKey);
selected.checked = true;
this.dialog.style.display = 'block';
};
-ViewerSelector.prototype.hide = function() {
+ViewerSelector.prototype.hide = function () {
if (this.root && this.root.contains(this.dialog)) {
this.root.removeChild(this.dialog);
}
this.dialog.style.display = 'none';
};
-ViewerSelector.prototype.getCurrentViewer = function() {
- return deviceInfo.Viewers[this.selectedKey];
+ViewerSelector.prototype.getCurrentViewer = function () {
+ return DeviceInfo.Viewers[this.selectedKey];
};
-ViewerSelector.prototype.getSelectedKey_ = function() {
+ViewerSelector.prototype.getSelectedKey_ = function () {
var input = this.dialog.querySelector('input[name=field]:checked');
if (input) {
return input.id;
}
return null;
};
-ViewerSelector.prototype.onChange = function(cb) {
+ViewerSelector.prototype.onChange = function (cb) {
this.onChangeCallbacks_.push(cb);
};
-ViewerSelector.prototype.fireOnChange_ = function(viewer) {
+ViewerSelector.prototype.fireOnChange_ = function (viewer) {
for (var i = 0; i < this.onChangeCallbacks_.length; i++) {
this.onChangeCallbacks_[i](viewer);
}
};
-ViewerSelector.prototype.onSave_ = function() {
+ViewerSelector.prototype.onSave_ = function () {
this.selectedKey = this.getSelectedKey_();
- if (!this.selectedKey || !deviceInfo.Viewers[this.selectedKey]) {
+ if (!this.selectedKey || !DeviceInfo.Viewers[this.selectedKey]) {
console.error('ViewerSelector.onSave_: this should never happen!');
return;
}
- this.fireOnChange_(deviceInfo.Viewers[this.selectedKey]);
+ this.fireOnChange_(DeviceInfo.Viewers[this.selectedKey]);
try {
localStorage.setItem(VIEWER_KEY, this.selectedKey);
- } catch(error) {
+ } catch (error) {
console.error('Failed to save viewer profile: %s', error);
}
this.hide();
};
-ViewerSelector.prototype.createDialog_ = function(options) {
+ViewerSelector.prototype.createDialog_ = function (options) {
var container = document.createElement('div');
container.classList.add(CLASS_NAME);
container.style.display = 'none';
@@ -2382,7 +2587,7 @@
s.position = 'fixed';
s.top = '24px';
s.left = '50%';
- s.marginLeft = (-width/2) + 'px';
+ s.marginLeft = -width / 2 + 'px';
s.width = width + 'px';
s.padding = '24px';
s.overflow = 'hidden';
@@ -2398,7 +2603,7 @@
container.appendChild(dialog);
return container;
};
-ViewerSelector.prototype.createH1_ = function(name) {
+ViewerSelector.prototype.createH1_ = function (name) {
var h1 = document.createElement('h1');
var s = h1.style;
s.color = 'black';
@@ -2409,7 +2614,7 @@
h1.innerHTML = name;
return h1;
};
-ViewerSelector.prototype.createChoice_ = function(id, name) {
+ViewerSelector.prototype.createChoice_ = function (id, name) {
var div = document.createElement('div');
div.style.marginTop = '8px';
div.style.color = 'black';
@@ -2427,7 +2632,7 @@
div.appendChild(label);
return div;
};
-ViewerSelector.prototype.createButton_ = function(label, onclick) {
+ViewerSelector.prototype.createButton_ = function (label, onclick) {
var button = document.createElement('button');
button.innerHTML = label;
var s = button.style;
@@ -2442,133 +2647,234 @@
button.addEventListener('click', onclick);
return button;
};
-var viewerSelector = ViewerSelector;
-
-function AndroidWakeLock() {
- var video = document.createElement('video');
- video.setAttribute('loop', '');
- function addSourceToVideo(element, type, dataURI) {
- var source = document.createElement('source');
- source.src = dataURI;
- source.type = 'video/' + type;
- element.appendChild(source);
+var commonjsGlobal$$1 = typeof window !== 'undefined' ? window : typeof commonjsGlobal !== 'undefined' ? commonjsGlobal : typeof self !== 'undefined' ? self : {};
+function unwrapExports$$1 (x) {
+ return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, 'default') ? x['default'] : x;
+}
+function createCommonjsModule$$1(fn, module) {
+ return module = { exports: {} }, fn(module, module.exports), module.exports;
+}
+var NoSleep = createCommonjsModule$$1(function (module, exports) {
+(function webpackUniversalModuleDefinition(root, factory) {
+ module.exports = factory();
+})(commonjsGlobal$$1, function() {
+return (function(modules) {
+ var installedModules = {};
+ function __webpack_require__(moduleId) {
+ if(installedModules[moduleId]) {
+ return installedModules[moduleId].exports;
+ }
+ var module = installedModules[moduleId] = {
+ i: moduleId,
+ l: false,
+ exports: {}
+ };
+ modules[moduleId].call(module.exports, module, module.exports, __webpack_require__);
+ module.l = true;
+ return module.exports;
+ }
+ __webpack_require__.m = modules;
+ __webpack_require__.c = installedModules;
+ __webpack_require__.d = function(exports, name, getter) {
+ if(!__webpack_require__.o(exports, name)) {
+ Object.defineProperty(exports, name, {
+ configurable: false,
+ enumerable: true,
+ get: getter
+ });
+ }
+ };
+ __webpack_require__.n = function(module) {
+ var getter = module && module.__esModule ?
+ function getDefault() { return module['default']; } :
+ function getModuleExports() { return module; };
+ __webpack_require__.d(getter, 'a', getter);
+ return getter;
+ };
+ __webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };
+ __webpack_require__.p = "";
+ return __webpack_require__(__webpack_require__.s = 0);
+ })
+ ([
+ (function(module, exports, __webpack_require__) {
+var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
+function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+var mediaFile = __webpack_require__(1);
+var oldIOS = typeof navigator !== 'undefined' && parseFloat(('' + (/CPU.*OS ([0-9_]{3,4})[0-9_]{0,1}|(CPU like).*AppleWebKit.*Mobile/i.exec(navigator.userAgent) || [0, ''])[1]).replace('undefined', '3_2').replace('_', '.').replace('_', '')) < 10 && !window.MSStream;
+var NoSleep = function () {
+ function NoSleep() {
+ _classCallCheck(this, NoSleep);
+ if (oldIOS) {
+ this.noSleepTimer = null;
+ } else {
+ this.noSleepVideo = document.createElement('video');
+ this.noSleepVideo.setAttribute('playsinline', '');
+ this.noSleepVideo.setAttribute('src', mediaFile);
+ this.noSleepVideo.addEventListener('timeupdate', function (e) {
+ if (this.noSleepVideo.currentTime > 0.5) {
+ this.noSleepVideo.currentTime = Math.random();
+ }
+ }.bind(this));
+ }
}
- addSourceToVideo(video,'webm', util$2.base64('video/webm', 'GkXfo0AgQoaBAUL3gQFC8oEEQvOBCEKCQAR3ZWJtQoeBAkKFgQIYU4BnQI0VSalmQCgq17FAAw9CQE2AQAZ3aGFtbXlXQUAGd2hhbW15RIlACECPQAAAAAAAFlSua0AxrkAu14EBY8WBAZyBACK1nEADdW5khkAFVl9WUDglhohAA1ZQOIOBAeBABrCBCLqBCB9DtnVAIueBAKNAHIEAAIAwAQCdASoIAAgAAUAmJaQAA3AA/vz0AAA='));
- addSourceToVideo(video, 'mp4', util$2.base64('video/mp4', 'AAAAHGZ0eXBpc29tAAACAGlzb21pc28ybXA0MQAAAAhmcmVlAAAAG21kYXQAAAGzABAHAAABthADAowdbb9/AAAC6W1vb3YAAABsbXZoZAAAAAB8JbCAfCWwgAAAA+gAAAAAAAEAAAEAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAIVdHJhawAAAFx0a2hkAAAAD3wlsIB8JbCAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAQAAAAAAIAAAACAAAAAABsW1kaWEAAAAgbWRoZAAAAAB8JbCAfCWwgAAAA+gAAAAAVcQAAAAAAC1oZGxyAAAAAAAAAAB2aWRlAAAAAAAAAAAAAAAAVmlkZW9IYW5kbGVyAAAAAVxtaW5mAAAAFHZtaGQAAAABAAAAAAAAAAAAAAAkZGluZgAAABxkcmVmAAAAAAAAAAEAAAAMdXJsIAAAAAEAAAEcc3RibAAAALhzdHNkAAAAAAAAAAEAAACobXA0dgAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAIAAgASAAAAEgAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABj//wAAAFJlc2RzAAAAAANEAAEABDwgEQAAAAADDUAAAAAABS0AAAGwAQAAAbWJEwAAAQAAAAEgAMSNiB9FAEQBFGMAAAGyTGF2YzUyLjg3LjQGAQIAAAAYc3R0cwAAAAAAAAABAAAAAQAAAAAAAAAcc3RzYwAAAAAAAAABAAAAAQAAAAEAAAABAAAAFHN0c3oAAAAAAAAAEwAAAAEAAAAUc3RjbwAAAAAAAAABAAAALAAAAGB1ZHRhAAAAWG1ldGEAAAAAAAAAIWhkbHIAAAAAAAAAAG1kaXJhcHBsAAAAAAAAAAAAAAAAK2lsc3QAAAAjqXRvbwAAABtkYXRhAAAAAQAAAABMYXZmNTIuNzguMw=='));
- this.request = function() {
- if (video.paused) {
- video.play();
+ _createClass(NoSleep, [{
+ key: 'enable',
+ value: function enable() {
+ if (oldIOS) {
+ this.disable();
+ this.noSleepTimer = window.setInterval(function () {
+ window.location.href = '/';
+ window.setTimeout(window.stop, 0);
+ }, 15000);
+ } else {
+ this.noSleepVideo.play();
+ }
}
- };
- this.release = function() {
- video.pause();
- };
-}
-function iOSWakeLock() {
- var timer = null;
- this.request = function() {
- if (!timer) {
- timer = setInterval(function() {
- window.location = window.location;
- setTimeout(window.stop, 0);
- }, 30000);
+ }, {
+ key: 'disable',
+ value: function disable() {
+ if (oldIOS) {
+ if (this.noSleepTimer) {
+ window.clearInterval(this.noSleepTimer);
+ this.noSleepTimer = null;
+ }
+ } else {
+ this.noSleepVideo.pause();
+ }
}
- };
- this.release = function() {
- if (timer) {
- clearInterval(timer);
- timer = null;
- }
- };
-}
-function getWakeLock() {
- var userAgent = navigator.userAgent || navigator.vendor || window.opera;
- if (userAgent.match(/iPhone/i) || userAgent.match(/iPod/i)) {
- return iOSWakeLock;
- } else {
- return AndroidWakeLock;
- }
-}
-var wakelock = getWakeLock();
-
+ }]);
+ return NoSleep;
+}();
+module.exports = NoSleep;
+ }),
+ (function(module, exports, __webpack_require__) {
+module.exports = 'data:video/mp4;base64,AAAAIGZ0eXBtcDQyAAACAGlzb21pc28yYXZjMW1wNDEAAAAIZnJlZQAACKBtZGF0AAAC8wYF///v3EXpvebZSLeWLNgg2SPu73gyNjQgLSBjb3JlIDE0MiByMjQ3OSBkZDc5YTYxIC0gSC4yNjQvTVBFRy00IEFWQyBjb2RlYyAtIENvcHlsZWZ0IDIwMDMtMjAxNCAtIGh0dHA6Ly93d3cudmlkZW9sYW4ub3JnL3gyNjQuaHRtbCAtIG9wdGlvbnM6IGNhYmFjPTEgcmVmPTEgZGVibG9jaz0xOjA6MCBhbmFseXNlPTB4MToweDExMSBtZT1oZXggc3VibWU9MiBwc3k9MSBwc3lfcmQ9MS4wMDowLjAwIG1peGVkX3JlZj0wIG1lX3JhbmdlPTE2IGNocm9tYV9tZT0xIHRyZWxsaXM9MCA4eDhkY3Q9MCBjcW09MCBkZWFkem9uZT0yMSwxMSBmYXN0X3Bza2lwPTEgY2hyb21hX3FwX29mZnNldD0wIHRocmVhZHM9NiBsb29rYWhlYWRfdGhyZWFkcz0xIHNsaWNlZF90aHJlYWRzPTAgbnI9MCBkZWNpbWF0ZT0xIGludGVybGFjZWQ9MCBibHVyYXlfY29tcGF0PTAgY29uc3RyYWluZWRfaW50cmE9MCBiZnJhbWVzPTMgYl9weXJhbWlkPTIgYl9hZGFwdD0xIGJfYmlhcz0wIGRpcmVjdD0xIHdlaWdodGI9MSBvcGVuX2dvcD0wIHdlaWdodHA9MSBrZXlpbnQ9MzAwIGtleWludF9taW49MzAgc2NlbmVjdXQ9NDAgaW50cmFfcmVmcmVzaD0wIHJjX2xvb2thaGVhZD0xMCByYz1jcmYgbWJ0cmVlPTEgY3JmPTIwLjAgcWNvbXA9MC42MCBxcG1pbj0wIHFwbWF4PTY5IHFwc3RlcD00IHZidl9tYXhyYXRlPTIwMDAwIHZidl9idWZzaXplPTI1MDAwIGNyZl9tYXg9MC4wIG5hbF9ocmQ9bm9uZSBmaWxsZXI9MCBpcF9yYXRpbz0xLjQwIGFxPTE6MS4wMACAAAAAOWWIhAA3//p+C7v8tDDSTjf97w55i3SbRPO4ZY+hkjD5hbkAkL3zpJ6h/LR1CAABzgB1kqqzUorlhQAAAAxBmiQYhn/+qZYADLgAAAAJQZ5CQhX/AAj5IQADQGgcIQADQGgcAAAACQGeYUQn/wALKCEAA0BoHAAAAAkBnmNEJ/8ACykhAANAaBwhAANAaBwAAAANQZpoNExDP/6plgAMuSEAA0BoHAAAAAtBnoZFESwr/wAI+SEAA0BoHCEAA0BoHAAAAAkBnqVEJ/8ACykhAANAaBwAAAAJAZ6nRCf/AAsoIQADQGgcIQADQGgcAAAADUGarDRMQz/+qZYADLghAANAaBwAAAALQZ7KRRUsK/8ACPkhAANAaBwAAAAJAZ7pRCf/AAsoIQADQGgcIQADQGgcAAAACQGe60Qn/wALKCEAA0BoHAAAAA1BmvA0TEM//qmWAAy5IQADQGgcIQADQGgcAAAAC0GfDkUVLCv/AAj5IQADQGgcAAAACQGfLUQn/wALKSEAA0BoHCEAA0BoHAAAAAkBny9EJ/8ACyghAANAaBwAAAANQZs0NExDP/6plgAMuCEAA0BoHAAAAAtBn1JFFSwr/wAI+SEAA0BoHCEAA0BoHAAAAAkBn3FEJ/8ACyghAANAaBwAAAAJAZ9zRCf/AAsoIQADQGgcIQADQGgcAAAADUGbeDRMQz/+qZYADLkhAANAaBwAAAALQZ+WRRUsK/8ACPghAANAaBwhAANAaBwAAAAJAZ+1RCf/AAspIQADQGgcAAAACQGft0Qn/wALKSEAA0BoHCEAA0BoHAAAAA1Bm7w0TEM//qmWAAy4IQADQGgcAAAAC0Gf2kUVLCv/AAj5IQADQGgcAAAACQGf+UQn/wALKCEAA0BoHCEAA0BoHAAAAAkBn/tEJ/8ACykhAANAaBwAAAANQZvgNExDP/6plgAMuSEAA0BoHCEAA0BoHAAAAAtBnh5FFSwr/wAI+CEAA0BoHAAAAAkBnj1EJ/8ACyghAANAaBwhAANAaBwAAAAJAZ4/RCf/AAspIQADQGgcAAAADUGaJDRMQz/+qZYADLghAANAaBwAAAALQZ5CRRUsK/8ACPkhAANAaBwhAANAaBwAAAAJAZ5hRCf/AAsoIQADQGgcAAAACQGeY0Qn/wALKSEAA0BoHCEAA0BoHAAAAA1Bmmg0TEM//qmWAAy5IQADQGgcAAAAC0GehkUVLCv/AAj5IQADQGgcIQADQGgcAAAACQGepUQn/wALKSEAA0BoHAAAAAkBnqdEJ/8ACyghAANAaBwAAAANQZqsNExDP/6plgAMuCEAA0BoHCEAA0BoHAAAAAtBnspFFSwr/wAI+SEAA0BoHAAAAAkBnulEJ/8ACyghAANAaBwhAANAaBwAAAAJAZ7rRCf/AAsoIQADQGgcAAAADUGa8DRMQz/+qZYADLkhAANAaBwhAANAaBwAAAALQZ8ORRUsK/8ACPkhAANAaBwAAAAJAZ8tRCf/AAspIQADQGgcIQADQGgcAAAACQGfL0Qn/wALKCEAA0BoHAAAAA1BmzQ0TEM//qmWAAy4IQADQGgcAAAAC0GfUkUVLCv/AAj5IQADQGgcIQADQGgcAAAACQGfcUQn/wALKCEAA0BoHAAAAAkBn3NEJ/8ACyghAANAaBwhAANAaBwAAAANQZt4NExC//6plgAMuSEAA0BoHAAAAAtBn5ZFFSwr/wAI+CEAA0BoHCEAA0BoHAAAAAkBn7VEJ/8ACykhAANAaBwAAAAJAZ+3RCf/AAspIQADQGgcAAAADUGbuzRMQn/+nhAAYsAhAANAaBwhAANAaBwAAAAJQZ/aQhP/AAspIQADQGgcAAAACQGf+UQn/wALKCEAA0BoHCEAA0BoHCEAA0BoHCEAA0BoHCEAA0BoHCEAA0BoHAAACiFtb292AAAAbG12aGQAAAAA1YCCX9WAgl8AAAPoAAAH/AABAAABAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADAAAAGGlvZHMAAAAAEICAgAcAT////v7/AAAF+XRyYWsAAABcdGtoZAAAAAPVgIJf1YCCXwAAAAEAAAAAAAAH0AAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAEAAAAAAygAAAMoAAAAAACRlZHRzAAAAHGVsc3QAAAAAAAAAAQAAB9AAABdwAAEAAAAABXFtZGlhAAAAIG1kaGQAAAAA1YCCX9WAgl8AAV+QAAK/IFXEAAAAAAAtaGRscgAAAAAAAAAAdmlkZQAAAAAAAAAAAAAAAFZpZGVvSGFuZGxlcgAAAAUcbWluZgAAABR2bWhkAAAAAQAAAAAAAAAAAAAAJGRpbmYAAAAcZHJlZgAAAAAAAAABAAAADHVybCAAAAABAAAE3HN0YmwAAACYc3RzZAAAAAAAAAABAAAAiGF2YzEAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAygDKAEgAAABIAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAY//8AAAAyYXZjQwFNQCj/4QAbZ01AKOyho3ySTUBAQFAAAAMAEAAr8gDxgxlgAQAEaO+G8gAAABhzdHRzAAAAAAAAAAEAAAA8AAALuAAAABRzdHNzAAAAAAAAAAEAAAABAAAB8GN0dHMAAAAAAAAAPAAAAAEAABdwAAAAAQAAOpgAAAABAAAXcAAAAAEAAAAAAAAAAQAAC7gAAAABAAA6mAAAAAEAABdwAAAAAQAAAAAAAAABAAALuAAAAAEAADqYAAAAAQAAF3AAAAABAAAAAAAAAAEAAAu4AAAAAQAAOpgAAAABAAAXcAAAAAEAAAAAAAAAAQAAC7gAAAABAAA6mAAAAAEAABdwAAAAAQAAAAAAAAABAAALuAAAAAEAADqYAAAAAQAAF3AAAAABAAAAAAAAAAEAAAu4AAAAAQAAOpgAAAABAAAXcAAAAAEAAAAAAAAAAQAAC7gAAAABAAA6mAAAAAEAABdwAAAAAQAAAAAAAAABAAALuAAAAAEAADqYAAAAAQAAF3AAAAABAAAAAAAAAAEAAAu4AAAAAQAAOpgAAAABAAAXcAAAAAEAAAAAAAAAAQAAC7gAAAABAAA6mAAAAAEAABdwAAAAAQAAAAAAAAABAAALuAAAAAEAADqYAAAAAQAAF3AAAAABAAAAAAAAAAEAAAu4AAAAAQAAOpgAAAABAAAXcAAAAAEAAAAAAAAAAQAAC7gAAAABAAA6mAAAAAEAABdwAAAAAQAAAAAAAAABAAALuAAAAAEAAC7gAAAAAQAAF3AAAAABAAAAAAAAABxzdHNjAAAAAAAAAAEAAAABAAAAAQAAAAEAAAEEc3RzegAAAAAAAAAAAAAAPAAAAzQAAAAQAAAADQAAAA0AAAANAAAAEQAAAA8AAAANAAAADQAAABEAAAAPAAAADQAAAA0AAAARAAAADwAAAA0AAAANAAAAEQAAAA8AAAANAAAADQAAABEAAAAPAAAADQAAAA0AAAARAAAADwAAAA0AAAANAAAAEQAAAA8AAAANAAAADQAAABEAAAAPAAAADQAAAA0AAAARAAAADwAAAA0AAAANAAAAEQAAAA8AAAANAAAADQAAABEAAAAPAAAADQAAAA0AAAARAAAADwAAAA0AAAANAAAAEQAAAA8AAAANAAAADQAAABEAAAANAAAADQAAAQBzdGNvAAAAAAAAADwAAAAwAAADZAAAA3QAAAONAAADoAAAA7kAAAPQAAAD6wAAA/4AAAQXAAAELgAABEMAAARcAAAEbwAABIwAAAShAAAEugAABM0AAATkAAAE/wAABRIAAAUrAAAFQgAABV0AAAVwAAAFiQAABaAAAAW1AAAFzgAABeEAAAX+AAAGEwAABiwAAAY/AAAGVgAABnEAAAaEAAAGnQAABrQAAAbPAAAG4gAABvUAAAcSAAAHJwAAB0AAAAdTAAAHcAAAB4UAAAeeAAAHsQAAB8gAAAfjAAAH9gAACA8AAAgmAAAIQQAACFQAAAhnAAAIhAAACJcAAAMsdHJhawAAAFx0a2hkAAAAA9WAgl/VgIJfAAAAAgAAAAAAAAf8AAAAAAAAAAAAAAABAQAAAAABAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAACsm1kaWEAAAAgbWRoZAAAAADVgIJf1YCCXwAArEQAAWAAVcQAAAAAACdoZGxyAAAAAAAAAABzb3VuAAAAAAAAAAAAAAAAU3RlcmVvAAAAAmNtaW5mAAAAEHNtaGQAAAAAAAAAAAAAACRkaW5mAAAAHGRyZWYAAAAAAAAAAQAAAAx1cmwgAAAAAQAAAidzdGJsAAAAZ3N0c2QAAAAAAAAAAQAAAFdtcDRhAAAAAAAAAAEAAAAAAAAAAAACABAAAAAArEQAAAAAADNlc2RzAAAAAAOAgIAiAAIABICAgBRAFQAAAAADDUAAAAAABYCAgAISEAaAgIABAgAAABhzdHRzAAAAAAAAAAEAAABYAAAEAAAAABxzdHNjAAAAAAAAAAEAAAABAAAAAQAAAAEAAAAUc3RzegAAAAAAAAAGAAAAWAAAAXBzdGNvAAAAAAAAAFgAAAOBAAADhwAAA5oAAAOtAAADswAAA8oAAAPfAAAD5QAAA/gAAAQLAAAEEQAABCgAAAQ9AAAEUAAABFYAAARpAAAEgAAABIYAAASbAAAErgAABLQAAATHAAAE3gAABPMAAAT5AAAFDAAABR8AAAUlAAAFPAAABVEAAAVXAAAFagAABX0AAAWDAAAFmgAABa8AAAXCAAAFyAAABdsAAAXyAAAF+AAABg0AAAYgAAAGJgAABjkAAAZQAAAGZQAABmsAAAZ+AAAGkQAABpcAAAauAAAGwwAABskAAAbcAAAG7wAABwYAAAcMAAAHIQAABzQAAAc6AAAHTQAAB2QAAAdqAAAHfwAAB5IAAAeYAAAHqwAAB8IAAAfXAAAH3QAAB/AAAAgDAAAICQAACCAAAAg1AAAIOwAACE4AAAhhAAAIeAAACH4AAAiRAAAIpAAACKoAAAiwAAAItgAACLwAAAjCAAAAFnVkdGEAAAAObmFtZVN0ZXJlbwAAAHB1ZHRhAAAAaG1ldGEAAAAAAAAAIWhkbHIAAAAAAAAAAG1kaXJhcHBsAAAAAAAAAAAAAAAAO2lsc3QAAAAzqXRvbwAAACtkYXRhAAAAAQAAAABIYW5kQnJha2UgMC4xMC4yIDIwMTUwNjExMDA=';
+ })
+ ]);
+});
+});
+var NoSleep$1 = unwrapExports$$1(NoSleep);
var nextDisplayId = 1000;
-var hasShowDeprecationWarning = false;
var defaultLeftBounds = [0, 0, 0.5, 1];
var defaultRightBounds = [0.5, 0, 0.5, 1];
-function VRFrameData$1() {
+var raf = window.requestAnimationFrame;
+var caf = window.cancelAnimationFrame;
+function VRFrameData() {
this.leftProjectionMatrix = new Float32Array(16);
this.leftViewMatrix = new Float32Array(16);
this.rightProjectionMatrix = new Float32Array(16);
this.rightViewMatrix = new Float32Array(16);
this.pose = null;
}
-function VRDisplay$2() {
+function VRDisplayCapabilities(config) {
+ Object.defineProperties(this, {
+ hasPosition: {
+ writable: false, enumerable: true, value: config.hasPosition
+ },
+ hasExternalDisplay: {
+ writable: false, enumerable: true, value: config.hasExternalDisplay
+ },
+ canPresent: {
+ writable: false, enumerable: true, value: config.canPresent
+ },
+ maxLayers: {
+ writable: false, enumerable: true, value: config.maxLayers
+ },
+ hasOrientation: {
+ enumerable: true, get: function get() {
+ deprecateWarning('VRDisplayCapabilities.prototype.hasOrientation', 'VRDisplay.prototype.getFrameData');
+ return config.hasOrientation;
+ }
+ }
+ });
+}
+function VRDisplay(config) {
+ config = config || {};
+ var USE_WAKELOCK = 'wakelock' in config ? config.wakelock : true;
this.isPolyfilled = true;
this.displayId = nextDisplayId++;
this.displayName = '';
this.depthNear = 0.01;
this.depthFar = 10000.0;
- this.isConnected = true;
this.isPresenting = false;
- this.capabilities = {
+ Object.defineProperty(this, 'isConnected', {
+ get: function get() {
+ deprecateWarning('VRDisplay.prototype.isConnected', 'VRDisplayCapabilities.prototype.hasExternalDisplay');
+ return false;
+ }
+ });
+ this.capabilities = new VRDisplayCapabilities({
hasPosition: false,
hasOrientation: false,
hasExternalDisplay: false,
canPresent: false,
maxLayers: 1
- };
+ });
this.stageParameters = null;
this.waitingForPresent_ = false;
this.layer_ = null;
- this.orphanedLayer = null;
+ this.originalParent_ = null;
this.fullscreenElement_ = null;
this.fullscreenWrapper_ = null;
this.fullscreenElementCachedStyle_ = null;
this.fullscreenEventTarget_ = null;
this.fullscreenChangeHandler_ = null;
this.fullscreenErrorHandler_ = null;
- this.wakelock_ = new wakelock();
+ if (USE_WAKELOCK && isMobile()) {
+ this.wakelock_ = new NoSleep$1();
+ }
}
-VRDisplay$2.prototype.getFrameData = function(frameData) {
- return util$2.frameDataFromPose(frameData, this.getPose(), this);
+VRDisplay.prototype.getFrameData = function (frameData) {
+ return frameDataFromPose(frameData, this._getPose(), this);
};
-VRDisplay$2.prototype.getPose = function() {
- return this.getImmediatePose();
+VRDisplay.prototype.getPose = function () {
+ deprecateWarning('VRDisplay.prototype.getPose', 'VRDisplay.prototype.getFrameData');
+ return this._getPose();
};
-VRDisplay$2.prototype.requestAnimationFrame = function(callback) {
- return window.requestAnimationFrame(callback);
+VRDisplay.prototype.resetPose = function () {
+ deprecateWarning('VRDisplay.prototype.resetPose');
+ return this._resetPose();
};
-VRDisplay$2.prototype.cancelAnimationFrame = function(id) {
- return window.cancelAnimationFrame(id);
+VRDisplay.prototype.getImmediatePose = function () {
+ deprecateWarning('VRDisplay.prototype.getImmediatePose', 'VRDisplay.prototype.getFrameData');
+ return this._getPose();
};
-VRDisplay$2.prototype.wrapForFullscreen = function(element) {
- if (util$2.isIOS()) {
+VRDisplay.prototype.requestAnimationFrame = function (callback) {
+ return raf(callback);
+};
+VRDisplay.prototype.cancelAnimationFrame = function (id) {
+ return caf(id);
+};
+VRDisplay.prototype.wrapForFullscreen = function (element) {
+ if (isIOS()) {
return element;
}
if (!this.fullscreenWrapper_) {
this.fullscreenWrapper_ = document.createElement('div');
- var cssProperties = [
- 'height: ' + Math.min(screen.height, screen.width) + 'px !important',
- 'top: 0 !important',
- 'left: 0 !important',
- 'right: 0 !important',
- 'border: 0',
- 'margin: 0',
- 'padding: 0',
- 'z-index: 999999 !important',
- 'position: fixed',
- ];
+ var cssProperties = ['height: ' + Math.min(screen.height, screen.width) + 'px !important', 'top: 0 !important', 'left: 0 !important', 'right: 0 !important', 'border: 0', 'margin: 0', 'padding: 0', 'z-index: 999999 !important', 'position: fixed'];
this.fullscreenWrapper_.setAttribute('style', cssProperties.join('; ') + ';');
this.fullscreenWrapper_.classList.add('webvr-polyfill-fullscreen-wrapper');
}
if (this.fullscreenElement_ == element) {
return this.fullscreenWrapper_;
}
- this.removeFullscreenWrapper();
+ if (this.fullscreenElement_) {
+ if (this.originalParent_) {
+ this.originalParent_.appendChild(this.fullscreenElement_);
+ } else {
+ this.fullscreenElement_.parentElement.removeChild(this.fullscreenElement_);
+ }
+ }
this.fullscreenElement_ = element;
- var parent = this.fullscreenElement_.parentElement;
- parent.insertBefore(this.fullscreenWrapper_, this.fullscreenElement_);
- parent.removeChild(this.fullscreenElement_);
+ this.originalParent_ = element.parentElement;
+ if (!this.originalParent_) {
+ document.body.appendChild(element);
+ }
+ if (!this.fullscreenWrapper_.parentElement) {
+ var parent = this.fullscreenElement_.parentElement;
+ parent.insertBefore(this.fullscreenWrapper_, this.fullscreenElement_);
+ parent.removeChild(this.fullscreenElement_);
+ }
this.fullscreenWrapper_.insertBefore(this.fullscreenElement_, this.fullscreenWrapper_.firstChild);
this.fullscreenElementCachedStyle_ = this.fullscreenElement_.getAttribute('style');
var self = this;
@@ -2576,22 +2882,13 @@
if (!self.fullscreenElement_) {
return;
}
- var cssProperties = [
- 'position: absolute',
- 'top: 0',
- 'left: 0',
- 'width: ' + Math.max(screen.width, screen.height) + 'px',
- 'height: ' + Math.min(screen.height, screen.width) + 'px',
- 'border: 0',
- 'margin: 0',
- 'padding: 0',
- ];
+ var cssProperties = ['position: absolute', 'top: 0', 'left: 0', 'width: ' + Math.max(screen.width, screen.height) + 'px', 'height: ' + Math.min(screen.height, screen.width) + 'px', 'border: 0', 'margin: 0', 'padding: 0'];
self.fullscreenElement_.setAttribute('style', cssProperties.join('; ') + ';');
}
applyFullscreenElementStyle();
return this.fullscreenWrapper_;
};
-VRDisplay$2.prototype.removeFullscreenWrapper = function() {
+VRDisplay.prototype.removeFullscreenWrapper = function () {
if (!this.fullscreenElement_) {
return;
}
@@ -2605,24 +2902,23 @@
this.fullscreenElementCachedStyle_ = null;
var parent = this.fullscreenWrapper_.parentElement;
this.fullscreenWrapper_.removeChild(element);
- parent.insertBefore(element, this.fullscreenWrapper_);
- parent.removeChild(this.fullscreenWrapper_);
- if (this.orphanedLayer) {
- element.parentElement.removeChild(element);
+ if (this.originalParent_ === parent) {
+ parent.insertBefore(element, this.fullscreenWrapper_);
}
+ else if (this.originalParent_) {
+ this.originalParent_.appendChild(element);
+ }
+ parent.removeChild(this.fullscreenWrapper_);
return element;
};
-VRDisplay$2.prototype.requestPresent = function(layers) {
+VRDisplay.prototype.requestPresent = function (layers) {
var wasPresenting = this.isPresenting;
var self = this;
if (!(layers instanceof Array)) {
- if (!hasShowDeprecationWarning) {
- console.warn("Using a deprecated form of requestPresent. Should pass in an array of VRLayers.");
- hasShowDeprecationWarning = true;
- }
+ deprecateWarning('VRDisplay.prototype.requestPresent with non-array argument', 'an array of VRLayers as the first argument');
layers = [layers];
}
- return new Promise(function(resolve, reject) {
+ return new Promise(function (resolve, reject) {
if (!self.capabilities.canPresent) {
reject(new Error('VRDisplay is not capable of presenting.'));
return;
@@ -2647,6 +2943,8 @@
layer.leftBounds[i] = leftBounds[i];
layer.rightBounds[i] = rightBounds[i];
}
+ self.wrapForFullscreen(self.layer_.source);
+ self.updatePresent_();
resolve();
return;
}
@@ -2658,18 +2956,14 @@
};
self.waitingForPresent_ = false;
if (self.layer_ && self.layer_.source) {
- if (!self.layer_.source.parentElement) {
- self.orphanedLayer = true;
- document.body.appendChild(self.layer_.source);
- }
var fullscreenElement = self.wrapForFullscreen(self.layer_.source);
- var onFullscreenChange = function() {
- var actualFullscreenElement = util$2.getFullscreenElement();
- self.isPresenting = (fullscreenElement === actualFullscreenElement);
+ var onFullscreenChange = function onFullscreenChange() {
+ var actualFullscreenElement = getFullscreenElement();
+ self.isPresenting = fullscreenElement === actualFullscreenElement;
if (self.isPresenting) {
if (screen.orientation && screen.orientation.lock) {
- screen.orientation.lock('landscape-primary').catch(function(error){
- console.error('screen.orientation.lock() failed due to', error.message);
+ screen.orientation.lock('landscape-primary').catch(function (error) {
+ console.error('screen.orientation.lock() failed due to', error.message);
});
}
self.waitingForPresent_ = false;
@@ -2680,55 +2974,54 @@
screen.orientation.unlock();
}
self.removeFullscreenWrapper();
- self.wakelock_.release();
+ self.disableWakeLock();
self.endPresent_();
self.removeFullscreenListeners_();
}
self.fireVRDisplayPresentChange_();
};
- var onFullscreenError = function() {
+ var onFullscreenError = function onFullscreenError() {
if (!self.waitingForPresent_) {
return;
}
self.removeFullscreenWrapper();
self.removeFullscreenListeners_();
- self.wakelock_.release();
+ self.disableWakeLock();
self.waitingForPresent_ = false;
self.isPresenting = false;
reject(new Error('Unable to present.'));
};
- self.addFullscreenListeners_(fullscreenElement,
- onFullscreenChange, onFullscreenError);
- if (util$2.requestFullscreen(fullscreenElement)) {
- self.wakelock_.request();
+ self.addFullscreenListeners_(fullscreenElement, onFullscreenChange, onFullscreenError);
+ if (requestFullscreen(fullscreenElement)) {
+ self.enableWakeLock();
self.waitingForPresent_ = true;
- } else if (util$2.isIOS() || util$2.isWebViewAndroid()) {
- self.wakelock_.request();
+ } else if (isIOS() || isWebViewAndroid()) {
+ self.enableWakeLock();
self.isPresenting = true;
self.beginPresent_();
self.fireVRDisplayPresentChange_();
resolve();
}
}
- if (!self.waitingForPresent_ && !util$2.isIOS()) {
- util$2.exitFullscreen();
+ if (!self.waitingForPresent_ && !isIOS()) {
+ exitFullscreen();
reject(new Error('Unable to present.'));
}
});
};
-VRDisplay$2.prototype.exitPresent = function() {
+VRDisplay.prototype.exitPresent = function () {
var wasPresenting = this.isPresenting;
var self = this;
this.isPresenting = false;
this.layer_ = null;
- this.wakelock_.release();
- return new Promise(function(resolve, reject) {
+ this.disableWakeLock();
+ return new Promise(function (resolve, reject) {
if (wasPresenting) {
- if (!util$2.exitFullscreen() && util$2.isIOS()) {
+ if (!exitFullscreen() && isIOS()) {
self.endPresent_();
self.fireVRDisplayPresentChange_();
}
- if (util$2.isWebViewAndroid()) {
+ if (isWebViewAndroid()) {
self.removeFullscreenWrapper();
self.removeFullscreenListeners_();
self.endPresent_();
@@ -2740,21 +3033,21 @@
}
});
};
-VRDisplay$2.prototype.getLayers = function() {
+VRDisplay.prototype.getLayers = function () {
if (this.layer_) {
return [this.layer_];
}
return [];
};
-VRDisplay$2.prototype.fireVRDisplayPresentChange_ = function() {
- var event = new CustomEvent('vrdisplaypresentchange', {detail: {display: this}});
+VRDisplay.prototype.fireVRDisplayPresentChange_ = function () {
+ var event = new CustomEvent('vrdisplaypresentchange', { detail: { display: this } });
window.dispatchEvent(event);
};
-VRDisplay$2.prototype.fireVRDisplayConnect_ = function() {
- var event = new CustomEvent('vrdisplayconnect', {detail: {display: this}});
+VRDisplay.prototype.fireVRDisplayConnect_ = function () {
+ var event = new CustomEvent('vrdisplayconnect', { detail: { display: this } });
window.dispatchEvent(event);
};
-VRDisplay$2.prototype.addFullscreenListeners_ = function(element, changeHandler, errorHandler) {
+VRDisplay.prototype.addFullscreenListeners_ = function (element, changeHandler, errorHandler) {
this.removeFullscreenListeners_();
this.fullscreenEventTarget_ = element;
this.fullscreenChangeHandler_ = changeHandler;
@@ -2782,9 +3075,8 @@
}
}
};
-VRDisplay$2.prototype.removeFullscreenListeners_ = function() {
- if (!this.fullscreenEventTarget_)
- return;
+VRDisplay.prototype.removeFullscreenListeners_ = function () {
+ if (!this.fullscreenEventTarget_) return;
var element = this.fullscreenEventTarget_;
if (this.fullscreenChangeHandler_) {
var changeHandler = this.fullscreenChangeHandler_;
@@ -2804,70 +3096,79 @@
this.fullscreenChangeHandler_ = null;
this.fullscreenErrorHandler_ = null;
};
-VRDisplay$2.prototype.beginPresent_ = function() {
+VRDisplay.prototype.enableWakeLock = function () {
+ if (this.wakelock_) {
+ this.wakelock_.enable();
+ }
};
-VRDisplay$2.prototype.endPresent_ = function() {
+VRDisplay.prototype.disableWakeLock = function () {
+ if (this.wakelock_) {
+ this.wakelock_.disable();
+ }
};
-VRDisplay$2.prototype.submitFrame = function(pose) {
+VRDisplay.prototype.beginPresent_ = function () {
};
-VRDisplay$2.prototype.getEyeParameters = function(whichEye) {
+VRDisplay.prototype.endPresent_ = function () {
+};
+VRDisplay.prototype.submitFrame = function (pose) {
+};
+VRDisplay.prototype.getEyeParameters = function (whichEye) {
return null;
};
-var VRFrameData_1 = VRFrameData$1;
-var VRDisplay_1 = VRDisplay$2;
-var base = {
- VRFrameData: VRFrameData_1,
- VRDisplay: VRDisplay_1
-};
-
-var options = {
+var config = {
+ ADDITIONAL_VIEWERS: [],
+ DEFAULT_VIEWER: '',
+ MOBILE_WAKE_LOCK: true,
DEBUG: false,
DPDB_URL: 'https://dpdb.webvr.rocks/dpdb.json',
K_FILTER: 0.98,
PREDICTION_TIME_S: 0.040,
- TOUCH_PANNER_DISABLED: true,
CARDBOARD_UI_DISABLED: false,
ROTATE_INSTRUCTIONS_DISABLED: false,
YAW_ONLY: false,
BUFFER_SCALE: 0.5,
- DIRTY_SUBMIT_FRAME_BINDINGS: false,
+ DIRTY_SUBMIT_FRAME_BINDINGS: false
};
-
-var VRDisplay$1 = base.VRDisplay;
var Eye = {
LEFT: 'left',
RIGHT: 'right'
};
-function CardboardVRDisplay(config) {
- var defaults = util$2.extend({}, options);
- this.config = util$2.extend(defaults, config || {});
+function CardboardVRDisplay(config$$1) {
+ var defaults = extend({}, config);
+ config$$1 = extend(defaults, config$$1 || {});
+ VRDisplay.call(this, {
+ wakelock: config$$1.MOBILE_WAKE_LOCK
+ });
+ this.config = config$$1;
this.displayName = 'Cardboard VRDisplay';
- this.capabilities.hasOrientation = true;
- this.capabilities.canPresent = true;
+ this.capabilities = new VRDisplayCapabilities({
+ hasPosition: false,
+ hasOrientation: true,
+ hasExternalDisplay: false,
+ canPresent: true,
+ maxLayers: 1
+ });
+ this.stageParameters = null;
this.bufferScale_ = this.config.BUFFER_SCALE;
- this.poseSensor_ = new fusionPoseSensor(this.config.K_FILTER,
- this.config.PREDICTION_TIME_S,
- this.config.TOUCH_PANNER_DISABLED,
- this.config.YAW_ONLY,
- this.config.DEBUG);
+ this.poseSensor_ = new PoseSensor(this.config);
this.distorter_ = null;
this.cardboardUI_ = null;
- this.dpdb_ = new dpdb(this.config.DPDB_URL, this.onDeviceParamsUpdated_.bind(this));
- this.deviceInfo_ = new deviceInfo(this.dpdb_.getDeviceParams());
- this.viewerSelector_ = new viewerSelector();
+ this.dpdb_ = new Dpdb(this.config.DPDB_URL, this.onDeviceParamsUpdated_.bind(this));
+ this.deviceInfo_ = new DeviceInfo(this.dpdb_.getDeviceParams(), config$$1.ADDITIONAL_VIEWERS);
+ this.viewerSelector_ = new ViewerSelector(config$$1.DEFAULT_VIEWER);
this.viewerSelector_.onChange(this.onViewerChanged_.bind(this));
this.deviceInfo_.setViewer(this.viewerSelector_.getCurrentViewer());
if (!this.config.ROTATE_INSTRUCTIONS_DISABLED) {
- this.rotateInstructions_ = new rotateInstructions();
+ this.rotateInstructions_ = new RotateInstructions();
}
- if (util$2.isIOS()) {
+ if (isIOS()) {
window.addEventListener('resize', this.onResize_.bind(this));
}
}
-CardboardVRDisplay.prototype = new VRDisplay$1();
-CardboardVRDisplay.prototype.getImmediatePose = function() {
+CardboardVRDisplay.prototype = Object.create(VRDisplay.prototype);
+CardboardVRDisplay.prototype._getPose = function () {
return {
- position: this.poseSensor_.getPosition(),
+ position: null,
orientation: this.poseSensor_.getOrientation(),
linearVelocity: null,
linearAcceleration: null,
@@ -2875,14 +3176,14 @@
angularAcceleration: null
};
};
-CardboardVRDisplay.prototype.resetPose = function() {
- this.poseSensor_.resetPose();
+CardboardVRDisplay.prototype._resetPose = function () {
+ if (this.poseSensor_.resetPose) {
+ this.poseSensor_.resetPose();
+ }
};
-CardboardVRDisplay.prototype.getEyeParameters = function(whichEye) {
- var offset = [this.deviceInfo_.viewer.interLensDistance * 0.5, 0.0, 0.0];
+CardboardVRDisplay.prototype._getFieldOfView = function (whichEye) {
var fieldOfView;
if (whichEye == Eye.LEFT) {
- offset[0] *= -1.0;
fieldOfView = this.deviceInfo_.getFieldOfViewLeftEye();
} else if (whichEye == Eye.RIGHT) {
fieldOfView = this.deviceInfo_.getFieldOfViewRightEye();
@@ -2890,14 +3191,38 @@
console.error('Invalid eye provided: %s', whichEye);
return null;
}
- return {
- fieldOfView: fieldOfView,
+ return fieldOfView;
+};
+CardboardVRDisplay.prototype._getEyeOffset = function (whichEye) {
+ var offset;
+ if (whichEye == Eye.LEFT) {
+ offset = [-this.deviceInfo_.viewer.interLensDistance * 0.5, 0.0, 0.0];
+ } else if (whichEye == Eye.RIGHT) {
+ offset = [this.deviceInfo_.viewer.interLensDistance * 0.5, 0.0, 0.0];
+ } else {
+ console.error('Invalid eye provided: %s', whichEye);
+ return null;
+ }
+ return offset;
+};
+CardboardVRDisplay.prototype.getEyeParameters = function (whichEye) {
+ var offset = this._getEyeOffset(whichEye);
+ var fieldOfView = this._getFieldOfView(whichEye);
+ var eyeParams = {
offset: offset,
renderWidth: this.deviceInfo_.device.width * 0.5 * this.bufferScale_,
- renderHeight: this.deviceInfo_.device.height * this.bufferScale_,
+ renderHeight: this.deviceInfo_.device.height * this.bufferScale_
};
+ Object.defineProperty(eyeParams, 'fieldOfView', {
+ enumerable: true,
+ get: function get() {
+ deprecateWarning('VRFieldOfView', 'VRFrameData\'s projection matrices');
+ return fieldOfView;
+ }
+ });
+ return eyeParams;
};
-CardboardVRDisplay.prototype.onDeviceParamsUpdated_ = function(newParams) {
+CardboardVRDisplay.prototype.onDeviceParamsUpdated_ = function (newParams) {
if (this.config.DEBUG) {
console.log('DPDB reported that device params were updated.');
}
@@ -2911,42 +3236,37 @@
this.distorter_.setTextureBounds(this.layer_.leftBounds, this.layer_.rightBounds);
}
};
-CardboardVRDisplay.prototype.beginPresent_ = function() {
+CardboardVRDisplay.prototype.beginPresent_ = function () {
var gl = this.layer_.source.getContext('webgl');
- if (!gl)
- gl = this.layer_.source.getContext('experimental-webgl');
- if (!gl)
- gl = this.layer_.source.getContext('webgl2');
- if (!gl)
- return;
+ if (!gl) gl = this.layer_.source.getContext('experimental-webgl');
+ if (!gl) gl = this.layer_.source.getContext('webgl2');
+ if (!gl) return;
if (this.layer_.predistorted) {
if (!this.config.CARDBOARD_UI_DISABLED) {
- gl.canvas.width = util$2.getScreenWidth() * this.bufferScale_;
- gl.canvas.height = util$2.getScreenHeight() * this.bufferScale_;
- this.cardboardUI_ = new cardboardUi(gl);
+ gl.canvas.width = getScreenWidth() * this.bufferScale_;
+ gl.canvas.height = getScreenHeight() * this.bufferScale_;
+ this.cardboardUI_ = new CardboardUI(gl);
}
} else {
if (!this.config.CARDBOARD_UI_DISABLED) {
- this.cardboardUI_ = new cardboardUi(gl);
+ this.cardboardUI_ = new CardboardUI(gl);
}
- this.distorter_ = new cardboardDistorter(gl, this.cardboardUI_,
- this.config.BUFFER_SCALE,
- this.config.DIRTY_SUBMIT_FRAME_BINDINGS);
+ this.distorter_ = new CardboardDistorter(gl, this.cardboardUI_, this.config.BUFFER_SCALE, this.config.DIRTY_SUBMIT_FRAME_BINDINGS);
this.distorter_.updateDeviceInfo(this.deviceInfo_);
}
if (this.cardboardUI_) {
- this.cardboardUI_.listen(function(e) {
+ this.cardboardUI_.listen(function (e) {
this.viewerSelector_.show(this.layer_.source.parentElement);
e.stopPropagation();
e.preventDefault();
- }.bind(this), function(e) {
+ }.bind(this), function (e) {
this.exitPresent();
e.stopPropagation();
e.preventDefault();
}.bind(this));
}
if (this.rotateInstructions_) {
- if (util$2.isLandscapeMode() && util$2.isMobile()) {
+ if (isLandscapeMode() && isMobile()) {
this.rotateInstructions_.showTemporarily(3000, this.layer_.source.parentElement);
} else {
this.rotateInstructions_.update();
@@ -2958,7 +3278,7 @@
window.addEventListener('vrdisplaypresentchange', this.vrdisplaypresentchangeHandler);
this.fireVRDisplayDeviceParamsChange_();
};
-CardboardVRDisplay.prototype.endPresent_ = function() {
+CardboardVRDisplay.prototype.endPresent_ = function () {
if (this.distorter_) {
this.distorter_.destroy();
this.distorter_ = null;
@@ -2974,7 +3294,11 @@
window.removeEventListener('orientationchange', this.orientationHandler);
window.removeEventListener('vrdisplaypresentchange', this.vrdisplaypresentchangeHandler);
};
-CardboardVRDisplay.prototype.submitFrame = function(pose) {
+CardboardVRDisplay.prototype.updatePresent_ = function () {
+ this.endPresent_();
+ this.beginPresent_();
+};
+CardboardVRDisplay.prototype.submitFrame = function (pose) {
if (this.distorter_) {
this.updateBounds_();
this.distorter_.submitFrame();
@@ -2988,103 +3312,57 @@
this.cardboardUI_.render();
}
};
-CardboardVRDisplay.prototype.onOrientationChange_ = function(e) {
+CardboardVRDisplay.prototype.onOrientationChange_ = function (e) {
this.viewerSelector_.hide();
if (this.rotateInstructions_) {
this.rotateInstructions_.update();
}
this.onResize_();
};
-CardboardVRDisplay.prototype.onResize_ = function(e) {
+CardboardVRDisplay.prototype.onResize_ = function (e) {
if (this.layer_) {
var gl = this.layer_.source.getContext('webgl');
- var cssProperties = [
- 'position: absolute',
- 'top: 0',
- 'left: 0',
- 'width: 100vw',
- 'height: 100vh',
- 'border: 0',
- 'margin: 0',
- 'padding: 0px',
- 'box-sizing: content-box',
- ];
+ var cssProperties = ['position: absolute', 'top: 0', 'left: 0',
+ 'width: 100vw', 'height: 100vh', 'border: 0', 'margin: 0',
+ 'padding: 0px', 'box-sizing: content-box'];
gl.canvas.setAttribute('style', cssProperties.join('; ') + ';');
- util$2.safariCssSizeWorkaround(gl.canvas);
+ safariCssSizeWorkaround(gl.canvas);
}
};
-CardboardVRDisplay.prototype.onViewerChanged_ = function(viewer) {
+CardboardVRDisplay.prototype.onViewerChanged_ = function (viewer) {
this.deviceInfo_.setViewer(viewer);
if (this.distorter_) {
this.distorter_.updateDeviceInfo(this.deviceInfo_);
}
this.fireVRDisplayDeviceParamsChange_();
};
-CardboardVRDisplay.prototype.fireVRDisplayDeviceParamsChange_ = function() {
+CardboardVRDisplay.prototype.fireVRDisplayDeviceParamsChange_ = function () {
var event = new CustomEvent('vrdisplaydeviceparamschange', {
detail: {
vrdisplay: this,
- deviceInfo: this.deviceInfo_,
+ deviceInfo: this.deviceInfo_
}
});
window.dispatchEvent(event);
};
-var cardboardVrDisplay = CardboardVRDisplay;
-
-var name = "webvr-polyfill";
-var version$1 = "0.9.41";
-var homepage = "https://github.com/googlevr/webvr-polyfill";
-var authors = ["Boris Smus <boris@smus.com>", "Brandon Jones <tojiro@gmail.com>", "Jordan Santell <jordan@jsantell.com>"];
-var description = "Use WebVR today, on mobile or desktop, without requiring a special browser build.";
-var devDependencies = { "babel-core": "^6.24.1", "babel-plugin-external-helpers": "^6.22.0", "babel-preset-env": "^1.6.1", "chai": "^3.5.0", "jsdom": "^9.12.0", "localStorage": "^1.0.3", "mocha": "^3.2.0", "rollup": "^0.52.1", "rollup-plugin-babel": "^3.0.2", "rollup-plugin-cleanup": "^2.0.0", "rollup-plugin-commonjs": "^8.2.6", "rollup-plugin-json": "^2.3.0", "rollup-plugin-node-resolve": "^3.0.0", "rollup-plugin-uglify": "^2.0.1", "semver": "^5.3.0" };
-var main = "build/webvr-polyfill.js";
-var keywords = ["vr", "webvr"];
-var license = "Apache-2.0";
-var scripts = { "build": "rollup -c", "build-min": "rollup -c rollup.config.min.js", "build-all": "npm run build && npm run build-min", "watch": "rollup -c -w", "test": "mocha -r test/init.js --compilers js:babel-core/register test/*.test.js", "preversion": "npm test", "version": "npm run build-all && git add build/*", "postversion": "git push && git push --tags && npm publish" };
-var repository = "googlevr/webvr-polyfill";
-var bugs = { "url": "https://github.com/googlevr/webvr-polyfill/issues" };
-var dependencies = { "cardboard-vr-display": "1.0.2" };
-var _package = {
- name: name,
- version: version$1,
- homepage: homepage,
- authors: authors,
- description: description,
- devDependencies: devDependencies,
- main: main,
- keywords: keywords,
- license: license,
- scripts: scripts,
- repository: repository,
- bugs: bugs,
- dependencies: dependencies
-};
-
-var _package$1 = Object.freeze({
- name: name,
- version: version$1,
- homepage: homepage,
- authors: authors,
- description: description,
- devDependencies: devDependencies,
- main: main,
- keywords: keywords,
- license: license,
- scripts: scripts,
- repository: repository,
- bugs: bugs,
- dependencies: dependencies,
- default: _package
+CardboardVRDisplay.VRFrameData = VRFrameData;
+CardboardVRDisplay.VRDisplay = VRDisplay;
+return CardboardVRDisplay;
+})));
});
+var CardboardVRDisplay = unwrapExports(cardboardVrDisplay);
-var config = {
+var version = "0.10.10";
+
+var DefaultConfig = {
+ ADDITIONAL_VIEWERS: [],
+ DEFAULT_VIEWER: '',
PROVIDE_MOBILE_VRDISPLAY: true,
- GET_VR_DISPLAYS_TIMEOUT: 1000,
+ MOBILE_WAKE_LOCK: true,
DEBUG: false,
DPDB_URL: 'https://dpdb.webvr.rocks/dpdb.json',
K_FILTER: 0.98,
PREDICTION_TIME_S: 0.040,
- TOUCH_PANNER_DISABLED: true,
CARDBOARD_UI_DISABLED: false,
ROTATE_INSTRUCTIONS_DISABLED: false,
YAW_ONLY: false,
@@ -3092,13 +3370,8 @@
DIRTY_SUBMIT_FRAME_BINDINGS: false
};
-var require$$1 = ( _package$1 && _package ) || _package$1;
-
-var VRDisplay = base.VRDisplay;
-var VRFrameData = base.VRFrameData;
-var version = require$$1.version;
-function WebVRPolyfill(config$$1) {
- this.config = util.extend(util.extend({}, config), config$$1);
+function WebVRPolyfill(config) {
+ this.config = extend(extend({}, DefaultConfig), config);
this.polyfillDisplays = [];
this.enabled = false;
this.hasNative = 'getVRDisplays' in navigator;
@@ -3106,28 +3379,34 @@
this.native.getVRDisplays = navigator.getVRDisplays;
this.native.VRFrameData = window.VRFrameData;
this.native.VRDisplay = window.VRDisplay;
- if (!this.hasNative || this.config.PROVIDE_MOBILE_VRDISPLAY && util.isMobile()) {
+ if (!this.hasNative || this.config.PROVIDE_MOBILE_VRDISPLAY && isMobile()) {
this.enable();
+ this.getVRDisplays().then(function (displays) {
+ if (displays && displays[0] && displays[0].fireVRDisplayConnect_) {
+ displays[0].fireVRDisplayConnect_();
+ }
+ });
}
}
WebVRPolyfill.prototype.getPolyfillDisplays = function () {
if (this._polyfillDisplaysPopulated) {
return this.polyfillDisplays;
}
- if (util.isMobile()) {
- var vrDisplay = new cardboardVrDisplay({
+ if (isMobile()) {
+ var vrDisplay = new CardboardVRDisplay({
+ ADDITIONAL_VIEWERS: this.config.ADDITIONAL_VIEWERS,
+ DEFAULT_VIEWER: this.config.DEFAULT_VIEWER,
+ MOBILE_WAKE_LOCK: this.config.MOBILE_WAKE_LOCK,
DEBUG: this.config.DEBUG,
DPDB_URL: this.config.DPDB_URL,
CARDBOARD_UI_DISABLED: this.config.CARDBOARD_UI_DISABLED,
K_FILTER: this.config.K_FILTER,
PREDICTION_TIME_S: this.config.PREDICTION_TIME_S,
- TOUCH_PANNER_DISABLED: this.config.TOUCH_PANNER_DISABLED,
ROTATE_INSTRUCTIONS_DISABLED: this.config.ROTATE_INSTRUCTIONS_DISABLED,
YAW_ONLY: this.config.YAW_ONLY,
BUFFER_SCALE: this.config.BUFFER_SCALE,
DIRTY_SUBMIT_FRAME_BINDINGS: this.config.DIRTY_SUBMIT_FRAME_BINDINGS
});
- vrDisplay.fireVRDisplayConnect_();
this.polyfillDisplays.push(vrDisplay);
}
this._polyfillDisplaysPopulated = true;
@@ -3146,38 +3425,36 @@
}
nativeGetFrameData.call(this, nativeFrameData);
frameData.pose = nativeFrameData.pose;
- util.copyArray(nativeFrameData.leftProjectionMatrix, frameData.leftProjectionMatrix);
- util.copyArray(nativeFrameData.rightProjectionMatrix, frameData.rightProjectionMatrix);
- util.copyArray(nativeFrameData.leftViewMatrix, frameData.leftViewMatrix);
- util.copyArray(nativeFrameData.rightViewMatrix, frameData.rightViewMatrix);
+ copyArray(nativeFrameData.leftProjectionMatrix, frameData.leftProjectionMatrix);
+ copyArray(nativeFrameData.rightProjectionMatrix, frameData.rightProjectionMatrix);
+ copyArray(nativeFrameData.leftViewMatrix, frameData.leftViewMatrix);
+ copyArray(nativeFrameData.rightViewMatrix, frameData.rightViewMatrix);
};
}
navigator.getVRDisplays = this.getVRDisplays.bind(this);
- window.VRDisplay = VRDisplay;
- window.VRFrameData = VRFrameData;
+ window.VRDisplay = CardboardVRDisplay.VRDisplay;
+ window.VRFrameData = CardboardVRDisplay.VRFrameData;
};
WebVRPolyfill.prototype.getVRDisplays = function () {
- this.getPolyfillDisplays();
- var polyfillDisplays = this.polyfillDisplays;
- var config$$1 = this.config;
+ var _this = this;
+ var config = this.config;
if (!this.hasNative) {
- return Promise.resolve(polyfillDisplays);
+ return Promise.resolve(this.getPolyfillDisplays());
}
- var timeoutId;
- var vrDisplaysNative = this.native.getVRDisplays.call(navigator);
- var timeoutPromise = new Promise(function (resolve) {
- timeoutId = setTimeout(function () {
- console.warn('Native WebVR implementation detected, but `getVRDisplays()` failed to resolve. Falling back to polyfill.');
- resolve([]);
- }, config$$1.GET_VR_DISPLAYS_TIMEOUT);
- });
- return util.race([vrDisplaysNative, timeoutPromise]).then(function (nativeDisplays) {
- clearTimeout(timeoutId);
- return nativeDisplays.length > 0 ? nativeDisplays : polyfillDisplays;
+ return this.native.getVRDisplays.call(navigator).then(function (nativeDisplays) {
+ return nativeDisplays.length > 0 ? nativeDisplays : _this.getPolyfillDisplays();
});
};
WebVRPolyfill.version = version;
-var webvrPolyfill = WebVRPolyfill;
+WebVRPolyfill.VRFrameData = CardboardVRDisplay.VRFrameData;
+WebVRPolyfill.VRDisplay = CardboardVRDisplay.VRDisplay;
+
+
+var webvrPolyfill = Object.freeze({
+ default: WebVRPolyfill
+});
+
+var require$$0 = ( webvrPolyfill && WebVRPolyfill ) || webvrPolyfill;
if (typeof commonjsGlobal !== 'undefined' && commonjsGlobal.window) {
if (!commonjsGlobal.document) {
@@ -3187,7 +3464,7 @@
commonjsGlobal.navigator = commonjsGlobal.window.navigator;
}
}
-var src = webvrPolyfill;
+var src = require$$0;
return src;
