added link from augmented-website to webar-playground

three.js/examples/augmented-website/TODO.md

+- rename arAppURL as appURL
+
 # Nice Url for augemented-webpages
 - then support on external site - try to get nice url
 - include that in webxr.io - little AR logo in bottom right - try clean url
@@ -7,20 +9,3 @@
   - here goes in iframe with the augmented-webpages examples
   - and url remains simple
   - no need to move files 
-
-- later refactor learning in multimarker itself
-  - this will clean the code for webar-playground and other potential application
-
-# TODO 
-- cleanup code in the screenAsPortal examples
-  - then make that the example for multi marker with a simpler 3d
-- put learner in the same .html to avoid reload
-- maybe do a threex-armultimarkersimple.js which regroup the usual usage of multi marker
-  - thus the boilerplate isnt too big when it is repeated all the time
-- clean up learner
-  - remove arToolkitContext
-  - have caller listen to the event and call areaLearning.onSourceProcessed()
-- we learn while we play ? thus the result are getting better and better
-- able to play when all marker are markers as learned
-- do nice visual on each marker - phase 'scan all the markers'
-- once all markers are learned we can start playing

three.js/examples/augmented-website/index.html

@@ -64,7 +64,7 @@
 			-
 			arrow keys to tune
 			<br/>
-				<a href='javascript:void(0)' onclick='markersPageLeave()'>Back</a>
+			<a href='javascript:void(0)' onclick='markersPageLeave()'>Back to qrcode</a>
 		</div>
 		<div style='position: absolute; bottom: 10px; width:100%; text-align: center;';>
 			Tracking backend:
@@ -171,8 +171,8 @@
 				</div>
 				<div style='position: absolute; bottom: 10px; width:100%; text-align: center;';>
 					Made with love by <a href='https://twitter.com/jerome_etienne' target='_blank'>@jerome_etienne</a>.
-					Create your own AR with <a href='https://jeromeetienne.github.io/webar-playground/' target='_blank'>WebAR Playground</a>.
-					Direct link to <a target='_blank' id='arAppURLLink' href='javascript:void(0)'>AR App</a> 
+					Create your own AR with <a id='webARPlaygroundLink' href='javascript:void(0)' target='_blank'>WebAR Playground</a>.
+					Direct link to the <a target='_blank' id='arAppURLLink' href='javascript:void(0)'>app</a> 
 				</div>
 			</main>
 		</div>

three.js/examples/augmented-website/landing-page/js/arAppURL.js

@@ -54,6 +54,19 @@ function arAppURLUpdatePage(url){
 }
 
 function updateArAppURL(){
+	
+	;(function(){
+		var urlOptions = {
+			trackingBackend: 'artoolkit',
+			markerPageResolution: window.innerWidth + 'x' + window.innerHeight,
+			firebasePeerID: (typeof(firebasePeerID) !== 'undefined' && firebasePeerID !== null) ? firebasePeerID : undefined,
+			arAppURL: 'https://jeromeetienne.github.io/webar-playground/'
+		}
+		var url = 'app/' + '#' + encodeURIComponent(JSON.stringify(urlOptions));
+		document.querySelector('#webARPlaygroundLink').href = url
+	})()
+	
+	
 	//////////////////////////////////////////////////////////////////////////////
 	//		build urlOptions
 	//////////////////////////////////////////////////////////////////////////////
@@ -61,12 +74,13 @@ function updateArAppURL(){
 	var urlOptions = {
 		trackingBackend: 'artoolkit',
 		markerPageResolution: window.innerWidth + 'x' + window.innerHeight,
+		firebasePeerID: (typeof(firebasePeerID) !== 'undefined' && firebasePeerID !== null) ? firebasePeerID : undefined,
 	}
 
-	if( typeof(firebasePeerID) !== 'undefined' && firebasePeerID !== null ){
-		urlOptions.firebasePeerID = firebasePeerID
-	}
-
+	// if( typeof(firebasePeerID) !== 'undefined' && firebasePeerID !== null ){
+	// 	urlOptions.firebasePeerID = firebasePeerID
+	// }
+	// 
 	// build arAppURL
 	if( location.search.substring(1) ){
 		urlOptions.arAppURL = location.search.substring(1)