janusweb 1.5.44 → 1.5.46

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.46",
   "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/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);