Last commit before release

AR-js-org · May 1, 2021 · 9f4d3c2 · 9f4d3c2
1 parent d1c2cb0
commit 9f4d3c2
Show file tree

Hide file tree

Showing 10 changed files with 65 additions and 10 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,15 @@
+# 3.3.2
+
+- Fixed bug in `arjs-webcam-texture component` which caused the webcam stream to freeze on iOS. Thanks to @stevenlybeck for this.
+
+- CORS proxy removed from examples
+
+- Added custom found/lost events to markerControls for three.js core (thanks to @fcor)
+
+- Deactivated GPS listener when AR.js app not in the foreground (thanks to @NVFedorov for raising this issue)
+
+- update license wording (thanks to @chingucoding)
+
 # 3.3.1
 
 - Fix minor location-based bugs

diff --git a/README.md b/README.md
@@ -57,7 +57,7 @@ Please import the one you need for your project, not both:
 You can also import a specific version replacing `master` keyword with version tag:
 
 ```html
-  <script src="https://raw.githack.com/AR-js-org/AR.js/3.3.1/aframe/build/aframe-ar-nft.js">
+  <script src="https://raw.githack.com/AR-js-org/AR.js/3.3.2/aframe/build/aframe-ar-nft.js">
 ```
 
 ## Get started

diff --git a/aframe/build/aframe-ar-location-only.js b/aframe/build/aframe-ar-location-only.js
@@ -656,6 +656,7 @@ AFRAME.registerComponent('arjs-webcam-texture', {
         this.scene.renderer.autoClear = false;
         this.video = document.createElement("video");
         this.video.setAttribute("autoplay", true);
+        this.video.setAttribute("playsinline", true);
         this.video.setAttribute("display", "none");
         document.body.appendChild(this.video);
         this.geom = new THREE.PlaneBufferGeometry(); //0.5, 0.5);

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/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ar.js",
-  "version": "3.3.1",
+  "version": "3.3.2",
   "description": "Efficient Augmented Reality for the Web",
   "main": "./aframe/build/aframe-ar.js",
   "scripts": {

diff --git a/three.js/build/ar-nft.js b/three.js/build/ar-nft.js
diff --git a/three.js/build/ar.js b/three.js/build/ar.js
diff --git a/three.js/src/threex/threex-artoolkitcontext-nft.js b/three.js/src/threex/threex-artoolkitcontext-nft.js
@@ -79,7 +79,7 @@ Object.assign(ARjs.Context.prototype, THREE.EventDispatcher.prototype);
 
 // default to github page
 ARjs.Context.baseURL = 'https://ar-js-org.github.io/AR.js/three.js/'
-ARjs.Context.REVISION = '3.3.1';
+ARjs.Context.REVISION = '3.3.2';
 
 /**
  * Create a default camera for this trackingBackend

diff --git a/three.js/src/threex/threex-artoolkitcontext.js b/three.js/src/threex/threex-artoolkitcontext.js
@@ -74,7 +74,7 @@ Object.assign(ARjs.Context.prototype, THREE.EventDispatcher.prototype);
 
 // default to github page
 ARjs.Context.baseURL = 'https://ar-js-org.github.io/AR.js/three.js/'
-ARjs.Context.REVISION = '3.3.1';
+ARjs.Context.REVISION = '3.3.2';
 
 /**
  * Create a default camera for this trackingBackend