janusweb 1.5.42 → 1.5.43

package/scripts/elements/outliner.js

@@ -59,7 +59,13 @@ elation.require(['janusweb.janusbase'], function() {
       this.outlinematerial.side = THREE.BackSide;
       //this.outlinematerial.blending = THREE.AdditiveBlending;
 
-      if (this.target) this.updateTarget();
+      if (this.target) {
+        this.updateTarget();
+      } else {
+        setTimeout(() => {
+          this.select(this.children[0]);
+        }, 50);
+      }
     },
     select(object) {
       this.selected = object;

package/scripts/external/JanusClientConnection.js

@@ -329,9 +329,7 @@ JanusClientConnection.prototype.connect = function() {
     this.status = 2;
     this._useridSuffix = '';
     this.sendLogon();
-    while (this.msgQueue.length > 0) {
-      this.send(this.msgQueue.shift());
-    }
+    this.sendQueuedCommands()
     this.dispatchEvent({type: 'connect'});
   }.bind(this);
 
@@ -362,6 +360,15 @@ JanusClientConnection.prototype.disconnect = function() {
   this.dispatchEvent({type: 'disconnecting'});
   this._websocket.close();
 }
+JanusClientConnection.prototype.sendQueuedCommands = function() {
+  if (this._websocket.readyState > 0) {
+    while (this.msgQueue.length > 0) {
+      this.send(this.msgQueue.shift());
+    }
+  } else {
+    setTimeout(() => this.sendQueuedCommands(), 100);
+  }
+}
 
 JanusClientConnection.prototype.sendLogon = function() {
   var msgData = {
@@ -385,13 +392,12 @@ JanusClientConnection.prototype.setUserId = function(userId) {
 };
 
 JanusClientConnection.prototype.send = function(msg) {
-  if (this._websocket.readyState == 0) {
-    this.msgQueue.push(msg);
-  } else if (this._websocket.readyState == 1) {
+  try {
     this._websocket.send(JSON.stringify(msg) + '\r\n');
-  } else {
-    //this.reconnect();
+  } catch (e) {
+    this.msgQueue.push(msg);
   }
+  //this.reconnect();
 };
 
 JanusClientConnection.prototype.onMessage = function(msg) {

package/scripts/image.js

@@ -37,7 +37,7 @@ elation.require(['janusweb.janusbase'], function() {
     this.createGeometry = function() {
       var aspect = this.getAspect(),
           thickness = 0.1; //Math.max(this.scale.x, this.scale.z) / (10 * this.scale.z);
-      var box = new THREE.BoxBufferGeometry(2, 2 * aspect, thickness);
+      var box = new THREE.BoxGeometry(2, 2 * aspect, thickness);
       box.applyMatrix4(new THREE.Matrix4().makeTranslation(0, 0, thickness / this.scale.z));
 
       // Flip the back face for images

package/scripts/janusbase.js

@@ -231,7 +231,7 @@ elation.require(['engine.things.generic', 'utils.template', 'janusweb.parts'], f
       }
     }
     this.createForces = function() {
-      if (this.collidable && !this.collision_trigger) {
+      if (this.collidable || this.collision_trigger) {
         elation.events.add(this.objects.dynamics, 'physics_collide', elation.bind(this, this.handleCollision));
       }
       this.updateRotationSpeed();
@@ -597,13 +597,16 @@ elation.require(['engine.things.generic', 'utils.template', 'janusweb.parts'], f
             sbs3d: args.sbs3d,
             ou3d: args.ou3d,
             eac360: args.eac360,
+            vr180: args.vr180,
             hasalpha: args.hasalpha,
             auto_play: args.auto_play,
             type: args.type,
             format: args.format,
             hls: args.hls,
             preload: args.preload,
-            baseurl: this.baseurl
+            baseurl: this.baseurl,
+            proxy: args.proxy,
+            extratracks: args.extratracks,
           });
         } else if (args.video) {
           assetlist.push({
@@ -613,12 +616,15 @@ elation.require(['engine.things.generic', 'utils.template', 'janusweb.parts'], f
             loop: args.loop,
             sbs3d: args.sbs3d,
             ou3d: args.ou3d,
+            vr180: args.vr180,
             hasalpha: args.hasalpha,
             auto_play: args.auto_play,
             type: args.type,
             format: args.format,
             hls: args.hls,
-            baseurl: this.baseurl
+            baseurl: this.baseurl,
+            proxy: args.proxy,
+            extratracks: args.extratracks,
           });
         }
       } else if (type == 'sound') {
@@ -796,7 +802,7 @@ elation.require(['engine.things.generic', 'utils.template', 'janusweb.parts'], f
           }
           parent.worldToLocal(camera.getWorldPosition(playerpos)).sub(this.position);
           dir.copy(playerpos).normalize();
-          if (billboard == 'y') {
+          if (billboard == 'y' || billboard === true || billboard == 'true') {
             this.rotation.radians.set(0, Math.atan2(dir.x, dir.z), 0);
             this.frameupdates['rotation'] = true;
           }
@@ -818,10 +824,12 @@ elation.require(['engine.things.generic', 'utils.template', 'janusweb.parts'], f
           this.refresh();
         }
 
+/*
         let pos = this.position;
         if (isNaN(pos.x)) pos.x = 0;
         if (isNaN(pos.y)) pos.y = 0;
         if (isNaN(pos.z)) pos.z = 0;
+*/
 
         if (this.properties.color === this.defaultcolor && (this.properties.color.r != 1 || this.properties.color.g != 1 || this.properties.color.b != 1)) {
           this.updateColor();
@@ -830,7 +838,7 @@ elation.require(['engine.things.generic', 'utils.template', 'janusweb.parts'], f
         this.resetFrameUpdates();
         this.dispatchEvent({type: 'update', data: ev.data, bubbles: false});
         var proxy = this.getProxyObject();
-        if (typeof proxy.update == 'function' && this.created) {
+        if (this.created && typeof proxy.update == 'function') {
           proxy.update(ev.data);
         }
       }
@@ -979,13 +987,13 @@ elation.require(['engine.things.generic', 'utils.template', 'janusweb.parts'], f
       if (other) {
         if (other.getProxyObject) {
           var proxy = other.getProxyObject();
-          //console.log('I collided', proxy, this);
+          //console.log('I collided', this.collision_trigger, other.collision_trigger, proxy, this);
 
-          if (this.collision_trigger || proxy.collision_trigger) {
+          if (this.collision_trigger || proxy.collision_trigger || other.collision_trigger) {
             this.dispatchEvent({type: 'trigger', data: { collision: ev.data, other: proxy }});
             ev.preventDefault();
             ev.stopPropagation();
-          } else if (this.collidable) {
+          } else if (this.collidable && other.collidable) {
             this.dispatchEvent({type: 'collision', data: { collision: ev.data, other: proxy }});
           } else {
             ev.preventDefault();
@@ -1031,7 +1039,7 @@ elation.require(['engine.things.generic', 'utils.template', 'janusweb.parts'], f
     }
     this.updateAnimation = function() {
       // Triggered whenever this.anim_id changes
-      if (this.anim_id) {
+      if (this.anim_id || !this.activeanimation) {
         this.setAnimation(this.anim_id);
       } else if (this.activeanimation) {
         this.stopAnimation();
@@ -1052,7 +1060,7 @@ elation.require(['engine.things.generic', 'utils.template', 'janusweb.parts'], f
           if (!this.fadetimers[clipname]) {
             // FIXME - for some reason, THREE.AnimationAction.fadeIn() / fadeOut() / etc are just causing the animations to stop, so we'll handle fading ourselves
             this.fadetimers[clipname] = setInterval(() => {
-              oldaction.weight *= .95;
+              oldaction.weight *= .9;
               if (oldaction.weight <= .001) {
                 oldaction.weight = 0;
                 oldaction.stop();
@@ -1088,10 +1096,12 @@ elation.require(['engine.things.generic', 'utils.template', 'janusweb.parts'], f
       if (!event.target) {
         event.target = target || event.element;
       }
+/*
       var handlerfn = 'on' + event.type;
       if (handlerfn in this) {
         this.executeCallback(this[handlerfn], event);
       }
+*/
       // Bubble event up to parents, unless the event was thrown with bubbling disabled or an event handler called stopPropagation()
       let firedev = elation.events.fire(event);
       let returnValue = true;
@@ -1172,7 +1182,7 @@ elation.require(['engine.things.generic', 'utils.template', 'janusweb.parts'], f
     this.raycast = (function() {
       var _pos = new THREE.Vector3(),
           _dir = new THREE.Vector3(0,0,-1);
-      return function(dir, offset, classname, maxdist) {
+      return function(dir, offset, classname, maxdist, colliderroot=null) {
         if (!this.room) return [];
         if (dir) {
           _dir.copy(dir);
@@ -1185,7 +1195,7 @@ elation.require(['engine.things.generic', 'utils.template', 'janusweb.parts'], f
         }
         this.localToWorld(_pos);
         this.objects.dynamics.localToWorldDir(_dir);
-        return this.room.raycast(_dir, _pos, classname, maxdist);
+        return this.room.raycast(_dir, _pos, classname, maxdist, colliderroot);
       };
     })();
     this.getElementsByTagName = function(tagname, elements) {
@@ -1282,9 +1292,9 @@ console.log('its null', k, this[k], prop);
         // Special handling for 'rotation' and 'color'
         if (realkey == 'rotation') {
 /*
-          props['rotation'][0] *= THREE.Math.RAD2DEG;
-          props['rotation'][1] *= THREE.Math.RAD2DEG;
-          props['rotation'][2] *= THREE.Math.RAD2DEG;
+          props['rotation'][0] *= THREE.MathUtils.RAD2DEG;
+          props['rotation'][1] *= THREE.MathUtils.RAD2DEG;
+          props['rotation'][2] *= THREE.MathUtils.RAD2DEG;
 */
         } else if (realkey == 'color') {
           if (!this.colorIsDefault) {
@@ -1402,5 +1412,17 @@ console.log('clone', props);
       }
       return false;
     }
+    this.physics_collide = function(ev) {
+      let obj1 = ev.data.bodies[0].object, obj2 = ev.data.bodies[1].object,
+          other = (obj1 == this ? obj2 : obj1);
+
+      let events = elation.events.fire({type: 'collide', element: this, data: {
+        other: (typeof other.getProxyObject == 'function' ? other.getProxyObject() : other),
+        collision: ev.data
+      } });
+      if (elation.events.wasDefaultPrevented(events)) {
+        ev.preventDefault();
+      }
+    }
   }, elation.engine.things.generic);
 });

package/scripts/janusghost.js

@@ -33,8 +33,8 @@ elation.require(['janusweb.janusbase', 'engine.things.leapmotion'], function() {
             diffuseColor.rgb *= vColor;
           #endif
           float dist = length(vViewPosition);
-          float mindist = .4;
-          float maxdist = .6;
+          float mindist = .2;
+          float maxdist = .4;
           if (dist < maxdist) {
             diffuseColor.a = clamp(((dist - mindist) / (maxdist - mindist)), 0., 1.);
           }
@@ -131,13 +131,11 @@ elation.require(['janusweb.janusbase', 'engine.things.leapmotion'], function() {
         this.ghostassets = assets;
         this.assetpack = elation.engine.assets.loadJSON(assets.assetlist);
       } else {
-        console.log(this.ghostassets);
-        this.assetpack.loadJSON(assets.assetlist);
+        this.assetpack.loadJSON(assets.assetlist, true);
       }
 
       let animnames = []; //'idle', 'walk', 'walk_left', 'walk_right', 'walk_back', 'run', 'jump', 'fly', 'speak', 'type', 'portal'];
       let animassets = assets.assetlist.filter(asset => animnames.indexOf(asset.name) != -1);
-      console.log('some ghost animations', animassets, assets);
 
       if (!this.animationmixer) {
         // Set up our animation mixer with a simple bone mapper for our head.  We'll add more animations to this ass other assets load
@@ -341,7 +339,7 @@ elation.require(['janusweb.janusbase', 'engine.things.leapmotion'], function() {
             if (this.body.animationmixer) {
               this.cloneAnimations(animasset);
             }
-            //this.body.setAnimation('idle');
+            this.body.setAnimation('idle');
           }
         });
         animasset.load();
@@ -664,9 +662,13 @@ elation.require(['janusweb.janusbase', 'engine.things.leapmotion'], function() {
         }
         if (ghostdef.head_id) {
           this.setHead(ghostdef.head_id, headpos, ghostdef.scale);
+        } else if (this.head) {
+          this.setHead(false);
         }
         if (ghostdef.body_id) {
           this.setBody(ghostdef.body_id, ghostdef.scale, ghostdef.pos);
+        } else if (this.body) {
+          this.setBody(false);
         }
         if (ghostdef._children) {
           for (var type in ghostdef._children) {

package/scripts/januslight.js

@@ -20,6 +20,7 @@ elation.require(['janusweb.janusbase'], function() {
         light_helper: { type: 'boolean', default: false, set: this.updateLightHelper },
         light_style: { type: 'string', default: '' },
         light_style_fps: { type: 'float', default: 10 },
+        color_temperature: { type: 'float', set: this.updateLight },
         collision_id: { type: 'string', default: 'sphere', set: this.updateCollider },
         collision_trigger: { type: 'boolean', default: true, set: this.updateCollider },
       });
@@ -73,14 +74,14 @@ elation.require(['janusweb.janusbase'], function() {
     this.getPlaceholderGeometry = function() {
       let placeholdergeo = null;
       if (this.light_cone_angle == 0) {
-        placeholdergeo = new THREE.SphereBufferGeometry(.1);
+        placeholdergeo = new THREE.SphereGeometry(.1);
       } else if (this.light_cone_angle == 1) {
-        placeholdergeo = new THREE.SphereBufferGeometry(.1);
+        placeholdergeo = new THREE.SphereGeometry(.1);
       } else {
         let angle = Math.acos(this.light_cone_angle),
             height = this.light_shadow_near,
             radius = Math.tan(angle) * height;
-        placeholdergeo = new THREE.ConeBufferGeometry(radius, height);
+        placeholdergeo = new THREE.ConeGeometry(radius, height);
         placeholdergeo.applyMatrix4(new THREE.Matrix4().makeRotationFromEuler(new THREE.Euler(-Math.PI/2, 0, 0)).setPosition(0, 0, height / 2));
       }
       return placeholdergeo;
@@ -139,7 +140,11 @@ elation.require(['janusweb.janusbase'], function() {
         this.light.intensity = .1;
         this.light.penumbra = this.light_penumbra;
         this.light.decay = this.light_decay;
-        this.light.color.copy(this.color);
+        if (this.color_temperature) {
+          this.light.color.copy(this.temperatureToRGB(this.color_temperature));
+        } else {
+          this.light.color.copy(this.color);
+        }
         this.light.color.multiplyScalar(this.light_intensity * avgscale * avgscale);
         this.light.distance = this.light_range * avgscale;
         if (this.light_cone_angle > 0 && this.light_cone_angle < 1) {
@@ -199,6 +204,42 @@ elation.require(['janusweb.janusbase'], function() {
       this.light.shadow.camera.top = d;
       this.light.shadow.camera.bottom = -d;
     }
+    this.temperatureToRGB = function(t) {
+      // From view-source:https://web.archive.org/web/20161108193229/https://tommitytom.co.uk/colourtemp/
+      let r = 0, g = 0, b = 0,
+          temp = Math.floor(t / 100 + 0.5),
+          rgb = null;
+
+      if (temp <= 66) {
+        r = 255;
+      } else {
+        r = temp - 60;
+        r = 329.698727446 * Math.pow(r, -0.1332047592);
+      }
+
+      if (temp <= 66) {
+        g = temp;
+        g = 99.4708025861 * Math.log(g) - 161.1195681661;
+      } else {
+        g = temp - 60;
+        g = 288.1221695283 * Math.pow(g, -0.0755148492);
+      }
+
+      if (temp >= 66) {
+        b = 255;
+      } else if (temp <= 19) {
+        b = 0;
+      } else {
+        b = temp - 10;
+        b = 138.5177312231 * Math.log(b) - 305.0447927307;
+      }
+
+      r = THREE.MathUtils.clamp(r, 0, 255) / 255;
+      g = THREE.MathUtils.clamp(g, 0, 255) / 255;
+      b = THREE.MathUtils.clamp(b, 0, 255) / 255;
+
+      return {r, g, b};
+    }
     this.getProxyObject = function(classdef) {
       if (!this._proxyobject) {
         this._proxyobject = elation.engine.things.janusobject.extendclass.getProxyObject.call(this, classdef);
@@ -215,6 +256,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'],
+          color_temperature:   [ 'property', 'color_temperature'],
         };
       }
       return this._proxyobject;

package/scripts/janusparticle.js

@@ -285,7 +285,7 @@ elation.require(['janusweb.janusbase'], function() {
       this.emitted = 0;
     }
     this.updateParticles = function(ev) {
-      if (!this.loaded || !this.started || !this.parent) return;
+      if (!this.loaded || !this.started || !this.parent || !this.visible) return;
       var now = performance.now(),
           elapsed = now - this.lasttime,
           endtime = now + this.duration * 1000,
@@ -553,9 +553,10 @@ elation.require(['janusweb.janusbase'], function() {
 
       point.active = 1;
 
-      var pos = this.geometry.attributes.position.array,
-          color = this.geometry.attributes.customColor.array,
-          size = this.geometry.attributes.size.array;
+      var geo = this.geometry,
+          pos = geo.attributes.position.array,
+          color = geo.attributes.customColor.array,
+          size = geo.attributes.size.array;
 
       if (newpos) {
         point.pos.copy(newpos);
@@ -564,8 +565,14 @@ elation.require(['janusweb.janusbase'], function() {
         pos[offset + 1] = newpos.y;
         pos[offset + 2] = newpos.z;
 
-        this.geometry.attributes.position.needsUpdate = true;
-        this.updateBoundingSphere(newpos);
+        geo.attributes.position.needsUpdate = true;
+        //this.updateBoundingSphere(newpos);
+        if (!this.updateBoundingSphereTimer) {
+          this.updateBoundingSphereTimer = setTimeout(() => {
+            this.updateBoundingSphere(newpos);
+            this.updateBoundingSphereTimer = false;
+          }, 0);
+        }
       }
 
       if (newvel) {
@@ -582,23 +589,119 @@ elation.require(['janusweb.janusbase'], function() {
         color[pointnum*4    ] = newcol.x;
         color[pointnum*4 + 1] = newcol.y;
         color[pointnum*4 + 2] = newcol.z;
-        color[pointnum*4 + 3] = elation.utils.any(point.opacity, this.opacity, 1);
+        color[pointnum*4 + 3] = elation.utils.any(point.opacity, this.properties.opacity, 1);
 
-        this.geometry.attributes.customColor.needsUpdate = true;
+        geo.attributes.customColor.needsUpdate = true;
       }
       if (newsize) {
         point.size = newsize;
         size[pointnum] = newsize;
 
-        this.geometry.attributes.size.needsUpdate = true;
+        geo.attributes.size.needsUpdate = true;
       }
       point.opacity = newopacity;
 
-      if (pointnum >= this.count) {
-        this.count = this.particles.length;
-        this.createParticles(false);
-        this.updateParticles();
+      if (pointnum >= this.properties.count) {
+        if (!this.updateParticleTimer) {
+          this.updateParticleTimer = setTimeout(() => { 
+            this.count = this.particles.length;
+            this.createParticles(false);
+            this.updateParticleTimer = false;
+          }, 0);
+        }
       }
     }
+    this.setPoints = (function() {
+      let furthest = new THREE.Vector3();
+      return function(points) {
+        var geo = this.geometry,
+            pos = geo.attributes.position.array,
+            color = geo.attributes.customColor.array,
+            size = geo.attributes.size.array;
+            furthestDistSq = 0,
+            particles = this.particles;
+        for (let i = 0; i < points.length; i++) {
+          let point = particles[i],
+              newpoint = points[i],
+              offset = i * 3;
+          
+          if (!point) {
+            point = this.createPoint();
+            point.active = 1;
+            particles[i] = point;
+          }
+
+          point.active = 1;
+
+          if ('pos' in newpoint) {
+            //point.pos.copy(newpoint.pos);
+            let p1 = point.pos,
+                p2 = newpoint.pos;
+            pos[offset    ] = p1.x = p2.x;
+            pos[offset + 1] = p1.y = p2.y;
+            pos[offset + 2] = p1.z = p2.z;
+
+  /*
+            point.pos.copy(newpoint.pos);
+            pos[offset    ] = point.pos.x;
+            pos[offset + 1] = point.pos.y;
+            pos[offset + 2] = point.pos.z;
+  */
+
+            //this.updateBoundingSphere(newpos);
+            let distSq = p2.x * p2.x + p2.y * p2.y + p2.z * p2.z;
+            if (distSq > furthestDistSq) {
+              furthest.x = newpoint.pos.x;
+              furthest.y = newpoint.pos.y;
+              furthest.z = newpoint.pos.z;
+              furthestDistSq = distSq;
+            }
+          }
+
+          if ('vel' in newpoint) {
+            //point.vel.copy(newpoint.vel);
+            point.vel.x = newpoint.vel.x;
+            point.vel.y = newpoint.vel.y;
+            point.vel.z = newpoint.vel.z;
+          }
+
+          if ('accel' in newpoint) {
+            //point.accel.copy(newpoint.accel);
+            point.accel.x = newpoint.accel.x;
+            point.accel.y = newpoint.accel.y;
+            point.accel.z = newpoint.accel.z;
+          }
+
+          if ('opacity' in newpoint) {
+            point.opacity = newpoint.opacity;
+          }
+
+
+          if ('col' in newpoint) {
+            point.color.setRGB(newpoint.col.x, newpoint.col.y, newpoint.col.z);
+
+            color[i*4    ] = newpoint.col.x;
+            color[i*4 + 1] = newpoint.col.y;
+            color[i*4 + 2] = newpoint.col.z;
+            color[i*4 + 3] = elation.utils.any(point.opacity, this.properties.opacity, 1);
+
+            geo.attributes.customColor.needsUpdate = true;
+          }
+          if ('size' in newpoint) {
+            point.size = newpoint.size;
+            size[i] = newpoint.size;
+
+            geo.attributes.size.needsUpdate = true;
+          }
+        }
+        geo.attributes.position.needsUpdate = true;
+        this.updateBoundingSphere(furthest);
+        if (points.length >= this.properties.count) {
+          this.count = particles.length;
+          this.createParticles(false);
+          this.updateParticleTimer = false;
+        }
+      }
+    })();
   }, elation.engine.things.janusbase);
 });