提交 bb09810b 编写于 作者: N Nikolay Mihaylov

Update version to 1.5.2 and update the relevant files after re-build.

上级 7726f09c
...@@ -252,7 +252,7 @@ git checkout master ...@@ -252,7 +252,7 @@ git checkout master
git merge dev git merge dev
# tag the release # tag the release
git tag 1.5.1 git tag 1.5.2
# push the tag on github # push the tag on github
git push origin --tags git push origin --tags
......
...@@ -5253,7 +5253,7 @@ Object.assign( ARjs.Context.prototype, THREE.EventDispatcher.prototype ); ...@@ -5253,7 +5253,7 @@ Object.assign( ARjs.Context.prototype, THREE.EventDispatcher.prototype );
// ARjs.Context.baseURL = '../' // ARjs.Context.baseURL = '../'
// default to github page // default to github page
ARjs.Context.baseURL = 'https://jeromeetienne.github.io/AR.js/three.js/' ARjs.Context.baseURL = 'https://jeromeetienne.github.io/AR.js/three.js/'
ARjs.Context.REVISION = '1.5.1' ARjs.Context.REVISION = '1.5.2'
...@@ -8230,6 +8230,12 @@ AFRAME.registerComponent('arjs-anchor', { ...@@ -8230,6 +8230,12 @@ AFRAME.registerComponent('arjs-anchor', {
type: 'number', type: 'number',
default: 0.6, default: 0.6,
}, },
// Whether to emit events when the element is found or lost.
emitevents: {
type: 'boolean',
default: false,
}
}, },
init: function () { init: function () {
var _this = this var _this = this
...@@ -8347,7 +8353,16 @@ AFRAME.registerComponent('arjs-anchor', { ...@@ -8347,7 +8353,16 @@ AFRAME.registerComponent('arjs-anchor', {
// honor visibility // honor visibility
////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////
if( _this._arAnchor.parameters.changeMatrixMode === 'modelViewMatrix' ){ if( _this._arAnchor.parameters.changeMatrixMode === 'modelViewMatrix' ){
var wasVisible = _this.el.object3D.visible
_this.el.object3D.visible = this._arAnchor.object3d.visible _this.el.object3D.visible = this._arAnchor.object3d.visible
if( _this.data.emitevents ){
if( _this.el.object3D.visible && !wasVisible ){
_this.el.emit('markerFound')
}else if( !_this.el.object3D.visible && wasVisible ){
_this.el.emit('markerLost')
}
}
}else if( _this._arAnchor.parameters.changeMatrixMode === 'cameraTransformMatrix' ){ }else if( _this._arAnchor.parameters.changeMatrixMode === 'cameraTransformMatrix' ){
_this.el.sceneEl.object3D.visible = this._arAnchor.object3d.visible _this.el.sceneEl.object3D.visible = this._arAnchor.object3d.visible
}else console.assert(false) }else console.assert(false)
...@@ -8404,6 +8419,7 @@ AFRAME.registerPrimitive('a-marker', AFRAME.utils.extendDeep({}, AFRAME.primitiv ...@@ -8404,6 +8419,7 @@ AFRAME.registerPrimitive('a-marker', AFRAME.utils.extendDeep({}, AFRAME.primitiv
'preset': 'arjs-anchor.preset', 'preset': 'arjs-anchor.preset',
'minConfidence': 'arjs-anchor.minConfidence', 'minConfidence': 'arjs-anchor.minConfidence',
'markerhelpers': 'arjs-anchor.markerhelpers', 'markerhelpers': 'arjs-anchor.markerhelpers',
'emitevents': 'arjs-anchor.emitevents',
'hit-testing-renderDebug': 'arjs-hit-testing.renderDebug', 'hit-testing-renderDebug': 'arjs-hit-testing.renderDebug',
'hit-testing-enabled': 'arjs-hit-testing.enabled', 'hit-testing-enabled': 'arjs-hit-testing.enabled',
此差异已折叠。
...@@ -49363,7 +49363,7 @@ Object.assign( ARjs.Context.prototype, THREE.EventDispatcher.prototype ); ...@@ -49363,7 +49363,7 @@ Object.assign( ARjs.Context.prototype, THREE.EventDispatcher.prototype );
// ARjs.Context.baseURL = '../' // ARjs.Context.baseURL = '../'
// default to github page // default to github page
ARjs.Context.baseURL = 'https://jeromeetienne.github.io/AR.js/three.js/' ARjs.Context.baseURL = 'https://jeromeetienne.github.io/AR.js/three.js/'
ARjs.Context.REVISION = '1.5.1' ARjs.Context.REVISION = '1.5.2'
此差异已折叠。
{ {
"name": "ar.js", "name": "ar.js",
"version": "1.5.1", "version": "1.5.2",
"description": "Efficient Augmented Reality for the Web", "description": "Efficient Augmented Reality for the Web",
"main": "three.js", "main": "three.js",
"scripts": { "scripts": {
......
...@@ -5253,7 +5253,7 @@ Object.assign( ARjs.Context.prototype, THREE.EventDispatcher.prototype ); ...@@ -5253,7 +5253,7 @@ Object.assign( ARjs.Context.prototype, THREE.EventDispatcher.prototype );
// ARjs.Context.baseURL = '../' // ARjs.Context.baseURL = '../'
// default to github page // default to github page
ARjs.Context.baseURL = 'https://jeromeetienne.github.io/AR.js/three.js/' ARjs.Context.baseURL = 'https://jeromeetienne.github.io/AR.js/three.js/'
ARjs.Context.REVISION = '1.5.1' ARjs.Context.REVISION = '1.5.2'
此差异已折叠。
...@@ -73,7 +73,7 @@ Object.assign( ARjs.Context.prototype, THREE.EventDispatcher.prototype ); ...@@ -73,7 +73,7 @@ Object.assign( ARjs.Context.prototype, THREE.EventDispatcher.prototype );
// ARjs.Context.baseURL = '../' // ARjs.Context.baseURL = '../'
// default to github page // default to github page
ARjs.Context.baseURL = 'https://jeromeetienne.github.io/AR.js/three.js/' ARjs.Context.baseURL = 'https://jeromeetienne.github.io/AR.js/three.js/'
ARjs.Context.REVISION = '1.5.1' ARjs.Context.REVISION = '1.5.2'
......
...@@ -5253,7 +5253,7 @@ Object.assign( ARjs.Context.prototype, THREE.EventDispatcher.prototype ); ...@@ -5253,7 +5253,7 @@ Object.assign( ARjs.Context.prototype, THREE.EventDispatcher.prototype );
// ARjs.Context.baseURL = '../' // ARjs.Context.baseURL = '../'
// default to github page // default to github page
ARjs.Context.baseURL = 'https://jeromeetienne.github.io/AR.js/three.js/' ARjs.Context.baseURL = 'https://jeromeetienne.github.io/AR.js/three.js/'
ARjs.Context.REVISION = '1.5.1' ARjs.Context.REVISION = '1.5.2'
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册