3.3.3-es6-beta-02 version

AR-js-org · Nov 16, 2021 · 3bf97f3 · 3bf97f3
1 parent fccd194
commit 3bf97f3
Show file tree

Hide file tree

Showing 12 changed files with 22 additions and 28,471 deletions.
diff --git a/aframe/build/aframe-ar-location-only.js b/aframe/build/aframe-ar-location-only.js
diff --git a/aframe/build/aframe-ar-nft.js b/aframe/build/aframe-ar-nft.js
diff --git a/aframe/build/aframe-ar.js b/aframe/build/aframe-ar.js
diff --git a/aframe/examples/marker-based/basic.html b/aframe/examples/marker-based/basic.html
@@ -2,7 +2,7 @@
 <html>
     <script src="https://aframe.io/releases/1.0.0/aframe.min.js"></script>
     <!-- we import arjs version without NFT but with marker + location based support -->
-    <script src="https://raw.githack.com/AR-js-org/AR.js/ES6/aframe/build/aframe-ar.js"></script>
+    <script src="https://raw.githack.com/AR-js-org/AR.js/dev/aframe/build/aframe-ar.js"></script>
     <body style="margin : 0px; overflow: hidden;">
         <a-scene embedded arjs>
         <a-marker preset="hiro">

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ar-js-org/ar.js",
-  "version": "3.3.3-es6-beta-01",
+  "version": "3.3.3-es6-beta-02",
   "description": "Efficient Augmented Reality for the Web",
   "main": "./aframe/build/aframe-ar.js",
   "scripts": {
@@ -51,8 +51,8 @@
   },
   "homepage": "https://github.com/AR-js-org/AR.js/",
   "devDependencies": {
-    "webpack": "^5.4.0",
-    "webpack-cli": "^4.5.0",
+    "webpack": "^5.64.1",
+    "webpack-cli": "^4.9.1",
     "worker-loader": "^3.0.8"
   },
   "dependencies": {

diff --git a/three.js/build/ar-nft.js b/three.js/build/ar-nft.js
diff --git a/three.js/build/ar-threex-nft.js b/three.js/build/ar-threex-nft.js
diff --git a/three.js/build/ar-threex.js b/three.js/build/ar-threex.js
diff --git a/three.js/build/ar.js b/three.js/build/ar.js
diff --git a/three.js/src/threex/arjs-context-nft.js b/three.js/src/threex/arjs-context-nft.js
@@ -85,7 +85,7 @@ Context.prototype.removeEventListener = THREE.EventDispatcher.prototype.removeEv
 
 // default to github page
 Context.baseURL = 'https://ar-js-org.github.io/AR.js/three.js/'
-Context.REVISION = '3.3.3-es6-beta-01';
+Context.REVISION = '3.3.3-es6-beta-02';
 
 /**
  * Create a default camera for this trackingBackend

diff --git a/three.js/src/threex/arjs-context.js b/three.js/src/threex/arjs-context.js
@@ -80,7 +80,7 @@ Context.prototype.removeEventListener = THREE.EventDispatcher.prototype.removeEv
 
 // default to github page
 Context.baseURL = 'https://ar-js-org.github.io/AR.js/three.js/'
-Context.REVISION = '3.3.3-es6-beta-01'
+Context.REVISION = '3.3.3-es6-beta-02'
 /**
  * Create a default camera for this trackingBackend
  * @param {string} trackingBackend - the tracking to user

diff --git a/three.js/src/threex/arjs-source.js b/three.js/src/threex/arjs-source.js
@@ -347,37 +347,37 @@ Source.prototype.hasMobileTorch = function () {
  */
 Source.prototype.toggleMobileTorch = function () {
     // sanity check
-    console.assert(this.hasMobileTorch() === true)
+    console.assert(this.hasMobileTorch() === true);
 
-    var stream = arToolkitSource.domElement.srcObject
+    var stream = arToolkitSource.domElement.srcObject;
     if (stream instanceof MediaStream === false) {
         if (!document.getElementById('error-popup')) {
             var errorPopup = document.createElement('div');
-            errorPopup.innerHTML = 'enabling mobile torch is available only on webcam'
+            errorPopup.innerHTML = 'enabling mobile torch is available only on webcam';
             errorPopup.setAttribute('id', 'error-popup');
             document.body.appendChild(errorPopup);
         }
-        return
+        return;
     }
 
     if (this._currentTorchStatus === undefined) {
-        this._currentTorchStatus = false
+        this._currentTorchStatus = false;
     }
 
     var videoTrack = stream.getVideoTracks()[0];
-    var capabilities = videoTrack.getCapabilities()
+    var capabilities = videoTrack.getCapabilities();
 
     if (!capabilities.torch) {
         if (!document.getElementById('error-popup')) {
             var errorPopup = document.createElement('div');
-            errorPopup.innerHTML = 'no mobile torch is available on your camera'
+            errorPopup.innerHTML = 'no mobile torch is available on your camera';
             errorPopup.setAttribute('id', 'error-popup');
             document.body.appendChild(errorPopup);
         }
-        return
+        return;
     }
 
-    this._currentTorchStatus = this._currentTorchStatus === false ? true : false
+    this._currentTorchStatus = this._currentTorchStatus === false ? true : false;
     videoTrack.applyConstraints({
         advanced: [{
             torch: this._currentTorchStatus