janusweb 1.5.44 → 1.5.47

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

@@ -102,7 +102,7 @@ elation.elements.define('janus-comms-userlist', class extends elation.elements.u
     elation.events.add(this.janusweb, 'room_load_start', (ev) => { this.updateRoom(ev.data); });
     elation.events.add(this.janusweb.network, 'janusweb_user_joined,janusweb_user_left,janusweb_user_disconnected', (ev) => this.updateUsers());
     setTimeout(() => {
-      this.updateUsers();
+      //this.updateUsers();
       this.updateRoom(room);
     }, 100);
   }
@@ -117,8 +117,10 @@ elation.elements.define('janus-comms-userlist', class extends elation.elements.u
   }
   updateRoom(room) {
     this.room = room;
-    this.innerHTML = '';
-    this.elements = elation.elements.fromTemplate('janus.comms.userlist', this);
+    //this.innerHTML = '';
+    if (!this.elements) {
+      this.elements = elation.elements.fromTemplate('janus.comms.userlist', this);
+    }
     this.userlist_room = this.userlist_room;
     this.userlist_online = this.userlist_online;
     this.userlist_friends = this.userlist_friends;
@@ -135,11 +137,12 @@ elation.elements.define('janus-comms-userlist', class extends elation.elements.u
     if (!janus.network) return;
     var remoteplayers = janus.network.remoteplayers;
     var users = Object.keys(remoteplayers);
-    users.unshift(player.userid);
+    //users.unshift(player.userid);
 
     if (this.elements.roomusers) {
       this.elements.roomusers.value = users.length;
     }
+    this.userlist_room = this.querySelector('ui-list[name="userlist_room"]');
     if (this.userlist_room) {
       this.userlist_room.setItems(users);
     }

package/media/assets/webui/themes/default.css

@@ -1235,7 +1235,7 @@ ui-spinner .loading-text {
   -webkit-animation: loading-text-opacity 2s linear 0s infinite normal;
   animation: loading-text-opacity 2s linear 0s infinite normal;
   color: #ffffff;
-  font-family: "Helvetica Neue, "Helvetica", ""arial";
+  font-family: "Helvetica Neue", "Helvetica", "arial";
   font-size: 10px;
   font-weight: bold;
   margin-top: 45px;

package/package.json

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

package/scripts/elements/outliner.js

@@ -69,6 +69,10 @@ elation.require(['janusweb.janusbase'], function() {
     },
     select(object) {
       this.selected = object;
+      if (!object) {
+        this.deselect();
+        return;
+      }
       let objmeshes = [], skinnedmeshes = [];
       object.traverseObjects(n => {
         if (n instanceof THREE.Mesh && n.material !== this.outlinematerial) {

package/scripts/external/JanusClientConnection.js

@@ -336,8 +336,8 @@ JanusClientConnection.prototype.connect = function() {
   this._websocket.onclose = function() {
     this.status = 0;
     this.dispatchEvent({type: 'disconnect'});
-    if (this.pendingReconnect) {
-      this.connect();
+    if (!this.pendingReconnect) {
+      this.reconnect();
     }
   }.bind(this);
 
@@ -346,10 +346,10 @@ JanusClientConnection.prototype.connect = function() {
 JanusClientConnection.prototype.reconnect = function(force) {
   var now = new Date().getTime();
   if (force || this.lastattempt + this.reconnectdelay <= now) {
+    this.pendingReconnect = true;
     if (this._websocket.readyState == this._websocket.OPEN) {
       console.log('Socket already connected, disconnecting');
       this.disconnect();
-      this.pendingReconnect = true;
     } else {
       console.log('Reconnecting...');
       this.connect();
@@ -392,12 +392,18 @@ JanusClientConnection.prototype.setUserId = function(userId) {
 };
 
 JanusClientConnection.prototype.send = function(msg) {
-  try {
-    this._websocket.send(JSON.stringify(msg) + '\r\n');
-  } catch (e) {
+  if (this._websocket.readyState == 3) {
     this.msgQueue.push(msg);
+    if (!this.pendingReconnect) {
+      this.reconnect();
+    }
+  } else {
+    try {
+      this._websocket.send(JSON.stringify(msg) + '\r\n');
+    } catch (e) {
+      this.msgQueue.push(msg);
+    }
   }
-  //this.reconnect();
 };
 
 JanusClientConnection.prototype.onMessage = function(msg) {

package/scripts/janusbase.js

@@ -191,7 +191,8 @@ elation.require(['engine.things.generic', 'utils.template', 'janusweb.parts'], f
                         emissive: 0x444400,
                         alphaTest: .01,
                         depthTest: false,
-                        depthWrite: false
+                        depthWrite: false,
+                        side: this.cull_face == 'none' ? THREE.DoubleSide : n.material.side,
                       });
                     }
                     n.userData.thing = this;

package/scripts/janusghost.js

@@ -393,7 +393,6 @@ elation.require(['janusweb.janusbase', 'engine.things.leapmotion'], function() {
         sourcecontainer.traverse(n => { /*console.log(' - ', n); */ if (n instanceof THREE.SkinnedMesh && n.skeleton) sourcemesh = n; });
       }
       this.objects['3d'].traverse(n => { if (n instanceof THREE.SkinnedMesh && n.skeleton) destmesh = n; });
-      //console.log('RETARGET ANI*MATION', clip, sourcemesh, destmesh, sourcecontainer);
       let remove = [];
       if (this.body && this.body.modelasset && this.body.modelasset.vrm) {
         let vrm = this.body.modelasset.vrm;
@@ -432,7 +431,6 @@ elation.require(['janusweb.janusbase', 'engine.things.leapmotion'], function() {
           let [name, property] = track.name.split('.');
           let srcbone = sourcemesh.skeleton.getBoneByName(name);
           let dstbone = destmesh.skeleton.getBoneByName(name);
-          //console.log(' - fix track', name, property, track, srcbone, dstbone);
           if (dstbone) {
             let scale = srcbone.position.length() / dstbone.position.length();
             if (property == 'position') {
@@ -447,6 +445,41 @@ elation.require(['janusweb.janusbase', 'engine.things.leapmotion'], function() {
             remove.push(track);
           }
         });
+      } else {
+        let armature = sourcecontainer.getObjectByName('Armature');
+        newclip.tracks.forEach(track => {
+          track.name = track.name.replace('mixamorig', '');
+          let p = track.name.split('.');
+          if (p[1] == 'position') {
+            for (let i = 0; i < track.values.length / 3; i++) {
+              track.values[i * 3] *= armature.scale.x;
+              track.values[i * 3 + 1] *= armature.scale.y;
+              track.values[i * 3 + 2] *= armature.scale.z;
+            }
+          }
+          if (p[0] == 'Hips') {
+            if (p[1] == 'position') {
+              let v = new THREE.Vector3();
+              for (let i = 0; i < track.values.length / 3; i++) {
+                v.set(track.values[i * 3], track.values[i * 3 + 1], track.values[i * 3 + 2]).applyQuaternion(armature.quaternion);
+                //console.log('position rotation', v, [track.values[i * 3], track.values[i * 3 + 1], track.values[i * 3 + 2]], track);
+                track.values[i * 3] = v.x;
+                track.values[i * 3 + 1] = v.y;
+                track.values[i * 3 + 2] = v.z;
+              }
+            } else if (p[1] == 'quaternion') {
+              //console.log('apply rotation', track);
+              let q = new THREE.Quaternion();
+              for (let i = 0; i < track.values.length / 4; i++) {
+                q.set(track.values[i * 4], track.values[i * 4 + 1], track.values[i * 4 + 2], track.values[i * 4 + 3]).premultiply(armature.quaternion);
+                track.values[i * 4] = q.x;
+                track.values[i * 4 + 1] = q.y;
+                track.values[i * 4 + 2] = q.z;
+                track.values[i * 4 + 3] = q.w;
+              }
+            }
+          }
+        });
       }
       remove.forEach(track => {
         let idx = newclip.tracks.indexOf(track);

package/scripts/janusxrplayer.js

@@ -313,7 +313,7 @@ elation.require(['engine.things.generic', 'janusweb.external.webxr-input-profile
             let visualResponse = component.visualResponses[k];
             // Find the topmost node in the visualization
             const valueNode = motionControllerRoot.getObjectByName(visualResponse.valueNodeName);
-
+            if (!valueNode) continue;
             // Calculate the new properties based on the weight supplied
             if (visualResponse.valueNodeProperty === 'visibility') {
               valueNode.visible = visualResponse.value;

package/scripts/multiplayermanager.js

@@ -103,7 +103,7 @@ elation.require(['janusweb.external.JanusClientConnection', 'janusweb.external.J
     }
     this.getServerForRoom = function(room) {
       var serverurl = this.getServerURLForRoom(room, true);
-      if (serverurl && !this.servers[serverurl]) {
+      if (serverurl && !this.servers[serverurl] && !room.private) {
         var server = new JanusClientConnection({
           host: serverurl,
           userId: this.janusweb.userId,

package/scripts/object.js

@@ -1018,10 +1018,10 @@ elation.require(['janusweb.janusbase', 'janusweb.websurface'], function() {
         m.opacity = (typeof oldmat.opacity != 'undefined' ? parseFloat(oldmat.opacity) : 1) * this.opacity;
         m.alphaTest = this.alphatest;
         m.aoMap = oldmat.aoMap;
-        m.normalMap = oldmat.normalMap;
-        m.bumpMap = oldmat.bumpMap;
-
         if (!(m instanceof THREE.MeshBasicMaterial)) {
+          m.normalMap = oldmat.normalMap;
+          m.bumpMap = oldmat.bumpMap;
+
           if (oldmat.emissiveMap) {
             m.emissiveMap = oldmat.emissiveMap;
             m.emissive.setRGB(1,1,1);

package/scripts/remoteplayer.js

@@ -141,7 +141,7 @@ elation.component.add('engine.things.remoteplayer', function() {
   this.setVolume = async function(volume) {
     if (this.mouth) {
       if (!this.mouth.audio) {
-        await this.mout.createAudio(null, listener);
+        await this.mouth.createAudio(null, listener);
       }
       this.mouth.audio.gain.gain.value = volume;
     }

package/scripts/room.js

@@ -93,6 +93,7 @@ elation.require([
         'onload': { type: 'string' },
         'sync': { type: 'boolean', default: false },
         'pointerlock': { type: 'boolean', default: true, set: this.updatePointerLock },
+        'players': { type: 'object', get: this.getRoomPlayers }
       });
 
       if (!roomTranslators) {
@@ -317,16 +318,26 @@ elation.require([
       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 (equi.loaded) {
+          this.skyboxtexture = equi.getInstance();
           this.skyboxtexture.mapping = THREE.EquirectangularReflectionMapping;
           this.skyboxtexture.encoding = THREE.sRGBEncoding;
           if (this.janus.currentroom === this) {
             this.skyboxobj.setTexture(this.skyboxtexture);
           }
           elation.events.fire({element: this, type: 'skybox_update'});
-        });
-        equi.getInstance();
+        } else {
+          elation.events.add(equi, 'asset_load', ev => {
+            this.skyboxtexture = ev.target._texture;
+            this.skyboxtexture.mapping = THREE.EquirectangularReflectionMapping;
+            this.skyboxtexture.encoding = THREE.sRGBEncoding;
+            if (this.janus.currentroom === this) {
+              this.skyboxobj.setTexture(this.skyboxtexture);
+            }
+            elation.events.fire({element: this, type: 'skybox_update'});
+          });
+          equi.getInstance();
+        }
       } else if (hasSkybox) {
         assets = [
           this.getAsset('image', this.skybox_right_id || 'black'),
@@ -2049,7 +2060,7 @@ elation.require([
         var hashargs = elation.url();
         var host = elation.utils.any(this.server, hashargs['janus.server'], elation.config.get('janusweb.network.host')),
             port = elation.utils.any(this.port, hashargs['janus.port'], elation.config.get('janusweb.network.port'), 5567);
-        this._server = this.janusweb.getConnection(host, port, this.url);
+        this._server = this.janus.network.getServerForRoom(this);
       }
       return this._server;
     }
@@ -2117,6 +2128,7 @@ elation.require([
           voipid: ['property', 'voipid'],
           voiprange: ['property', 'voiprange'],
           voipserver: ['property', 'voipserver'],
+          players: ['property', 'players'],
 
           localToWorld:  ['function', 'localToWorld'],
           worldToLocal:  ['function', 'worldToLocal'],
@@ -2797,6 +2809,7 @@ console.log('dispatch to parent', event, this, event.target);
           child.die();
         }
       }
+      elation.events.fire({type: 'janus_room_unload', element: this});
     }
     this.getAudioNodes = function() {
       return new Promise(async (resolve, reject) => {
@@ -2980,6 +2993,15 @@ console.log('unknown material', mat);
         }
       }
     }
+    this.getRoomPlayers = function() {
+      let players = {};
+      for (let k in janus.network.remoteplayers) {
+        if (this.janus.network.remoteplayers[k].room === this) {
+          players[k] = this.janus.network.remoteplayers[k];
+        }
+      }
+      return players;
+    }
   }, elation.engine.things.generic);
 });