janusweb 1.5.33 → 1.5.34

package/scripts/room.js

@@ -3,7 +3,7 @@ elation.require([
      'engine.things.generic', 'engine.things.label', 'engine.things.skybox',
     'janusweb.object', 'janusweb.portal', 'janusweb.image', 'janusweb.video', 'janusweb.text', 'janusweb.janusparagraph',
     'janusweb.sound', 'janusweb.januslight', 'janusweb.janusparticle', 'janusweb.janusghost',
-    'janusweb.translators.bookmarks', 'janusweb.translators.reddit', 'janusweb.translators.error', 'janusweb.translators.blank', 'janusweb.translators.default', 'janusweb.translators.dat'
+    'janusweb.translators.bookmarks', 'janusweb.translators.reddit', 'janusweb.translators.error', 'janusweb.translators.blank', 'janusweb.translators.default', 'janusweb.translators.dat', 'janusweb.translators.janusvfs'
   ], function() {
   elation.component.add('engine.things.janusroom', function() {
     this.postinit = function() {
@@ -27,13 +27,13 @@ elation.require([
         'baseurl': { type: 'string', default: false },
         'source': { type: 'string' },
         'skybox': { type: 'boolean', default: true, set: this.toggleSkybox },
-        'skybox_equi': { type: 'string' },
-        'skybox_left': { type: 'string' },
-        'skybox_right': { type: 'string' },
-        'skybox_up': { type: 'string' },
-        'skybox_down': { type: 'string' },
-        'skybox_front': { type: 'string' },
-        'skybox_back': { type: 'string' },
+        'skybox_equi': { type: 'string', set: this.setSkybox },
+        'skybox_left_id': { type: 'string', set: this.setSkybox },
+        'skybox_right_id': { type: 'string', set: this.setSkybox },
+        'skybox_up_id': { type: 'string', set: this.setSkybox },
+        'skybox_down_id': { type: 'string', set: this.setSkybox },
+        'skybox_front_id': { type: 'string', set: this.setSkybox },
+        'skybox_back_id': { type: 'string', set: this.setSkybox },
         'cubemap_irradiance_id': { type: 'string' },
         'cubemap_radiance_id': { type: 'string' },
         'fog': { type: 'boolean', default: false, set: this.setFog },
@@ -76,12 +76,13 @@ elation.require([
         'className': { type: 'string', default: '', set: this.setClassName },
         'gazetime': { type: 'float', default: 1000 },
         'selfavatar': { type: 'boolean', default: false },
-        'requirescripts': { type: 'string' },
+        'requires': { type: 'string' },
         'onload': { type: 'string' },
         'sync': { type: 'boolean', default: false },
         'pointerlock': { type: 'boolean', default: true },
       });
       this.translators = {
+        '^janus-vfs:': elation.janusweb.translators.janusvfs({janus: this.janus}),
         '^about:blank$': elation.janusweb.translators.blank({janus: this.janus}),
         '^bookmarks$': elation.janusweb.translators.bookmarks({janus: this.janus}),
         '^dat:': elation.janusweb.translators.dat({janus: this.janus}),
@@ -296,31 +297,32 @@ elation.require([
       }
       if (this.skyboxtexture) {
         this.skyboxobj.setTexture(this.skyboxtexture);
-        return;
+        //return;
       }
 
-      var hasSkybox = (this.skybox_left || this.skybox_right || this.skybox_top || this.skybox_bottom || this.skybox_left || this.skybox_right) != undefined;
+      var hasSkybox = (this.skybox_left_id || this.skybox_right_id || this.skybox_top_id || this.skybox_bottom_id || this.skybox_left_id || this.skybox_right_id) != undefined;
+      var assets = [];
       if (this.skybox_equi) {
         let equi = this.getAsset('image', this.skybox_equi);
-        var assets = [];
         elation.events.add(equi, 'asset_load', ev => {
           this.skyboxtexture = ev.target._texture;
           if (this.janus.currentroom === this) {
             this.skyboxobj.setTexture(this.skyboxtexture);
           }
         });
+        equi.getInstance();
       } else if (hasSkybox) {
-        var assets = [
-          this.getAsset('image', this.skybox_right || 'black'),
-          this.getAsset('image', this.skybox_left || 'black'),
-          this.getAsset('image', this.skybox_up || 'black'),
-          this.getAsset('image', this.skybox_down || 'black'),
-          this.getAsset('image', this.skybox_front || 'black'),
-          this.getAsset('image', this.skybox_back || 'black')
+        assets = [
+          this.getAsset('image', this.skybox_right_id || 'black'),
+          this.getAsset('image', this.skybox_left_id || 'black'),
+          this.getAsset('image', this.skybox_up_id || 'black'),
+          this.getAsset('image', this.skybox_down_id || 'black'),
+          this.getAsset('image', this.skybox_front_id || 'black'),
+          this.getAsset('image', this.skybox_back_id || 'black')
         ];
       } else {
         var skyboxname = 'dayskybox';
-        var assets = [
+        assets = [
           this.getAsset('image', skyboxname + '_right'),
           this.getAsset('image', skyboxname + '_left'),
           this.getAsset('image', skyboxname + '_up'),
@@ -705,12 +707,12 @@ elation.require([
       this.fullsource = data;
       var titlere = /<title>([\s\S]*?)<\/title>/mi;
       var re = /<fireboxroom>[\s\S]*?<\/fireboxroom>/mi;
-      var re2 = /<janus-viewer>[\s\S]*?<\/janus-viewer>/mi;
+      var re2 = /<janus-viewer[^>]*>[\s\S]*?<\/janus-viewer>/mi;
       var mtitle = data.match(titlere);
       var parsed = {
         title: 'Untitled Room',
         source: false 
-      }
+      };
       if (mtitle) {
         parsed.title = mtitle[1];
         this.setTitle(mtitle[1]);
@@ -728,6 +730,40 @@ elation.require([
       }
       return parsed;
     }
+    this.updateSource = function(source) {
+      var datapath = elation.config.get('janusweb.datapath', '/media/janusweb');
+      try {
+        var roomdata = this.janus.parser.parse(source, this.baseurl, datapath);
+      } catch (e) {
+      }
+      console.log('updated roomdata!', roomdata);
+      if (roomdata && roomdata.room) {
+        for (let k in roomdata.room) {
+          let val = roomdata.room[k];
+          if (val !== null && room[k] != val) {
+            console.log('update room value', k, room[k], val);
+            room[k] = val;
+          }
+        }
+        if (roomdata.object) {
+          for (let i = 0; i < roomdata.object.length; i++) {
+            let objdata = roomdata.object[i];
+            let roomobj = room.objects[objdata.js_id];
+            if (roomobj) {
+              for (let k in objdata) {
+                let val = objdata[k];
+                if (roomobj[k] != objdata[k] && val !== null) {
+                  roomobj[k] = val;
+                }
+              }
+            } else {
+              objdata.persist = true;
+              this.createObject('object', objdata);
+            }
+          }
+        }
+      }
+    }
 
     this.loadRoomAssets = function(roomdata) {
       if (roomdata && roomdata.assets && roomdata.assets.assetlist && roomdata.assets.assetlist.length > 0) {
@@ -868,12 +904,12 @@ elation.require([
 
         if (typeof room.skybox != 'undefined') this.properties.skybox = room.skybox;
         if (room.skybox_equi) this.properties.skybox_equi = room.skybox_equi;
-        if (room.skybox_left_id) this.properties.skybox_left = room.skybox_left_id;
-        if (room.skybox_right_id) this.properties.skybox_right = room.skybox_right_id;
-        if (room.skybox_up_id) this.properties.skybox_up = room.skybox_up_id;
-        if (room.skybox_down_id) this.properties.skybox_down = room.skybox_down_id;
-        if (room.skybox_front_id) this.properties.skybox_front = room.skybox_front_id;
-        if (room.skybox_back_id) this.properties.skybox_back = room.skybox_back_id;
+        if (room.skybox_left_id) this.properties.skybox_left_id = room.skybox_left_id;
+        if (room.skybox_right_id) this.properties.skybox_right_id = room.skybox_right_id;
+        if (room.skybox_up_id) this.properties.skybox_up_id = room.skybox_up_id;
+        if (room.skybox_down_id) this.properties.skybox_down_id = room.skybox_down_id;
+        if (room.skybox_front_id) this.properties.skybox_front_id = room.skybox_front_id;
+        if (room.skybox_back_id) this.properties.skybox_back_id = room.skybox_back_id;
 
         if (room.cubemap_radiance_id) this.properties.cubemap_radiance_id = room.cubemap_radiance_id;
         if (room.cubemap_irradiance_id) this.properties.cubemap_irradiance_id = room.cubemap_irradiance_id;
@@ -935,10 +971,12 @@ elation.require([
           this.pendingScriptMap = {};
           this.loadScripts(assets.scripts);
         }
-        if (room.require) {
+
+        let requires = room.requires || room.require;
+        if (requires) {
           let roomproxy = this.getProxyObject();
-          roomproxy.require(room.require);
-          this.requirescripts = room.require;
+          roomproxy.require(requires);
+          this.requires = requires;
         }
       }
       this.applyingEdits = false;
@@ -1287,7 +1325,7 @@ console.log('connect room audio to graph', this.audionodes.gain, this.audionodes
           objectargs.ghost_id = args.id;
           //objectargs.ghost_scale = args.scale;
           //objectargs.scale = new THREE.Vector3(1,1,1);
-          objectargs.orientation = new THREE.Quaternion()
+          objectargs.orientation = new THREE.Quaternion();
           break;
       }
       //console.log('spawn it', realtype, args, objectargs);
@@ -1406,6 +1444,7 @@ console.log('connect room audio to graph', this.audionodes.gain, this.audionodes
             hasalpha: args.hasalpha,
             maxsize: args.maxsize,
             preload: args.preload,
+            proxy: args.proxy,
             baseurl: this.baseurl
           };
           assetlist.push(assetargs);
@@ -1446,6 +1485,7 @@ console.log('connect room audio to graph', this.audionodes.gain, this.audionodes
             format: args.format,
             hls: args.hls,
             preload: args.preload,
+            proxy: args.proxy,
             baseurl: this.baseurl
           });
         } else if (args.video) {
@@ -1474,6 +1514,7 @@ console.log('connect room audio to graph', this.audionodes.gain, this.audionodes
           src: src,
           buffer: args.buffer,
           rate: args.rate,
+          proxy: args.proxy,
           baseurl: this.baseurl
         });
       } else if (type == 'websurface') {
@@ -1525,7 +1566,8 @@ console.log('connect room audio to graph', this.audionodes.gain, this.audionodes
           tex0: args.tex || args.tex0 || srcparts[1],
           tex1: args.tex1 || srcparts[2],
           tex2: args.tex2 || srcparts[3],
-          tex3: args.tex3 || srcparts[4]
+          tex3: args.tex3 || srcparts[4],
+          proxy: args.proxy,
         });
       } else if (type == 'ghost') {
         var src = (args.src.match(/^file:/) ? args.src.replace(/^file:/, datapath) : args.src);
@@ -2008,7 +2050,7 @@ console.log('connect room audio to graph', this.audionodes.gain, this.audionodes
           locked:        ['property', 'locked'],
           private:       ['property', 'private'],
           selfavatar:    ['property', 'selfavatar'],
-          requirescripts:['property', 'requirescripts'],
+          requires:      ['property', 'requires'],
           pos:           ['property', 'spawnpoint.position'],
           sync:          ['property', 'sync'],
           js_id:         ['property', 'roomid'],
@@ -2016,12 +2058,12 @@ console.log('connect room audio to graph', this.audionodes.gain, this.audionodes
 
           skybox:         ['property', 'skybox'],
           skybox_equi:    ['property', 'skybox_equi'],
-          skybox_left_id: ['property', 'skybox_left'],
-          skybox_right_id:['property', 'skybox_right'],
-          skybox_up_id:   ['property', 'skybox_up'],
-          skybox_down_id: ['property', 'skybox_down'],
-          skybox_front_id:['property', 'skybox_front'],
-          skybox_back_id: ['property', 'skybox_back'],
+          skybox_left_id: ['property', 'skybox_left_id'],
+          skybox_right_id:['property', 'skybox_right_id'],
+          skybox_up_id:   ['property', 'skybox_up_id'],
+          skybox_down_id: ['property', 'skybox_down_id'],
+          skybox_front_id:['property', 'skybox_front_id'],
+          skybox_back_id: ['property', 'skybox_back_id'],
 
           pendingScripts: ['property', 'pendingScripts'],
           pendingCustomElements: ['property', 'pendingCustomElements'],
@@ -2112,7 +2154,7 @@ console.log('connect room audio to graph', this.audionodes.gain, this.audionodes
           var real = this.getObjectFromProxy(change);
           if (real) {
             var xmltype = typemap[real.type] || 'Object';
-            xmlnode = xmldoc.createElement(xmltype);
+            let xmlnode = xmldoc.createElement(xmltype);
             
             var attrs = Object.keys(change);
             for (var i = 0; i < attrs.length; i++) {
@@ -2326,7 +2368,7 @@ console.log('connect room audio to graph', this.audionodes.gain, this.audionodes
               val = elation.utils.arrayget(this.properties, def[1]);
 
           if (k == 'url' || !propdef) continue;
-          if (k == 'requirescripts') k = 'require';
+          if (k == 'requires') k = 'require';
 
           let defaultval = propdef.default;
           if (val instanceof THREE.Vector2) {
@@ -2611,7 +2653,7 @@ console.log('dispatch to parent', event, this, event.target);
       if (!url) url = this.url;
       if (url[0] == '/') {
         url = this.baseurl.replace(/^(https?:\/\/[^\/]+)\/.*$/, '$1') + url;
-      } else if (!url.match(/https?:\/\//i)) {
+      } else if (!url.match(/:\/\//i)) {
         url = this.baseurl + url;
       }
       return url;
@@ -2692,7 +2734,7 @@ console.log('dispatch to parent', event, this, event.target);
     this.fadeAudioOut = function(time=4, value=0) {
       if (this.audionodes) {
         let gain = this.audionodes.gain,
-            ctx = this.audionodes.listener.context;
+            ctx = this.audionodes.listener.context,
             currentgain = gain.gain.value;
 
         gain.gain.cancelScheduledValues(ctx.currentTime);

package/scripts/sound.js

@@ -223,7 +223,6 @@ elation.require(['janusweb.janusbase'], function() {
           playing:      [ 'property', 'playing', 'sound.isPlaying'],
           pitch:        [ 'property', 'pitch'],
           auto_play:    [ 'property', 'auto_play'],
-          playing:      [ 'property', 'playing'],
           play:         [ 'function', 'play'],
           pause:        [ 'function', 'pause'],
           stop:         [ 'function', 'stop'],

package/scripts/text.js

@@ -26,6 +26,7 @@ elation.require(['engine.things.label'], function() {
         'roughness':       { type: 'float', default: null, min: 0, max: 1, set: this.updateMaterial, comment: 'Material roughness value' },
         'metalness':       { type: 'float', default: null, set: this.updateMaterial, comment: 'Material metalness value' },
         'envmap_id':       { type: 'string', set: this.updateMaterial, comment: 'Environment map texture ID (overrides skybox reflections)' },
+        'wireframe':       { type: 'boolean', default: false, set: this.updateMaterial, comment: 'Wireframe rendering' },
       });
       this.emptygeometry = new THREE.BufferGeometry();
       elation.events.add(this.engine, 'engine_frame', elation.bind(this, this.handleFrameUpdates));
@@ -91,7 +92,8 @@ elation.require(['engine.things.label'], function() {
         emissive: this.properties.emissive, 
         flatShading: false,
         depthTest: this.properties.depthTest,
-        reflectivity: .5
+        reflectivity: .5,
+        wireframe: this.wireframe,
       };
       if (this.room.pbr) {
         matargs.roughness = this.roughness;
@@ -219,7 +221,6 @@ elation.require(['engine.things.label'], function() {
           text:  [ 'property', 'text'],
           col:   [ 'property', 'color'],
           emissive:  [ 'property', 'emissive'],
-          font:  [ 'property', 'font'],
           bevel:  [ 'property', 'bevel'],
           bevel_thickness:  [ 'property', 'bevel_thickness'],
           bevel_size:  [ 'property', 'bevel_size'],
@@ -228,6 +229,13 @@ elation.require(['engine.things.label'], function() {
           roughness:  [ 'property', 'roughness'],
           metalness:  [ 'property', 'metalness'],
           envmap_id:  [ 'property', 'envmap_id'],
+          font:       [ 'property', 'font'],
+          font_size:  [ 'property', 'font_size'],
+          font_scale: [ 'property', 'font_scale'],
+          align:       [ 'property', 'align'],
+          verticalalign:  [ 'property', 'verticalalign'],
+          zalign: [ 'property', 'zalign'],
+          wireframe: [ 'property', 'wireframe'],
         };
       }
       return this._proxyobject;

package/scripts/translators/janusvfs.js

@@ -0,0 +1,20 @@
+elation.require([], function() {
+  elation.component.add('janusweb.translators.janusvfs', function() {
+    this.exec = function(args) {
+      return new Promise(async function(resolve, reject) {
+        setTimeout(async () => {
+          elation.engine.assetdownloader.fetchURL(args.url).then((ev) => {
+            let decoder = new TextDecoder('utf-8');
+            let src = decoder.decode(ev.target.data);
+            elation.events.fire({element: room._target, type: 'room_load_processing'});
+            room.loadFromSource(src);
+            resolve({room: { }, source: src});
+          }).catch((err) => {
+            console.log('oh no', err);
+            reject();
+          });
+        }, 1000);
+      });
+    }
+  });
+});

package/scripts/video.js

@@ -32,7 +32,7 @@ elation.require(['janusweb.janusbase'], function() {
             if (camera.name) {
               texture.setEye(camera.name);
             }
-          }
+          };
         }
         return mesh;
       } else {

package/scripts/websurface.js

@@ -5,6 +5,7 @@ elation.require(['engine.things.generic'], function() {
       this.defineProperties({
         websurface_id: { type: 'string' },
         image_id: { type: 'string' },
+        url: { type: 'string', set: this.updateURL },
         color: { type: 'color', default: 0xffffff },
         hovercolor: { type: 'color', default: 0x009900 },
         activecolor: { type: 'color', default: 0x00ff00 }
@@ -27,6 +28,8 @@ elation.require(['engine.things.generic'], function() {
         // and hope that most sites are running both.
 
         this.url = url.replace(/^http:/, 'https:');
+      } else {
+        this.url = this.websurface_id;
       }
 
       // FIXME - binding of member functions should happen at object creation
@@ -78,7 +81,9 @@ elation.require(['engine.things.generic'], function() {
     }
     this.createObjectDOM = function() {
         var websurface = this.room.websurfaces[this.properties.websurface_id];
-        if (websurface) {
+        if (!websurface) {
+          websurface = {};
+        }
           var width = websurface.width || 1024,
               height = websurface.height || 768,
               border = elation.utils.any(websurface.border, true);
@@ -103,7 +108,6 @@ elation.require(['engine.things.generic'], function() {
 
           this.iframe = iframe;
           this.domobj = obj;
-        }
     }
     this.activate = function() {
       if (!this.active) {
@@ -167,6 +171,11 @@ setTimeout(elation.bind(this, function() {
         this.objects['3d'].remove(this.domobj);
       }
     }
+    this.updateURL = function() {
+      if (this.iframe) {
+        this.iframe.src = this.url;
+      }
+    }
   }, elation.engine.things.janusbase);
 });