janusweb 1.5.51 → 1.5.53

package/scripts/portal.js

@@ -38,6 +38,7 @@ elation.require(['janusweb.janusbase'], function() {
       this.lastactivatetime = 0;
     }
     this.createObject3D = function() {
+      this.created = true;
       this.objects['3d'] = new THREE.Object3D();
       this.updateGeometry();
       return this.objects['3d'];
@@ -99,13 +100,15 @@ elation.require(['janusweb.janusbase'], function() {
       }
     }
     this.createMaterial = function() {
+      if (this.portalmaterial) return this.portalmaterial;
       var matargs = {
         color: 0xdddddd,
         side: THREE.DoubleSide,
       };
       var mat;
+      let shader = false;
       if (this.shader_id) {
-        let shader = this.getAsset('shader', this.shader_id);
+        shader = this.getAsset('shader', this.shader_id);
         //console.log('shader', this.shader_id, shader);
         if (shader) {
           let shadermaterial = shader.getInstance();
@@ -123,7 +126,12 @@ elation.require(['janusweb.janusbase'], function() {
         var asset = this.getAsset('image', this.thumb_id);
         if (asset) var thumb = asset.getInstance();
         if (thumb) {
-          mat.map = thumb;
+          thumb.encoding = THREE.sRGBEncoding;
+          if (shader) {
+            mat.uniforms.iChannel0.value = thumb;
+          } else {
+            mat.map = thumb;
+          }
           if (asset.loaded) {
             if (asset.hasalpha) {
               mat.transparent = true;
@@ -148,6 +156,8 @@ elation.require(['janusweb.janusbase'], function() {
       mat.polygonOffsetFactor = -1;
       mat.polygonOffsetUnits = -4;
 
+      this.portalmaterial = mat;
+
       return mat;
     }
     this.adjustAspectRatio = function(image) {
@@ -504,6 +514,7 @@ elation.require(['janusweb.janusbase'], function() {
       this.janus.network.unsubscribe(this.portalroom);
     }
     this.updateGeometry = function() {
+      if (!this.created) return;
       var thickness = 0.05 * this.size.z;
       var offset = ((thickness / 2) / this.properties.scale.z) * 2;
       var box;

package/scripts/room.js

@@ -81,7 +81,7 @@ elation.require([
         'server': { type: 'string' },
         'port': { type: 'int' },
         'rate': { type: 'int', default: 200 },
-        'voip': { type: 'string', default: 'none' },
+        'voip': { type: 'string', default: 'janus' },
         'voipid': { type: 'string' },
         'voiprange': { type: 'float', default: 1 },
         'voipserver': { type: 'string', default: 'voip.janusxr.org' },
@@ -93,7 +93,10 @@ elation.require([
         'onload': { type: 'string' },
         'sync': { type: 'boolean', default: false },
         'pointerlock': { type: 'boolean', default: true, set: this.updatePointerLock },
-        'players': { type: 'object', get: this.getRoomPlayers }
+        'players': { type: 'object', get: this.getRoomPlayers },
+        'defaultview': { type: 'string' },
+        'showavatar': { type: 'bool', default: true, set: this.updateAvatarVisibility },
+        'spawnradius': { type: 'float', default: 0 },
       });
 
       if (!roomTranslators) {
@@ -229,6 +232,11 @@ elation.require([
       this.updateToneMapping();
       this.setNearFar();
       this.setPlayerPosition();
+      if (typeof player != 'undefined' && this.defaultview && this.defaultview != player.cameraview) {
+        player.setCameraView(this.defaultview);
+      }
+      this.updateAvatarVisibility();
+
       elation.events.fire({element: this, type: 'room_active', data: this});
     }
     this.setPlayerPosition = function(pos, orientation) {
@@ -258,14 +266,22 @@ elation.require([
         document.location.hash = hash;
       }
       let spawnpoint = this.getSpawnpoint();
-      player.startposition.copy(spawnpoint.position);
-      player.startorientation.copy(spawnpoint.orientation);
+      if (typeof player != 'undefined') {
+        player.startposition.copy(spawnpoint.position);
+        player.startorientation.copy(spawnpoint.orientation);
+      }
     }
     this.getSpawnpoint = function(referrer) {
       let spawnpoint = {
         position: this.spawnpoint.position,
         orientation: this.spawnpoint.quaternion,
       };
+      if (this.spawnradius) {
+        let dist = Math.random() * this.spawnradius,
+            angle = Math.random() * 2 * Math.PI;
+        spawnpoint.position.x += Math.sin(angle) * dist;
+        spawnpoint.position.z += Math.cos(angle) * dist;
+      }
       if (referrer) {
         let links = this.getObjectsByTagName('link');
         for (let i = 0; i < links.length; i++) {
@@ -981,6 +997,12 @@ elation.require([
         this.flying = elation.utils.any(room.flying, true);
         this.teleport = elation.utils.any(room.teleport, true);
         this.pointerlock = elation.utils.any(room.pointerlock, true);
+        this.defaultview = elation.utils.any(room.defaultview, null);
+        this.showavatar = elation.utils.any(room.showavatar, true);
+        if ('spawnradius' in room) this.spawnradius = room.spawnradius;
+        if (typeof player != 'undefined' && this.defaultview && this.defaultview != player.cameraview) {
+          player.setCameraView(this.defaultview);
+        }
         //if (room.col) this.properties.col = room.col;
 
         this.properties.walk_speed = room.walk_speed || 1.8;
@@ -1374,7 +1396,7 @@ elation.require([
       if (this.jsobjects[objectargs.js_id]) {
         objectargs.js_id = objectargs.js_id + '_' + window.uniqueId();
       }
-      var object = parentobj.spawn(realtype, (parentobj.js_id || room.roomid) + '_' + objectargs.js_id, objectargs),
+      var object = parentobj.spawn(realtype, room.roomid + (parentobj.js_id ? '_' + parentobj.js_id : '') + '_' + 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;
@@ -2131,6 +2153,8 @@ elation.require([
           voiprange: ['property', 'voiprange'],
           voipserver: ['property', 'voipserver'],
           players: ['property', 'players'],
+          defaultview: ['property', 'defaultview'],
+          showavatar: ['property', 'showavatar'],
 
           localToWorld:  ['function', 'localToWorld'],
           worldToLocal:  ['function', 'worldToLocal'],
@@ -2852,6 +2876,9 @@ console.log('dispatch to parent', event, this, event.target);
         gain.gain.cancelScheduledValues(ctx.currentTime);
         gain.gain.linearRampToValueAtTime(gain.gain.value, ctx.currentTime);
         gain.gain.linearRampToValueAtTime(value, ctx.currentTime + time);
+        if (gain.gain.value == 0) {
+          gain.gain.value = .01;
+        }
       }
     }
     this.fadeAudioOut = function(time=4, value=0) {
@@ -3004,6 +3031,19 @@ console.log('unknown material', mat);
       }
       return players;
     }
+    this.updateAvatarVisibility = function() {
+      if (typeof player != 'undefined' && player.ghost) {
+        if (this.showavatar) {
+          player.ghost.visible = true;
+          if (player.ghost.body) player.ghost.body.visible = true;
+          if (player.ghost.head) player.ghost.head.visible = true;
+        } else {
+          player.ghost.visible = false;
+          if (player.ghost.body) player.ghost.body.visible = false;
+          if (player.ghost.head) player.ghost.head.visible = false;
+        }
+      }
+    }
   }, elation.engine.things.generic);
 });