From 63bc7a02c5163555e079269a39d2a72de592518c Mon Sep 17 00:00:00 2001
From: Fabien Benetou <fabien-services@benetou.fr>
Date: Fri, 13 Oct 2023 10:17:37 +0200
Subject: [PATCH] ice map and annotation

---
 index.html | 15 +++++++++++---
 jxr.js     | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 68 insertions(+), 4 deletions(-)

diff --git a/index.html b/index.html
index 870cc8c..a3a6dd9 100644
--- a/index.html
+++ b/index.html
@@ -104,7 +104,7 @@
 
       <a-troika-text value="SpaSca : Spatial Scaffolding" anchor="left" outline-width="5%" font="../content/ChakraPetch-Regular.ttf" position="-5.26197 6.54224 -1.81284"
 	scale="4 4 5" rotation="90 0 0" troika-text="outlineWidth: 0.01; strokeColor: #ffffff" material="flatShading: true; blending: additive; emissive: #c061cb"></a-troika-text>
-      <a-sky hide-on-enter-ar color="black"></a-sky>
+      <a-sky hide-on-enter-ar color="lightgray"></a-sky>
       <a-entity hide-on-enter-ar="" id="environment" class="hidableenvironment" ></a-entity>
       <a-entity hide-on-enter-ar="" id="environmentsky" class="hidableenvironment" ></a-entity>
       <a-troika-text anchor=left target value="instructions : \n--right pinch to move\n--left pinch to execute" position="0 0.65 -0.2" scale="0.1 0.1 0.1"></a-troika-text>
@@ -128,10 +128,19 @@
       <!-- somehow disable hand interaction despite, according to the documentation, it should rely on world position 
 	      <a-text target value="jxr qs #rig sa position 0 0 10" position="0 1.55 .5" rotation="0 180 0" scale="0.1 0.1 0.1"></a-text>
 	-->
-      <a-console position="0 1.1 -0.8" rotation="-45 0 0" height=2 font-size="34" height=0.5 skip-intro=true></a-console>
+      <a-console position="0 2 -0.8" rotation="-5 0 0" font-size="34" height=1 skip-intro=true></a-console>
 
-      <a-box target position="0 1.65 -0.5" scale="0.01 0.01 0.01"></a-box>
+      <a-troika-text value="Biggu's Gate" outline-width="5%" font="../content/ChakraPetch-Regular.ttf" position="0 2 -0.5"
+	rotation="25 0 0" troika-text="outlineWidth: 0.01; strokeColor: #ffffff" material="flatShading: true; blending: additive; emissive: #00f"></a-troika-text>
+	<a-gltf-model hide-on-enter-ar="" src="../content/winterset/Mountains.glb" position="0 0 0" rotation="0 0 0" scale="10 10 10" class="clonableasset"></a-gltf-model>
 
+	<a-gltf-model src="../content/winterset/Crystal.glb" position="-1 0 -1" rotation="0 0 0" scale=".1 .1 .1" class="clonableasset"></a-gltf-model>
+	<a-gltf-model id="fish" src="../content/winterset/Fish.glb" position="2 0 -2" rotation="0 0 0" scale=".01 .01 .01" class="clonableasset"></a-gltf-model>
+	<a-gltf-model id="penguin" src="../content/winterset/Penguin.glb" position="0 0 -1" rotation="0 0 0" scale=".1 .1 .1" class="clonableasset"></a-gltf-model>
+
+	<a-gltf-model src="../content/winterset/Pinetree.glb" position="0 3 -10" rotation="0 0 0" scale="5 5 5" class="clonableasset"></a-gltf-model>
+
+	<a-plane hide-on-enter-ar="" scale="50 50 50" rotation="-90 0 0" color="lightblue"></a-plane>
     </a-scene>
   </body>
 </script>
diff --git a/jxr.js b/jxr.js
index 68ed536..257bcb8 100644
--- a/jxr.js
+++ b/jxr.js
@@ -3419,12 +3419,46 @@ function thumbToIndexAngle(){
 	}, 590)
 }
 
+function addAnnotation(el, content){
+	let annotation = document.createElement( 'a-troika-text' )
+	annotation.setAttribute('value', content)
+	annotation.setAttribute('position', '0 .1 -.1')
+	annotation.setAttribute('rotation', '-90 0 0')
+	annotation.setAttribute("anchor", "left" )
+	annotation.setAttribute("outline-width", "5%" )
+	annotation.setAttribute("outline-color", "black" )
+	el.appendChild(annotation)
+	return el
+}
+
 // used for testing, now that jxr.js is outside of index.html, could consider putting this back in index.html instead to keep behavior one would expect from a library
 // does indeed create problems, namely other pages relying on it do get this testing behavior
 AFRAME.registerComponent('startfunctions', {
   init: function () {
+
+/* class clonableasset : Crystal.glb Fish.glb Mountains.glb Penguin.glb Pinetree.glb
+consider also 
+	backend needed for caching
+		getPolyList(keyword) cachePoly(res) loadPolyThumbnails(res) loadFirstPolyModel(res) loadPolyModels(res)
+
+
+see https://git.benetou.fr/utopiah/text-code-xr-engine/issues/52 for more shorthands
+
+*/
+	const movePenguin = "jxr qs #penguin sa position 1 0 -2"
+	const rotatePenguin = "jxr qs #penguin sa rotation 0 -20 0"
+
 	//addBlockCodeExample(text="hi", pos="0 1.4 -0.2", color="black", outlineColor="white")
-	addBlockCodeExample('code', '0 1.5 -0.2')
+	addBlockCodeExample('add penguin', '0 1.5 -0.2')
+	let elToAnnotate = addBlockCodeExample('move penguin forward', '0 1.6 -0.2')
+	addAnnotation(elToAnnotate, 'fait avancer pengouin')
+	console.log(elToAnnotate)
+	addBlockCodeExample('add green cube', '0 1.4 -0.2')
+
+	addBlockCodeExample(movePenguin, '0 1.45 -0.2')
+	addBlockCodeExample(rotatePenguin, '0 1.55 -0.2')
+// should change color and enable the 2 new types
+
 	//relies on addCompoundPrimitiveExample() which already uses snap-on-pinched-ended
 	// also relies on addNewNote() so means code might be executed on left pinch or move with right pinch indepdently from block, to verify
 
@@ -3440,6 +3474,27 @@ AFRAME.registerComponent('startfunctions', {
 	el.setAttribute('scale', '.1 .1 .1') 
 	AFRAME.scenes[0].appendChild(el)
 
+	let h = [
+		[1,1,1,1,1,1,1,1,1,1],
+		[1,0,0,0,1,0,0,0,0,1],
+		[1,0,0,0,0,1,0,0,0,1],
+		[1,0,0,0,1,0,0,0,0,1],
+		[1,0,0,0,0,1,0,0,0,1],
+		[1,0,0,0,1,0,0,0,0,1],
+		[1,0,0,0,0,1,0,0,0,1],
+		[1,0,0,0,1,0,0,0,0,1],
+		[1,0,0,0,0,1,0,0,0,1],
+		[1,1,1,1,1,1,1,1,1,1],
+	]
+	for (let z=0;z<10;z++)
+		for (let x=0;x<10;x++){
+			el = document.createElement("a-entity")
+			el.setAttribute('position', (x-5) + ' 0 ' + (z-5) )
+			el.setAttribute('geometry', "primitive: cylinder; segmentsRadial: 8; segmentsHeight: 1; radius: 0.5; height: "+(h[x][z]+.1)+";" )
+			el.setAttribute('material', 'color', 'lightblue')
+			AFRAME.scenes[0].appendChild(el)
+		}
+
 	// consider instanciateFromPrimitive() also in order to clone a set of blocks
   }
 })