From 83e615d3c214d9074d5d07ba3e0b20b643e2dba1 Mon Sep 17 00:00:00 2001
From: Jerome Etienne <jerome.etienne@gmail.com>
Date: Mon, 24 Sep 2018 16:21:09 +0100
Subject: [PATCH] added credits + removd emitevens option +
 cameraTransformMatrix

---
 CHANGELOG.md                       |  2 +-
 aframe/build/aframe-ar.js          | 11 +++++++++++
 aframe/examples/marker-events.html |  3 ---
 aframe/src/component-anchor.js     | 25 ++++++++++---------------
 4 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b3e5251..961997f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 ## aframe-ar.js
 
-- aframe-ar.js - `<a-marker>` elements will emit `markerFound` and `markerLost` events, if they have `emitevents='true'` set.
+- aframe-ar.js - `<a-marker>` elements will emit `markerFound` and `markerLost` events - PR #333 thanks @nikolaymihaylov
 
 ## Demos
 
diff --git a/aframe/build/aframe-ar.js b/aframe/build/aframe-ar.js
index 1534176..300034b 100644
--- a/aframe/build/aframe-ar.js
+++ b/aframe/build/aframe-ar.js
@@ -8364,10 +8364,21 @@ AFRAME.registerComponent('arjs-anchor', {
 		//		honor visibility
 		//////////////////////////////////////////////////////////////////////////////
 		if( _this._arAnchor.parameters.changeMatrixMode === 'modelViewMatrix' ){
+			var wasVisible = _this.el.object3D.visible
 			_this.el.object3D.visible = this._arAnchor.object3d.visible
 		}else if( _this._arAnchor.parameters.changeMatrixMode === 'cameraTransformMatrix' ){
+			var wasVisible = _this.el.sceneEl.object3D.visible
 			_this.el.sceneEl.object3D.visible = this._arAnchor.object3d.visible
 		}else console.assert(false)
+
+		// emit markerFound markerLost
+		if( _this._arAnchor.object3d.visible === true && wasVisible === false ){
+			_this.el.emit('markerFound')
+		}else if( _this._arAnchor.object3d.visible === false && wasVisible === true ){
+			_this.el.emit('markerLost')
+		}
+
+
 	}
 })
 
diff --git a/aframe/examples/marker-events.html b/aframe/examples/marker-events.html
index 636ab47..3cd2b1c 100644
--- a/aframe/examples/marker-events.html
+++ b/aframe/examples/marker-events.html
@@ -8,9 +8,6 @@
 		init: function () {
 			var marker = this.el;
 
-			// Make the element emit events when found and when lost.
-			marker.setAttribute('emitevents', 'true');
-
 			marker.addEventListener('markerFound', function() {
 				var markerId = marker.id;
 				console.log('markerFound', markerId);
diff --git a/aframe/src/component-anchor.js b/aframe/src/component-anchor.js
index db27558..7adc0f6 100644
--- a/aframe/src/component-anchor.js
+++ b/aframe/src/component-anchor.js
@@ -34,12 +34,6 @@ AFRAME.registerComponent('arjs-anchor', {
 			type: 'number',
 			default: 0.6,
 		},
-
-		// Whether to emit events when the element is found or lost.
-		emitevents: {
-			type: 'boolean',
-			default: false,
-		}
 	},
 	init: function () {
 		var _this = this
@@ -163,17 +157,19 @@ AFRAME.registerComponent('arjs-anchor', {
 		if( _this._arAnchor.parameters.changeMatrixMode === 'modelViewMatrix' ){
 			var wasVisible = _this.el.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' ){
+			var wasVisible = _this.el.sceneEl.object3D.visible
 			_this.el.sceneEl.object3D.visible = this._arAnchor.object3d.visible
 		}else console.assert(false)
+
+		// emit markerFound markerLost
+		if( _this._arAnchor.object3d.visible === true && wasVisible === false ){
+			_this.el.emit('markerFound')
+		}else if( _this._arAnchor.object3d.visible === false && wasVisible === true ){
+			_this.el.emit('markerLost')
+		}
+
+
 	}
 })
 
@@ -227,7 +223,6 @@ AFRAME.registerPrimitive('a-marker', AFRAME.utils.extendDeep({}, AFRAME.primitiv
 		'preset': 'arjs-anchor.preset',
 		'minConfidence': 'arjs-anchor.minConfidence',
 		'markerhelpers': 'arjs-anchor.markerhelpers',
-		'emitevents': 'arjs-anchor.emitevents',
 
 		'hit-testing-renderDebug': 'arjs-hit-testing.renderDebug',
 		'hit-testing-enabled': 'arjs-hit-testing.enabled',
-- 
GitLab