elation-engine 0.9.119 → 0.9.121

package/package.json

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

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));
@@ -1000,6 +1000,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

@@ -238,6 +238,7 @@ elation.require(["physics.cyclone"], function() {
       let material1 = new THREE.LineBasicMaterial({color: 0x00ffff, transparent: true, depthWrite: false, depthTest: false, opacity: .05, blending: THREE.AdditiveBlending, linewidth: 4});
       let material2 = new THREE.LineBasicMaterial({color: 0x00ffff, transparent: true, depthWrite: false, depthTest: true, opacity: .2, blending: THREE.AdditiveBlending, linewidth: 4});
       this.geometry = geo;
+      geo.computeBoundingSphere();
       let obj = new THREE.Object3D();
       obj.add(new THREE.LineSegments(geo, material1));
       obj.add(new THREE.LineSegments(geo, material2));
@@ -428,9 +429,9 @@ elation.require(["physics.cyclone"], function() {
     this.createBoundingPlane = function(collider) {
       var plane = new THREE.PlaneGeometry(1000, 1000);
       var planemat = new THREE.MeshBasicMaterial({color: 0x00ffff, transparent: true, opacity: .04, depthWrite: false, polygonOffset: true, polygonOffsetFactor: -5, polygonOffsetUnits: 1, wireframe: false, blending: THREE.AdditiveBlending });
-  // FIXME - this only really works for horizontal planes
-  var mat = new THREE.Matrix4().makeRotationFromQuaternion(new THREE.Quaternion().setFromAxisAngle(new THREE.Vector3(1,0,0), -Math.PI/2));
-  plane.applyMatrix(mat);
+      // FIXME - this only really works for horizontal planes
+      var mat = new THREE.Matrix4().makeRotationFromQuaternion(new THREE.Quaternion().setFromAxisAngle(new THREE.Vector3(1,0,0), -Math.PI/2));
+      plane.applyMatrix4(mat);
       var mesh = new THREE.Mesh(plane, planemat);
       return mesh;
     }
@@ -441,7 +442,7 @@ elation.require(["physics.cyclone"], function() {
       var mesh = new THREE.Mesh(cyl, cylmat);
 console.log('my offset', collider.offset, collider);
       let offset = collider.offset.clone();//.multiply(collider.body.scale);
-      cyl.applyMatrix(new THREE.Matrix4().makeTranslation(offset.x, offset.y, offset.z));
+      cyl.applyMatrix4(new THREE.Matrix4().makeTranslation(offset.x, offset.y, offset.z));
       return mesh;
     }
     this.createBoundingMesh = function(collider) {
@@ -814,7 +815,7 @@ console.log('ffff', collision.impulses[i], len);
       var size = [bbox.max.x - bbox.min.x, bbox.max.y - bbox.min.y, bbox.max.z - bbox.min.z];
       var offset = [(bbox.max.x + bbox.min.x) / 2, (bbox.max.y - bbox.min.y) / 2, (bbox.max.z + bbox.min.z) / 2];
       var insidegeo = new THREE.BoxGeometry(size[0], size[1], size[2]);
-      insidegeo.applyMatrix(new THREE.Matrix4().makeTranslation(offset[0], size[1]/2 + offset[1], offset[2]));
+      insidegeo.applyMatrix4(new THREE.Matrix4().makeTranslation(offset[0], size[1]/2 + offset[1], offset[2]));
       var insidemat_side = new THREE.MeshPhongMaterial({emissive: 0x006666, color: 0x00ffff, opacity: 0.8, transparent: true, depthWrite: false, depthTest: false});
       var insidemat_top = new THREE.MeshPhongMaterial({emissive: 0x006666, color: 0x00ffff, opacity: 0.5, transparent: true, depthWrite: false, depthTest: false});
 

package/scripts/systems/world.js

@@ -357,7 +357,7 @@ elation.require([
     this.spawn = function(type, name, spawnargs, parent, autoload) {
       if (elation.utils.isNull(name)) name = type + Math.floor(Math.random() * 1000000);
       if (!spawnargs) spawnargs = {};
-      if (!parent) parent = this.children['default'] || this;
+      //if (!parent) parent = this.children['default'] || this;
       if (typeof autoload == 'undefined') autoload = true;
 
       var logprefix = "";
@@ -388,8 +388,10 @@ elation.require([
           } else {
             currentobj = elation.engine.things[type]({type: realtype, container: elation.html.create(), name: name, engine: this.engine, client: this.client, properties: spawnargs});
           }
-          parent.add(currentobj);
-          //currentobj.reparent(parent);
+          if (parent) {
+            parent.add(currentobj);
+            //currentobj.reparent(parent);
+          }
 
           //console.log(logprefix + "\t- added new " + type + ": " + name, currentobj);
         }

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() {
@@ -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);
 });