janusweb 1.5.30 → 1.5.34

package/scripts/portal.js

@@ -2,13 +2,12 @@ elation.require(['janusweb.janusbase'], function() {
   elation.component.add('engine.things.janusportal', function() {
     this.postinit = function() {
       this.defineProperties({
-        'url': { type: 'string' },
+        'url': { type: 'string', set: this.updateTitle },
         'title': { type: 'string' },
         'janus': { type: 'object' },
         'room': { type: 'object' },
         //'color': { type: 'color', default: new THREE.Color(0xffffff), set: this.updateMaterial },
         'size': { type: 'vector3', default: new THREE.Vector3(1.4,2.2,1), set: this.updateGeometry },
-        'url': { type: 'string', set: this.updateTitle },
         'open': { type: 'boolean', default: false },
         'collision_id': { type: 'string', default: 'cube', set: this.updateCollider },
         'collision_scale': { type: 'vector3', set: this.updateCollider },
@@ -26,6 +25,8 @@ elation.require(['janusweb.janusbase'], function() {
         'target': { type: 'string', default: '' },
         'round': { type: 'boolean', default: false },
         'cooldown': { type: 'float', default: 1000 },
+        'font': { type: 'string', default: 'impact' },
+        'font_weight': { type: 'string', default: 'bold' },
       });
       this.addTag('usable');
       elation.engine.things.janusportal.extendclass.postinit.call(this);
@@ -53,7 +54,7 @@ elation.require(['janusweb.janusbase'], function() {
     this.updateTitle = function() {
       if (this.draw_text) {
         var title = this.title;
-        if (!title) {
+        if (!title && this.url) {
           title = this.url.replace(/^https?:\/\//i, '');
           if (title.match(/^[^\/]+\/$/)) {
             title = title.substr(0, title.length - 1);
@@ -75,8 +76,8 @@ elation.require(['janusweb.janusbase'], function() {
               collidable: false,
               pickable: false,
               background: 'rgba(255,255,255,.4)',
-              font: 'impact',
-              fontWeight: 'bold',
+              font: this.font,
+              fontWeight: this.font_weight,
               textShadowBlur: 5,
               textShadowColor: 'black',
               height: .1,
@@ -90,10 +91,12 @@ elation.require(['janusweb.janusbase'], function() {
     this.createChildren = function() {
         //elation.events.add(this.label, 'mouseover,mousemove,mouseout,click', this);
       this.updateCollider();
-      elation.events.add(this, 'click', elation.bind(this, this.activate));
-      elation.events.add(this, 'mouseover', elation.bind(this, this.hover));
-      elation.events.add(this, 'mouseout', elation.bind(this, this.unhover));
-      elation.events.add(this, 'collide', (ev) => this.handleCollide());
+      if (this.url) {
+        elation.events.add(this, 'click', elation.bind(this, this.activate));
+        elation.events.add(this, 'mouseover', elation.bind(this, this.hover));
+        elation.events.add(this, 'mouseout', elation.bind(this, this.unhover));
+        elation.events.add(this, 'collide', (ev) => this.handleCollide(ev));
+      }
     }
     this.createMaterial = function() {
       var matargs = {
@@ -106,7 +109,7 @@ elation.require(['janusweb.janusbase'], function() {
         //console.log('shader', this.shader_id, shader);
         if (shader) {
           let shadermaterial = shader.getInstance();
-          shadermaterial.uniforms = this.room.parseShaderUniforms(shader.uniforms);
+          //shadermaterial.uniforms = this.room.parseShaderUniforms(shader.uniforms);
           mat = shadermaterial;
           mat.transparent = true;
           mat.side = THREE.DoubleSide;
@@ -329,7 +332,7 @@ elation.require(['janusweb.janusbase'], function() {
         console.log('load that room', this.portalroom);
 
         var scene = new THREE.Scene();
-        scene.background = this.portalroom.skyboxtexture
+        scene.background = this.portalroom.skyboxtexture;
         scene.add(this.portalroom.objects['3d']);
         this.scene = scene;
         this.scene.updateMatrixWorld(true);
@@ -521,6 +524,7 @@ elation.require(['janusweb.janusbase'], function() {
           textureWidth: this.mirror_texturesize,
           textureHeight: this.mirror_texturesize,
         });
+        group.castShadow = true;
         this.group = group;
         if (this.objects['3d']) {
           this.objects['3d'].add(group);
@@ -532,6 +536,7 @@ elation.require(['janusweb.janusbase'], function() {
         //var group = new THREE.Object3D();
         var group = new THREE.Mesh(box, mat);
         group.renderOrder = 10;
+        group.castShadow = true;
 
         if (this.draw_glow) {
           var framewidth = .05,
@@ -557,6 +562,7 @@ elation.require(['janusweb.janusbase'], function() {
           var framemat = new THREE.MeshPhongMaterial({color: 0x0000cc, emissive: 0x222222});
           var frame = new THREE.Mesh(framegeo, framemat);
           this.frame = frame;
+          frame.castShadow = true;
           group.add(frame);
         }
         this.material = mat;
@@ -565,6 +571,7 @@ elation.require(['janusweb.janusbase'], function() {
 
         var framemat = new THREE.MeshPhongMaterial({color: 0x0000cc, emissive: 0x222222});
         var frame = new THREE.Mesh(framegeo, framemat);
+        frame.castShadow = true;
         this.frame = frame;
         group.add(frame);
 
@@ -609,21 +616,23 @@ elation.require(['janusweb.janusbase'], function() {
     }
     this.handleFrameUpdates = function(ev) {
       elation.engine.things.janusportal.extendclass.handleFrameUpdates.call(this, ev);
-      if (this.shader) {
+      if (this.shader && this.shader.uniforms) {
         if (this.shader.uniforms.time) {
           this.shader.uniforms.time.value = performance.now() / 1000;
           this.refresh();
         }
       }
     }
-    this.handleCollide = function() {
+    this.handleCollide = function(ev) {
+      // TODO - we could potentially handle sending other physical objects through portals here, but for now we only care about the player
+      if (ev.data.other !== player._target) return;
       // Only activate portal if the player is walking towards it
       let fwd = this.localToWorld(V(0,0,1)).sub(this.localToWorld(V(0,0,0)));
       let dot = fwd.dot(normalized(player.vel));
       if (dot < 0) {
         this.activate();
         // FIXME - we should be transforming the user's velocity into the new room's coordinate space, but right now a portal isn't aware of what's on the other side
-        //player.vel = V(0,0,0);
+        player.vel = V(0,0,0);
       }
     }
   }, elation.engine.things.janusbase);

package/scripts/remoteplayer.js

@@ -72,30 +72,6 @@ elation.component.add('engine.things.remoteplayer', function() {
       billboard: 'y'
     });
 */
-    if (this.engine.client.player.usevoip && this.engine.systems.sound.canPlaySound) {
-      this.mouth = this.head.spawn('sound', this.properties.player_name + '_voice', {
-        //loop: true
-      });
-/*
-      this.mouth.createAudio();
-      var context = this.mouth.audio.context;
-      this.voip = new JanusVOIPPlayer();
-      this.voip.start(context);
-      this.audiobuffer = {readyCallbacks: []};//new THREE.AudioBuffer(this.mouth.audio.context);
-      this.audiobuffer.buffer = this.voip.rawbuffer;
-
-      //elation.events.add(this.voip, 'voip_player_data', elation.bind(this, this.handleVoipData));
-      this.audiobuffer.ready = true;
-      for ( var i = 0; i < this.audiobuffer.readyCallbacks.length; i ++ ) {
-
-        this.audiobuffer.readyCallbacks[ i ]( this.voip.rawbuffer );
-
-      }
-*/
-    }
-
-    //this.mouth.audio.setBuffer(this.audiobuffer);
-    elation.events.add(this, 'thing_change', elation.bind(this, this.updateTransparency));
   };
   this.speak = function(noise) {
     this.voip.speak(noise);
@@ -136,7 +112,7 @@ elation.component.add('engine.things.remoteplayer', function() {
   this.addVoice = async function(stream) {
     this.mouth = this.createObject('sound', {
       pos: V(0, 0, 0),
-      distanceModel: 'exponential',
+      distancemodel: 'exponential',
       dist: 8,
       rolloff: 0.75,
     });