janusweb 1.5.30 → 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() {
@@ -26,13 +26,14 @@ elation.require([
         'corsproxy': { type: 'string', default: false },
         'baseurl': { type: 'string', default: false },
         'source': { type: 'string' },
-        'skybox': { type: 'boolean', default: true },
-        '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': { type: 'boolean', default: true, set: this.toggleSkybox },
+        '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 },
@@ -75,11 +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}),
@@ -225,15 +228,15 @@ elation.require([
         // Reparent player to the room if necessary
         this.appendChild(player.getProxyObject());
       }
+      player.reset_position();
       player.position.copy(pos);
       player.orientation.copy(orientation);
-      //player.reset_position();
       player.properties.movestrength = 80 * this.properties.walk_speed;
       player.properties.runstrength = 80 * this.properties.run_speed;
       player.cursor_visible = (!janus.hmd ? elation.utils.any(this.cursor_visible, true) : false);
       player.cursor_opacity = elation.utils.any(this.cursor_opacity, .8);
       // FIXME - for some reason the above call sometimes orients the player backwards.  Doing it on a delay fixes it...
-      setTimeout(elation.bind(player, player.reset_position), 0);
+      //setTimeout(elation.bind(player, player.reset_position), 0);
     }
     this.setHash = function(hash) {
       this.urlhash = hash;
@@ -255,7 +258,15 @@ elation.require([
           if (links[i].url == referrer) {
             //spawnpoint.position = links[i].position;
             spawnpoint.position = links[i].localToWorld(V(0,0,player.fatness*2));
-            spawnpoint.orientation = links[i].orientation.clone().multiply(new THREE.Quaternion().setFromEuler(new THREE.Euler(0, Math.PI, 0))); // Flip 180 degrees from portal orientation
+            spawnpoint.orientation = links[i].orientation.clone();
+            let node = links[i];
+            let roomproxy = this.getProxyObject();
+            while (node.parent && node.parent != roomproxy) {
+              node = node.parent;
+              node.handleFrameUpdates({});
+              spawnpoint.orientation.multiply(node.orientation);
+            }
+            spawnpoint.orientation.multiply(new THREE.Quaternion().setFromEuler(new THREE.Euler(0, Math.PI, 0))); // Flip 180 degrees from portal orientation
             break;
           }
         }
@@ -286,22 +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;
-      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')
+      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);
+        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) {
+        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'),
@@ -328,6 +349,12 @@ elation.require([
       assets.forEach(elation.bind(this, function(asset) { 
         if (asset) {
           var n = asset.getInstance();
+          if (asset.loaded) {
+            loaded++;
+            if (loaded + errored == 6) {
+              this.processSkybox(assets);
+            }
+          } else {
             elation.events.add(n, 'asset_load,asset_error', elation.bind(this, function(ev) {
               if (ev.type == 'asset_load') loaded++;
               else errored++;
@@ -336,6 +363,7 @@ elation.require([
               }
             }));
           }
+        }
       }));
       return false;
     }
@@ -386,10 +414,26 @@ elation.require([
           if (this.janus.currentroom === this) {
             this.skyboxobj.setTexture(this.skyboxtexture);
           }
+          elation.events.fire({element: this, type: 'skybox_update'});
           return true;
         }
       }
     }
+    this.toggleSkybox = function() {
+      if (this.skybox) {
+        this.engine.systems.render.renderer.setClearAlpha(1);
+        if (this.skyboxtexture) {
+          this.skyboxobj.setTexture(this.skyboxtexture);
+        } else {
+          this.setSkybox();
+        }
+      } else {
+        this.engine.systems.render.renderer.setClearAlpha(0);
+        if (this.skyboxobj) {
+          this.skyboxobj.setTexture(null);
+        }
+      }
+    }
     this.setFog = function() {
       if (this.fog) {
         var fogcol = this.properties.fog_col || 0;
@@ -663,11 +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 mtitle = data.match(titlere);
       var parsed = {
         title: 'Untitled Room',
         source: false 
-      }
+      };
       if (mtitle) {
         parsed.title = mtitle[1];
         this.setTitle(mtitle[1]);
@@ -677,15 +722,56 @@ elation.require([
       var m = data.match(re);
       if (m) { 
         parsed.source = m[0];
+      } else {
+        let m2 = data.match(re2);
+        if (m2) {
+          parsed.source = m2[0].replaceAll('janus-viewer', 'fireboxroom');
+        }
       }
       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) {
         var assetlist = roomdata.assets.assetlist;
         if (roomdata.assets.websurfaces) {
           elation.utils.merge(roomdata.assets.websurfaces, this.websurfaces);
+          if (!this.roomassets.websurface) this.roomassets.websurface = {};
+          elation.utils.merge(roomdata.assets.websurfaces, this.roomassets.websurface);
         }
 
         if (roomdata.assets.ghosts) {
@@ -787,8 +873,8 @@ elation.require([
             links.forEach(link => {
               let url = this.getFullRoomURL(link.url);
               if (url == this.referrer) {
-                this.spawnpoint.quaternion.copy(link.orientation.inverse());
-                this.spawnpoint.position.fromArray(link.pos);
+                this.spawnpoint.quaternion.copy(link.orientation).invert();
+                this.spawnpoint.position.copy(link.pos);
                 this.spawnpoint.position.add(this.spawnpoint.localToWorld(V(0,0,-player.fatness)));
                 hasReciprocalLink = true;
               }
@@ -812,15 +898,18 @@ elation.require([
             });
           }
         }
-        setTimeout(() => this.setPlayerPosition(), 0);
+        if (this.active) {
+          setTimeout(() => this.setPlayerPosition(), 0);
+        }
 
         if (typeof room.skybox != 'undefined') this.properties.skybox = room.skybox;
-        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_equi) this.properties.skybox_equi = room.skybox_equi;
+        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;
@@ -859,6 +948,7 @@ elation.require([
         this.gravity = elation.utils.any(room.gravity, 0);
         this.flying = elation.utils.any(room.flying, true);
         this.teleport = elation.utils.any(room.teleport, true);
+        this.pointerlock = elation.utils.any(room.pointerlock, true);
         //if (room.col) this.properties.col = room.col;
 
         this.properties.walk_speed = room.walk_speed || 1.8;
@@ -881,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;
@@ -896,6 +988,7 @@ elation.require([
     }
     this.loadScripts = function(scripts) {
       scripts.forEach(s => {
+        this.loadNewAsset('script', { src: s.src, override: { room: this.getProxyObject() } });
         let scriptasset = this.getAsset('script', s.src);
         let script = scriptasset.getInstance();
         if (scriptasset.loaded) {
@@ -912,6 +1005,10 @@ elation.require([
           if (!this.pendingScriptMap[s.src]) {
             this.pendingScripts++;
             this.pendingScriptMap[s.src] = true;;
+            elation.events.add(scriptasset, 'asset_error', (ev) => {
+              console.error('Failed to load Janus room script', scriptasset);
+              this.doScriptOnload();
+            });
             elation.events.add(script, 'asset_load', () => {
               script.onload = () => this.doScriptOnload();
               document.head.appendChild(script);
@@ -947,9 +1044,9 @@ elation.require([
         elation.events.add(window, 'click', this.onClick);
         elation.events.add(window, 'keydown', this.onKeyDown);
         elation.events.add(window, 'keyup', this.onKeyUp);
-        elation.events.add(this.engine.client.container, 'mousedown,touchstart', this.onMouseDown);
-        elation.events.add(this.engine.client.container, 'mouseup,touchend', this.onMouseUp);
-        elation.events.add(this.engine.client.container, 'mousemove', this.onMouseMove);
+        //elation.events.add(this, 'mousedown,touchstart', this.onMouseDown);
+        //elation.events.add(this, 'mouseup,touchend', this.onMouseUp);
+        //elation.events.add(this, 'mousemove', this.onMouseMove);
         elation.events.add(this, 'click', this.onObjectClick);
 /*
         elation.events.add(this, 'dragenter', this.handleDragOver);
@@ -965,9 +1062,10 @@ elation.require([
 console.log('connect room audio to graph', this.audionodes.gain, this.audionodes.listener.getInput(), this);
           this.fadeAudioIn(2);
         }
-      }
-      if (this.engine.systems.admin) {
-        elation.events.add(this.engine.systems.admin, 'admin_edit_change', elation.bind(this, this.onRoomEdit));
+        this.engine.systems.controls.pointerLockEnabled = this.pointerlock;
+        if (this.engine.systems.admin) {
+          elation.events.add(this.engine.systems.admin, 'admin_edit_change', elation.bind(this, this.onRoomEdit));
+        }
       }
       //this.showDebug();
     }
@@ -1015,6 +1113,7 @@ console.log('connect room audio to graph', this.audionodes.gain, this.audionodes
             console.log('disconnect room audio from graph', this.audionodes.gain, this.audionodes.listener.getInput(), this);
           }, 1500);
         }
+        //this.engine.systems.controls.pointerLockEnabled = this.pointerlock;
       }
     }
     this.setTitle = function(title) {
@@ -1226,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);
@@ -1345,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);
@@ -1385,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) {
@@ -1413,11 +1514,14 @@ 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') {
         if (args.id) {
           this.websurfaces[args.id] = args;
+          if (!this.roomassets.websurface) this.roomassets.websurface = {};
+          this.roomassets.websurface[args.id] = args;
         }
       } else if (type == 'script') {
         var src = (args.src.match(/^file:/) ? args.src.replace(/^file:/, datapath) : args.src);
@@ -1425,7 +1529,8 @@ console.log('connect room audio to graph', this.audionodes.gain, this.audionodes
           assettype:'script',
           name: src,
           src: src,
-          baseurl: this.baseurl
+          baseurl: this.baseurl,
+          override: { room: this.getProxyObject() }
         });
       } else if (type == 'object' || type == 'model') {
         var src, mtlsrc, srcparts = [];
@@ -1461,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);
@@ -1535,9 +1641,13 @@ console.log('connect room audio to graph', this.audionodes.gain, this.audionodes
     }
     this.playSound = function(name, properties) {
       if (!this.sounds[name]) {
-        this.sounds[name] = this.createObject('Sound', {
-          id: name
-        });
+        if (room.objects[name]) {
+          this.sounds[name] = room.objects[name];
+        } else {
+          this.sounds[name] = this.createObject('Sound', {
+            id: name
+          });
+        }
       }
       if (this.sounds[name]) {
         if (properties) {
@@ -1710,14 +1820,20 @@ console.log('connect room audio to graph', this.audionodes.gain, this.audionodes
       }
     }
     this.onThingChange = function(ev) {
-      var thing = ev.target;
-      if (!this.applyingEdits && thing.js_id && this.jsobjects[thing.js_id]) {
-        var proxy = this.jsobjects[thing.js_id];
-        if (proxy.sync) {
-          if (!this.appliedchanges[thing.js_id]) {
-            this.changes[thing.js_id] = proxy;
+      if (this.applyingEdits) return;
+
+      let thing = ev.target,
+          js_id = thing.properties.js_id;
+
+      if (!js_id) return;
+
+      let proxy = this.jsobjects[js_id];
+      if (proxy) {
+        if (thing.properties.sync) {
+          if (!this.appliedchanges[js_id]) {
+            this.changes[js_id] = proxy;
           }
-          proxy.sync = proxy.autosync;
+          thing.properties.sync = proxy.autosync;
         }
       }
     }
@@ -1743,8 +1859,8 @@ console.log('connect room audio to graph', this.audionodes.gain, this.audionodes
       }
     }
     this.onScriptTick = function(ev) {
-      this.engine.systems.world.scene['world-3d'].updateMatrix();
-      this.engine.systems.world.scene['world-3d'].updateMatrixWorld();
+      //this.engine.systems.world.scene['world-3d'].updateMatrix();
+      //this.engine.systems.world.scene['world-3d'].updateMatrixWorld();
 /*
       for (var k in this.jsobjects) {
         var realobj = this.getObjectFromProxy(this.jsobjects[k]);
@@ -1934,19 +2050,20 @@ 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'],
           pickable:      ['property', 'pickable'],
 
           skybox:         ['property', 'skybox'],
-          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_equi:    ['property', 'skybox_equi'],
+          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'],
@@ -2000,10 +2117,10 @@ console.log('connect room audio to graph', this.audionodes.gain, this.audionodes
           onColliderEnter: ['callback', 'janus_room_collider_enter'],
           onColliderExit:  ['callback', 'janus_room_collider_exit'],
           onClick:         ['callback', 'click,touchstart', 'engine.client.container'],
-          onMouseDown:     ['callback', 'janus_room_mousedown'],
-          onMouseUp:       ['callback', 'janus_room_mouseup'],
-          onMouseMove:     ['callback', 'janus_room_mousemove'],
-          onMouseDrag:     ['callback', 'janus_room_mousedrag'],
+          onMouseDown:     ['callback', 'mousedown'],
+          onMouseUp:       ['callback', 'mouseup'],
+          onMouseMove:     ['callback', 'mousemove'],
+          onMouseDrag:     ['callback', 'mousedrag'],
           onKeyDown:       ['callback', 'janus_room_keydown'],
           onKeyUp:         ['callback', 'janus_room_keyup']
         });
@@ -2037,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++) {
@@ -2232,7 +2349,9 @@ console.log('connect room audio to graph', this.audionodes.gain, this.audionodes
           var asset = this.roomassets[type][assetname];
 
           let defaultasset = (janus.assetpack.assetmap[type] ? janus.assetpack.assetmap[type][assetname] : undefined);
-          if (assetname != asset.src && asset !== defaultasset) {
+          if (type == 'script') {
+            assetsrc += '    <assetscript src="' + asset.src + '" />\n';
+          } else if (assetname != asset.src && asset !== defaultasset) {
             assetsrc += '    <asset' + (assettypemap[type] || type) + ' id="' + assetname + '" src="' + asset.src + '" />\n';
           }
         }
@@ -2249,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) {
@@ -2463,14 +2582,14 @@ console.log('connect room audio to graph', this.audionodes.gain, this.audionodes
                 }
               }
             });
-            if (this.pendingScripts) {
+            if (!this.loaded && this.pendingScripts) {
               // We're still waiting for the room to finish loading, so wait for the room_load_complete event before checking if we need to load anything else
               this.addEventListener('room_load_complete', (ev) => {
                 // Room and all of its assets have finished loading. If our required component still isn't available, check the master package list and autoload if possible
                 if (!finished) {
                   this.loadComponentList().then(components => {
                     if (components[k]) {
-                      this.loadNewAsset('script', { src: components[k].url });
+                      this.loadNewAsset('script', { src: components[k].url, override: { room: this.getProxyObject() } });
                       this._target.loadScripts([{src: components[k].url}]);
                     }
                   });
@@ -2480,7 +2599,7 @@ console.log('connect room audio to graph', this.audionodes.gain, this.audionodes
               // Room is already loaded and scripts are processed - we still don't know about this component, so load it up
               this.loadComponentList().then(components => {
                 if (components[k]) {
-                  this.loadNewAsset('script', { src: components[k].url });
+                  this.loadNewAsset('script', { src: components[k].url, override: { room: this.getProxyObject() } });
                   this._target.loadScripts([{src: components[k].url}]);
                 }
               });
@@ -2534,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;
@@ -2546,9 +2665,12 @@ console.log('dispatch to parent', event, this, event.target);
       this.loaded = false;
     }
     this.contains = function(obj) {
+      if (obj._target) obj = obj._target;
+      let room = this;
+      if (this._target) room = this._target;
       let ptr = obj;
       while (ptr.parent) {
-        if (ptr.parent == this) return true;
+        if (ptr.parent == room) return true;
         ptr = ptr.parent;
       }
       return false;
@@ -2612,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

@@ -14,7 +14,7 @@ elation.require(['janusweb.janusbase'], function() {
         pitch: { type: 'float', default: 1.0, set: this.updateSound },
         gain: { type: 'float', default: 1.0, set: this.updateSound },
         starttime: { type: 'float', default: 0.0, set: this.updateSound },
-        distanceModel: { type: 'string', set: this.updateSound },
+        distancemodel: { type: 'string', default: 'inverse', set: this.updateSound },
         rolloff: { type: 'float', default: 1.0, set: this.updateSound },
         rect: { type: 'string', set: this.updateSound }
       });
@@ -36,7 +36,7 @@ elation.require(['janusweb.janusbase'], function() {
       }
     }
     this.createAudio = async function(src, audionodes) {
-      var sound = this.getAsset('sound', this.sound_id);
+      var sound = this.getAsset('sound', this.sound_id, true);
       if (!src) {
         this.currentsound = this.sound_id;
         if (sound && sound.src) {
@@ -58,8 +58,8 @@ elation.require(['janusweb.janusbase'], function() {
           this.audio = new THREE.Audio(audionodes.listener);
         } else {
           this.audio = new THREE.PositionalAudio(audionodes.listener);
-          if (this.properties.distanceModel) {
-            this.audio.panner.distanceModel = this.properties.distanceModel;
+          if (this.properties.distancemodel) {
+            this.audio.panner.distanceModel = this.properties.distancemodel;
           }
           //this.audio.panner.maxDistance = this.properties.distance;
           if (this.dist) {
@@ -131,6 +131,9 @@ elation.require(['janusweb.janusbase'], function() {
           await this.createAudio();
         }
         if (this.audio && this.audio.buffer) { //this.audio.source && this.audio.source.buffer) {
+          if (this.audio.source) {
+            this.audio.stop();
+          }
           this.audio.setVolume(this.gain);
           if (this.audio.isPlaying) {
             this.audio.source.currentTime = 0;
@@ -173,7 +176,7 @@ elation.require(['janusweb.janusbase'], function() {
         if (this.audio instanceof THREE.PositionalAudio) {
           this.audio.setRolloffFactor(this.rolloff);
           this.audio.setRefDistance(this.dist);
-          this.audio.setDistanceModel(this.distanceModel);
+          this.audio.setDistanceModel(this.distancemodel);
         }
       }
       if (this.rect) {
@@ -220,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'],