janusweb 1.5.29 → 1.5.33

package/media/assets/webui/apps/comms/voip.js

@@ -163,6 +163,11 @@ console.log('leave room and remove all occupants', this.room);
     elation.events.add(player._target, 'username_change', (ev) => this.handleUsernameChange(ev));
     elation.events.fire({type: 'init', element: this});
   }
+  disconnect() {
+    if (this.sfu) {
+      this.sfu.adapter.disconnect();
+    }
+  }
   initRoom(room) {
     let sfu = this.sfu;
     if (!room.private) {
@@ -197,21 +202,19 @@ elation.elements.define('janus-voip-client-hifi', class extends elation.elements
     let localuser = this.parentNode.localuser;
     this.remoteusers[localuser.userid] = localuser;
 
-console.log('create hifi client', this);
     elation.file.get('js', 'https://hifi-spatial-audio-api.s3.amazonaws.com/releases/latest/HighFidelityAudio-latest.js', (ev) => {
       this.connect();
-console.log('FIRE HIFI INIT');
       elation.events.fire({type: 'init', element: this});
     });
     this.roomid = room.voipid || '2bfa2bd1-9338-46c3-b740-e339303a1225';
   }
   async connect() {
     let currentPosition = new HighFidelityAudio.Point3D({ "x": 0, "y": 0, "z": 0 });
-    let currentOrientation = new HighFidelityAudio.OrientationQuat3D({ x: 0, y: 0, z: 0, w: 1});
+    let currentOrientation = new HighFidelityAudio.Quaternion({ x: 0, y: 0, z: 0, w: 1});
 
     let initialHiFiAudioAPIData = new HighFidelityAudio.HiFiAudioAPIData({
       position: currentPosition,
-      orientationQuat: currentOrientation,
+      orientation: currentOrientation,
       providedUserID: player.getNetworkUsername(),
      });
     let hifiCommunicator = new HighFidelityAudio.HiFiCommunicator({ initialHiFiAudioAPIData });
@@ -231,7 +234,6 @@ console.log('voip picker select?', ev);
     });
 */
 
-console.log('new hifi client has existing input stream?', this.inputstream);
     if (this.inputstream) {
       hifiCommunicator.setInputAudioMediaStream(this.inputstream);
     }
@@ -262,7 +264,7 @@ console.log('new hifi client has existing input stream?', this.inputstream);
     let newUserDataSubscription = new HighFidelityAudio.UserDataSubscription({
       components: [
         HighFidelityAudio.AvailableUserDataSubscriptionComponents.Position,
-        HighFidelityAudio.AvailableUserDataSubscriptionComponents.OrientationQuat,
+        HighFidelityAudio.AvailableUserDataSubscriptionComponents.Orientation,
         HighFidelityAudio.AvailableUserDataSubscriptionComponents.VolumeDecibels
       ],
       callback: audioDataArray => this.handleUserDataSubscription(audioDataArray)
@@ -273,7 +275,7 @@ console.log('new hifi client has existing input stream?', this.inputstream);
 /*
     this.userData = {
       position: currentPosition,
-      orientationQuat: currentOrientation,
+      orientation: currentOrientation,
       providedUserID: player.getNetworkUsername(),
     };
 */
@@ -308,10 +310,10 @@ console.log('new hifi client has existing input stream?', this.inputstream);
       this.userData.position.y = pos.y * scale;
       this.userData.position.z = pos.z * scale;
 
-      this.userData.orientationQuat.x = orientation.x;
-      this.userData.orientationQuat.y = orientation.y;
-      this.userData.orientationQuat.z = orientation.z;
-      this.userData.orientationQuat.w = orientation.w;
+      this.userData.orientation.x = orientation.x;
+      this.userData.orientation.y = orientation.y;
+      this.userData.orientation.z = orientation.z;
+      this.userData.orientation.w = orientation.w;
 
       if (this.hifiCommunicator._currentHiFiAudioAPIData) {
         this.hifiCommunicator.updateUserDataAndTransmit(this.userData);
@@ -366,7 +368,7 @@ elation.elements.define('janus-voip-localuser', class extends elation.elements.b
     this.defineAttribute('userid', { type: 'string', });
     this.defineAttribute('muted', { type: 'boolean', default: true, });
     this.defineAttribute('speaking', { type: 'boolean', default: false });
-
+    this.defineAttribute('threshold', { type: 'float', default: .2 });
   }
   create() {
     this.userid = player.getNetworkUsername();
@@ -428,6 +430,30 @@ elation.elements.define('janus-voip-localuser', class extends elation.elements.b
 */
     this.stream = data;
 
+    let listener = player.engine.systems.sound.getRealListener();
+    let context = listener.context;
+    let analyser = context.createAnalyser();
+    let source = context.createMediaStreamSource(this.stream);
+    source.connect(analyser);
+
+    analyser.fftSize = 32;
+    this.analyser = analyser;
+    this.audiobuffer = new Uint8Array(analyser.frequencyBinCount);
+
+    if (this.updateVolumeInterval) {
+      clearInterval(this.updateVolumeInterval);
+      this.updateVolumeInterval = false;
+    }
+    this.updateVolumeInterval = setInterval(() => {
+      analyser.getByteFrequencyData(this.audiobuffer);
+      let sum = 0;
+      for (let i = 0; i < this.audiobuffer.length; i++) {
+        sum += this.audiobuffer[i];
+      }
+      let avg = sum / this.audiobuffer.length;
+      this.updateVolume(avg / 100);
+    }, 20);
+
 /*
     player.createObject('object', {
       id: 'cone',
@@ -457,15 +483,24 @@ elation.elements.define('janus-voip-localuser', class extends elation.elements.b
     this.averagevolume = (percent * .6 + this.averagevolume * .4)
     if (isNaN(this.averagevolume)) this.averagevolume = 0;
     //this.style.opacity = percent;
-    if (this.averagevolume > .1) {
+    if (this.averagevolume > this.threshold) {
       this.speaking = true;
+      player.defaultanimation = 'speak';
       if (this.colorreset) {
         clearTimeout(this.colorreset);
       } 
       this.colorreset = setTimeout(() => {
         this.speaking = false;
         this.colorreset = false;
+        player.defaultanimation = 'idle';
       }, 200);
+      if (player.ghost) {
+        player.ghost.setSpeakingVolume(this.averagevolume);
+      }
+    } else {
+      if (player.ghost) {
+        player.ghost.setSpeakingVolume(0);
+      }
     }
   }
   
@@ -479,6 +514,7 @@ elation.elements.define('janus-voip-remoteuser', class extends elation.elements.
       'hasvideo': { type: 'boolean', default: false },
       'averagevolume': { type: 'float', default: 0 },
       'speaking': { type: 'boolean', default: false },
+      'threshold': { type: 'float', default: .2 },
     });
     this.lastposition = V();
     setTimeout(() => this.setAttribute('active', true), 100);
@@ -520,6 +556,30 @@ elation.elements.define('janus-voip-remoteuser', class extends elation.elements.
       this.audio = audio;
       this.appendChild(audio);
       this.hasaudio = true;
+
+      let listener = player.engine.systems.sound.getRealListener();
+      let context = listener.context;
+      let analyser = context.createAnalyser();
+      let source = context.createMediaStreamSource(audio.srcObject);
+      source.connect(analyser);
+
+      analyser.fftSize = 32;
+      this.analyser = analyser;
+      this.audiobuffer = new Uint8Array(analyser.frequencyBinCount);
+
+      if (this.updateVolumeInterval) {
+        clearInterval(this.updateVolumeInterval);
+        this.updateVolumeInterval = false;
+      }
+      this.updateVolumeInterval = setInterval(() => {
+        analyser.getByteFrequencyData(this.audiobuffer);
+        let sum = 0;
+        for (let i = 0; i < this.audiobuffer.length; i++) {
+          sum += this.audiobuffer[i];
+        }
+        let avg = sum / this.audiobuffer.length;
+        this.updateVolume(avg / 100);
+      }, 20);
     }
 
     let remoteuser = janus.network.remoteplayers[this.id];
@@ -598,7 +658,9 @@ elation.elements.define('janus-voip-remoteuser', class extends elation.elements.
 
       elation.events.add(this.remoteuser, 'update', ev => {
         // Store user's last known position so we know where they were once they leave
-        this.remoteuser.localToWorld(this.lastposition.set(0,0,0));
+        if (this.lastposition) {
+          this.remoteuser.localToWorld(this.lastposition.set(0,0,0));
+        }
       });
     }
 
@@ -653,7 +715,7 @@ elation.elements.define('janus-voip-remoteuser', class extends elation.elements.
     if (isNaN(this.averagevolume)) this.averagevolume = 0;
     //this.style.opacity = percent;
 //console.log('update volume', percent, this);
-    if (this.averagevolume > .1) {
+    if (this.averagevolume > this.threshold) {
       this.speaking = true;
       if (this.colorreset) {
         clearTimeout(this.colorreset);
@@ -664,10 +726,9 @@ elation.elements.define('janus-voip-remoteuser', class extends elation.elements.
       }, 200);
     }
 
-    let scale = 1 + this.averagevolume / 2.5;
     if (this.label3d) {
       this.label3d.setAudioVolume(this.averagevolume);
-      this.label3d.scale.set(scale, scale, scale);
+      this.remoteuser.setSpeakingVolume(this.averagevolume);
     }
   }
 });
@@ -680,6 +741,9 @@ elation.elements.define('janus-voip-picker', class extends elation.elements.base
          <!-- li><ui-togglebutton name="video" disabled="1">With my webcam</ui-togglebutton></li -->
        </ul>
     `, this);
+    this.defineAttributes({
+      'showvideo': { type: 'boolean', default: true },
+    });
 
     elation.events.add(this.elements.none, 'click', (ev) => this.handleSelectNone());
     elation.events.add(this.elements.audio, 'click', (ev) => this.handleSelectAudio(ev));
@@ -689,7 +753,7 @@ elation.elements.define('janus-voip-picker', class extends elation.elements.base
     if (this.voipconfig) {
       // FIXME - starting the audio without explicitly asking the user within this session is bad, but we want to resume across refreshes
       //         We should use a session cookie-based timeout in addition to the localStorage settings
-      //this.handleSelectAudio({detail: 1});
+      this.handleSelectAudio({detail: 1});
     }
     console.log('voip picker loaded config', this.voipconfig);
   }
@@ -710,7 +774,7 @@ elation.elements.define('janus-voip-picker', class extends elation.elements.base
     console.log('selected audio', ev.detail, this.voipconfig);
     //janus.engine.systems.sound.enableSound();
     if (!this.subpicker) {
-      this.subpicker = elation.elements.create('janus-voip-picker-audio', { config: (this.voipconfig ? JSON.stringify(this.voipconfig) : false) });
+      this.subpicker = elation.elements.create('janus-voip-picker-audio', { config: (this.voipconfig ? JSON.stringify(this.voipconfig) : false), showvideo: this.showvideo });
       elation.events.add(this.subpicker, 'select', ev => {
 console.log('SELECTED', ev.detail);
         document.dispatchEvent(new CustomEvent('voip-picker-select', { detail: ev.detail }));
@@ -734,8 +798,9 @@ elation.elements.define('janus-voip-picker-audio', class extends elation.element
   create() {
     this.defineAttributes({
       'config': { type: 'object', default: false },
+      'showvideo': { type: 'boolean', default: true },
     });
-    this.elements = elation.elements.fromString(`
+    let tplstr = `
       <div class="permissions" name="permissions">
         <ui-spinner></ui-spinner>
         Waiting for permission to be granted
@@ -747,20 +812,27 @@ elation.elements.define('janus-voip-picker-audio', class extends elation.element
           <janus-voip-picker-mictest name="mictest" width="75" height="25"></janus-voip-picker-mictest>
         </li>
         <!-- li><ui-select name="outputDevice" label="Output"></ui-select></li -->
-        <li><ui-toggle name="echoCancellation" label="Echo Cancellation"></ui-toggle></li>
-        <li><ui-toggle name="noiseSuppression" label="Noise Reduction"></ui-toggle></li>
-      </ul>
-      <h3>Video</h3>
-      <ul>
-        <li><ui-toggle name="webcamEnabled" label="Webcam"></ui-toggle></li>
-        <li>
-          <ui-select name="videoDevice" label="Webcam" hidden="1"></ui-select>
-          <janus-voip-picker-videotest name="videotest" width="150" height="150"></janus-voip-picker-videotest>
-        </li>
+        <li><ui-toggle name="echoCancellation" label="Echo Cancellation" checked></ui-toggle></li>
+        <li><ui-toggle name="noiseSuppression" label="Noise Reduction" checked></ui-toggle></li>
       </ul>
+    `;
+  
+    if (this.showvideo && this.showvideo != 'false') {
+       tplstr += `<h3>Video</h3>
+        <ul>
+          <li><ui-toggle name="webcamEnabled" label="Webcam"></ui-toggle></li>
+          <li>
+            <ui-select name="videoDevice" label="Webcam" hidden="1"></ui-select>
+            <janus-voip-picker-videotest name="videotest" width="150" height="150"></janus-voip-picker-videotest>
+          </li>
+        </ul>
+      `;
+    }
+    tplstr += `
       <ui-label name="error" hidden></ui-label>
       <ui-button name="submit">Continue</ui-button>
-    `, this);
+    `;
+    this.elements = elation.elements.fromString(tplstr, this);
 
     if (this.config) {
       console.log('I have a config!', this.config);
@@ -771,7 +843,9 @@ elation.elements.define('janus-voip-picker-audio', class extends elation.element
     //this.getUserMedia();
 
     this.elements.inputDevice.addEventListener('change', (ev) => this.getUserMedia());
-    this.elements.videoDevice.addEventListener('change', (ev) => this.getUserMedia());
+    if (this.elements.videoDevice) {
+      this.elements.videoDevice.addEventListener('change', (ev) => this.getUserMedia());
+    }
     //this.elements.outputDevice.addEventListener('change', (ev) => this.getUserMedia());
     elation.events.add(this.elements.echoCancellation, 'toggle', (ev) => this.getUserMedia());
     elation.events.add(this.elements.noiseSuppression, 'toggle', (ev) => this.getUserMedia());
@@ -803,11 +877,14 @@ elation.elements.define('janus-voip-picker-audio', class extends elation.element
 
         // FIXME - I'm not really using these UI elements properly here, I shouldn't be mucking with the HTML elements directly
         inputs.select.innerHTML = '';
-        cameras.select.innerHTML = '';
-        //outputs.select.innerHTML = '';
-
         let hasWebcamPermission = true;
-        let webcamDisabled = elation.elements.create('option', {innerHTML: 'Disabled', value: 'none', append: cameras.select});
+        let webcamDisabled;
+        if (cameras) {
+          cameras.select.innerHTML = '';
+          //outputs.select.innerHTML = '';
+
+          webcamDisabled = elation.elements.create('option', {innerHTML: 'Disabled', value: 'none', append: cameras.select});
+        }
         devices.forEach(d => {
           if (d.kind == 'audioinput') {
             elation.elements.create('option', {innerHTML: d.label, value: d.deviceId, append: inputs.select});
@@ -821,16 +898,18 @@ elation.elements.define('janus-voip-picker-audio', class extends elation.element
             elation.elements.create('option', {innerHTML: d.label, value: d.deviceId, append: outputs.select});
           }
         });        
-        if (hasWebcamPermission && this.elements.videoDevice.hidden ) {
-          this.elements.webcamEnabled.hide();
-          this.elements.videoDevice.show();
-          let option = this.elements.videoDevice.select.childNodes[0];
-          option.selected = true;
-          this.elements.videoDevice.select.value = option.value;
-        } else {
-          console.log('NO WEBCAM PERMISSION');
-          this.elements.webcamEnabled.show();
-          this.elements.videoDevice.hide();
+        if (this.elements.videoDevice) {
+          if (hasWebcamPermission && this.elements.videoDevice.hidden ) {
+            this.elements.webcamEnabled.hide();
+            this.elements.videoDevice.show();
+            let option = this.elements.videoDevice.select.childNodes[0];
+            option.selected = true;
+            this.elements.videoDevice.select.value = option.value;
+          } else {
+            console.log('NO WEBCAM PERMISSION');
+            this.elements.webcamEnabled.show();
+            this.elements.videoDevice.hide();
+          }
         }
         this.elements.permissions.style.display = 'none';
 
@@ -840,7 +919,7 @@ elation.elements.define('janus-voip-picker-audio', class extends elation.element
             //this.elements.inputDevice.select.value = this.voipconfig.inputDevice;
             this.elements.inputDevice.setSelected(voipconfig.inputDevice);
           }
-          if (voipconfig.videoDevice) {
+          if (voipconfig.videoDevice && this.elements.videoDevice) {
             this.elements.videoDevice.setSelected(voipconfig.videoDevice);
           }
           //this.dispatchEvent(new CustomEvent('select', {detail: this.stream})); 
@@ -862,7 +941,7 @@ elation.elements.define('janus-voip-picker-audio', class extends elation.element
       console.log('input!', this.elements.inputDevice.value);
       constraints.audio.deviceId = { exact: this.elements.inputDevice.value };
     }
-    if (this.elements.videoDevice.value && this.elements.videoDevice.value != 'none') {
+    if (this.elements.videoDevice && this.elements.videoDevice.value && this.elements.videoDevice.value != 'none') {
       console.log('video!', this.elements.videoDevice.value);
       constraints.video = {
         deviceId: { exact: this.elements.videoDevice.value },
@@ -886,7 +965,9 @@ elation.elements.define('janus-voip-picker-audio', class extends elation.element
       .then(stream => {
         this.elements.submit.disabled = false;
         this.elements.mictest.setStream(stream);
-        this.elements.videotest.setStream(stream);
+        if (this.elements.videotest) {
+          this.elements.videotest.setStream(stream);
+        }
         if (this.stream) {
           let tracks = this.stream.getTracks();
           tracks.forEach(t => {
@@ -923,10 +1004,12 @@ elation.elements.define('janus-voip-picker-audio', class extends elation.element
     ];
     keys.forEach(k => {
       let el = this.elements[k];
-      if (el instanceof elation.elements.ui.toggle) {
-        settings[k] = this.elements[k].checked;
-      } else {
-        settings[k] = this.elements[k].value;
+      if (this.elements[k]) {
+        if (el instanceof elation.elements.ui.toggle) {
+          settings[k] = this.elements[k].checked;
+        } else {
+          settings[k] = this.elements[k].value;
+        }
       }
     });
     return settings;
@@ -949,8 +1032,8 @@ elation.elements.define('janus-voip-picker-audio', class extends elation.element
       if ('inputDevice' in settings) this.elements['inputDevice'].setSelected(settings['inputDevice']);
       if ('echoCancellation' in settings) this.elements['echoCancellation'].checked = settings['echoCancellation'];
       if ('noiseSuppression' in settings) this.elements['noiseSuppression'].checked = settings['noiseSuppression'];
-      if ('webcamEnabled' in settings) this.elements['webcamEnabled'].checked = settings['webcamEnabled'];
-      if ('videoDevice' in settings) this.elements['videoDevice'].setSelected(settings['videoDevice']);
+      if ('webcamEnabled' in settings && this.elements['webcamEnabled']) this.elements['webcamEnabled'].checked = settings['webcamEnabled'];
+      if ('videoDevice' in settings && this.elements['videoDevice']) this.elements['videoDevice'].setSelected(settings['videoDevice']);
 
       this.currentsettings = settings;
     }

package/media/assets/webui/apps/editor/editor.js

@@ -1104,9 +1104,11 @@ console.log('change color', obj.col, vec);
       }
     }
     this.history.push({type: 'addobjects', objects: objects});
+    /*
     if (janus.engine.systems.admin.hidden) {
       janus.engine.systems.controls.requestPointerLock();
     }
+    */
   }
   handleThingAdd(ev) {
     setTimeout(() => {

package/media/assets/webui/apps/inventory/inventory.html

@@ -37,6 +37,7 @@
       <ui-tab label="Room Assets">
         <janus-ui-inventory-roomassets></janus-ui-inventory-roomassets>
       </ui-tab>
+      <!-- Disabled Google Poly - maybe one day ICOSA Gallery or someone else will offer the old Google Blocks API again
       <ui-tab label="Google Poly"> 
         <ui-flexpanel id="poly" vertical>
           <ui-input noflex placeholder="Search for Google Poly models" onaccept="let models = document.getElementById('models'); models.apiargs.keywords = this.value; delete models.apiargs.pageToken; document.getElementById('itemlist').clear(); models.load(); pagination.disabled = false;"></ui-input>
@@ -44,16 +45,18 @@
           <ui-button noflex id="pagination" onclick="let models = document.getElementById('models'); if (models.rawdata.nextPageToken) { models.apiargs.pageToken = models.rawdata.nextPageToken; models.append(); } else { this.disabled = true; }">Load More</ui-button>
         </ui-flexpanel>
       </ui-tab>
-
+      -->
       <ui-tab label="Vesta">
           <h3>Vesta integration coming soon!</h3>
           <p>When it's ready, you'll be able to access assets you've stored on your Vesta account, and bring them with you anywhere you go.</p>
           <p><a href="https://vesta.janusvr.com/">Sign up for a vesta account today</a></p>
       </ui-tab>
       <ui-tab label="Import">
-        <h3>Did you know?</h3>
-        <p>You can drag 3d models, images, videos, and sounds into Janus rooms from other websites, or even your local hard drive!</p>
-        <p>Just select the files, drag them over, and drop them into the world.  Then use our in-world editing tools to place it where you want it to be.</p>
+        <div>
+          <h3>Did you know!?</h3>
+          <p>You can drag 3d models, images, videos, and sounds into Janus rooms from other websites, or even your local hard drive!</p>
+          <p>Just select the files, drag them over, and drop them into the world.  Then use our in-world editing tools to place it where you want it to be.</p>
+        </div>
       </ui-tab>
     </ui-tabs>
 

package/media/assets/webui/apps/inventory/inventory.js

@@ -6,7 +6,7 @@ elation.elements.define('janus.ui.inventory', class extends elation.elements.bas
     console.log('INVENTORY ELEMENTS', elements);
     if (elements.primitives) {
       elation.events.add(elements.primitives, 'select', (ev) => this.handlePrimitiveSelect(ev));
-      elation.events.add(elements.polyobjects, 'select', (ev) => this.handleAssetSelect(ev));
+      //elation.events.add(elements.polyobjects, 'select', (ev) => this.handleAssetSelect(ev));
     }
   }
   addSource(name, collection) {

package/media/assets/webui/apps/locomotion/teleporter.js

@@ -18,7 +18,7 @@ janus.registerElement('locomotion_teleporter', {
       shadow: false,
       shadow_cast: false,
       shadow_receive: false,
-      renderorder: 20,
+      renderorder: 51,
       depth_test: false,
       depth_write: false,
     });
@@ -31,7 +31,7 @@ janus.registerElement('locomotion_teleporter', {
       shadow: false,
       shadow_cast: false,
       shadow_receive: false,
-      renderorder: 10,
+      renderorder: 50,
     });
     this.pointer = this.marker.createObject('Object', {
       id: 'pyramid',
@@ -44,6 +44,7 @@ janus.registerElement('locomotion_teleporter', {
       shadow: false,
       shadow_cast: false,
       shadow_receive: false,
+      renderorder: 52,
     });
 /*
     this.light = this.createObject('Light', {
@@ -82,7 +83,7 @@ janus.registerElement('locomotion_teleporter', {
       depth_write: false,
       shadow_cast: false,
       shadow_receive: false,
-      renderorder: 100,
+      renderorder: 1000,
       visible: false,
     });
 
@@ -124,8 +125,8 @@ janus.registerElement('locomotion_teleporter', {
     });
     this.activateControlContext('teleporter');
 
-    room.addEventListener('mousedown', (ev) => this.handleMouseDown(ev));
-    room.addEventListener('mouseup', (ev) => this.handleMouseUp(ev));
+    //room.addEventListener('mousedown', (ev) => this.handleMouseDown(ev));
+    //room.addEventListener('mouseup', (ev) => this.handleMouseUp(ev));
     elation.events.add(janus._target, 'room_change', (ev) => this.handleRoomChange(ev));
   },
   update() {
@@ -184,7 +185,7 @@ janus.registerElement('locomotion_teleporter', {
         }
       }
       this.laser.updateLine();
-      if (this.laser.room !== room) room.appendChild(this.laser);
+      if (this.laser.room !== room._target) room.appendChild(this.laser);
       this.pointer.orientation._target.setFromEuler(new THREE.Euler(Math.PI/2, this.teleportangle, 0, "YXZ"));
     } else {
       if (this.shroud.visible) {
@@ -327,8 +328,8 @@ janus.registerElement('locomotion_teleporter', {
     if (!room.teleport) return;
     this.visible = true;
     this.particles.visible = true;
-    if (this.laser.room !== room) room.appendChild(this.laser);
-    if (this.particles.room !== room) room.appendChild(this.particles);
+    if (this.laser.room !== room._target) room.appendChild(this.laser);
+    if (this.particles.room !== room._target) room.appendChild(this.particles);
     this.laser.visible = true;
     this.active = true;
     this.particles.start();

package/media/assets/webui/apps/settings/settings.html

@@ -2,7 +2,7 @@
   <ui-tab label="Identity">
     <ui-formgroup>
       <janus-username-picker></janus-username-picker>
-      <ui-textarea label="Avatar"></ui-textarea>
+      <!-- ui-textarea label="Avatar"></ui-textarea -->
       <janus-avatar-picker src="https://janusxr.org/vrto2020/avatars.json"></janus-avatar-picker>
     </ui-formgroup>
     <!-- janus-viewer-avatar src="https://kool.website/avatars/chibii/1/1.txt" width="500" height="200"></janus-viewer-avatar -->

package/media/assets/webui/apps/virtualgamepad/virtualgamepad.js

@@ -97,13 +97,15 @@ this.debug.style.zIndex = '1000';
     }
 
     let janus = elation.component.fetch(this.queryParentSelector('[data-elation-component="janusweb.client"]'))
-    janus.engine.systems.controls.addVirtualGamepad(this);
-    this.hide();
-    janus.engine.systems.render.renderer.domElement.addEventListener('touchstart', (ev) => {
-      this.show();
-      this.reset();
-      if (!player.enabled) player.enable();
-    });
+    if (janus) {
+      janus.engine.systems.controls.addVirtualGamepad(this);
+      this.hide();
+      janus.engine.systems.render.renderer.domElement.addEventListener('touchstart', (ev) => {
+        this.show();
+        this.reset();
+        if (!player.enabled) player.enable();
+      });
+    }
   }
   reset() {
     for (let i = 0; i < this.axes.length; i++) {

package/media/assets/webui/apps/xrmenu/xrmenu.js

@@ -14,6 +14,10 @@ janus.registerElement('xrmenu', {
     });
 */
 
+    this.worldpos = V();
+    this.worlddir = V();
+    this.playervec = V();
+
     let xrmenu = janus.ui.apps.default.apps.xrmenu;
     let asseturl = xrmenu.resolveFullURL('./xrmenu-assets.json');
     fetch(asseturl).then(res => res.json()).then(assetlist => {
@@ -66,10 +70,11 @@ janus.registerElement('xrmenu', {
       button.pos.x = (-width / 2) + (this.buttonwidth * this.buttonmargin * (i + .5)) ;
     }
   },
+/*
   update() {
-    let worldpos = this.localToWorld(V());
-    let worlddir = this.localToWorld(V(0, 0, 1)).sub(worldpos).normalize();
-    let playervec = player.head.localToWorld(V()).sub(worldpos).normalize();
+    let worldpos = this.localToWorld(this.worldpos.set(0,0,0));
+    let worlddir = this.localToWorld(this.worlddir.set(0,0,1)).sub(worldpos).normalize();
+    let playervec = player.head.localToWorld(this.playervec.set(0,0,0)).sub(worldpos).normalize();
     let dot = playervec.dot(worlddir);
     let opacity = Math.max(0, dot);
     for (let k in this.buttons) {
@@ -79,6 +84,7 @@ janus.registerElement('xrmenu', {
     }
     //this.backing.opacity = opacity;
   },
+*/
 });
 janus.registerElement('xrmenu-button', {
   onactivate: null,
@@ -122,6 +128,8 @@ janus.registerElement('xrmenu-popup', {
   element: null,
   width: 512,
   height: 512,
+  depth_test: true,
+  renderorder: 0,
 
   create() {
 
@@ -160,7 +168,6 @@ container.style.opacity = 0;
 this.elementcontainer = container;
 
 setTimeout(() => {
-console.log('my element', element);
     let canvas = element.toCanvas(this.width, this.height, 1);
 /*
 document.body.appendChild(canvas);
@@ -186,6 +193,8 @@ canvas.style.border = '1px solid red';
       lighting: false,
       //image_id: 'xrmenu-element-canvas',
       scale: V(1, this.height / this.width, 1),
+      depth_test: this.depth_test,
+      renderorder: this.renderorder,
     });
     this.element = element;
     this.plane.addEventListener('mousemove', ev => this.handleMouse(ev));

package/media/assets/webui/none.json

@@ -0,0 +1 @@
+{}

package/media/assets.json

@@ -101,7 +101,8 @@
 
   { "assettype":"model", "name":"avatar", "src":"assets/avatar.obj", "tex0": "avatar_tex0" },
   { "assettype":"model", "name":"avatar_head", "src":"assets/avatar_head.obj", "tex0": "avatar_head_tex0" },
-  { "assettype":"model", "name":"avatar_gltf", "src":"assets/Beta.gltf/Beta.gltf" },
+  { "assettype":"model", "name":"avatar_gltf", "src":"assets/janus-avatar-base.glb" },
+  { "assettype":"model", "name":"avatar_animations", "src":"assets/janus-avatar-animations.glb" },
 
   { "assettype":"image", "name":"avatar_tex0", "src":"assets/avatar.png", "preload": false },
   { "assettype":"image", "name":"avatar_head_tex0", "src":"assets/avatar_head.png", "preload": false },

package/media/index.html

@@ -34,7 +34,7 @@
     <script src="janusweb.js"></script>
   </head>
   <body>
-    <janus-viewer src="https://vesta.janusxr.org/"></janus-viewer>
+    <janus-viewer src="https://www.janusxr.org/"></janus-viewer>
   </body>
 </html>