elation-engine 0.9.113 → 0.9.115

package/scripts/things/player.js

@@ -24,6 +24,7 @@ elation.require(['engine.things.generic', 'engine.things.camera', 'engine.things
         flying: { type: 'boolean', default: false, set: function(key, value) { this.properties.flying = value; this.toggle_flying(value); }},
         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 },
       });
       this.controlstate = this.engine.systems.controls.addContext('player', {
         'move_forward': ['keyboard_w', elation.bind(this, this.updateControls)],
@@ -151,7 +152,10 @@ elation.require(['engine.things.generic', 'engine.things.camera', 'engine.things
 
       this.flying = value;
       this.usegravity = !this.flying;
-      console.log('toggle flying', this.flying);
+      if (this.gravityForce) {
+        this.gravityForce.update(this.gravityVector.set(0,this.usegravity * -9.8 , 0));
+      }
+      //console.log('toggle flying', this.flying, this.gravityForce);
     }
     this.reset_position = function(ev) {
       if (!ev || ev.value == 1) {
@@ -185,8 +189,14 @@ elation.require(['engine.things.generic', 'engine.things.camera', 'engine.things
       this.gravityForce = this.objects.dynamics.addForce("gravity", this.gravityVector);
       this.moveForce = this.objects.dynamics.addForce("static", {});
       this.jumpForce = this.objects.dynamics.addForce("static", {});
-      this.objects.dynamics.restitution = 0.1;
-      //this.objects.dynamics.setCollider('sphere', {radius: this.properties.fatness, offset: new THREE.Vector3(0, this.fatness, 0)});
+      this.objects.dynamics.restitution = 0;
+/*
+      this.objects.dynamics.linearDamping = 1.5;
+      this.objects.dynamics.angularDamping = .1;
+      this.objects.dynamics.material.staticfriction = 1.1;
+      this.objects.dynamics.material.dynamicfriction = 1;
+*/
+      //this.objects.dynamics.setCollider('sphere', {radius: this.properties.fatness, length: this.height, /*offset: new THREE.Vector3(0, this.fatness, 0) */});
       this.objects.dynamics.addConstraint('axis', { axis: new THREE.Vector3(0,1,0) });
       // FIXME - should be in createChildren
       this.createBodyParts();
@@ -201,33 +211,35 @@ elation.require(['engine.things.generic', 'engine.things.camera', 'engine.things
     }
     this.createBodyParts = function() {
       this.torso = this.spawn('generic', this.properties.player_id + '_torso', {
-        'position': [0,1,0]
+        'position': [0,0,0]
       });
       this.shoulders = this.torso.spawn('generic', this.properties.player_id + '_shoulders', {
         'position': [0,0.3,-0.2]
       });
       this.neck = this.torso.spawn('generic', this.properties.player_id + '_neck', {
-        'position': [0,0.6,0]
+        'position': [0,1.45,0]
       });
       this.head = this.neck.spawn('generic', this.properties.player_id + '_head', {
-        'position': [0,0,0],
+        'position': [0,.3,0],
         'mass': 1
       });
 
-      this.placeholder_body = new THREE.Mesh(new THREE.CylinderBufferGeometry(this.fatness, this.fatness, this.height), new THREE.MeshPhongMaterial({color: 0xcccccc, transparent: true, opacity: .5}));
+/*
+      this.placeholder_body = new THREE.Mesh(new THREE.CylinderGeometry(this.fatness, this.fatness, this.height), new THREE.MeshPhongMaterial({color: 0xcccccc, transparent: true, opacity: .5}));
       this.placeholder_body.position.y = this.height / 2;
       this.placeholder_body.layers.set(10);
       this.objects['3d'].add(this.placeholder_body);
 
       this.vrcalibrate = new THREE.Object3D();
       this.vrposetarget = new THREE.Object3D();
-      let vrposedebug = new THREE.Mesh(new THREE.CylinderBufferGeometry(0, 1, 2), new THREE.MeshPhongMaterial({color: 0xffcccc, transparent: true, opacity: .5}));
+      let vrposedebug = new THREE.Mesh(new THREE.CylinderGeometry(0, 1, 2), new THREE.MeshPhongMaterial({color: 0xffcccc, transparent: true, opacity: .5}));
       vrposedebug.position.z = -1;
       vrposedebug.rotation.x = Math.PI/2;
       this.vrcalibrate.add(this.vrposetarget);
       //this.vrposetarget.add(vrposedebug);
       vrposedebug.layers.set(10);
       this.objects['3d'].add(this.vrcalibrate);
+*/
       /*
       let renderer = this.engine.systems.render.renderer;
       if (renderer.vr && renderer.vr.setPoseTarget) {
@@ -689,8 +701,8 @@ elation.require(['engine.things.generic', 'engine.things.camera', 'engine.things
     this.calibrateVR = function() {
       //this.vrcalibrate.position.copy(this.vrposetarget.position).multiplyScalar(-1);
       //this.vrcalibrate.quaternion.copy(this.vrposetarget.quaternion).conjugate();
-      this.vrcalibrate.matrix.getInverse(this.vrposetarget.matrix);
-      this.vrcalibrate.matrix.decompose(this.vrcalibrate.position, this.vrcalibrate.rotation, this.vrcalibrate.scale);
+      //this.vrcalibrate.matrix.getInverse(this.vrposetarget.matrix);
+      //this.vrcalibrate.matrix.decompose(this.vrcalibrate.position, this.vrcalibrate.rotation, this.vrcalibrate.scale);
     }
     this.getViewFrustum = (function() {
       let frustum = new THREE.Frustum(),
@@ -703,5 +715,11 @@ elation.require(['engine.things.generic', 'engine.things.camera', 'engine.things
         return frustum;
       }
     })();
+    this.updateCamera = function() {
+      if (this.camera) {
+        this.camera.fov = this.fov;
+      }
+    }
+
   }, elation.engine.things.generic);
 });

package/scripts/things/skysphere.js

@@ -7,7 +7,7 @@ elation.require(['engine.things.generic'], function() {
       });
     }
     this.createObject3D = function() {
-      var geo = new THREE.SphereBufferGeometry(1000, 64, 32);
+      var geo = new THREE.SphereGeometry(1000, 64, 32);
 
       // Flip UVs on x axis so that the texture isn't reversed when viewed from inside the sphere
       for (var i = 0; i < geo.attributes.uv.length; i += 2) {

package/scripts/things/terrain.js

@@ -20,7 +20,7 @@ elation.require('engine.things.generic', function() {
       });
     }
     this.createObject3D = function() {
-      var geo = new THREE.PlaneBufferGeometry(this.properties.size, this.properties.size, this.properties.resolution, this.properties.resolution);
+      var geo = new THREE.PlaneGeometry(this.properties.size, this.properties.size, this.properties.resolution, this.properties.resolution);
 
       var mat = elation.engine.materials.getShaderMaterial('terrain', {
         color: this.properties.color,

package/scripts/things/text.js

@@ -12,7 +12,7 @@ elation.require(['engine.things.generic'], function() {
       });
     }
     this.createObject3D = function() {
-      var geo = new THREE.PlaneBufferGeometry(this.properties.width, this.properties.height);
+      var geo = new THREE.PlaneGeometry(this.properties.width, this.properties.height);
       var tex = elation.engine.materials.getTextureLabel(this.properties.text, this.properties.fontsize, this.properties.color, this.properties.font);
       var mat = new THREE.MeshBasicMaterial({map: tex, transparent: true});
       return new THREE.Mesh(geo, mat);