janusweb 1.5.50 → 1.5.51

package/package.json

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

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 => {

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) {

package/scripts/room.js

@@ -1374,7 +1374,7 @@ 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),
+      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;