janusweb 1.7.0 → 1.7.1

package/media/assets/webui/apps/xrfragment/level7-engine-prefixes.import.js

@@ -0,0 +1,229 @@
+// https://xrfragment.org/#%F0%9F%93%9Clevel7%3A%20engine%20prefixes
+// There are cases where the 3D scene file might want to hint the 
+// specific features to the viewer-engine (JANUSWEB, THREE.js, AFRAME, Godot e.g.). 
+
+xrf_engines = function(){
+
+  const {toJanusObject,applyPrefixes,applyCleanup} = xrf_engines
+  let cleanup = []
+
+  const map = (obj,key,realKey) => {
+    let match     = true 
+
+    // compatibility workaround: some 3D editors omit false booleans in export :/
+    // therefore we support boolean strings
+    if( obj.userData[key] == 'false' ) obj.userData[key] = false
+    if( obj.userData[key] == 'true'  ) obj.userData[key] = true
+
+    // increment/decrement
+    let scroller = key.match(/[+]$/) 
+    if( scroller && !scene.scrollers ){
+      if( typeof obj.userData[key] != 'number' ) obj.userData[key] = parseFloat(obj.userData[key])
+      scene.scrollers = []
+      elation.events.add(null, 'janusweb_script_frame', function(e){
+        scene.scrollers.map( (f) => f(e.data) ) // e.data == delta
+      })
+    }
+
+    // special cases
+    switch( key ){
+      case "-three-material.blending": if( obj.material ){
+                                         const modes = {
+                                           'THREE.NoBlending':          THREE.NoBlending,
+                                           'THREE.NormalBlending':      THREE.NormalBlending,
+                                           'THREE.AdditiveBlending':    THREE.AdditiveBlending,
+                                           'THREE.SubtractiveBlending': THREE.SubtractiveBlending,
+                                           'THREE.MultiplyBlending':    THREE.MultiplyBlending
+                                         }
+                                         setTimeout( () => { // not sure why this only works in setTimeout
+                                           if( modes[ obj.userData[key] ] ) obj.material.blending = modes[ obj.userData[key] ]
+                                         },10)
+                                       }
+                                       break;
+
+      case "-three-material.sides":    if( obj.material ){
+                                         const modes = {
+                                           'THREE.FrontSide':  THREE.NoBlending,
+                                           'THREE.BackSide':   THREE.NormalBlending,
+                                           'THREE.DoubleSide': THREE.DoubleSide
+                                         }
+                                         setTimeout( () => { // not sure why this only works in setTimeout
+                                           if( modes[ obj.userData[key] ] ) obj.material.sides = modes[ obj.userData[key] ]
+                                         },10)
+                                       }
+                                       break;
+
+      case "-janus-use_local_asset": room.use_local_asset = obj.userData[key]
+                                     room.localasset = room.createObject('object', {
+                                       id: room.use_local_asset,
+                                       collision_id: room.use_local_asset + '_collision',
+                                       collision_scale: V(1,1,1),
+                                       collision_pos: V(0,0,0),
+                                       col: room.col,
+                                       //fwd: room.fwd,
+                                       xdir: room.xdir,
+                                       ydir: room.ydir,
+                                       zdir: room.zdir,
+                                       shadows: true
+                                     });
+                                     break;
+
+      // DECLARATIVE entities
+      case "-janus-tag":             let opts    = {}// rotation: '0 -180 0' }
+                                     for( let i in obj.userData ){ 
+                                       if( !i.match(/^-janus-/) ) continue
+                                       opts[ i.replace(/-janus-/,'') ] = obj.userData[i]
+                                     }
+
+                                     // create asset
+                                     if( obj.userData['-janus-tag'].match(/^asset/) ){
+                                       if( opts.src && !opts.src.match(/(^\.|:\/)/) ) opts.src = room.baseurl + opts.src
+                                       room.loadNewAsset( opts['tag'].replace(/^asset/,''), opts )
+                                     }else{
+                                       opts.js_id = opts.name = String(`-janus-${obj.name}_${obj.userData['-janus-tag']}`).replace(/.*janus-/,'-janus-')
+                                       // create room object
+                                       const jo = room.createObject( opts.tag, opts )
+                                       jo.objects['3d'].name = opts.js_id
+                                       jo.visible = false
+                                        
+                                       // replace janusobject with nested THREE obj
+                                       obj.parent.add( jo.objects['3d'] )
+
+                                       // fix unclickable objects (since obj might be nested in the scene-tree)
+                                       if( jo.colliders ){
+                                         jo.removeCollider()
+                                         jo.colliders.parent.children.push( jo.objects['3d'] )
+                                       }
+
+                                       // we need setTimeout otherwise quaternion is not updated 
+                                       // https://github.com/jbaicoianu/janusweb/issues/306
+                                       setTimeout( () => {
+                                         jo.orientation.copy( obj.quaternion)
+                                         jo.position.copy( obj.position )
+                                         //jo.scale.copy( obj.scale )
+                                         jo.visible = true
+                                       },200)
+                                       // mark previously generated geo/materials by janusweb export for deletion
+                                       obj.traverse ( (o) => cleanup.push(o) )
+                                       cleanup.push(obj)
+                                     }
+                                     break;
+      // OBJECTS
+      case "-janus-collision_id":    const collision_id = obj.userData[key]
+                                     if( collision_id != obj.name ){
+                                       console.warn(`xrfragment: ${obj.name}.collision_id can be '${obj.name}' only (for now)..skipping '${collision_id}'`)
+                                     }else{
+                                       const jo = toJanusObject(obj,{noreparent:true})
+                                       jo.collidable = true
+                                       jo.collision_id = collision_id
+                                       jo.removeCollider();
+                                       const collider = obj.clone()
+                                       collider.position.set(0,0,0)
+                                       collider.rotation.set(0,0,0)
+                                       collider.scale.set(1,1,1)
+                                       jo.collision_trigger = true
+                                       jo.setCollider('mesh',{mesh: collider})
+                                       jo.colliders.parent = obj
+                                       //jo.objects.dynamics.mass = 1
+                                       //jo.objects.dynamics.addForce('static', new THREE.Vector3(0, room.gravity, 0));
+                                       //elation.events.add(jo.objects.dynamics, 'physics_collide', elation.bind(jo, jo.handleCollision));
+                                       console.log(`xrfragment: setting collision_id = ${collision_id}`)
+                                     }
+                                     break;
+
+      default:                      match = false                     
+              
+                                    // JANUS property fallthrough
+                                    if( key.match(/^-janus-/) && !key.match("-janus-tag") ){
+                                      // *TODO* more heuristics to determine scene
+                                      if( obj.name == 'Scene' || obj?.parent?.name == '' || obj.userData['-janus-source']){ 
+                                        room[realKey] = obj.userData[key];
+                                      }else{
+                                        toJanusObject(obj)[realKey] = obj.userData[key]
+                                      }
+                                      match = true
+                                    }
+
+                                    // THREE fallthrough
+                                    if( key.match(/^-three-/) ){
+
+                                      if( realKey.match('material.') && obj.material ){ // clone shared materials
+                                        obj.material = obj.material.clone()
+                                        if( realKey.match('material.map') ) obj.material.map = obj.material.map.clone()
+                                      }
+                                      
+                                      const setKeyVal     = (o, path, val       ) => new Function('o', 'v',     `o.${path}  = v               `)(o, val);
+                                      if( scroller ){
+                                        const setKeyValIncr = (o, path, val, delta) => new Function('o', 'speed', `o.${path} += ${delta} * speed`)(o, val);
+                                        try{ 
+                                          const myscroller    = function(path,val,delta){
+                                            setKeyValIncr( this, path, val, delta) 
+                                          }.bind(obj, realKey.replace(/[+]$/,''), obj.userData[key])
+                                          myscroller(0.000001)              // see if it triggers error
+                                          scene.scrollers.push(myscroller)  // otherwise add frame-function
+                                        }catch(e){ 
+                                          console.error(`could not apply engine prefix: ${obj.name} => ${key} (tip: dont use them on <paragraph> objects)`) 
+                                        }
+                                      }else{
+                                        try{ 
+                                          setKeyVal( obj, realKey, obj.userData[key] ) 
+                                        }catch(e){ console.error(e) }
+                                      }
+                                      match = true
+                                    }
+                                    break;
+    }
+
+    if( match ){
+      //console.log(`xrfragment: engine prefix '${key}:${realKey}' = '${obj.userData[key]}'`)
+    }
+  }
+
+  room.gravity = 0 // new default unless specified otherwise
+  let scene = elation.engine.instances.default.systems.world.scene['world-3d'] 
+  const isAsset    = (obj) => String(obj.userData['-janus-tag']).match(/^asset/)
+  const isJanusTag = (obj) => String(obj.userData['-janus-tag']) && !isAsset(obj)
+  applyPrefixes(scene,map, (o) => isAsset(o)                    ) // janus requires first initialzing of assets
+  applyPrefixes(scene,map, (o) => isJanusTag(o)                 ) // then regular janus tags
+  applyPrefixes(scene,map, (o) => !isJanusTag(o) && !isAsset(o) ) // then set properties on the rest
+  applyCleanup(cleanup)
+}
+
+
+xrf_engines.toJanusObject = function(obj,opts){
+  if( room.objects[ obj.name ] ) return room.objects[ obj.name ]
+  opts = opts || {}
+  opts.tag = opts.tag || 'object'
+  const create = () => room.createObject( opts.tag,{ js_id: obj.name, ...opts })
+  let jo = create()
+  jo.objects['3d'] = obj
+  return jo
+}
+
+xrf_engines.applyPrefixes = function(scene,map,criteria){
+  criteria = criteria ? criteria : (obj) => true 
+  scene.traverse( (obj) => {
+    if( criteria(obj) ){
+      for( let field in obj.userData ){
+        if( obj.userData[field] ){ 
+          try{
+            map(obj,field, field.replace(/^-(janus|three)-/,'') )
+          }catch(e){ console.error(e) }
+        }
+      }
+    }
+  })
+}
+
+xrf_engines.applyCleanup = function(cleanup){
+  const clean = (o) => {
+    if( o.geometry ) o.geometry.dispose()
+    if( o.material ) o.material.dispose()
+    o.removeFromParent()
+  }
+  cleanup.map(clean)
+}
+
+
+elation.events.add(null, 'room_load_complete', xrf_engines ) // future scenes
+if( room.loaded ) xrf_engines()                              // current scene

package/media/assets/webui/apps/xrfragment/patch/metaquest-fix-flickering.js

@@ -0,0 +1,15 @@
+// Meta Quest 2 results in rapid flickering when loading a new room
+// therefore we show the shroud while loading
+setActiveRoom = room.janus.setActiveRoom.bind(room.janus)
+room.janus.setActiveRoom = function(url,referer,skipURL){
+  if( url.replace(/#.*/,'') != room.url ){
+    room.fadeAudioOut()
+    setTimeout( function(){ 
+      setActiveRoom.apply(room.janus, [url, referer, skipURL])
+    }, 500)
+  }else{ 
+    room.urlhash = url.match('#') ? url.replace(/.*#/,'') : 'spawn'
+    room.setPlayerPosition()
+    // ignore same-room setActiveRoom-calls (it restarts audio when clicking internal hyperlinks)
+  }
+}

package/media/assets/webui/apps/xrfragment/xrfragment.json

@@ -0,0 +1,14 @@
+{
+  "templates": {
+  },
+  "scripts":  [
+    "./level2-hyperlink.js",
+    "./level0-sidecarfile.js",
+    "./level7-engine-prefixes.import.js",
+    "./level7-engine-prefixes.export.js",
+    "./patch/metaquest-fix-flickering.js"
+  ],
+  "css":      []
+}
+
+

package/media/assets/webui/default.json

@@ -11,6 +11,7 @@
     "virtualgamepad": "./apps/virtualgamepad/virtualgamepad.json",
     "buttons": "./apps/buttons/buttons.json",
     "xrmenu": "./apps/xrmenu/xrmenu.json",
+    "xrfragment": "./apps/xrfragment/xrfragment.json",
     "vfs": "./apps/vfs/vfs.json"
   },
   "includes": [

package/media/images/portal.svg

@@ -0,0 +1,130 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="79.375008mm"
+   height="158.75mm"
+   viewBox="0 0 79.375007 158.75"
+   version="1.1"
+   id="svg1"
+   xml:space="preserve"
+   inkscape:version="1.4.2 (ebf0e940d0, 2025-05-08)"
+   sodipodi:docname="portal.svg"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"><sodipodi:namedview
+     id="namedview1"
+     pagecolor="#ffffff"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     inkscape:document-units="mm"
+     inkscape:zoom="0.73673541"
+     inkscape:cx="48.185549"
+     inkscape:cy="464.88875"
+     inkscape:window-width="1920"
+     inkscape:window-height="1030"
+     inkscape:window-x="0"
+     inkscape:window-y="26"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="layer1" /><defs
+     id="defs1"><inkscape:path-effect
+       effect="fillet_chamfer"
+       id="path-effect6"
+       is_visible="true"
+       lpeversion="1"
+       nodesatellites_param="F,0,0,1,0,0,0,1 @ F,0,0,1,0,7.2009148,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,6.7344665,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,5.7643969,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,7.2192412,0,1 | F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 | F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 | F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 | F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 | F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 | F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 | F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 | F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 | F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 | F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 | F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 | F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 | F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 | F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1"
+       radius="0"
+       unit="px"
+       method="auto"
+       mode="F"
+       chamfer_steps="1"
+       flexible="false"
+       use_knot_distance="true"
+       apply_no_radius="true"
+       apply_with_radius="true"
+       only_selected="false"
+       hide_knots="false" /><inkscape:path-effect
+       effect="fillet_chamfer"
+       id="path-effect5"
+       is_visible="true"
+       lpeversion="1"
+       nodesatellites_param="F,0,0,1,0,6.191627,0,1 @ F,0,0,1,0,7.505764,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 | F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1"
+       radius="0"
+       unit="px"
+       method="auto"
+       mode="F"
+       chamfer_steps="1"
+       flexible="false"
+       use_knot_distance="true"
+       apply_no_radius="true"
+       apply_with_radius="true"
+       only_selected="false"
+       hide_knots="false" /><inkscape:path-effect
+       effect="fillet_chamfer"
+       id="path-effect4"
+       is_visible="true"
+       lpeversion="1"
+       nodesatellites_param="F,0,0,1,0,5.2792018,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1"
+       radius="0"
+       unit="px"
+       method="auto"
+       mode="F"
+       chamfer_steps="1"
+       flexible="false"
+       use_knot_distance="true"
+       apply_no_radius="true"
+       apply_with_radius="true"
+       only_selected="false"
+       hide_knots="false" /><inkscape:path-effect
+       effect="fillet_chamfer"
+       id="path-effect3"
+       is_visible="true"
+       lpeversion="1"
+       nodesatellites_param="F,0,0,1,0,0,0,1 @ F,0,0,1,0,5.7643974,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,6.1418531,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 | F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 | F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 | F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 | F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 | F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 | F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 | F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 | F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 | F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 | F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 | F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 | F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 | F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 | F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1"
+       radius="0"
+       unit="px"
+       method="auto"
+       mode="F"
+       chamfer_steps="1"
+       flexible="false"
+       use_knot_distance="true"
+       apply_no_radius="true"
+       apply_with_radius="true"
+       only_selected="false"
+       hide_knots="false" /><linearGradient
+       id="linearGradient2"
+       inkscape:collect="always"><stop
+         style="stop-color:#364051;stop-opacity:0.26459038;"
+         offset="0"
+         id="stop2" /><stop
+         style="stop-color:#4a6483;stop-opacity:0.49411765;"
+         offset="0.38955703"
+         id="stop5" /><stop
+         style="stop-color:#947ac4;stop-opacity:1;"
+         offset="1"
+         id="stop3" /></linearGradient><linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2"
+       id="linearGradient3"
+       x1="127.20676"
+       y1="190.95575"
+       x2="125.82147"
+       y2="111.5928"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-22.266022,-50.996373)" /></defs><g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-64.560526,-20.90281)"><path
+       style="fill:url(#linearGradient3);stroke:none"
+       d="M 64.560526,100.27781 V 28.103725 a 7.2009148,7.2009148 135 0 1 7.200915,-7.200915 h 32.486589 32.95303 a 6.7344665,6.7344665 45 0 1 6.73447,6.734466 v 72.640534 l 0,73.6106 a 5.7643969,5.7643969 135 0 1 -5.7644,5.7644 h -33.9231 -32.468263 a 7.2192412,7.2192412 45 0 1 -7.219241,-7.21924 z m 47.103984,29.96041 c 3.30617,-0.89658 6.16277,-2.11655 8.7251,-3.72622 6.98934,-4.39076 11.53086,-10.56792 13.83499,-18.8177 0.48271,-1.72835 0.5565,-2.71166 0.5565,-7.41649 0,-4.704823 -0.0738,-5.688133 -0.5565,-7.416483 -2.30413,-8.24978 -6.84565,-14.42695 -13.83499,-18.8177 -2.5689,-1.6138 -5.43589,-2.83688 -8.7251,-3.72217 -2.55776,-0.68843 -9.42862,-0.95176 -12.402534,-0.47534 -10.8555,1.73904 -20.28912,9.58188 -23.99411,19.94801 -1.2723,3.55973 -1.72805,6.32622 -1.72707,10.483683 9.6e-4,4.08141 0.44822,6.87117 1.64645,10.26947 1.03429,2.9334 1.66772,4.17255 3.62059,7.08285 4.34347,6.47292 11.22797,11.10147 19.09019,12.83461 3.158324,0.69621 10.829344,0.56999 13.766484,-0.22652 z m -11.914404,-1.57307 c -13.08222,-2.28643 -23.09848,-13.06889 -24.03518,-25.87379 -0.64646,-8.837263 2.21242,-16.696163 8.28145,-22.765193 6.04898,-6.04898 13.79151,-8.88345 22.632904,-8.28572 11.92033,0.8059 22.16853,9.45106 25.46177,21.479 0.51415,1.87781 0.59239,2.81007 0.59239,7.058363 0,4.2483 -0.0782,5.18056 -0.59239,7.05837 -2.99448,10.9368 -11.36764,18.84373 -22.34177,21.09776 -1.91619,0.39357 -8.23426,0.53966 -9.999174,0.23121 z m 1.164184,-11.67565 c -2.463224,-1.79225 -5.168364,-5.26924 -6.569154,-8.44346 l -0.49623,-1.12448 h -2.87023 c -1.97121,0 -2.87024,0.0944 -2.87024,0.30147 0,0.43057 1.47343,2.76695 2.60716,4.13412 2.35223,2.83656 7.61793,5.74857 10.595564,5.85951 0.56836,0.0212 0.52671,-0.0552 -0.39687,-0.72716 z m 8.03494,0.37347 c 3.18248,-0.84719 6.87927,-3.15195 8.83123,-5.50582 1.13372,-1.36717 2.60715,-3.70355 2.60715,-4.13412 0,-0.20822 -0.92068,-0.29876 -2.97656,-0.29273 l -2.97657,0.009 -1.10778,2.30636 c -1.27253,2.64936 -3.14145,5.05872 -5.2672,6.79035 -1.61221,1.3133 -1.46174,1.45319 0.88973,0.82722 z m -5.49495,-5.04661 v -4.8948 h -3.968754 c -2.71819,0 -3.96875,0.092 -3.96875,0.29204 0,0.80418 2.18452,4.28343 3.70416,5.89957 1.368124,1.45499 3.805444,3.55555 4.167194,3.59142 0.0364,0.004 0.0661,-2.1961 0.0661,-4.88823 z m 5.15937,1.855 c 1.80981,-1.83861 3.13335,-3.76242 3.9611,-5.75761 l 0.41163,-0.99219 h -3.9723 -3.9723 v 4.91281 4.91281 l 0.85989,-0.59713 c 0.47294,-0.32843 1.69334,-1.44384 2.71198,-2.47869 z m -15.337294,-8.80032 c -0.0992,-0.25466 -0.3097,-1.50481 -0.46779,-2.77812 -0.27657,-2.22771 -0.0302,-6.130013 0.46779,-7.408343 0.16538,-0.42455 -0.0719,-0.46302 -2.85627,-0.46302 h -3.03663 l -0.36511,1.25677 c -0.21641,0.74491 -0.36512,2.49603 -0.36512,4.299483 0,1.80346 0.14871,3.55458 0.36512,4.29948 l 0.36511,1.25677 h 3.03663 c 2.78435,0 3.02165,-0.0385 2.85627,-0.46302 z m 10.177924,-5.09323 v -5.556253 h -4.346874 -4.34687 l -0.32567,1.52136 c -0.41827,1.95392 -0.41827,6.115873 0,8.069793 l 0.32567,1.52135 h 4.34687 4.346874 z m 10.36219,4.43177 c 0.42701,-1.46197 0.42701,-7.401563 0,-8.863543 l -0.32842,-1.12448 h -4.22314 -4.22313 v 5.556253 5.55625 h 4.22313 4.22314 z m 7.66123,-0.13229 c 0.21641,-0.7449 0.36512,-2.49602 0.36512,-4.29948 0,-1.803453 -0.14871,-3.554573 -0.36512,-4.299483 l -0.36511,-1.25677 h -3.03315 -3.03315 l 0.22326,1.38907 c 0.1228,0.76398 0.22327,2.63922 0.22327,4.167183 0,1.52797 -0.10047,3.40321 -0.22327,4.16719 l -0.22326,1.38906 h 3.03315 3.03315 z M 94.345136,92.009577 c 1.40079,-3.17422 4.10593,-6.6512 6.569154,-8.44346 1.19166,-0.86706 0.84372,-0.96209 -1.367474,-0.37346 -3.18248,0.84719 -6.87926,3.15195 -8.83122,5.50582 -1.13373,1.36716 -2.60716,3.70355 -2.60716,4.13412 0,0.20704 0.89903,0.30146 2.87024,0.30146 h 2.87023 z m 9.109144,-3.78302 v -4.9075 l -1.12839,0.77635 c -1.88197,1.29483 -4.751514,4.5327 -5.817124,6.5638 -0.5456,1.03993 -0.99199,2.02219 -0.99199,2.18282 0,0.20001 1.25056,0.29203 3.96875,0.29203 h 3.968754 z m 9.12047,3.91532 c -1.13224,-2.72914 -4.20629,-6.5233 -6.67308,-8.2363 l -0.85989,-0.59713 v 4.91281 4.9128 h 3.9723 3.9723 z m 7.81286,0.69072 c 0,-0.43057 -1.47343,-2.76696 -2.60715,-4.13412 -1.95196,-2.35387 -5.64875,-4.65863 -8.83123,-5.50582 -2.35147,-0.62597 -2.50194,-0.48608 -0.88973,0.82722 2.12575,1.73162 3.99467,4.14099 5.2672,6.79035 l 1.10778,2.30636 2.97657,0.009 c 2.05588,0.006 2.97656,-0.0845 2.97656,-0.29273 z"
+       id="path1"
+       sodipodi:nodetypes="cccccccccsssscssssssssscssssscsccscssssccssccssccccssscccsscccccsssssscssscssccccssccccsscccccccsssscccssscccssssssscsccssssccsscccccssssssccss"
+       inkscape:path-effect="#path-effect6"
+       inkscape:original-d="m 64.560526,100.27781 v -79.375 h 39.687504 39.6875 v 79.375 79.375 h -39.6875 -39.687504 z m 47.103984,29.96041 c 3.30617,-0.89658 6.16277,-2.11655 8.7251,-3.72622 6.98934,-4.39076 11.53086,-10.56792 13.83499,-18.8177 0.48271,-1.72835 0.5565,-2.71166 0.5565,-7.41649 0,-4.704823 -0.0738,-5.688133 -0.5565,-7.416483 -2.30413,-8.24978 -6.84565,-14.42695 -13.83499,-18.8177 -2.5689,-1.6138 -5.43589,-2.83688 -8.7251,-3.72217 -2.55776,-0.68843 -9.42862,-0.95176 -12.402534,-0.47534 -10.8555,1.73904 -20.28912,9.58188 -23.99411,19.94801 -1.2723,3.55973 -1.72805,6.32622 -1.72707,10.483683 9.6e-4,4.08141 0.44822,6.87117 1.64645,10.26947 1.03429,2.9334 1.66772,4.17255 3.62059,7.08285 4.34347,6.47292 11.22797,11.10147 19.09019,12.83461 3.158324,0.69621 10.829344,0.56999 13.766484,-0.22652 z m -11.914404,-1.57307 c -13.08222,-2.28643 -23.09848,-13.06889 -24.03518,-25.87379 -0.64646,-8.837263 2.21242,-16.696163 8.28145,-22.765193 6.04898,-6.04898 13.79151,-8.88345 22.632904,-8.28572 11.92033,0.8059 22.16853,9.45106 25.46177,21.479 0.51415,1.87781 0.59239,2.81007 0.59239,7.058363 0,4.2483 -0.0782,5.18056 -0.59239,7.05837 -2.99448,10.9368 -11.36764,18.84373 -22.34177,21.09776 -1.91619,0.39357 -8.23426,0.53966 -9.999174,0.23121 z m 1.164184,-11.67565 c -2.463224,-1.79225 -5.168364,-5.26924 -6.569154,-8.44346 l -0.49623,-1.12448 h -2.87023 c -1.97121,0 -2.87024,0.0944 -2.87024,0.30147 0,0.43057 1.47343,2.76695 2.60716,4.13412 2.35223,2.83656 7.61793,5.74857 10.595564,5.85951 0.56836,0.0212 0.52671,-0.0552 -0.39687,-0.72716 z m 8.03494,0.37347 c 3.18248,-0.84719 6.87927,-3.15195 8.83123,-5.50582 1.13372,-1.36717 2.60715,-3.70355 2.60715,-4.13412 0,-0.20822 -0.92068,-0.29876 -2.97656,-0.29273 l -2.97657,0.009 -1.10778,2.30636 c -1.27253,2.64936 -3.14145,5.05872 -5.2672,6.79035 -1.61221,1.3133 -1.46174,1.45319 0.88973,0.82722 z m -5.49495,-5.04661 v -4.8948 h -3.968754 c -2.71819,0 -3.96875,0.092 -3.96875,0.29204 0,0.80418 2.18452,4.28343 3.70416,5.89957 1.368124,1.45499 3.805444,3.55555 4.167194,3.59142 0.0364,0.004 0.0661,-2.1961 0.0661,-4.88823 z m 5.15937,1.855 c 1.80981,-1.83861 3.13335,-3.76242 3.9611,-5.75761 l 0.41163,-0.99219 h -3.9723 -3.9723 v 4.91281 4.91281 l 0.85989,-0.59713 c 0.47294,-0.32843 1.69334,-1.44384 2.71198,-2.47869 z m -15.337294,-8.80032 c -0.0992,-0.25466 -0.3097,-1.50481 -0.46779,-2.77812 -0.27657,-2.22771 -0.0302,-6.130013 0.46779,-7.408343 0.16538,-0.42455 -0.0719,-0.46302 -2.85627,-0.46302 h -3.03663 l -0.36511,1.25677 c -0.21641,0.74491 -0.36512,2.49603 -0.36512,4.299483 0,1.80346 0.14871,3.55458 0.36512,4.29948 l 0.36511,1.25677 h 3.03663 c 2.78435,0 3.02165,-0.0385 2.85627,-0.46302 z m 10.177924,-5.09323 v -5.556253 h -4.346874 -4.34687 l -0.32567,1.52136 c -0.41827,1.95392 -0.41827,6.115873 0,8.069793 l 0.32567,1.52135 h 4.34687 4.346874 z m 10.36219,4.43177 c 0.42701,-1.46197 0.42701,-7.401563 0,-8.863543 l -0.32842,-1.12448 h -4.22314 -4.22313 v 5.556253 5.55625 h 4.22313 4.22314 z m 7.66123,-0.13229 c 0.21641,-0.7449 0.36512,-2.49602 0.36512,-4.29948 0,-1.803453 -0.14871,-3.554573 -0.36512,-4.299483 l -0.36511,-1.25677 h -3.03315 -3.03315 l 0.22326,1.38907 c 0.1228,0.76398 0.22327,2.63922 0.22327,4.167183 0,1.52797 -0.10047,3.40321 -0.22327,4.16719 l -0.22326,1.38906 h 3.03315 3.03315 z M 94.345136,92.009577 c 1.40079,-3.17422 4.10593,-6.6512 6.569154,-8.44346 1.19166,-0.86706 0.84372,-0.96209 -1.367474,-0.37346 -3.18248,0.84719 -6.87926,3.15195 -8.83122,5.50582 -1.13373,1.36716 -2.60716,3.70355 -2.60716,4.13412 0,0.20704 0.89903,0.30146 2.87024,0.30146 h 2.87023 z m 9.109144,-3.78302 v -4.9075 l -1.12839,0.77635 c -1.88197,1.29483 -4.751514,4.5327 -5.817124,6.5638 -0.5456,1.03993 -0.99199,2.02219 -0.99199,2.18282 0,0.20001 1.25056,0.29203 3.96875,0.29203 h 3.968754 z m 9.12047,3.91532 c -1.13224,-2.72914 -4.20629,-6.5233 -6.67308,-8.2363 l -0.85989,-0.59713 v 4.91281 4.9128 h 3.9723 3.9723 z m 7.81286,0.69072 c 0,-0.43057 -1.47343,-2.76696 -2.60715,-4.13412 -1.95196,-2.35387 -5.64875,-4.65863 -8.83123,-5.50582 -2.35147,-0.62597 -2.50194,-0.48608 -0.88973,0.82722 2.12575,1.73162 3.99467,4.14099 5.2672,6.79035 l 1.10778,2.30636 2.97657,0.009 c 2.05588,0.006 2.97656,-0.0845 2.97656,-0.29273 z" /></g></svg>

package/media/index.html

@@ -34,8 +34,55 @@
     <script src="janusweb.js"></script>
   </head>
   <body>
-    <janus-viewer src="https://www.janusxr.org/"></janus-viewer>
+    <janus-viewer src="./index.html"></janus-viewer> <!-- project this document in 3D -->
   </body>
 </html>
 
+<!-- 
 
+<fireboxroom>
+  <assets></assets>
+  <room use_local_asset="room_plane" fwd="0 0 1">
+    <object js_id="links" rotation="0 180 0">
+
+      <link js_id="1" pos="3 0 10" xdir="-0.866027 0 0.499998" ydir="0 1 0" zdir="-0.499998 0 -0.866027" url="https://www.reddit.com/r/vrsites" col="#ffffff" scale="1.5 3 1" draw_glow="false" >
+        <paragraph js_id="p" width="300" height="700" pos="0 1.53 0.05" transparent="true" scale="0.7 1.68 1" lighting="false">
+          <![CDATA[ <img src="media/images/portal.svg" width="300" height="700"/> ]]>
+        </paragraph>
+      </link>
+
+       <link js_id="3" pos="5 0 8.5" xdir="-0.707109 0 0.707105" ydir="0 1 0" zdir="-0.707105 0 -0.707109" url="https://vesta.janusxr.org" col="#ffffff" scale="1.5 3 1" draw_glow="false">
+        <paragraph js_id="p" width="300" height="700" pos="0 1.53 0.05" transparent="true" scale="0.7 1.68 1" lighting="false">
+        <![CDATA[ <img src="media/images/portal.svg" width="300" height="700"/> ]]>
+        </paragraph>
+      </link> 
+
+       <link js_id="2" pos="-3 0 10" xdir="-0.866024 0 -0.500002" ydir="0 1 0" zdir="0.500002 0 -0.866024" url="workspaces" col="#ffffff" scale="1.5 3 1" draw_glow="false">
+        <paragraph js_id="p" width="300" height="700" pos="0 1.53 0.05" transparent="true" scale="0.7 1.68 1" lighting="false">
+          <![CDATA[ <img src="media/images/portal.svg" width="300" height="700"/> ]]>
+        </paragraph>
+      </link>
+
+       <link js_id="4" pos="-5 0 8.5" xdir="-0.707106 0 -0.707108" ydir="0 1 0" zdir="0.707108 0 -0.707106" url="bookmarks" col="#ffffff" scale="1.5 3 1" draw_glow="false">
+        <paragraph js_id="p" width="300" height="700" pos="0 1.53 0.05" transparent="true" scale="0.7 1.68 1" lighting="false">
+          <![CDATA[ <img src="media/images/portal.svg" width="300" height="700"/> ]]>
+        </paragraph>
+      </link>
+
+       <link js_id="0" pos="0 0 10.8" xdir="-1 0 -0.000002" ydir="0 1 0" zdir="0.000002 0 -1" url="https://www.janusxr.org/newlobby/index.html" col="#ffffff" scale="1.5 3 1" draw_glow="false">
+        <paragraph js_id="p" width="300" height="700" pos="0 1.53 0.05" transparent="true" scale="0.7 1.68 1" lighting="false">
+          <![CDATA[ <img src="media/images/portal.svg" width="300" height="700"/> ]]>
+        </paragraph>
+       </link>
+
+       <link js_id="5" pos="-6.51 0 6.5" rotation="-180 65 -180" url="https://xrforge.isvery.ninja" col="#ffffff" scale="1.5 3 1" draw_glow="false">
+        <paragraph js_id="p" width="300" height="700" pos="0 1.53 0.05" transparent="true" scale="0.7 1.68 1" lighting="false">
+          <![CDATA[ <img src="media/images/portal.svg" width="300" height="700"/> ]]>
+        </paragraph>
+       </link>
+
+     </object>
+  </room>
+</fireboxroom>
+
+-->

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "janusweb",
   "description": "Web client for JanusVR worlds",
-  "version": "1.7.0",
+  "version": "1.7.1",
   "main": "scripts/janusweb.js",
   "author": "James Baicoianu",
   "license": "MIT",

package/scripts/client.js

@@ -152,6 +152,30 @@ elation.require(['elements.elements', 'elements', 'engine.engine', 'engine.asset
           }
         }
       });
+      this.initProxies()
+    }
+    initProxies() {
+      elation.engine.assets = new Proxy(elation.engine.assets,{
+        get(me,k){
+          if( k == "corsproxy" && me[k] ){
+            const p = elation.config.get("engine.assets.corsproxies")
+            if( ! p?.length ){ 
+              return me[k] // nothing to roundrobin
+            }else{ // roundrobin proxies
+              if( !p.index ) p.index = 0
+              const corsproxy = p[ p.index ]  
+              elation.config.set("engine.assets.corsproxy", corsproxy )
+              p.index = (p.index + 1) % p.length
+              return corsproxy
+            }
+          }
+          return me[k]
+        },
+        set(me,k,v){
+          me[k] = v
+          return true
+        }
+      })
     }
     initButtons() {
       this.sharebutton = elation.ui.button({classname: 'janusweb_sharing', label: 'Share'});

package/scripts/config.js

@@ -1,5 +1,16 @@
 elation.config.set('janusweb.network.host', 'wss://presence.janusxr.org:5567');        // Default presence server
-elation.config.set('engine.assets.corsproxy', 'https://p.janusxr.org/'); // CORS proxy URL
+
+proxies = [
+  'https://p.janusxr.org/',
+  'https://cors.xrforge.isvery.ninja/'
+]
+elation.config.set('engine.assets.corsproxy',   proxies[0]); // CORS proxy URL
+elation.config.set('engine.assets.corsproxies', []        ); // rotate **online** proxies only
+proxies.map( (url) => 
+  fetch(url,{method:'HEAD'})
+  .then( (res) => res.ok && elation.config.get("engine.assets.corsproxies").push(url) )
+)
+
 elation.config.set('engine.assets.workers', 'auto'); // Number of workers to use for asset parsing
 //elation.config.set('engine.assets.image.maxsize', 16384); 
 elation.config.set('engine.assets.image.anisotropy', 16); 

package/scripts/janusbase.js

@@ -353,6 +353,7 @@ elation.require(['engine.things.generic', 'utils.template', 'janusweb.parts'], f
           jsid:     ['property', 'js_id'],
           pos:      ['property', 'position'],
           rotation: ['property', 'rotation'],
+          angular:  ['property', 'angular'],
           scale:    ['property', 'scale'],
           //rotation_order: ['property', 'rotation_order'],
           col:      ['property', 'color'],