Skip to content

Commit

Permalink
Last commit before release
Browse files Browse the repository at this point in the history
  • Loading branch information
nicolocarpignoli committed Feb 29, 2020
1 parent 466803a commit 3238209
Show file tree
Hide file tree
Showing 11 changed files with 39 additions and 51 deletions.
4 changes: 2 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# 2.2.1
# 2.2.2

- enhanced camera contraints, fixing a bug on Chrome for Huaweis that was displaying rear camera stream in greyscale
- Restored old camera constraints, was giving better performances for some devices but worst for others.

# 2.2.0

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.2.1/aframe/build/aframe-ar.js"></script>
<script src="https://raw.githack.com/jeromeetienne/AR.js/2.2.2/aframe/build/aframe-ar.js"></script>
<body style='margin : 0px; overflow: hidden;'>
<a-scene embedded arjs>
<a-marker preset="hiro">
Expand Down
24 changes: 10 additions & 14 deletions aframe/build/aframe-ar.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion aframe/build/aframe-ar.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ar.js",
"version": "2.2.1",
"version": "2.2.2",
"description": "Efficient Augmented Reality for the Web",
"main": "./aframe/build/aframe-ar.min.js",
"scripts": {
Expand Down
24 changes: 10 additions & 14 deletions three.js/build/ar.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

24 changes: 10 additions & 14 deletions three.js/build/ar.lean.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion three.js/build/ar.lean.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion three.js/build/ar.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion three.js/src/threex/threex-artoolkitcontext.js
Original file line number Diff line number Diff line change
Expand Up @@ -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.2.1';
ARjs.Context.REVISION = '2.2.2';

/**
* Create a default camera for this trackingBackend
Expand Down

0 comments on commit 3238209

Please sign in to comment.