提交 916850bd 编写于 作者: N nicolo.carpignoli

Last commit before release

上级 8ec44811
# 2.1.1
- fixed a bug that causes Overconstrained Error on desktop
- cleaned repo (removed data like videos and heavy files)
# 2.1.0
- Removed support for Google Tango (obsolete and no more supported by Google)
......
......@@ -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.0/aframe/build/aframe-ar.js"></script>
<script src="https://raw.githack.com/jeromeetienne/AR.js/2.1.1/aframe/build/aframe-ar.js"></script>
<body style='margin : 0px; overflow: hidden;'>
<a-scene embedded arjs>
<a-marker preset="hiro">
......
......@@ -2506,7 +2506,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.0';
ARjs.Context.REVISION = '2.1.1';
/**
* Create a default camera for this trackingBackend
......@@ -3105,7 +3105,7 @@ ARjs.Source.prototype._initSourceWebcam = function (onReady, onError) {
var userMediaConstraints = {
audio: false,
video: {
facingMode: { exact: 'environment' },
facingMode: 'environment',
width: {
ideal: _this.parameters.sourceWidth,
// min: 1024,
......
此差异已折叠。
{
"name": "ar.js",
"version": "2.1.0",
"version": "2.1.1",
"description": "Efficient Augmented Reality for the Web",
"main": "",
"scripts": {
......
......@@ -2506,7 +2506,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.0';
ARjs.Context.REVISION = '2.1.1';
/**
* Create a default camera for this trackingBackend
......@@ -3105,7 +3105,7 @@ ARjs.Source.prototype._initSourceWebcam = function (onReady, onError) {
var userMediaConstraints = {
audio: false,
video: {
facingMode: { exact: 'environment' },
facingMode: 'environment',
width: {
ideal: _this.parameters.sourceWidth,
// min: 1024,
......
......@@ -2506,7 +2506,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.0';
ARjs.Context.REVISION = '2.1.1';
/**
* Create a default camera for this trackingBackend
......@@ -3105,7 +3105,7 @@ ARjs.Source.prototype._initSourceWebcam = function (onReady, onError) {
var userMediaConstraints = {
audio: false,
video: {
facingMode: { exact: 'environment' },
facingMode: 'environment',
width: {
ideal: _this.parameters.sourceWidth,
// min: 1024,
......
此差异已折叠。
此差异已折叠。
......@@ -76,7 +76,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.0';
ARjs.Context.REVISION = '2.1.1';
/**
* Create a default camera for this trackingBackend
......
......@@ -183,7 +183,7 @@ ARjs.Source.prototype._initSourceWebcam = function (onReady, onError) {
var userMediaConstraints = {
audio: false,
video: {
facingMode: { exact: 'environment' },
facingMode: 'environment',
width: {
ideal: _this.parameters.sourceWidth,
// min: 1024,
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册