janusweb 1.5.50 → 1.5.52

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

@@ -344,6 +344,7 @@ ui-window>.ui_window_content {
 }
 ui-window>ui-window-content {
   order: 1;
+  position: relative;
 }
 ui-window[scrollable]>ui-window-content {
   overflow: auto;
@@ -1087,7 +1088,7 @@ ui-treeview ui-list {
   margin: 0 0 0 .3em;
   padding-left: .8em;
   -webkit-user-select: none;
-  -webkit-tap-highlight-color: rgba(0,0,0,0); 
+  -webkit-tap-highlight-color: rgba(0,0,0,0);
 }
 ui-treeview>ui-list {
   border-left: 0;
@@ -1122,7 +1123,7 @@ ui-treeview ui-treeviewitem>ui-text:hover {
 ui-treeview ui-treeviewitem.state_selected>ui-text {
   color: #0f0;
 }
-ui-treeview ul li.state_selected, 
+ui-treeview ul li.state_selected,
 ui-treeview ul li.state_hover li.state_selected {
   max-height: none;
 }
@@ -1284,3 +1285,93 @@ ui-image-picker canvas {
   display: inline-block;
   vertical-align: top;
 }
+
+/* <ui-wizard> */
+ui-wizard {
+  display: flex;
+  flex-direction: column;
+  flex: 1;
+}
+ui-wizard[type="paginate"]>ui-wizard-step {
+  display: none;
+  opacity: 0;
+  transition: opacity 500ms linear;
+  flex: 1;
+}
+ui-wizard[step=""]>ui-wizard-backbutton,
+ui-wizard[step="1"]>ui-wizard-backbutton {
+  display: none;
+}
+/* Up to 10 steps - wizards with more steps should probably be split up some */
+ui-wizard[type="paginate"][step=""]>ui-wizard-step:nth-of-type(1),
+ui-wizard[type="paginate"][step="1"]>ui-wizard-step:nth-of-type(1),
+ui-wizard[type="paginate"][step="2"]>ui-wizard-step:nth-of-type(2),
+ui-wizard[type="paginate"][step="3"]>ui-wizard-step:nth-of-type(3),
+ui-wizard[type="paginate"][step="4"]>ui-wizard-step:nth-of-type(4),
+ui-wizard[type="paginate"][step="5"]>ui-wizard-step:nth-of-type(5),
+ui-wizard[type="paginate"][step="6"]>ui-wizard-step:nth-of-type(6),
+ui-wizard[type="paginate"][step="7"]>ui-wizard-step:nth-of-type(7),
+ui-wizard[type="paginate"][step="8"]>ui-wizard-step:nth-of-type(8),
+ui-wizard[type="paginate"][step="9"]>ui-wizard-step:nth-of-type(9),
+ui-wizard[type="paginate"][step="10"]>ui-wizard-step:nth-of-type(10) {
+  display: flex;
+  opacity: 1;
+  flex: 1;
+  flex-direction: column;
+}
+ui-wizard-step>section {
+  padding: 0 .5em 0 .5em;
+}
+ui-wizard[type="paginate"] ui-wizard-pagination {
+  display: grid;
+  grid-template-columns: 50% 50%;
+  align-items: center;
+  justify-items: center;
+}
+ui-wizard[type="paginate"] ui-wizard-pagination ui-button.back {
+  grid-column-start: 1;
+}
+ui-wizard[type="paginate"] ui-wizard-pagination ui-button.next {
+  grid-column-start: 2;
+}
+ui-wizard-navigation {
+  display: flex;
+  flex-direction: row;
+}
+ui-wizard-navigation ui-buttonbar {
+  width: 100%;
+}
+ui-wizard-navigation ui-buttonbar ui-button {
+  margin: 0;
+  position: relative;
+  clip-path: polygon(0 0, 120% 0%, 120% 100%, 0 100%, 1lh 50%);
+  padding-left: 1lh;
+}
+ui-wizard-navigation ui-buttonbar ui-button:first-child {
+  clip-path: none;
+  border-radius: 0;
+}
+ui-wizard-navigation ui-buttonbar ui-button::after {
+  width:0;
+  height: 0;
+  content: '';
+  display: block;
+  position: absolute;
+  right: calc(-1lh + 1px);
+  border-top: 1lh solid transparent;
+  border-bottom: 1lh solid transparent;
+  border-left: 1lh solid var(--logo-green);
+  top: 0;
+}
+ui-wizard-navigation ui-buttonbar ui-button:last-child::after {
+  display: none;
+}
+ui-wizard-navigation ui-buttonbar ui-button[disabled]::after {
+  border-left: 1lh solid #666;
+}
+ui-wizard-navigation ui-buttonbar ui-button.state_active {
+  background: white;
+}
+ui-wizard-navigation ui-buttonbar ui-button.state_active::after {
+  border-left: 1lh solid white;
+}

package/package.json

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

package/scripts/client.js

@@ -12,6 +12,7 @@ elation.require(['elements.elements', 'elements', 'engine.engine', 'engine.asset
     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 && args.fullsize != 'false', container == document.body);
+    var thirdperson = elation.utils.any(args.thirdperson && args.thirdperson != 'false', false);
 
     if (elation.config.get('serviceworker.enabled') && 'serviceWorker' in navigator) {
       var workerscript = elation.config.get('serviceworker.script', 'service-worker.js');
@@ -83,6 +84,7 @@ elation.require(['elements.elements', 'elements', 'engine.engine', 'engine.asset
       tracking: usetracking,
       trackingid: trackingid,
       avatarsrc: args.avatarsrc,
+      thirdperson: thirdperson,
     });
     return new Promise(function(resolve, reject) {
       elation.events.add(janusweb.engine, 'engine_start', function() { resolve(janusweb); });
@@ -106,6 +108,8 @@ elation.require(['elements.elements', 'elements', 'engine.engine', 'engine.asset
         server: { type: 'string' },
         avatarsrc: { type: 'string' },
         muted: { type: 'boolean', default: false },
+        thirdperson: { type: 'boolean', default: false },
+        autofullscreen: { type: 'boolean', default: false },
       });
     }
     initEngine() {
@@ -139,11 +143,13 @@ elation.require(['elements.elements', 'elements', 'engine.engine', 'engine.asset
         window.scrollTo(0, 1);
       });
       window.addEventListener('touchend', ev => {
-        // FIXME - useragent hack isn't the best way of handling this, but it beats getting stuck in non-immersive fullscreen mode while in a VR headset
-        if (navigator.userAgent.indexOf('OculusBrowser') != -1) {
-          this.startXR();
-        } else if (!this.view.isFullscreen()) {
-          this.toggleFullscreen({value: 1});
+        if (ev.target == this.engine.systems.render.renderer.domElement) {
+          // FIXME - useragent hack isn't the best way of handling this, but it beats getting stuck in non-immersive fullscreen mode while in a VR headset
+          if (navigator.userAgent.indexOf('OculusBrowser') != -1) {
+            this.startXR();
+          } else if (this.autofullscreen && !this.view.isFullscreen()) {
+            this.toggleFullscreen({value: 1});
+          }
         }
       });
     }
@@ -192,6 +198,7 @@ elation.require(['elements.elements', 'elements', 'engine.engine', 'engine.asset
         avatarsrc: this.avatarsrc,
         staticfriction: 2,
         dynamicfriction: 1.9,
+        cameraview: (this.thirdperson ? 'thirdperson' : 'firstperson'),
       });
       elation.events.add(this.engine.systems.render, 'render_view_add', (ev) => this.handleRenderViewAdd(ev));
 
@@ -266,13 +273,20 @@ elation.require(['elements.elements', 'elements', 'engine.engine', 'engine.asset
       var frame = elation.ui.iframe({src: 'http://github.com/jbaicoianu/janusweb/', classname: 'janusweb_about'});
       aboutwin.setcontent(frame);
     }
+    isFullscreen() {
+      return document.fullscreenElement === this;
+    }
     toggleFullscreen(ev, updateOnly) {
-      var view = this.view;
-      if (!updateOnly && view && (typeof ev == 'undefined' || ev.value == 1 || typeof ev.value == 'undefined')) {
-        view.toggleFullscreen();
+      let isfullscreen = this.isFullscreen();
+      if (!updateOnly && (typeof ev == 'undefined' || ev.value == 1 || typeof ev.value == 'undefined')) {
+        if (!isfullscreen) {
+          this.parentNode.requestFullscreen();
+        } else {
+          document.exitFullscreen();
+        }
       }
       if (this.fullscreenbutton) {
-        if (view.isFullscreen()) {
+        if (isfullscreen) {
           this.fullscreenbutton.addclass('state_fullscreen');
           this.fullscreenbutton.setLabel('Shrink');
         } else {
@@ -331,6 +345,7 @@ elation.require(['elements.elements', 'elements', 'engine.engine', 'engine.asset
           uiconfig: { type: 'string', default: false },
           showui: { type: 'boolean', default: true },
           shownavigation: { type: 'boolean', default: true },
+          thirdperson: { type: 'boolean', default: false },
         });
       }
       create() {
@@ -357,13 +372,14 @@ elation.require(['elements.elements', 'elements', 'engine.engine', 'engine.asset
           trackingid: this.trackingid,
           networking: this.networking,
           corsproxy: this.corsproxy,
-          //resolution: width + 'x' + height,
+          resolution: width + 'x' + height,
           showui: this.showui && this.showui != 'false',
           shownavigation: this.shownavigation,
           avatarsrc: this.avatarsrc,
           uiconfig: this.uiconfig,
           container: this,
           fullsize: this.fullsize,
+          thirdperson: this.thirdperson && this.thirdperson != 'false',
         };
         return args;
       }
@@ -474,8 +490,13 @@ elation.require(['elements.elements', 'elements', 'engine.engine', 'engine.asset
     elation.elements.define('janus.overlay', class extends elation.elements.base {
       init() {
         super.init();
-        elation.events.add(this.player, 'player_enable', ev => { this.hide(); });
-        elation.events.add(this.player, 'player_disable', ev => { this.show(); });
+        this.defineAttributes({
+          autotoggle: { type: 'bool', default: false }
+        });
+        if (this.autotoggle) {
+          elation.events.add(this.player, 'player_enable', ev => { this.hide(); });
+          elation.events.add(this.player, 'player_disable', ev => { this.show(); });
+        }
       }
       show() {
         super.show();
@@ -484,15 +505,17 @@ elation.require(['elements.elements', 'elements', 'engine.engine', 'engine.asset
         }
         elation.events.fire({type: 'overlay_show', element: this});
       }
-      hide() {
+      hide(remove=true) {
         super.hide();
         elation.events.fire({type: 'overlay_hide', element: this});
-        setTimeout(() => {
-          if (this.parentNode) {
-            this.oldparent = this.parentNode;
-            this.parentNode.removeChild(this);
-          }
-        }, 1000);
+        if (remove) {
+          setTimeout(() => {
+            if (this.parentNode) {
+              this.oldparent = this.parentNode;
+              this.parentNode.removeChild(this);
+            }
+          }, 1000);
+        }
       }
     });
   }

package/scripts/elements/linesegments.js

@@ -32,7 +32,7 @@ elation.require(['janusweb.janusbase'], function() {
         if (!this.geometry) {
           let geo = new THREE.BufferGeometry();
           let lineobj = new THREE.LineSegments(geo, new THREE.LineBasicMaterial({
-            vertexColors: THREE.VertexColors,
+            vertexColors: true,
             opacity: this.opacity,
             transparent: (this.transparent !== null ? this.transparent : this.opacity < 1),
             depthWrite: this.depth_write,

package/scripts/external/JanusClientConnection.js

@@ -320,6 +320,7 @@ JanusClientConnection.prototype.connect = function() {
   this.error = '';
   this._websocket = new WebSocket(this._host, 'binary');
   this.status = 1;
+  this.active = false;
   this.loggedin = false;
   this.loggingin = false;
   this.msgQueue = [];
@@ -336,7 +337,7 @@ JanusClientConnection.prototype.connect = function() {
   this._websocket.onclose = function() {
     this.status = 0;
     this.dispatchEvent({type: 'disconnect'});
-    if (!this.pendingReconnect) {
+    if (this.active) {
       this.reconnect();
     }
   }.bind(this);
@@ -354,6 +355,8 @@ JanusClientConnection.prototype.reconnect = function(force) {
       console.log('Reconnecting...');
       this.connect();
     }
+  } else {
+    console.log('reconnect attempted too soon', this.lastattempt, now, this.reconnectdelay);
   }
 }
 JanusClientConnection.prototype.disconnect = function() {
@@ -392,7 +395,7 @@ JanusClientConnection.prototype.setUserId = function(userId) {
 };
 
 JanusClientConnection.prototype.send = function(msg) {
-  if (this._websocket.readyState == 3) {
+  if (this._websocket.readyState > 1) {
     this.msgQueue.push(msg);
     if (!this.pendingReconnect) {
       this.reconnect();

package/scripts/external/JanusFireboxParser.js

@@ -84,6 +84,7 @@ JanusFireboxParser.prototype.parseAssets = function(xml, baseurl, datapath) {
       reverse3d: n.reverse3d,
       tex_linear: n.tex_linear,
       equi: n.equi,
+      srgb: n.srgb,
     });
   });
   videoassets.forEach(function(n) { 

package/scripts/janusbase.js

@@ -370,7 +370,8 @@ elation.require(['engine.things.generic', 'utils.template', 'janusweb.parts'], f
           visible:  ['property', 'visible'],
           //tagName:  ['property', 'tag'],
           billboard: ['property', 'billboard'],
-          className:  ['property', 'className'],
+          'class':  ['property', 'className'],
+          classname:  ['property', 'className'],
           classList:  ['property', 'classList'],
           gazetime:  ['property', 'gazetime'],
           layers:  ['property', 'layers'],
@@ -1410,6 +1411,12 @@ console.log('clone', props);
             roomproxy.appendChild(objproxy);
           }
           this.start();
+        } else if (!newroom && !ischild) {
+          let oldroomproxy = (oldroom._target ? oldroom : oldroom.getProxyObject()),
+              objproxy = (this._target ? this : this.getProxyObject());
+          if (oldroomproxy.contains(objproxy)) {
+            oldroomproxy.removeChild(objproxy);
+          }
         }
       }
     }

package/scripts/janusghost.js

@@ -293,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 => {
@@ -419,7 +407,7 @@ elation.require(['janusweb.janusbase', 'engine.things.leapmotion'], function() {
         //newclip = THREE.SkeletonUtils.retargetClip(destmesh, sourcemesh, newclip, {useFirstFramePosition: true});
         //console.log('retarget it!', newclip, destmesh, sourcemesh);
         newclip.tracks.forEach(track => {
-          let [name, property] = track.name.split('.');
+          let [name, property] = track.name.replace('mixamorig:', '').split('.');
           let srcbone = sourcemesh.skeleton.getBoneByName(name);
           let dstbone = destmesh.skeleton.getBoneByName(name);
           if (dstbone) {
@@ -717,15 +705,17 @@ elation.require(['janusweb.janusbase', 'engine.things.leapmotion'], function() {
               }
             }
           }
-          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);
+          if (this.body) {
+            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);
+                }
               }
-            }
-          });
+            });
+          }
         }
       }
     }

package/scripts/januslight.js

@@ -7,7 +7,7 @@ elation.require(['janusweb.janusbase'], function() {
         light_directional: { type: 'bool', default: false, set: this.updateLight },
         light_range: { type: 'float', default: 0, set: this.updateLight, min: 0, comment: 'Max distance at which light can affect objects' },
         light_intensity: { type: 'float', default: 10, set: this.updateLight, comment: 'Light brightness' },
-        light_cone_angle: { type: 'float', default: 0, set: this.updateLight, min: 0, max: 1, comment: 'Light cone shape. 0 = directional, 1 = point light, anything inbetween is a spotlight' },
+        light_cone_angle: { type: 'float', default: 0, set: this.updateLight, min: 0, max: 1, comment: 'Light cone shape. 0 = point light, 1 = directional, anything inbetween is a spotlight' },
         light_cone_exponent: { type: 'float', default: 1, set: this.updateLight },
         light_penumbra: { type: 'float', default: 1, set: this.updateLight, min: 0, max: 1, comment: 'Spotlight fall-off. 0 is crisp, 1 is smooth' },
         light_decay: { type: 'float', default: 2, set: this.updateLight, comment: 'The amount the light dims along the distance of the light. Default is 1. For physically correct lighting, set this to 2.' },
@@ -17,6 +17,7 @@ elation.require(['janusweb.janusbase'], function() {
         light_shadow_far: { type: 'float', set: this.updateLight },
         light_shadow_bias: { type: 'float', default: .0001, set: this.updateLight },
         light_shadow_radius: { type: 'float', default: 2.5, set: this.updateLight },
+        light_shadow_size: { type: 'int', default: 512, set: this.updateLight },
         light_helper: { type: 'boolean', default: false, set: this.updateLightHelper },
         light_style: { type: 'string', default: '' },
         light_style_fps: { type: 'float', default: 10 },
@@ -196,6 +197,7 @@ elation.require(['janusweb.janusbase'], function() {
       this.light.shadow.camera.fov = 90;
       this.light.shadow.mapSize.set(shadowSize, shadowSize);
       this.light.shadow.bias = this.light_shadow_bias;
+      this.light.shadow.mapSize.set(this.light_shadow_size, this.light_shadow_size);
 
       // directional light shadow parameters
       let d = this.light_range;
@@ -256,6 +258,7 @@ elation.require(['janusweb.janusbase'], function() {
           light_shadow_far:    [ 'property', 'light_shadow_far'],
           light_shadow_bias:   [ 'property', 'light_shadow_bias'],
           light_shadow_radius: [ 'property', 'light_shadow_radius'],
+          light_shadow_size:   [ 'property', 'light_shadow_size'],
           color_temperature:   [ 'property', 'color_temperature'],
         };
       }

package/scripts/janusparticle.js

@@ -420,6 +420,7 @@ elation.require(['janusweb.janusbase'], function() {
       pointpos.add(this.emitter_pos);
 
       point.opacity = this.opacity;
+      point.active = 0;
 
       var vel = point.vel,
           accel = point.accel,

package/scripts/janusplayer.js

@@ -37,6 +37,7 @@ elation.require(['engine.things.player', 'janusweb.external.JanusVOIP', 'ui.butt
         avatarsrc: { type: 'string' },
         cameraview: { type: 'string', default: 'firstperson' },
         camerazoom: { type: 'float', default: 0 },
+        cameraheight: { type: 'float', default: 0 },
         cameraangle: { type: 'float', default: 0 },
         decouplehead: { type: 'boolean', default: false },
       });
@@ -148,12 +149,19 @@ document.body.dispatchEvent(click);
       this.getAvatarData().then(d => this.currentavatar = d);
       this.morphtargetchanges = {};
       this.eventlistenerproxies = {};
+
+      if (this.cameraview == 'thirdperson') {
+        this.camerazoom = 2;
+        this.cameraheight = .25;
+      }
+      this.updateCamera();
+      this.handleFrameUpdates = elation.bind(this, this.handleFrameUpdates);
     }
     this.createChildren = function() {
       elation.engine.things.janusplayer.extendclass.createChildren.call(this);
 
-      this.cursor = new THREE.Sprite(new THREE.SpriteMaterial({color: 0xffffff, depthTest: false, depthWrite: false, transparent: true, map: null, fog: false}));
-      this.cursor.renderOrder = 100;
+      this.cursor = new THREE.Sprite(new THREE.SpriteMaterial({color: 0xffffff, depthTest: false, depthWrite: false, transparent: true, map: null, fog: false, transparent: true}));
+      this.cursor.renderOrder = 500;
       this.engine.systems.world.scene['world-3d'].add(this.cursor);
 
 
@@ -169,6 +177,7 @@ document.body.dispatchEvent(click);
         }
       });
 
+      this.updateCamera();
       this.updateCollider();
     }
     this.enable = function() {
@@ -307,7 +316,7 @@ document.body.dispatchEvent(click);
           this.ghost.setHeadOrientation(_tmpquat.multiplyQuaternions(this.neck.orientation._target, this.head.orientation._target), true);
           if (this.ghost._target.head) {
             //this.ghost._target.face.position.copy(this.head.position);
-            this.ghost.head.orientation.copy(this.head.orientation).multiply(this.neck.orientation);;
+            this.ghost._target.head.orientation.copy(this.head.orientation).multiply(this.neck.orientation);;
           }
         }
       }
@@ -643,11 +652,13 @@ document.body.dispatchEvent(click);
           hand1_p3:      ['property', 'hands.right.p3'],
           hand1_p4:      ['property', 'hands.right.p4'],
           url:           ['property', 'parent.currentroom.url'],
+          ghost:         ['property', 'ghost'],
 
           collision_radius: ['property', 'collision_radius'],
 
           currentavatar: ['property', 'currentavatar'],
           defaultanimation: ['property', 'defaultanimation'],
+          eventlistenerproxies: ['property', 'eventlistenerproxies'],
 
           localToWorld:  ['function', 'localToWorld'],
           worldToLocal:  ['function', 'worldToLocal'],
@@ -735,12 +746,12 @@ document.body.dispatchEvent(click);
 
       if (this.jumping) {
         animid = 'jump';
-      } else if (this.controlstate.move_left) {
-        animid = (running ? 'run' : 'walk_left');
-      } else if (this.controlstate.move_right) {
-        animid = (running ? 'run' : 'walk_right');
+      } else if (this.controlstate.move_left && Math.abs(this.controlstate.move_left) > .15) {
+        animid = (running ? 'run' : (this.controlstate.move_left > 0 ? 'walk_left' : 'walk_right'));
+      } else if (this.controlstate.move_right && Math.abs(this.controlstate.move_right) > .15) {
+        animid = (running ? 'run' : (this.controlstate.move_right > 0 ? 'walk_right' : 'walk_left'));
       } else if (this.controlstate.move_forward) {
-        animid = (running ? 'run' : 'walk');
+        animid = (running ? 'run' : (this.controlstate.move_forward > 0 ? 'walk' : 'walk_back'));
       } else if (this.controlstate.move_backward) {
         animid = (running ? 'run' : 'walk_back');
       } else if (document.activeElement && this.properties.janus.chat && document.activeElement === this.properties.janus.chat.input.inputelement) {
@@ -1109,9 +1120,6 @@ document.body.dispatchEvent(click);
         }
       };
     })();
-    this.dispatchEvent = function(event, target) {
-      let firedev = elation.events.fire(event);
-    }
     this.lookAt = function(other, up, turnhead) {
       if (!up) up = new THREE.Vector3(0,1,0);
       if (!other) return;
@@ -1224,17 +1232,25 @@ document.body.dispatchEvent(click);
     this.toggleCamera = function(ev) {
       if (ev.value == 1) {
         if (this.cameraview == 'firstperson') {
-          this.cameraview = 'thirdperson';
-          this.cameraangle = 0;
-          this.camerazoom = 2;
+          this.setCameraView('thirdperson');
         } else {
-          this.cameraview = 'firstperson';
-          this.cameraangle = 0;
-          this.camerazoom = 0;
+          this.setCameraView('firstperson');
         }
-        this.updateCamera();
       }
     }
+    this.setCameraView = function(cameraview) {
+      this.cameraview = cameraview;
+      if (this.cameraview == 'thirdperson') {
+        this.cameraangle = 0;
+        this.camerazoom = 2;
+        this.cameraheight = .25;
+      } else if (this.cameraview == 'firstperson') {
+        this.cameraangle = 0;
+        this.camerazoom = 0;
+        this.cameraheight = 0;
+      }
+      this.updateCamera();
+    }
     this.zoomView = function(amount, ev) {
       if (this.cameraview == 'thirdperson') {
         //this.camera.position.z -= amount / 10;
@@ -1253,6 +1269,7 @@ document.body.dispatchEvent(click);
         this.camera.fov = this.fov;
         this.camera.position.z = Math.cos(this.cameraangle) * this.camerazoom;
         this.camera.position.x = Math.sin(this.cameraangle) * this.camerazoom;
+        this.camera.position.y = this.cameraheight;
         this.camera.orientation.setFromEuler(new THREE.Euler(0, this.cameraangle, 0));
       }
     }
@@ -1295,8 +1312,9 @@ document.body.dispatchEvent(click);
       let returnValue = true;
       firedev.forEach(e => returnValue &= e.returnValue);
       if (event.bubbles !== false && returnValue && this.parent && this.parent.dispatchEvent) {
-        event.element = this.parent;
-        this.parent.dispatchEvent(event);
+        let ev = elation.events.clone(event);
+        ev.element = this.parent;
+        this.parent.dispatchEvent(ev);
       }
     }
     this.addEventListenerProxy = function(name, handler, bubble) {
@@ -1327,5 +1345,14 @@ document.body.dispatchEvent(click);
         }
       }
     }
+    this.attachObject = function(attachpoint, obj) {
+      if (this.ghost && this.ghost.body) {
+        if (attachpoint in this.ghost.body.parts) {
+          this.ghost.body.parts[attachpoint].add(obj);
+        }
+        return obj;
+      }
+      return false;
+    }
   }, elation.engine.things.player);
 });

package/scripts/multiplayermanager.js

@@ -156,6 +156,7 @@ console.log('[MultiplayerManager] set active room:', room, this.activeroom);
         var oldserver = this.getServerForRoom(this.activeroom);
         //oldserver.leave_room(room.url);
         oldserver.unsubscribe(room.url);
+        oldserver.active = false;
       }
 
       // Tell the server we're now in the new room
@@ -165,6 +166,7 @@ console.log('[MultiplayerManager] set active room:', room, this.activeroom);
         var partymode = this.player.party_mode && room.party_mode;
         server.subscribe(room.url);
         server.enter_room(room.url, partymode);
+        server.active = true;
       }
     }
     this.getJanusOrientation = (function() { 

package/scripts/object.js

@@ -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) {
@@ -1140,7 +1140,7 @@ elation.require(['janusweb.janusbase', 'janusweb.websurface'], function() {
       }
     }
     this.isUsingPBR = function() {
-      return this.lighting && elation.utils.any(this.room.pbr, elation.config.get('janusweb.materials.pbr'));
+      return this.lighting && elation.utils.any(this.room && this.room.pbr, elation.config.get('janusweb.materials.pbr'));
     }
     this.isUsingToonShader = function() {
       return this.lighting && elation.utils.any(this.room.toon, elation.config.get('janusweb.materials.toon'));

package/scripts/parts.js

@@ -27,7 +27,7 @@ elation.require([], function() {
       if (!this._proxies[name]) {
         var rootobject = this._object._target || this._object;
 //console.log('replace the part', name, part.rotation, part.parent, part);
-        this._parts[name] = elation.engine.things.janusobject({
+        let newpart = this._parts[name] = elation.engine.things.janusobject({
           type: 'janusobject',
           id: rootobject.id + '_parts_' + name,
           name: name,
@@ -35,10 +35,14 @@ elation.require([], function() {
           engine: this._object.engine,
           properties: {
             object: object,
+            parent: this._object,
             rotation: [object.rotation.x * THREE.MathUtils.RAD2DEG, object.rotation.y * THREE.MathUtils.RAD2DEG, object.rotation.z * THREE.MathUtils.RAD2DEG], 
             room: rootobject.room
           }
         });
+        if (this._object.colliders && newpart.colliders) {
+          this._object.colliders.add(newpart.colliders);
+        }
         // TODO - set up object hierarchy here
         this._proxies[name] = this._parts[name].getProxyObject();
         this._proxies[name].start();