janusweb 1.5.31 → 1.5.35

package/scripts/janusplayer.js

@@ -116,7 +116,7 @@ elation.require(['engine.things.player', 'janusweb.external.JanusVOIP', 'ui.butt
       elation.events.add(this.engine.client.container, 'mousedown', elation.bind(this, this.updateMouseStatus));
       elation.events.add(this.engine.client.container, 'mouseup', elation.bind(this, this.updateMouseStatus));
 
-      elation.events.add(this.room, 'mouseover,mouseout', elation.bind(this, this.updateCursorStyle));
+      this.updateCursorStyle = elation.bind(this, this.updateCursorStyle);
 
       this.touchcache = {
         positions: []
@@ -368,10 +368,10 @@ elation.require(['engine.things.player', 'janusweb.external.JanusVOIP', 'ui.butt
         if (typeof playerpos.z == 'undefined' || isNaN(playerpos.z)) playerpos.z = 0;
         this.objects['3d'].updateMatrix();
         this.objects['3d'].updateMatrixWorld();
-        this.objects['3d'].matrixWorld.extractBasis(v.xdir, v.ydir, v.zdir)
+        this.objects['3d'].matrixWorld.extractBasis(v.xdir, v.ydir, v.zdir);
       }
       if (this.head) {
-        this.head.objects['3d'].matrixWorld.extractBasis(v.view_xdir, v.view_ydir, v.view_zdir)
+        this.head.objects['3d'].matrixWorld.extractBasis(v.view_xdir, v.view_ydir, v.view_zdir);
         v.head_pos.setFromMatrixPosition(this.head.objects['3d'].matrixWorld);
         v.view_zdir.negate();
       }
@@ -446,10 +446,14 @@ elation.require(['engine.things.player', 'janusweb.external.JanusVOIP', 'ui.butt
     }
     this.setRoom = function(newroom) {
       if (this.room) {
+        let oldroomproxy = this.room.getProxyObject();
+        oldroomproxy.removeEventListener('mouseover', this.updateCursorStyle);
+        oldroomproxy.removeEventListener('mouseout', this.updateCursorStyle);
         this.room.part();
       }
       this.room = newroom;
       this.room.join();
+
 /*
       if (!this.gazecaster) {
         this.gazecaster = newroom.createObject('raycaster', {persist: false});
@@ -462,6 +466,10 @@ elation.require(['engine.things.player', 'janusweb.external.JanusVOIP', 'ui.butt
         this.gazecaster.setRoom(newroom);
       }
 */
+      let newroomproxy = newroom.getProxyObject();
+      newroomproxy.addEventListener('mouseover', this.updateCursorStyle);
+      newroomproxy.addEventListener('mouseout', this.updateCursorStyle);
+
       if (!this.cursors) {
         this.cursors = {
           'default': janus.getAsset('image', 'cursor_crosshair'),
@@ -483,7 +491,8 @@ elation.require(['engine.things.player', 'janusweb.external.JanusVOIP', 'ui.butt
               avatar_src: 'data:text/plain,' + encodeURIComponent(avatar),
               showlabel: false,
               //pos: V(0, -this.fatness, 0),
-              rotation: V(0, 180, 0),
+              //rotation: V(0, 180, 0),
+              renderorder: 101,
             });
             this.ghost.orientation.set(0,1,0,0);
           }
@@ -645,8 +654,9 @@ elation.require(['engine.things.player', 'janusweb.external.JanusVOIP', 'ui.butt
         ghost_id: this.getUsername(),
         avatar_src: 'data:text/plain,' + encodeURIComponent(avatar),
         showlabel: false,
-        pos: V(0, -this.fatness, 0),
-        rotation: V(0, 180, 0),
+        //pos: V(0, -this.fatness, 0),
+        //rotation: V(0, 180, 0),
+        renderorder: 101,
       });
 
       return setting;
@@ -776,10 +786,9 @@ elation.require(['engine.things.player', 'janusweb.external.JanusVOIP', 'ui.butt
     }
     this.updateCursorStyle = function(ev) {
       var vrdisplay = this.engine.systems.render.views.main.vrdisplay;
-      var obj = ev.target || ev.element;
+      var obj = ev.element;
       var proxyobj = (obj.getProxyObject ? obj.getProxyObject() : obj);
 
-
       if (obj && proxyobj && (ev.type == 'mouseover' || ev.type == 'mousemove') && (
             obj.onclick ||
             elation.events.hasEventListener(obj, 'click') ||
@@ -832,10 +841,16 @@ elation.require(['engine.things.player', 'janusweb.external.JanusVOIP', 'ui.butt
     this.updateCollider = function() {
       if (this.objects['dynamics']) {
         if (this.collision_radius > 0) {
+/*
           this.setCollider('sphere', {
             radius: this.collision_radius,
-            length: this.height,
-            //offset: V(0, this.collision_radius, 0)
+          });
+*/
+          this.pickable = false;
+          this.setCollider('capsule', {
+            radius: this.collision_radius,
+            length: 1,
+            offset: V(0, this.collision_radius, 0)
           });
         } else {
           this.removeCollider();

package/scripts/janusweb.js

@@ -101,7 +101,7 @@ elation.require([
       if (this.urltemplate) {
         dust.filters.stripunsafe = function(s) {
           return s.replace(/:\//g, '');
-        }
+        };
         elation.template.add('janusweb.url', this.urltemplate);
       }
       this.initScripting();
@@ -157,6 +157,7 @@ elation.require([
         userid:            ['property', 'userId'],
         avatarlighting:    ['property', 'settings.avatarlighting'],
         ui:                ['property', 'engine.client.ui'],
+        currentroom:       ['property', 'currentroom'],
 
         hmd:               ['accessor', 'isVRActive'],
 
@@ -172,6 +173,7 @@ elation.require([
         load:              ['function', 'navigateTo'],
         setActiveRoom:     ['function', 'setActiveRoom'],
         preload:           ['function', 'preload'],
+        createRoom:        ['function', 'createRoom'],
         navhome:           ['function', 'navigateHome'],
         chatsend:          ['function', 'sendChatMessage'],
         sync:              ['function', 'currentroom.sync'],
@@ -410,7 +412,24 @@ elation.require([
       }
     }
     this.preload = function(url, stripreferrer) {
-      this.load(url, false, null, stripreferrer);
+      return this.load(url, false, null, stripreferrer);
+    }
+    this.createRoom = function(url, makeactive=true) {
+      let newroom = this.spawn('janusroom', url, {
+        url: url,
+        janus: this,
+        corsproxy: this.corsproxy,
+        deferload: true
+      });
+
+      this.rooms[newroom.roomid] = newroom;
+      //console.log('made new room', url, room);
+      this.loading = false;
+      if (newroom && makeactive) {
+        this.setActiveRoom(newroom);
+      }
+      this.initScripting();
+      return newroom.getProxyObject();
     }
     this.getFixedURL = function(url) {
       // Our 'clean' client URLs don't contain a : because many services have problems parsing them
@@ -511,7 +530,7 @@ elation.require([
     }
     this.handleRoomEditOther = function(data) {
       var roomId = data.roomId,
-          movedata = data.position;
+          movedata = data.position,
           edit = movedata.room_edit,
           del = movedata.room_delete;
 

package/scripts/janusxrplayer.js

@@ -562,6 +562,7 @@ elation.require(['engine.things.generic', 'janusweb.external.webxr-input-profile
           lighting: false,
           opacity: .5,
           cull_face: 'none',
+          billboard: 'y',
         });
         this.raycaster = this.createObject('raycaster', {});
         this.raycaster.addEventListener('raycastenter', (ev) => this.handleRaycastEnter(ev));
@@ -572,8 +573,10 @@ elation.require(['engine.things.generic', 'janusweb.external.webxr-input-profile
         this.worldToLocal(this.laser.positions[1].copy(endpoint));
         this.laser.updateLine();
         this.cursor.pos.copy(endpoint);
+        let cursorscale = player.head.distanceTo(endpoint) / 12;
+        this.cursor.scale.set(cursorscale, cursorscale, cursorscale);
         //this.cursor.zdir = normal;
-        if (this.cursor.room !== room) room.appendChild(this.cursor);
+        if (this.cursor.room !== room._target) room.appendChild(this.cursor);
         //this.cursor.zdir.copy(player.view_dir).multiplyScalar(-1);
         //this.cursor.zdir = normal;
         this.cursor.visible = true;

package/scripts/multiplayermanager.js

@@ -180,7 +180,7 @@ console.log('[MultiplayerManager] set active room:', room, this.activeroom);
           dir: (-tmpVecZ.x) + ' ' + (-tmpVecZ.y) + ' ' + (-tmpVecZ.z),
           up_dir: '0 1 0',
           //view_dir: this.tmpVecZ.toArray().join(' ')
-        }
+        };
         if (head) {
           //this.tmpMat.makeRotationFromQuaternion(head.properties.orientation);
           tmpMat.copy(head.objects['3d'].matrixWorld);
@@ -230,8 +230,8 @@ console.log('[MultiplayerManager] set active room:', room, this.activeroom);
       //console.log('[MultiplayerManager] player update', moveData);
       if (this.avatarNeedsUpdate || player.avatarNeedsUpdate) {
         moveData.avatar = player.getCurrentAvatarData().replace(/"/g, "^");
-        this.avatarNeedsUpdate = false
-        player.avatarNeedsUpdate = false
+        this.avatarNeedsUpdate = false;
+        player.avatarNeedsUpdate = false;
       } else if (moveData.avatar) {
         delete moveData.avatar;
       }