Last commit before release

AR-js-org · May 8, 2021 · aaad984 · aaad984
1 parent c6661e2
commit aaad984
Show file tree

Hide file tree

Showing 12 changed files with 22 additions and 16 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+# 3.3.3
+
+- Fixed bug which prevents `minDistance` and `maxDistance` working with a simulated location
+
+- Fixed typo in name of `gps-entity-place-update-position` event
+
 # 3.3.2
 
 - Fixed bug in `arjs-webcam-texture component` which caused the webcam stream to freeze on iOS. Thanks to @stevenlybeck for this.

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.2/aframe/build/aframe-ar-nft.js">
+  <script src="https://raw.githack.com/AR-js-org/AR.js/3.3.3/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
@@ -1168,7 +1168,7 @@ AFRAME.registerComponent('gps-entity-place', {
 
             this.el.setAttribute('distance', distanceForMsg);
             this.el.setAttribute('distanceMsg', formatDistance(distanceForMsg));
-            this.el.dispatchEvent(new CustomEvent('gps-entity-place-update-positon', { detail: { distance: distanceForMsg } }));
+            this.el.dispatchEvent(new CustomEvent('gps-entity-place-update-position', { detail: { distance: distanceForMsg } }));
 
             var actualDistance = this._cameraGps.computeDistanceMeters(ev.detail.position, dstCoords, true);
 
@@ -1807,7 +1807,7 @@ AFRAME.registerComponent('gps-projected-entity-place', {
             this.el.setAttribute('distance', distanceForMsg);
             this.el.setAttribute('distanceMsg', formatDistance(distanceForMsg));
 
-            this.el.dispatchEvent(new CustomEvent('gps-entity-place-update-positon', { detail: { distance: distanceForMsg } }));
+            this.el.dispatchEvent(new CustomEvent('gps-entity-place-update-position', { detail: { distance: distanceForMsg } }));
 
             var actualDistance = this._cameraGps.computeDistanceMeters(dstCoords, true);
 

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/src/location-based/gps-entity-place.js b/aframe/src/location-based/gps-entity-place.js
@@ -43,7 +43,7 @@ AFRAME.registerComponent('gps-entity-place', {
 
             this.el.setAttribute('distance', distanceForMsg);
             this.el.setAttribute('distanceMsg', formatDistance(distanceForMsg));
-            this.el.dispatchEvent(new CustomEvent('gps-entity-place-update-positon', { detail: { distance: distanceForMsg } }));
+            this.el.dispatchEvent(new CustomEvent('gps-entity-place-update-position', { detail: { distance: distanceForMsg } }));
 
             var actualDistance = this._cameraGps.computeDistanceMeters(ev.detail.position, dstCoords, true);
 

diff --git a/aframe/src/location-based/gps-projected-entity-place.js b/aframe/src/location-based/gps-projected-entity-place.js
@@ -66,7 +66,7 @@ AFRAME.registerComponent('gps-projected-entity-place', {
             this.el.setAttribute('distance', distanceForMsg);
             this.el.setAttribute('distanceMsg', formatDistance(distanceForMsg));
 
-            this.el.dispatchEvent(new CustomEvent('gps-entity-place-update-positon', { detail: { distance: distanceForMsg } }));
+            this.el.dispatchEvent(new CustomEvent('gps-entity-place-update-position', { detail: { distance: distanceForMsg } }));
 
             var actualDistance = this._cameraGps.computeDistanceMeters(dstCoords, true);
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ar.js",
-  "version": "3.3.2",
+  "version": "3.3.3",
   "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.2';
+ARjs.Context.REVISION = '3.3.3';
 
 /**
  * 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.2';
+ARjs.Context.REVISION = '3.3.3';
 
 /**
  * Create a default camera for this trackingBackend