From 2249e7be9a3648b2223f0e4999759dc6ca241120 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Salvador=20de=20la=20Puente=20Gonz=C3=A1lez?= Date: Fri, 2 Mar 2018 11:28:47 +0100 Subject: [PATCH 1/4] Add some folder structure to the project --- Assets/WebGLTemplates/WebVR/index.html | 7 +-- Assets/WebGLTemplates/WebVR/lib.meta | 10 ++++ .../WebVR/{ => lib}/gl-matrix-min.js | 0 .../WebVR/{ => lib}/gl-matrix-min.js.meta | 4 +- .../WebVR/{ => lib}/webvr-polyfill.min.js | 0 .../WebVR/{ => lib}/webvr-polyfill.min.js.map | 0 .../{ => lib}/webvr-polyfill.min.js.map.meta | 4 +- .../{ => lib}/webvr-polyfill.min.js.meta | 4 +- Assets/WebGLTemplates/WebVR/src.meta | 10 ++++ Assets/WebGLTemplates/WebVR/src/telemetry.js | 48 +++++++++++++++++++ .../WebVR/src/telemetry.js.meta | 9 ++++ Assets/WebGLTemplates/WebVR/styles.meta | 10 ++++ .../WebVR/{ => styles}/webvr.css | 0 .../WebVR/styles/webvr.css.meta | 9 ++++ Assets/WebGLTemplates/WebVR/webvr.css.meta | 8 ---- 15 files changed, 106 insertions(+), 17 deletions(-) create mode 100644 Assets/WebGLTemplates/WebVR/lib.meta rename Assets/WebGLTemplates/WebVR/{ => lib}/gl-matrix-min.js (100%) mode change 100755 => 100644 rename Assets/WebGLTemplates/WebVR/{ => lib}/gl-matrix-min.js.meta (68%) rename Assets/WebGLTemplates/WebVR/{ => lib}/webvr-polyfill.min.js (100%) mode change 100755 => 100644 rename Assets/WebGLTemplates/WebVR/{ => lib}/webvr-polyfill.min.js.map (100%) mode change 100755 => 100644 rename Assets/WebGLTemplates/WebVR/{ => lib}/webvr-polyfill.min.js.map.meta (68%) rename Assets/WebGLTemplates/WebVR/{ => lib}/webvr-polyfill.min.js.meta (68%) create mode 100644 Assets/WebGLTemplates/WebVR/src.meta create mode 100644 Assets/WebGLTemplates/WebVR/src/telemetry.js create mode 100644 Assets/WebGLTemplates/WebVR/src/telemetry.js.meta create mode 100644 Assets/WebGLTemplates/WebVR/styles.meta rename Assets/WebGLTemplates/WebVR/{ => styles}/webvr.css (100%) mode change 100755 => 100644 create mode 100644 Assets/WebGLTemplates/WebVR/styles/webvr.css.meta delete mode 100755 Assets/WebGLTemplates/WebVR/webvr.css.meta diff --git a/Assets/WebGLTemplates/WebVR/index.html b/Assets/WebGLTemplates/WebVR/index.html index a1225be..25f42ab 100755 --- a/Assets/WebGLTemplates/WebVR/index.html +++ b/Assets/WebGLTemplates/WebVR/index.html @@ -10,7 +10,8 @@ %UNITY_CUSTOM_NAME% | %UNITY_WEB_NAME% - + + - + + diff --git a/Assets/WebGLTemplates/WebVR/lib.meta b/Assets/WebGLTemplates/WebVR/lib.meta new file mode 100644 index 0000000..f55c325 --- /dev/null +++ b/Assets/WebGLTemplates/WebVR/lib.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: d2a6d0a7586c8134ba35c449d97a8ba6 +folderAsset: yes +timeCreated: 1519985767 +licenseType: Free +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/WebGLTemplates/WebVR/gl-matrix-min.js b/Assets/WebGLTemplates/WebVR/lib/gl-matrix-min.js old mode 100755 new mode 100644 similarity index 100% rename from Assets/WebGLTemplates/WebVR/gl-matrix-min.js rename to Assets/WebGLTemplates/WebVR/lib/gl-matrix-min.js diff --git a/Assets/WebGLTemplates/WebVR/gl-matrix-min.js.meta b/Assets/WebGLTemplates/WebVR/lib/gl-matrix-min.js.meta similarity index 68% rename from Assets/WebGLTemplates/WebVR/gl-matrix-min.js.meta rename to Assets/WebGLTemplates/WebVR/lib/gl-matrix-min.js.meta index 354b4cf..dbde4c0 100644 --- a/Assets/WebGLTemplates/WebVR/gl-matrix-min.js.meta +++ b/Assets/WebGLTemplates/WebVR/lib/gl-matrix-min.js.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 -guid: 7e17ecd3f3a0d4b70a7062cfe1e2e42e -timeCreated: 1512279285 +guid: 1f358a6f04ff58044bb7f744fdec9215 +timeCreated: 1519985767 licenseType: Free DefaultImporter: externalObjects: {} diff --git a/Assets/WebGLTemplates/WebVR/webvr-polyfill.min.js b/Assets/WebGLTemplates/WebVR/lib/webvr-polyfill.min.js old mode 100755 new mode 100644 similarity index 100% rename from Assets/WebGLTemplates/WebVR/webvr-polyfill.min.js rename to Assets/WebGLTemplates/WebVR/lib/webvr-polyfill.min.js diff --git a/Assets/WebGLTemplates/WebVR/webvr-polyfill.min.js.map b/Assets/WebGLTemplates/WebVR/lib/webvr-polyfill.min.js.map old mode 100755 new mode 100644 similarity index 100% rename from Assets/WebGLTemplates/WebVR/webvr-polyfill.min.js.map rename to Assets/WebGLTemplates/WebVR/lib/webvr-polyfill.min.js.map diff --git a/Assets/WebGLTemplates/WebVR/webvr-polyfill.min.js.map.meta b/Assets/WebGLTemplates/WebVR/lib/webvr-polyfill.min.js.map.meta similarity index 68% rename from Assets/WebGLTemplates/WebVR/webvr-polyfill.min.js.map.meta rename to Assets/WebGLTemplates/WebVR/lib/webvr-polyfill.min.js.map.meta index fbef821..20cbc79 100644 --- a/Assets/WebGLTemplates/WebVR/webvr-polyfill.min.js.map.meta +++ b/Assets/WebGLTemplates/WebVR/lib/webvr-polyfill.min.js.map.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 -guid: 39192c959a0274749a8c164615c3df7d -timeCreated: 1517989736 +guid: bb535c0e44190994091ac028d9a09849 +timeCreated: 1519985767 licenseType: Free DefaultImporter: externalObjects: {} diff --git a/Assets/WebGLTemplates/WebVR/webvr-polyfill.min.js.meta b/Assets/WebGLTemplates/WebVR/lib/webvr-polyfill.min.js.meta similarity index 68% rename from Assets/WebGLTemplates/WebVR/webvr-polyfill.min.js.meta rename to Assets/WebGLTemplates/WebVR/lib/webvr-polyfill.min.js.meta index c8a2f77..b2d9bda 100644 --- a/Assets/WebGLTemplates/WebVR/webvr-polyfill.min.js.meta +++ b/Assets/WebGLTemplates/WebVR/lib/webvr-polyfill.min.js.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 -guid: b1e8beae11600499b919f18981b44d94 -timeCreated: 1517973444 +guid: 396dffe588e5d0a4d836c8ca14054823 +timeCreated: 1519985767 licenseType: Free DefaultImporter: externalObjects: {} diff --git a/Assets/WebGLTemplates/WebVR/src.meta b/Assets/WebGLTemplates/WebVR/src.meta new file mode 100644 index 0000000..6884d2b --- /dev/null +++ b/Assets/WebGLTemplates/WebVR/src.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 8882a0361860601459cb8312e1e87bb3 +folderAsset: yes +timeCreated: 1519985767 +licenseType: Free +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/WebGLTemplates/WebVR/src/telemetry.js b/Assets/WebGLTemplates/WebVR/src/telemetry.js new file mode 100644 index 0000000..f2fb09d --- /dev/null +++ b/Assets/WebGLTemplates/WebVR/src/telemetry.js @@ -0,0 +1,48 @@ +/* global localStorage, location, Raven */ +(function () { +// This checks for "production"-looking origins (e.g., `https://example.com`). +if (window.isSecureContext === false || + (location.hostname === 'localhost' || + location.hostname === '127.0.0.1' || + location.hostname === '0.0.0.0' || + location.hostname.indexOf('ngrok.io') > -1 || + location.hostname.indexOf('localtunnel.me') > -1)) { + return; +} + +injectScript('https://cdn.ravenjs.com/3.22.3/console/raven.min.js', function (err) { + if (err) { + console.warn('Could not load Raven.js script:', err); + return; + } + if (!('Raven' in window)) { + console.warn('Could not find `window.Raven` global'); + return; + } + ravenLoaded(); +}); + +function ravenLoaded () { + console.log('Raven.js script loaded'); + Raven.config('https://e359be9fb9324addb0dc97b664cf5ee6@sentry.io/294878') + .install(); +} + +function injectScript (src, callback) { + var script = document.createElement('script'); + script.src = src; + script.crossorigin = 'anonymous'; + script.addEventListener('load', function () { + if (callback) { + callback(null, true); + } + }); + script.addEventListener('error', function (err) { + if (callback) { + callback(err); + } + }); + document.head.appendChild(script); + return script; +} +})(); diff --git a/Assets/WebGLTemplates/WebVR/src/telemetry.js.meta b/Assets/WebGLTemplates/WebVR/src/telemetry.js.meta new file mode 100644 index 0000000..574560e --- /dev/null +++ b/Assets/WebGLTemplates/WebVR/src/telemetry.js.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: c633f0bb019160240890f318c0892720 +timeCreated: 1519985767 +licenseType: Free +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/WebGLTemplates/WebVR/styles.meta b/Assets/WebGLTemplates/WebVR/styles.meta new file mode 100644 index 0000000..3303f56 --- /dev/null +++ b/Assets/WebGLTemplates/WebVR/styles.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 12b38352b14eb6a4eb28be7cd94d3a42 +folderAsset: yes +timeCreated: 1519985767 +licenseType: Free +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/WebGLTemplates/WebVR/webvr.css b/Assets/WebGLTemplates/WebVR/styles/webvr.css old mode 100755 new mode 100644 similarity index 100% rename from Assets/WebGLTemplates/WebVR/webvr.css rename to Assets/WebGLTemplates/WebVR/styles/webvr.css diff --git a/Assets/WebGLTemplates/WebVR/styles/webvr.css.meta b/Assets/WebGLTemplates/WebVR/styles/webvr.css.meta new file mode 100644 index 0000000..e56e285 --- /dev/null +++ b/Assets/WebGLTemplates/WebVR/styles/webvr.css.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 26b62d33edf91c54c95b6d80c3dec633 +timeCreated: 1519985767 +licenseType: Free +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/WebGLTemplates/WebVR/webvr.css.meta b/Assets/WebGLTemplates/WebVR/webvr.css.meta deleted file mode 100755 index 16f6c4a..0000000 --- a/Assets/WebGLTemplates/WebVR/webvr.css.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 8445918f772914f72915553df837da19 -timeCreated: 1494698833 -licenseType: Pro -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: From 53993c4a13de38b004518b5f0e11e2065f3d7c1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Salvador=20de=20la=20Puente=20Gonz=C3=A1lez?= Date: Fri, 2 Mar 2018 13:41:37 +0100 Subject: [PATCH 2/4] First draft of telemetry interface --- Assets/WebGLTemplates/WebVR/index.html | 8 +- Assets/WebGLTemplates/WebVR/src/telemetry.js | 104 +++++++++++++++---- 2 files changed, 91 insertions(+), 21 deletions(-) diff --git a/Assets/WebGLTemplates/WebVR/index.html b/Assets/WebGLTemplates/WebVR/index.html index 25f42ab..e9cfd8d 100755 --- a/Assets/WebGLTemplates/WebVR/index.html +++ b/Assets/WebGLTemplates/WebVR/index.html @@ -11,8 +11,14 @@ - + + - + + - + + diff --git a/Assets/WebGLTemplates/WebVR/src/telemetry.js b/Assets/WebGLTemplates/WebVR/lib/telemetry.js similarity index 81% rename from Assets/WebGLTemplates/WebVR/src/telemetry.js rename to Assets/WebGLTemplates/WebVR/lib/telemetry.js index 9af0b16..4d124fe 100644 --- a/Assets/WebGLTemplates/WebVR/src/telemetry.js +++ b/Assets/WebGLTemplates/WebVR/lib/telemetry.js @@ -2,13 +2,16 @@ (function (window) { 'use strict'; -if (!('UnityLoader' in window)) { - console.warn('`UnityLoader` object not found.'); - return; +if (!('MozillaResearch' in window)) { + window.MozillaResearch = {}; +} + +if (!('telemetry' in window.MozillaResearch)) { + window.MozillaResearch.telemetry = {} ; } var navigator = window.navigator; -var telemetry = getModule('UnityLoader.WebVR.telemetry'); +var telemetry = window.MozillaResearch.telemetry; telemetry.ga = { create: function (trackingId, cookieDomain, name, fieldsObject) { @@ -97,16 +100,4 @@ function injectScript (src, callback) { return script; } -function getModule (modulePath) { - var fragments = modulePath.split('.'); - var currentModule = window; - for (var i = 0, l = fragments.length; i < l; i++) { - var submoduleName = fragments[i]; - if (!(submoduleName in currentModule)) { - currentModule[submoduleName] = {}; - } - currentModule = currentModule[submoduleName]; - } - return currentModule; -} })(window); diff --git a/Assets/WebGLTemplates/WebVR/src/telemetry.js.meta b/Assets/WebGLTemplates/WebVR/lib/telemetry.js.meta similarity index 100% rename from Assets/WebGLTemplates/WebVR/src/telemetry.js.meta rename to Assets/WebGLTemplates/WebVR/lib/telemetry.js.meta diff --git a/Assets/WebGLTemplates/WebVR/styles/webvr.css b/Assets/WebGLTemplates/WebVR/styles/webvr.css index 765f3bf..c3be537 100644 --- a/Assets/WebGLTemplates/WebVR/styles/webvr.css +++ b/Assets/WebGLTemplates/WebVR/styles/webvr.css @@ -104,7 +104,7 @@ a:link, a:visited { } #entervr { - background: #fff url(vr.png) center no-repeat; + background: #fff url(../vr.png) center no-repeat; background-size: 80%; cursor: pointer; display: none; diff --git a/Assets/WebGLTemplates/WebVR/src.meta b/Assets/WebGLTemplates/WebVR/vendor.meta similarity index 70% rename from Assets/WebGLTemplates/WebVR/src.meta rename to Assets/WebGLTemplates/WebVR/vendor.meta index 6884d2b..3f6dd3b 100644 --- a/Assets/WebGLTemplates/WebVR/src.meta +++ b/Assets/WebGLTemplates/WebVR/vendor.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 -guid: 8882a0361860601459cb8312e1e87bb3 +guid: d0df3df31b907984d94fb1f937b5d179 folderAsset: yes -timeCreated: 1519985767 +timeCreated: 1520325169 licenseType: Free DefaultImporter: externalObjects: {} diff --git a/Assets/WebGLTemplates/WebVR/lib/gl-matrix-min.js b/Assets/WebGLTemplates/WebVR/vendor/gl-matrix-min.js similarity index 100% rename from Assets/WebGLTemplates/WebVR/lib/gl-matrix-min.js rename to Assets/WebGLTemplates/WebVR/vendor/gl-matrix-min.js diff --git a/Assets/WebGLTemplates/WebVR/lib/gl-matrix-min.js.meta b/Assets/WebGLTemplates/WebVR/vendor/gl-matrix-min.js.meta similarity index 100% rename from Assets/WebGLTemplates/WebVR/lib/gl-matrix-min.js.meta rename to Assets/WebGLTemplates/WebVR/vendor/gl-matrix-min.js.meta diff --git a/Assets/WebGLTemplates/WebVR/lib/webvr-polyfill.min.js b/Assets/WebGLTemplates/WebVR/vendor/webvr-polyfill.min.js similarity index 100% rename from Assets/WebGLTemplates/WebVR/lib/webvr-polyfill.min.js rename to Assets/WebGLTemplates/WebVR/vendor/webvr-polyfill.min.js diff --git a/Assets/WebGLTemplates/WebVR/lib/webvr-polyfill.min.js.map b/Assets/WebGLTemplates/WebVR/vendor/webvr-polyfill.min.js.map similarity index 100% rename from Assets/WebGLTemplates/WebVR/lib/webvr-polyfill.min.js.map rename to Assets/WebGLTemplates/WebVR/vendor/webvr-polyfill.min.js.map diff --git a/Assets/WebGLTemplates/WebVR/lib/webvr-polyfill.min.js.map.meta b/Assets/WebGLTemplates/WebVR/vendor/webvr-polyfill.min.js.map.meta similarity index 100% rename from Assets/WebGLTemplates/WebVR/lib/webvr-polyfill.min.js.map.meta rename to Assets/WebGLTemplates/WebVR/vendor/webvr-polyfill.min.js.map.meta diff --git a/Assets/WebGLTemplates/WebVR/lib/webvr-polyfill.min.js.meta b/Assets/WebGLTemplates/WebVR/vendor/webvr-polyfill.min.js.meta similarity index 100% rename from Assets/WebGLTemplates/WebVR/lib/webvr-polyfill.min.js.meta rename to Assets/WebGLTemplates/WebVR/vendor/webvr-polyfill.min.js.meta From 4872a73510f685efc946506851a89fce95d5213f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Salvador=20de=20la=20Puente=20Gonz=C3=A1lez?= Date: Tue, 6 Mar 2018 11:09:27 +0100 Subject: [PATCH 4/4] Simplifying options and deminifying GA setup --- Assets/WebGLTemplates/WebVR/index.html | 4 ++-- Assets/WebGLTemplates/WebVR/lib/telemetry.js | 13 +++++++++---- Assets/WebGLTemplates/WebVR/styles.meta | 10 ---------- Assets/WebGLTemplates/WebVR/{styles => }/webvr.css | 2 +- .../WebVR/{styles => }/webvr.css.meta | 4 ++-- 5 files changed, 14 insertions(+), 19 deletions(-) delete mode 100644 Assets/WebGLTemplates/WebVR/styles.meta rename Assets/WebGLTemplates/WebVR/{styles => }/webvr.css (97%) rename Assets/WebGLTemplates/WebVR/{styles => }/webvr.css.meta (68%) diff --git a/Assets/WebGLTemplates/WebVR/index.html b/Assets/WebGLTemplates/WebVR/index.html index 2fa9506..067e079 100755 --- a/Assets/WebGLTemplates/WebVR/index.html +++ b/Assets/WebGLTemplates/WebVR/index.html @@ -14,8 +14,8 @@ diff --git a/Assets/WebGLTemplates/WebVR/lib/telemetry.js b/Assets/WebGLTemplates/WebVR/lib/telemetry.js index 4d124fe..50d496c 100644 --- a/Assets/WebGLTemplates/WebVR/lib/telemetry.js +++ b/Assets/WebGLTemplates/WebVR/lib/telemetry.js @@ -7,7 +7,7 @@ if (!('MozillaResearch' in window)) { } if (!('telemetry' in window.MozillaResearch)) { - window.MozillaResearch.telemetry = {} ; + window.MozillaResearch.telemetry = {}; } var navigator = window.navigator; @@ -29,13 +29,14 @@ telemetry.ga = { }; telemetry.start = function (config) { + config = config || {}; if (navigator.doNotTrack === '1') { return; } - if (config.researchErrorLogging) { + if (config.errorLogging) { startErrorLogging(); } - if (config.researchAnalytics) { + if (config.analytics) { startAnalytics(); } }; @@ -43,7 +44,11 @@ telemetry.start = function (config) { setupAnalytics(); function setupAnalytics() { - window.ga=window.ga||function(){(ga.q=ga.q||[]).push(arguments)};ga.l=+new Date; + window.ga = window.ga || function () { + (window.ga.q = (window.ga.q || [])).push(arguments) + }; + window.ga.l = +(new Date()); + if (navigator.doNotTrack === '1') { return; } diff --git a/Assets/WebGLTemplates/WebVR/styles.meta b/Assets/WebGLTemplates/WebVR/styles.meta deleted file mode 100644 index 3303f56..0000000 --- a/Assets/WebGLTemplates/WebVR/styles.meta +++ /dev/null @@ -1,10 +0,0 @@ -fileFormatVersion: 2 -guid: 12b38352b14eb6a4eb28be7cd94d3a42 -folderAsset: yes -timeCreated: 1519985767 -licenseType: Free -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/WebGLTemplates/WebVR/styles/webvr.css b/Assets/WebGLTemplates/WebVR/webvr.css similarity index 97% rename from Assets/WebGLTemplates/WebVR/styles/webvr.css rename to Assets/WebGLTemplates/WebVR/webvr.css index c3be537..765f3bf 100644 --- a/Assets/WebGLTemplates/WebVR/styles/webvr.css +++ b/Assets/WebGLTemplates/WebVR/webvr.css @@ -104,7 +104,7 @@ a:link, a:visited { } #entervr { - background: #fff url(../vr.png) center no-repeat; + background: #fff url(vr.png) center no-repeat; background-size: 80%; cursor: pointer; display: none; diff --git a/Assets/WebGLTemplates/WebVR/styles/webvr.css.meta b/Assets/WebGLTemplates/WebVR/webvr.css.meta similarity index 68% rename from Assets/WebGLTemplates/WebVR/styles/webvr.css.meta rename to Assets/WebGLTemplates/WebVR/webvr.css.meta index e56e285..e093489 100644 --- a/Assets/WebGLTemplates/WebVR/styles/webvr.css.meta +++ b/Assets/WebGLTemplates/WebVR/webvr.css.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 -guid: 26b62d33edf91c54c95b6d80c3dec633 -timeCreated: 1519985767 +guid: 8445918f772914f72915553df837da19 +timeCreated: 1520350787 licenseType: Free DefaultImporter: externalObjects: {}