janusweb 1.5.49 → 1.5.51

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

@@ -99,7 +99,7 @@ elation.elements.define('janus-comms-userlist', class extends elation.elements.u
     this.userlist_friends = this.elements.userlist_friends;
     this.usermarkers = {};
 
-    elation.events.add(this.janusweb, 'room_load_start', (ev) => { this.updateRoom(ev.data); });
+    elation.events.add(this.janusweb, 'room_load_start', (ev) => { this.updateRoom(ev.data || ev.element); });
     elation.events.add(this.janusweb.network, 'janusweb_user_joined,janusweb_user_left,janusweb_user_disconnected', (ev) => this.updateUsers());
     setTimeout(() => {
       //this.updateUsers();
@@ -209,7 +209,7 @@ elation.elements.define('janus-comms-chat', class extends elation.elements.base
       }
     });
     elation.events.add(janus._target, 'clientprint', (ev) => this.handleClientPrint(ev.data));
-    elation.events.add(this.janusweb, 'room_load_start', (ev) => { this.updateRoom(ev.data); });
+    elation.events.add(this.janusweb, 'room_load_start', (ev) => { this.updateRoom(ev.element); });
     // FIXME - first element with the current design is a <detail> element, but this is fragile if that changes
     this.elements[0].addEventListener('toggle', (ev) => this.elements.chatinput.focus());
     this.updateRoom(room);

package/package.json

@@ -1,12 +1,13 @@
 {
   "name": "janusweb",
   "description": "Web client for JanusVR worlds",
-  "version": "1.5.49",
+  "version": "1.5.51",
   "main": "scripts/janusweb.js",
   "author": "James Baicoianu",
   "license": "MIT",
   "scripts": {
     "postinstall": "./utils/init.sh",
+    "clean": "./utils/clean-build.sh",
     "build": "./utils/build.sh",
     "postversion": "git push origin v`npm view janusweb version`",
     "test": "./utils/activate.sh && ./node_modules/.bin/karma start tests/karma.conf.js --single-run",

package/scripts/client.js

@@ -9,9 +9,9 @@ elation.require(['elements.elements', 'elements', 'engine.engine', 'engine.asset
     var rootdir = elation.utils.any(args.rootdir, elation.config.get('dependencies.rootdir'), document.location.pathname);
     var path = elation.utils.any(args.path, elation.config.get('dependencies.path'), '/');
     var homepage = elation.utils.any(args.homepage, elation.config.get('janusweb.homepage'), document.location.href);
-    var corsproxy = elation.utils.any(args.corsproxy, elation.config.get('engine.assets.corsproxy'), document.location.href);
+    var corsproxy = elation.utils.any(args.corsproxy && args.corsproxy != 'false', elation.config.get('engine.assets.corsproxy'), document.location.href);
     var container = elation.utils.any(args.container, document.body);
-    var fullsize = elation.utils.any(args.fullsize, container == document.body);
+    var fullsize = elation.utils.any(args.fullsize && args.fullsize != 'false', container == document.body);
 
     if (elation.config.get('serviceworker.enabled') && 'serviceWorker' in navigator) {
       var workerscript = elation.config.get('serviceworker.script', 'service-worker.js');
@@ -65,11 +65,11 @@ elation.require(['elements.elements', 'elements', 'engine.engine', 'engine.asset
       append: container, 
       homepage: homepage, 
       corsproxy: corsproxy, 
-      showui: (args.showui && args.showui != "false"),
-      shownavigation: (args.shownavigation && args.shownavigation != "false"),
+      showui: elation.utils.any(args.showui && args.showui != "false", true),
+      shownavigation: elation.utils.any(args.shownavigation && args.shownavigation != "false", true),
       uiconfig: args.uiconfig,
-      showchat: elation.utils.any(args.showchat, true),
-      usevoip: elation.utils.any(args.usevoip, false),
+      showchat: elation.utils.any(args.showchat && args.showchat != 'false', true),
+      usevoip: elation.utils.any(args.usevoip && args.usevoip != 'false', false),
       resolution: args.resolution, 
       fullsize: fullsize,
       url: args.url,

package/scripts/janusbase.js

@@ -52,6 +52,7 @@ elation.require(['engine.things.generic', 'utils.template', 'janusweb.parts'], f
         hasposition: { type: 'boolean', default: true },
         gazetime: { type: 'float' },
         static: { type: 'boolean', default: false },
+        isinternal: { type: 'boolean', default: false },
         ongazeenter: { type: 'callback' },
         ongazeleave: { type: 'callback' },
         ongazeprogress: { type: 'callback' },

package/scripts/janusghost.js

@@ -38,6 +38,9 @@ elation.require(['janusweb.janusbase', 'engine.things.leapmotion'], function() {
           if (dist < maxdist) {
             diffuseColor.a = clamp(((dist - mindist) / (maxdist - mindist)), 0., 1.);
           }
+          if (diffuseColor.a <= 1e-4) {
+            discard;
+          }
         `;
       }
     }
@@ -124,6 +127,7 @@ elation.require(['janusweb.janusbase', 'engine.things.leapmotion'], function() {
       this.shoulders = this.createObject('object', {
         'js_id': this.properties.player_id + '_shoulders',
         'pos': V(0, 1.0, 0),
+        'isinternal': true,
       });
     }
     this.setGhostAssets = function(assets) {
@@ -234,23 +238,13 @@ elation.require(['janusweb.janusbase', 'engine.things.leapmotion'], function() {
               //pos: headpos.clone().negate(),
               //orientation: new THREE.Quaternion().setFromEuler(new THREE.Euler(0, Math.PI, 0)),
               //rotation: V(0, 180, 0),
-              lighting: this.lighting,
-              //cull_face: 'none'
-              opacity: 0.9999,
-              renderorder: this.renderorder || 100,
-              shader_chunk_replace: (this.lighting ? {
-                'color_fragment': 'color_fragment_discard_close',
-              } : {}),
             });
+            this.applyAvatarMaterial(this.face, 1);
             this.face.start();
           } else {
             this.face = headid;
             this.face.lighting = this.lighting;
-            this.face.opacity = 0.9999;
-            this.face.renderorder = this.renderorder || 100;
-            this.face.shader_chunk_replace = (this.lighting ? {
-              'color_fragment': 'color_fragment_discard_close',
-            } : {});
+            this.applyAvatarMaterial(this.face, 1);
             this.head.appendChild(headid);
             this.face.start();
           }
@@ -289,12 +283,9 @@ elation.require(['janusweb.janusbase', 'engine.things.leapmotion'], function() {
             rotation: V(0, 180, 0),
             lighting: this.lighting,
             //cull_face: 'none'
-            opacity: 0.9999,
-            renderorder: this.renderorder || 100,
-            shader_chunk_replace: (this.lighting ? {
-              'color_fragment': 'color_fragment_discard_close',
-            } : {}),
+            isinternal: true,
           });
+          this.applyAvatarMaterial(this.body, 0);
         } else {
           this.body = bodyid;
           this.appendChild(bodyid);
@@ -302,22 +293,10 @@ elation.require(['janusweb.janusbase', 'engine.things.leapmotion'], function() {
         if (pos) this.body.pos = pos;
         this.body.start();
         if (scale && this.body) this.body.scale.fromArray(scale);
-
-        elation.events.add(this, 'load', ev => {
-          if (this.body.modelasset) {
-            if (this.body.modelasset.loaded) {
-              this.loadAnimations();
-              if (this.animation_extras) {
-                this.loadAnimationExtras();
-              }
-            } else {
-              elation.events.add(this.body.modelasset, 'asset_load_complete', () => {
-                this.loadAnimations();
-                if (this.animation_extras) {
-                  this.loadAnimationExtras();
-                }
-              });
-            }
+        elation.events.add(this.body.modelasset, 'asset_load', ev => {
+          this.loadAnimations();
+          if (this.animation_extras) {
+            this.loadAnimationExtras();
           }
           // FIXME - this prevents avatars from being culled, which prevents our default mesh from disappearing but also means we lose out on possible performance optimizations in rooms with lots of avatars
           this.objects['3d'].traverse(n => {
@@ -448,7 +427,11 @@ elation.require(['janusweb.janusbase', 'engine.things.leapmotion'], function() {
       } else {
         let armature = sourcecontainer.getObjectByName('Armature') || sourcecontainer;
         newclip.tracks.forEach(track => {
-          track.name = track.name.replace('mixamorig', '');
+          //track.name = track.name.replace('mixamorig:', '');
+          let idx = track.name.indexOf(':');
+          if (idx > -1) {
+            track.name = track.name.substr(idx + 1);
+          }
           let p = track.name.split('.');
           if (p[1] == 'position') {
             for (let i = 0; i < track.values.length / 3; i++) {
@@ -701,19 +684,36 @@ elation.require(['janusweb.janusbase', 'engine.things.leapmotion'], function() {
           this.setBody(false);
         }
         if (ghostdef._children) {
+          let potentialAttachments = [];
           for (var type in ghostdef._children) {
             for (var i = 0; i < ghostdef._children[type].length; i++) {
               let js_id = ghostdef._children[type][i].js_id;
-              delete ghostdef._children[type][i].js_id;
+              //delete ghostdef._children[type][i].js_id;
+              ghostdef._children[type][i].isinternal = true;
               let childobj = this.createObject(type, ghostdef._children[type][i]);
               this.ghostchildren.push(childobj);
               if (js_id == 'head') {
                 this.setHead(childobj, headpos, ghostdef.scale);
               } else if (js_id == 'body') {
                 this.setBody(childobj, ghostdef.scale, ghostdef.pos);
+              } else {
+                potentialAttachments.push(childobj);
+                this.applyAvatarMaterial(childobj, 2);
+                childobj.traverse(obj => {
+                  this.applyAvatarMaterial(obj, 3);
+                });
               }
             }
           }
+          this.body.addEventListener('load', ev => {
+            for (let i = 0; i < potentialAttachments.length; i++) {
+              let obj = potentialAttachments[i];
+              if (obj.js_id in this.body.parts) {
+                this.body.parts[obj.js_id].add(obj);
+                this.applyAvatarMaterial(obj, 3);
+              }
+            }
+          });
         }
       }
     }
@@ -723,7 +723,8 @@ elation.require(['janusweb.janusbase', 'engine.things.leapmotion'], function() {
           'position': [0,1.0,0],
           'parent': this,
           'janus': this.janus,
-          'room': this.room
+          'room': this.room,
+          'isinternal': true,
         });
       }
       if (!this.hands) {
@@ -894,5 +895,13 @@ return;
       }
       return this._proxyobject;
     }
+    this.applyAvatarMaterial = function(obj, renderorderOffset=0) {
+      if (this.lighting && obj.lighting) {
+        obj.transparent = true;
+        if (obj.opacity == 1) obj.opacity = 0.9999;
+        if (!obj.renderorder) obj.renderorder = this.renderorder + renderorderOffset;
+        obj.shader_chunk_replace = { 'color_fragment': 'color_fragment_discard_close' };
+      }
+    }
   }, elation.engine.things.janusbase);
 });

package/scripts/object.js

@@ -44,7 +44,7 @@ elation.require(['janusweb.janusbase', 'janusweb.websurface'], function() {
         lmap_id: { type: 'string', set: this.updateMaterial, comment: 'Lightmap texture ID' },
         video_id: { type: 'string', set: this.updateVideo, comment: 'Video texture ID' },
         shader_id: { type: 'string', set: this.updateMaterial, comment: 'Shader ID' },
-        shader_chunk_replace: { type: 'object' },
+        shader_chunk_replace: { type: 'object', set: this.updateMaterial },
         url: { type: 'string', set: this.updateWebsurfaceURL },
         loop: { type: 'boolean' },
         websurface_id: { type: 'string', set: this.updateWebsurface, comment: 'WebSurface ID' },
@@ -109,7 +109,7 @@ elation.require(['janusweb.janusbase', 'janusweb.websurface'], function() {
         object = this.object;
         setTimeout(() => { this.handleLoad(); this.assignTextures(); }, 100);
       } else if (this.janusid) {
-        var asset = this.getAsset('model', this.janusid, true);
+        var asset = this.modelasset = this.getAsset('model', this.janusid, true);
         this.dispatchEvent({type: 'loadstart'});
         if (asset) {
           if (asset.loaded) {

package/scripts/room.js

@@ -840,7 +840,7 @@ elation.require([
       }
       this.createLights();
     }
-    this.createRoomObjects = function(roomdata, parent) {
+    this.createRoomObjects = function(roomdata, parent, isinternal) {
       var room = roomdata.room,
           assets = roomdata.assets || [];
 
@@ -853,6 +853,7 @@ elation.require([
         if (exclude.indexOf(k) == -1) {
           roomdata[k].forEach(elation.bind(this, function(n) {
             n.persist = true;
+            n.isinternal = isinternal;
             this.createObject(k, n, parent);
           }));
         }
@@ -1373,16 +1374,17 @@ elation.require([
       if (this.jsobjects[objectargs.js_id]) {
         objectargs.js_id = objectargs.js_id + '_' + window.uniqueId();
       }
-      var object = parentobj.spawn(realtype, this.roomid + '_' + objectargs.js_id, objectargs);
-      if (objectargs.js_id) {
-        this.jsobjects[objectargs.js_id] = object.getProxyObject(customElement);
+      var object = parentobj.spawn(realtype, (parentobj.js_id || room.roomid) + '_' + objectargs.js_id, objectargs),
+          proxyobj = object.getProxyObject(customElement);
+      if (proxyobj && objectargs.js_id && !objectargs.isinternal && (parentobj == this || 'js_id' in args)) {
+        this.jsobjects[objectargs.js_id] = proxyobj;
       }
 
       if (realtype == 'janussound') {
         this.sounds[objectargs.sound_id] = object;
         this.sounds[objectargs.js_id] = object;
 
-        this.jsobjects[objectargs.js_id].addEventListener('sound_delayed', (ev) => this.handleDelayedSound(ev));
+        proxyobj.addEventListener('sound_delayed', (ev) => this.handleDelayedSound(ev));
       }
       if (realtype == 'janusvideo') {
         this.videos[objectargs.video_id] = object;
@@ -1408,14 +1410,14 @@ elation.require([
           }
           children[k] = objs;
         }
-        this.createRoomObjects(children, this.jsobjects[objectargs.js_id]);
+        this.createRoomObjects(children, proxyobj, objectargs.isinternal);
       }
 
       if (this.enabled && !skipstart) {
         object.start();
       }
 
-      return this.jsobjects[objectargs.js_id];
+      return proxyobj;
     }
     this.appendChild = function(obj) {
       var proxyobj = obj

package/utils/clean-build.sh

@@ -0,0 +1,4 @@
+#!/bin/sh
+
+[ -e elation ] && rm -r elation
+[ -e node_modules ] && rm -r node_modules