elation-engine 0.9.120 → 0.9.122

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "elation-engine",
   "description": "WebGL/WebVR engine written in Javascript",
-  "version": "0.9.120",
+  "version": "0.9.122",
   "main": "",
   "author": "James Baicoianu",
   "license": "MIT",

package/scripts/assets.js

@@ -1528,6 +1528,9 @@ console.log('set up hls', hlsConfig);
             if (n.geometry && !n.geometry.attributes.normal) {
               n.geometry.computeVertexNormals();
             }
+            if (n.name.match(/^mixamorig:/)) {
+              n.name = n.name.replace('mixamorig:', '');
+            }
           });
 
           if (modeldata.userData && modeldata.userData.gltfExtensions && modeldata.userData.gltfExtensions.VRM) {

package/scripts/external/three/three-objects.js

@@ -739,6 +739,13 @@ console.log('skelly data', boneDatas);
 
                 //console.log('found a part to clone!', oldname, parts[0], src, dst, track.name);
                 found = true;
+              } else if (parts[0].indexOf(':') > -1) {
+                let parts2 = parts[0].split(':');
+                if (parts2[1] == src.name || parts[1] == src.uuid) {
+                  parts[0] = dst.name || dst.uuid;
+                  track.name = parts.join('.');
+                  found = true;
+                }
               }
             });
             if (!found) {

package/scripts/external/three/three.js

@@ -45194,7 +45194,7 @@
 	}
 
 	// Characters [].:/ are reserved for track binding syntax.
-	const _RESERVED_CHARS_RE = '\\[\\]\\.:\\/';
+	const _RESERVED_CHARS_RE = '\\[\\]\\.\\/';
 	const _reservedRe = new RegExp( '[' + _RESERVED_CHARS_RE + ']', 'g' );
 
 	// Attempts to allow node names from any language. ES5's `\w` regexp matches

package/scripts/systems/controls.js

@@ -210,7 +210,7 @@ elation.require(['ui.window', 'ui.panel', 'ui.toggle', 'ui.slider', 'ui.label',
       if (!this.container) this.container = (this.engine.systems.render ? this.engine.systems.render.renderer.domElement : window);
       elation.events.add(this.container, "mousedown,mousemove,mouseup,mousewheel,click,DOMMouseScroll,gesturestart,gesturechange,gestureend", this);
       //elation.events.add(this.container, "touchstart,touchmove,touchend, this);
-      elation.events.add(window, "keydown,keyup,webkitGamepadConnected,webkitgamepaddisconnected,MozGamepadConnected,MozGamepadDisconnected,gamepadconnected,gamepaddisconnected", this);
+      elation.events.add(window, "keydown,keyup,webkitGamepadConnected,webkitgamepaddisconnected,MozGamepadConnected,MozGamepadDisconnected,gamepadconnected,gamepaddisconnected,focus", this);
       //elation.events.add(window, "deviceorientation,devicemotion", this);
       elation.events.add(document, "pointerlockchange,webkitpointerlockchange,mozpointerlockchange", elation.bind(this, this.pointerLockChange));
       elation.events.add(document, "pointerlockerror,webkitpointerlockerror,mozpointerlockerror", elation.bind(this, this.pointerLockError));
@@ -810,6 +810,7 @@ elation.require(['ui.window', 'ui.panel', 'ui.toggle', 'ui.slider', 'ui.label',
         this.state[bindid] = 0;
         this.changes.push(bindid);
       }, 10);
+      ev.preventDefault();
     }
     this.keydown = function(ev) {
       // Send key events for both keyboard_<key> and keyboard_<modname>_<key>
@@ -1000,6 +1001,9 @@ return;
         this.capturekeys.splice(idx, 1);
       }
     }
+    this.focus = function(ev) {
+      if (this.state['keyboard_alt']) this.state['keyboard_alt'] = 0; // fix sticky alt key on alt tab
+    }
   });
 if (0) {
   elation.component.add('engine.systems.controls.config', function() {

package/scripts/systems/physics.js

@@ -21,13 +21,13 @@ elation.require(["physics.cyclone"], function() {
     this.engine_start = function(ev) {
       //console.log("PHYSICS: starting");
       this.system.start({subprocessor: 'cpu', processorargs: { path: 'https://baicoianu.com/~bai/janusweb/build/1.5.32/media/lib/physx/'}});
-      this.lasttime = new Date().getTime();
+      this.lasttime = performance.now();
       if (this.interval) {
         clearInterval(this.interval);
       }
       if (this.async) {
         this.interval = setInterval(elation.bind(this, function() {
-          var now = new Date().getTime();
+          var now = performance.now();
             //this.system.step(this.timescale * (now - this.lasttime) / 1000);
             //if (this.stats) this.stats.update();
           this.step((now - this.lasttime) / 1000);

package/scripts/things/generic.js

@@ -242,6 +242,9 @@ elation.component.add("engine.things.generic", function() {
       configurable: true,
       enumerable: true,
       get: function() { 
+        if ('get' in prop) {
+          return prop.get.call(this);
+        }
         var proxy = this._proxies[propname]; 
         if (proxy) {
           return proxy;

package/scripts/things/player.js

@@ -25,6 +25,7 @@ elation.require(['engine.things.generic', 'engine.things.camera', 'engine.things
         dynamicfriction:{ type: 'float', default: 2.0, comment: 'Dynamic friction inherent to this object' },
         staticfriction: { type: 'float', default: 1.9, comment: 'Static friction inherent to this object' },
         fov: { type: 'float', default: 75, set: this.updateCamera },
+        turnhead: { type: 'boolean', default: false, set: this.updateHeadLock },
       });
       this.controlstate = this.engine.systems.controls.addContext('player', {
         'move_forward': ['keyboard_w', elation.bind(this, this.updateControls)],
@@ -182,6 +183,7 @@ elation.require(['engine.things.generic', 'engine.things.camera', 'engine.things
     this.createChildren = function() {
       // place camera at head height
       this.headconstraint = this.head.objects.dynamics.addConstraint('axis', { axis: new THREE.Vector3(1,0,0), min: -Math.PI/2, max: Math.PI/2 });
+      this.neckconstraint = this.neck.objects.dynamics.addConstraint('axis', { axis: new THREE.Vector3(0,1,0), min: 3/4 * -Math.PI/2, max: 3/4 * Math.PI/2 });
       this.reset_position();
     }
     this.createForces = function() {
@@ -220,7 +222,7 @@ elation.require(['engine.things.generic', 'engine.things.camera', 'engine.things
         'position': [0,1.45,0]
       });
       this.head = this.neck.spawn('generic', this.properties.player_id + '_head', {
-        'position': [0,.3,0],
+        'position': [0,.2,0],
         'mass': 1
       });
 
@@ -491,7 +493,12 @@ elation.require(['engine.things.generic', 'engine.things.camera', 'engine.things
             var theta = angular.length();
             angular.divideScalar(theta);
             tmpquat.setFromAxisAngle(angular, theta);
-            this.properties.orientation.multiply(tmpquat);
+            if (this.turnhead) {
+              this.neck.properties.orientation.multiply(tmpquat);
+            } else {
+              this.properties.orientation.multiply(tmpquat);
+              this.neck.properties.orientation.set(0,0,0,1);
+            }
             ev.data.mouse_turn = 0;
             ev.data.mouse_look[0] = 0;
             changed = true;
@@ -720,6 +727,17 @@ elation.require(['engine.things.generic', 'engine.things.camera', 'engine.things
         this.camera.fov = this.fov;
       }
     }
-
+    this.updateHeadLock = function() {
+      if (this.headconstraint && this.neckconstraint) {
+        if (this.turnhead) {
+          //this.headconstraint.enabled = false;
+          this.neckconstraint.min = 3/4 * -Math.PI/2;
+          this.neckconstraint.max = 3/4 * Math.PI/2;
+        } else {
+          this.neckconstraint.min = 0;
+          this.neckconstraint.max = 0;
+        }
+      }
+    }
   }, elation.engine.things.generic);
 });