better links in multi markers

80c1b1e2 · Jerome Etienne · f1152be3 · 80c1b1e2 · 80c1b1e2
隐藏空白更改
内联并排

Showing with 10 addition and 4 deletion

aframe/aframe-ar.js aframe/aframe-ar.js +1 -1

aframe/examples/multi-markers.html aframe/examples/multi-markers.html +9 -3

未找到文件。
--- a/aframe/aframe-ar.js
+++ b/aframe/aframe-ar.js
@@ -297,7 +297,7 @@ console.log('this.data.markerhelpers', this.data.markerhelpers)
 					// add an helper to visuable each sub-marker
 					var markerHelper = new THREEx.ArMarkerHelper(subMarkerControls)
 					scene.add( markerHelper.object3d )	
-				})				
+				})	
 			}
 		}else if( this.data.type === 'pattern' || this.data.type === 'barcode' || this.data.type === 'unknown' ){
 			this._arMarkerControls = new THREEx.ArMarkerControls(artoolkitContext, this._markerRoot, this.data)

--- a/aframe/examples/multi-markers.html
+++ b/aframe/examples/multi-markers.html
@@ -4,9 +4,15 @@
 <!-- include aframe-ar.js -->
 <script src="../build/aframe-ar.js"></script>
 <body style='margin : 0px; overflow: hidden; font-family: Monospace;'><div style='position: fixed; top: 10px; width:inherit; text-align: center; z-index: 1;'>
-	<a href="https://github.com/jeromeetienne/AR.js/" target="_blank">AR.js</a> - multi markers example for a-frame
-	<br/>
-	Contact me any time at <a href='https://twitter.com/jerome_etienne' target='_blank'>@jerome_etienne</a>
+	<a href="https://github.com/jeromeetienne/AR.js/" target="_blank">AR.js</a> - multi markers example for a-frame by <a href='https://twitter.com/jerome_etienne' target='_blank'>@jerome_etienne</a>
+	<br/>	
+	Try with <a href='javascript:void(0)' id='augmentedWebsiteButton' target='_blank'>augmented-website</a>
+	<script type="text/javascript">
+		document.querySelector('#augmentedWebsiteButton').addEventListener('click', function(){
+			var arjsSystem = document.querySelector('a-scene').systems.arjs
+			arjsSystem.navigateToLearnerPage()
+		})
+	</script>
 </div>
 	<a-scene embedded arjs='sourceType: webcam;'>
 		<a-marker preset='area' markerhelpers=true>