janusweb 1.5.41 → 1.5.43

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

@@ -256,7 +256,7 @@ elation.require(['janusweb.janusbase'], function() {
       geo.setAttribute('size', new THREE.BufferAttribute(size, 1));
 
       this.created = true;
-      this.emitted = 0;
+      this.spawncount = 0;
       this.currentpoint = 0;
       this.lasttime = performance.now();
 
@@ -282,15 +282,16 @@ elation.require(['janusweb.janusbase'], function() {
         color[i*4+2] = point.color.b;
         color[i*4+3] = point.opacity;
       }
+      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,
           emitted = 0,
           startpoint = this.currentpoint,
-          spawncount = this.rate * elapsed / 1000,
+          spawncount = this.spawncount + this.rate * elapsed / 1000,
           count = this.count,
           loop = this.loop;
 
@@ -315,10 +316,12 @@ elation.require(['janusweb.janusbase'], function() {
             p.endtime = (this.duration > 0 ? endtime : Infinity);
             p.active = 1;
             emitted++;
+            spawncount--;
             this.currentpoint = (this.currentpoint + 1) % count;
           }
         } 
       }
+      this.spawncount = spawncount;
       this.lasttime = now;
       // Notify the renderer of our changes, but only if we're visible to the player
       // We also rate limit here, so if nothing else in the scene is changing, we
@@ -550,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);
@@ -561,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) {
@@ -579,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);
 });