Last commit before release

1e4a1215 · nicolo.carpignoli · d1dcbca2 · 1e4a1215 · 1e4a1215 · 1e4a1215
11 changed file
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
+# 2.2.0
+
+- it's now possible to track markers with white background and black shapes, using `labelingMode: white_region;` property on `arjs` component (thanks to @umutto)
+- in location based is now possible to simulate altitude, longitude and latitude for user position (thanks to @cmcfadden)
+- default package script for jsdelvr (thanks to @benalfree)
+
 # 2.1.8

 - handle y position (height) of content in Location Based, using `position` property of A-FRAME

--- a/README.md
+++ b/README.md
@@ -127,7 +127,7 @@ You can also use GeoAR.js **without** the script, adding `gps-entity-place` enti
 <!doctype HTML>
 <html>
 <script src="https://aframe.io/releases/1.0.0/aframe.min.js"></script>
-<script src="https://raw.githack.com/jeromeetienne/AR.js/2.1.8/aframe/build/aframe-ar.js"></script>
+<script src="https://raw.githack.com/jeromeetienne/AR.js/2.2.0/aframe/build/aframe-ar.js"></script>
  <body style='margin : 0px; overflow: hidden;'>
    <a-scene embedded arjs>
      <a-marker preset="hiro">

--- a/aframe/build/aframe-ar.js
+++ b/aframe/build/aframe-ar.js
@@ -2531,7 +2531,7 @@ Object.assign(ARjs.Context.prototype, THREE.EventDispatcher.prototype);
 // ARjs.Context.baseURL = '../'
 // default to github page
 ARjs.Context.baseURL = 'https://jeromeetienne.github.io/AR.js/three.js/'
-ARjs.Context.REVISION = '2.1.8';
+ARjs.Context.REVISION = '2.2.0';

 /**
 * Create a default camera for this trackingBackend

--- a/aframe/build/aframe-ar.min.js
+++ b/aframe/build/aframe-ar.min.js
--- a/package-lock.json
+++ b/package-lock.json
 {
  "name": "ar.js",
-  "version": "2.1.8",
+  "version": "2.2.0",
  "lockfileVersion": 1,
  "requires": true,
  "dependencies": {

--- a/package.json
+++ b/package.json
 {
  "name": "ar.js",
-  "version": "2.1.8",
+  "version": "2.2.0",
  "description": "Efficient Augmented Reality for the Web",
  "main": "./aframe/build/aframe-ar.min.js",
  "scripts": {

--- a/three.js/build/ar.js
+++ b/three.js/build/ar.js
@@ -2531,7 +2531,7 @@ Object.assign(ARjs.Context.prototype, THREE.EventDispatcher.prototype);
 // ARjs.Context.baseURL = '../'
 // default to github page
 ARjs.Context.baseURL = 'https://jeromeetienne.github.io/AR.js/three.js/'
-ARjs.Context.REVISION = '2.1.8';
+ARjs.Context.REVISION = '2.2.0';

 /**
 * Create a default camera for this trackingBackend

--- a/three.js/build/ar.lean.js
+++ b/three.js/build/ar.lean.js
@@ -2531,7 +2531,7 @@ Object.assign(ARjs.Context.prototype, THREE.EventDispatcher.prototype);
 // ARjs.Context.baseURL = '../'
 // default to github page
 ARjs.Context.baseURL = 'https://jeromeetienne.github.io/AR.js/three.js/'
-ARjs.Context.REVISION = '2.1.8';
+ARjs.Context.REVISION = '2.2.0';

 /**
 * Create a default camera for this trackingBackend

--- a/three.js/build/ar.lean.min.js
+++ b/three.js/build/ar.lean.min.js
--- a/three.js/build/ar.min.js
+++ b/three.js/build/ar.min.js
--- a/three.js/src/threex/threex-artoolkitcontext.js
+++ b/three.js/src/threex/threex-artoolkitcontext.js
@@ -81,7 +81,7 @@ Object.assign(ARjs.Context.prototype, THREE.EventDispatcher.prototype);
 // ARjs.Context.baseURL = '../'
 // default to github page
 ARjs.Context.baseURL = 'https://jeromeetienne.github.io/AR.js/three.js/'
-ARjs.Context.REVISION = '2.1.8';
+ARjs.Context.REVISION = '2.2.0';

 /**
 * Create a default camera for this trackingBackend