janusweb 1.5.30 → 1.5.34

package/scripts/janusbase.js

@@ -19,6 +19,7 @@ elation.require(['engine.things.generic', 'utils.template', 'janusweb.parts'], f
         js_id:    { type: 'string' },
         color:    { type: 'color', default: this.defaultcolor, set: this.updateColor, comment: 'Object color' },
         opacity:  { type: 'float', default: 1.0, set: this.updateOpacity, min: 0, max: 1, comment: 'Object translucency, from 0..1' },
+        transparent: { type: 'bool', default: null, set: this.updateOpacity, comment: 'Override object transparency autodetection' },
         alphatest:  { type: 'float', default: 0.05, set: this.updateAlphaTest, min: 0, max: 1 },
         fwd:      { type: 'vector3', default: new THREE.Vector3(0,0,1), set: this.pushFrameUpdate, comment: 'Forward vector (zdir == fwd)' },
         xdir:     { type: 'vector3', default: new THREE.Vector3(1,0,0), set: this.pushFrameUpdate, comment: 'Left vector' },
@@ -50,10 +51,12 @@ elation.require(['engine.things.generic', 'utils.template', 'janusweb.parts'], f
         billboard: { type: 'string', default: '' },
         hasposition: { type: 'boolean', default: true },
         gazetime: { type: 'float' },
+        static: { type: 'boolean', default: false },
         ongazeenter: { type: 'callback' },
         ongazeleave: { type: 'callback' },
         ongazeprogress: { type: 'callback' },
         ongazeactivate: { type: 'callback' },
+        oncollision: { type: 'callback' },
       });
       this.lastframevalues = {
         position: new THREE.Vector3(0,0,0),
@@ -80,7 +83,7 @@ elation.require(['engine.things.generic', 'utils.template', 'janusweb.parts'], f
         this.properties.orientation.copy(this.object.quaternion);
         return this.object;
       }
-      if (this.renderorder) this.object.renderOrder = this.renderorder;
+      if (this.renderorder && this.object) this.object.renderOrder = this.renderorder;
       return new THREE.Object3D();
     }
     this.createChildren = function() {
@@ -120,7 +123,7 @@ elation.require(['engine.things.generic', 'utils.template', 'janusweb.parts'], f
       this.refresh();
     }
     this.updateOpacity = function() {
-      this.setOpacity(this.opacity);
+      this.setOpacity(this.opacity, this.transparent);
     },
     this.updateAlphaTest = function() {
       this.setAlphaTest(this.alphatest);
@@ -129,7 +132,7 @@ elation.require(['engine.things.generic', 'utils.template', 'janusweb.parts'], f
       this.removeCollider();
       if (!(this.collidable || this.pickable) || !this.objects['dynamics']) return;
       var collision_id = this.collision_id || this.collider_id;
-      var collision_scale = this.scale.clone();
+      var collision_scale = V().copy(this.scale);
       if (this.collision_scale) {
         collision_scale.multiply(this.collision_scale);
       }
@@ -154,7 +157,7 @@ elation.require(['engine.things.generic', 'utils.template', 'janusweb.parts'], f
         } else if (collision_id == 'cylinder') {
           this.setCollider('cylinder', {height: 1, radius: .5, offset: new THREE.Vector3(0, 0.5, 0), trigger: this.collision_trigger});
         } else if (collision_id == 'capsule') {
-          this.setCollider('capsule', {height: 1, radius: .5, offset: new THREE.Vector3(0, 0.5, 0), trigger: this.collision_trigger});
+          this.setCollider('capsule', {length: 1, radius: .5, offset: new THREE.Vector3(0, 0, 0), trigger: this.collision_trigger});
         } else {
           var colliderasset = this.getAsset('model', collision_id);
           if (colliderasset) {
@@ -174,24 +177,25 @@ elation.require(['engine.things.generic', 'utils.template', 'janusweb.parts'], f
               let remove = [];
               collider.traverse(n => {
                 // Ignore collider if it's too high-poly
-                if (n instanceof THREE.Mesh && !((n.geometry instanceof THREE.BufferGeometry && n.geometry.attributes.position.count <= 65536) ||
-                      (n.geometry instanceof THREE.Geometry && n.geometry.vertices.length <= 65536))) {
-                  console.warn('Collider mesh rejected, too many polys!', collision_id, this, n, collider);
-                  elation.events.fire({type: 'thing_collider_rejected', element: this, data: {root: collider, mesh: n}});
-                  remove.push(n);
-                } else {
-                  if (n.material) {
-                    n.material = new THREE.MeshPhongMaterial({
-                      color: collidercolor,
-                      opacity: .2,
-                      transparent: true,
-                      emissive: 0x444400,
-                      alphaTest: .01,
-                      depthTest: false,
-                      depthWrite: false
-                    });
+                if (n instanceof THREE.Mesh && n.geometry instanceof THREE.BufferGeometry) {
+                  if (n.geometry.attributes.position.count > 65536) {
+                    console.warn('Collider mesh rejected, too many polys!', collision_id, this, n, collider);
+                    elation.events.fire({type: 'thing_collider_rejected', element: this, data: {root: collider, mesh: n}});
+                    remove.push(n);
+                  } else {
+                    if (n.material) {
+                      n.material = new THREE.MeshPhongMaterial({
+                        color: collidercolor,
+                        opacity: .2,
+                        transparent: true,
+                        emissive: 0x444400,
+                        alphaTest: .01,
+                        depthTest: false,
+                        depthWrite: false
+                      });
+                    }
+                    n.userData.thing = this;
                   }
-                  n.userData.thing = this;
                 }
               });
               if (remove.length > 0) {
@@ -205,8 +209,12 @@ elation.require(['engine.things.generic', 'utils.template', 'janusweb.parts'], f
               //this.colliders.add(collider);
               processMeshCollider(collider);
             } else {
+              let meshColliderLoaded = false;
               elation.events.add(collider, 'asset_load', elation.bind(this, function(ev) {
-                processMeshCollider(collider);
+                if (!meshColliderLoaded) {
+                  processMeshCollider(collider);
+                }
+                meshColliderLoaded = true;
               }) );
             }
           }
@@ -223,7 +231,9 @@ elation.require(['engine.things.generic', 'utils.template', 'janusweb.parts'], f
       }
     }
     this.createForces = function() {
-      elation.events.add(this.objects.dynamics, 'physics_collide', elation.bind(this, this.handleCollision));
+      if (this.collidable && !this.collision_trigger) {
+        elation.events.add(this.objects.dynamics, 'physics_collide', elation.bind(this, this.handleCollision));
+      }
       this.updateRotationSpeed();
     }
     this.updateRotationSpeed = function() {
@@ -286,7 +296,7 @@ elation.require(['engine.things.generic', 'utils.template', 'janusweb.parts'], f
             }
           } else if (val instanceof THREE.Color) {
             if (defaultval instanceof THREE.Color) defaultval = defaultval.toArray();
-            if (!('default' in propdef) || ('default' in propdef && !(val.r == defaultval[0] && val.g == defaultval[1] && val.b == defaultval[2]))) {
+            if (!('default' in propdef) || defaultval === null || ('default' in propdef && !(val.r == defaultval[0] && val.g == defaultval[1] && val.b == defaultval[2]))) {
               attrs[k] = val.toArray().map(n => Math.round(n * 10000) / 10000).join(' ');
             }
           } else if (val instanceof THREE.Euler) {
@@ -347,6 +357,7 @@ elation.require(['engine.things.generic', 'utils.template', 'janusweb.parts'], f
           dynamicfriction:['property', 'dynamicfriction'],
           staticfriction:['property', 'staticfriction'],
           opacity:  ['property', 'opacity'],
+          transparent:  ['property', 'transparent'],
           alphatest:  ['property', 'alphatest'],
           sync:     ['property', 'sync'],
           autosync: ['property', 'autosync'],
@@ -372,6 +383,9 @@ elation.require(['engine.things.generic', 'utils.template', 'janusweb.parts'], f
           rotate_deg_per_sec:  [ 'property', 'rotate_deg_per_sec'],
           rotate_axis:  [ 'property', 'rotate_axis'],
 
+          anim_id:    ['property', 'anim_id'],
+          anim_transition_time:    ['property', 'anim_transition_time'],
+
           fwd:      ['property', 'zdir'],
           xdir:     ['property', 'xdir'],
           ydir:     ['property', 'ydir'],
@@ -708,7 +722,11 @@ elation.require(['engine.things.generic', 'utils.template', 'janusweb.parts'], f
     }
     this.start = function() {
       if (!this.started) {
-        elation.events.add(this.room, 'janusweb_script_frame_end', this.handleFrameUpdates);
+        if (!this.static) {
+          elation.events.add(this.room, 'janusweb_script_frame_end', this.handleFrameUpdates);
+        } else {
+          this.handleFrameUpdates({data: {dt: 0}});
+        }
         this.started = true;
       }
       for (var k in this.children) {
@@ -725,7 +743,9 @@ elation.require(['engine.things.generic', 'utils.template', 'janusweb.parts'], f
         }
       }
       if (this.started) {
-        elation.events.remove(this.room, 'janusweb_script_frame_end', this.handleFrameUpdates);
+        if (!this.static) {
+          elation.events.remove(this.room, 'janusweb_script_frame_end', this.handleFrameUpdates);
+        }
         this.started = false;
         this.dispatchEvent({type: 'stop', bubbles: false});
       }
@@ -739,7 +759,7 @@ elation.require(['engine.things.generic', 'utils.template', 'janusweb.parts'], f
           dir = new THREE.Vector3(),
           up = new THREE.Vector3();
       return function(ev) {
-        let parent = this.parent;
+        let parent = this.properties.parent;
         let billboard = this.properties.billboard;
         if (billboard && parent) {
           //player.camera.localToWorld(playerpos.set(0,0,0));
@@ -896,7 +916,7 @@ elation.require(['engine.things.generic', 'utils.template', 'janusweb.parts'], f
     }
 
     this.createObject = function(type, args, skipstart) {
-      return room.createObject(type, args, this, !this.started);
+      return this.room.createObject(type, args, this, !this.started);
     }
     this.appendChild = function(obj) {
       var proxyobj = obj
@@ -934,8 +954,8 @@ elation.require(['engine.things.generic', 'utils.template', 'janusweb.parts'], f
           realobj.stop();
           this.remove(realobj);
           this.updateScriptChildren();
-          if (room.objects[obj.js_id]) {
-            delete room.objects[obj.js_id];
+          if (this.room.objects[obj.js_id]) {
+            delete this.room.objects[obj.js_id];
           }
         }
       }
@@ -974,15 +994,16 @@ elation.require(['engine.things.generic', 'utils.template', 'janusweb.parts'], f
         }
       }
     }
-    this.setOpacity = function(opacity) {
-      if (this.objects['3d'] && this.currentopacity != opacity) {
+    this.setOpacity = function(opacity, transparent) {
+      if (this.objects['3d'] && (this.currentopacity != opacity || this.currenttransparent !== transparent)) {
         this.currentopacity = opacity;
-        this.traverseObjects(function(n) {
+        this.currenttransparent = transparent;
+        this.traverseObjects((n) => {
           if (n.material) {
             var m = (elation.utils.isArray(n.material) ? n.material : [n.material]);
             for (var i = 0; i < m.length; i++) {
               m[i].opacity = opacity;
-              m[i].transparent = (opacity < 1);
+              m[i].transparent = (transparent !== null ? transparent : opacity < 1);
               if (m[i].transparent) {
                 m[i].alphaTest = this.alphatest;
               }
@@ -1009,25 +1030,58 @@ elation.require(['engine.things.generic', 'utils.template', 'janusweb.parts'], f
     }
     this.updateAnimation = function() {
       // Triggered whenever this.anim_id changes
-      this.setAnimation(this.anim_id);
+      if (this.anim_id) {
+        this.setAnimation(this.anim_id);
+      } else if (this.activeanimation) {
+        this.stopAnimation();
+      }
     }
     this.setAnimation = function(anim_id) {
-      if (!this.activeanimation || anim_id != this.anim_id) {
-        if (!this.animationmixer) return;
+      if (!this.started) return;
+      if (!this.activeanimation || anim_id != this.activeanimation._clip.name) {
+        if (!this.animationmixer) this.extractAnimations(this.objects['3d']);
         if (this.activeanimation) {
           //console.log('pause active animation', this.activeanimation);
           // TODO - interpolating between actions would make transitions smoother
-          this.activeanimation.stop();
+          //this.activeanimation.stop();
+          //this.activeanimation.fadeOut(.5);
+          let oldaction = this.activeanimation;
+          if (!this.fadetimers) this.fadetimers = {};
+          let clipname = oldaction._clip.name;
+          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;
+              if (oldaction.weight <= .001) {
+                oldaction.weight = 0;
+                oldaction.stop();
+                clearTimeout(this.fadetimers[clipname]);
+                this.fadetimers[clipname] = false;
+              }
+            }, 20);
+          }
         }
-        if (this.animationactions && this.animationactions[anim_id]) {
-          var action = this.animationactions[anim_id];
-          //console.log('found action!', anim_id, action);
+        if (this.animations && this.animations[anim_id]) {
+          var action = this.animations[anim_id];
+          let clipname = action._clip.name;
+          if (this.fadetimers && this.fadetimers[clipname]) {
+            clearTimeout(this.fadetimers[clipname]);
+            this.fadetimers[clipname] = false;
+          }
+          action.weight = 1;
+          action.reset();
           action.play();
           this.activeanimation = action;
         }
         this.anim_id = anim_id;
       }
     }
+    this.stopAnimation = function() {
+      if (this.activeanimation) {
+        this.activeanimation.stop();
+        this.activeanimation = false;
+      }
+    }
     this.dispatchEvent = function(event, target) {
       if (!event.element) event.element = target || this;
       if (!event.target) {
@@ -1315,9 +1369,10 @@ console.log('clone', props);
       }
     }
     this.setRoom = function(newroom, ischild) {
-      if (newroom._target) newroom = newroom._target; // If the proxy object is passed in, use its target instead
+      if (newroom && newroom._target) newroom = newroom._target; // If the proxy object is passed in, use its target instead
 
       if (this.room !== newroom) {
+        let oldroom = this.room;
         if (!ischild) {
           this.stop();
         }
@@ -1327,7 +1382,13 @@ console.log('clone', props);
             this.children[k].setRoom(newroom, true);
           }
         }
-        if (!ischild) {
+        if (newroom && !ischild) {
+          let roomproxy = (newroom._target ? newroom : newroom.getProxyObject()),
+              objproxy = (this._target ? this : this.getProxyObject());
+          if (!roomproxy.contains(objproxy)) {
+            //newroom.add(this);
+            roomproxy.appendChild(objproxy);
+          }
           this.start();
         }
       }