elation-engine 0.9.113 → 0.9.115

package/scripts/things/generic.js

@@ -788,11 +788,10 @@ elation.component.add("engine.things.generic", function() {
       // Determine appropriate collider for the geometry associated with this thing
       var dyn = this.objects['dynamics'];
       if (geom && dyn) {
-        if (geom instanceof THREE.SphereGeometry ||
-            geom instanceof THREE.SphereBufferGeometry) {
+        if (geom instanceof THREE.SphereGeometry) {
           if (!geom.boundingSphere) geom.computeBoundingSphere();
           this.setCollider('sphere', {radius: geom.boundingSphere.radius});
-        } else if (geom instanceof THREE.PlaneGeometry || geom instanceof THREE.PlaneBufferGeometry) {
+        } else if (geom instanceof THREE.PlaneGeometry) {
           if (!geom.boundingBox) geom.computeBoundingBox();
           var size = new THREE.Vector3().subVectors(geom.boundingBox.max, geom.boundingBox.min);
 
@@ -1258,7 +1257,7 @@ elation.component.add("engine.things.generic", function() {
       meshes[i].updateMatrix();
       meshes[i].updateMatrixWorld();
       //meshes[i].material = new THREE.MeshPhongMaterial({color: 0x999900, emissive: 0x666666, opacity: .5, transparent: true});
-      this.colliders.add(meshes[i]);
+      //this.colliders.add(meshes[i]);
       let collidercolor = 0x999999;
       if (rigid.mass === 0) {
         collidercolor = 0x990000;

package/scripts/things/label2d.js

@@ -22,7 +22,7 @@ elation.require(['engine.things.label'], function() {
       var label = labelgen.getLabel(text);
       var height = this.height;
       var width = height * aspect;
-      var geometry = new THREE.PlaneBufferGeometry(width, height);
+      var geometry = new THREE.PlaneGeometry(width, height);
       geometry.applyMatrix4(new THREE.Matrix4().makeTranslation(0, height/2, .02));
       return geometry;
     }

package/scripts/things/leapmotion.js

@@ -46,7 +46,7 @@ elation.require(['engine.external.leapmotion.leap'], function() {
         joints: new THREE.MeshPhongMaterial({color: 0xccffcc, transparent: false, opacity: 1, blending: THREE.NormalBlending}),
         tips: new THREE.MeshPhongMaterial({color: 0xffcccc, transparent: true, opacity: .2, blending: THREE.NormalBlending})
       };
-      this.palm = new THREE.Mesh(new THREE.BoxBufferGeometry(palmsize[0], palmsize[1], palmsize[2]), this.materials.bones);
+      this.palm = new THREE.Mesh(new THREE.BoxGeometry(palmsize[0], palmsize[1], palmsize[2]), this.materials.bones);
       this.palm.geometry.applyMatrix(new THREE.Matrix4().setPosition(new THREE.Vector3(0, 0, -palmsize[2] / 4)));
       this.palm.scale.set(.01,.01,.01);
       this.palm.updateMatrix();
@@ -55,7 +55,7 @@ elation.require(['engine.external.leapmotion.leap'], function() {
       this.palm.receiveShadow = true;
       this.objects['3d'].add(this.palm);
 
-      this.arm = new THREE.Mesh(new THREE.CylinderBufferGeometry(0.75, 0.5, 1, undefined, undefined, true), this.materials.bones);
+      this.arm = new THREE.Mesh(new THREE.CylinderGeometry(0.75, 0.5, 1, undefined, undefined, true), this.materials.bones);
       //this.arm.geometry.applyMatrix(new THREE.Matrix4().setPosition(new THREE.Vector3(0, 0, -palmsize[2] / 4)));
       this.arm.geometry.applyMatrix(new THREE.Matrix4().makeRotationX(Math.PI/2));
       this.arm.scale.set(.01,.01,.01);
@@ -65,7 +65,7 @@ elation.require(['engine.external.leapmotion.leap'], function() {
       this.arm.receiveShadow = true;
       this.objects['3d'].add(this.arm);
 
-      this.wrist = new THREE.Mesh(new THREE.SphereBufferGeometry(0.5), this.materials.joints);
+      this.wrist = new THREE.Mesh(new THREE.SphereGeometry(0.5), this.materials.joints);
       this.wrist.scale.set(.01,.01,.01);
       this.wrist.updateMatrix();
       //this.wrist.matrixAutoUpdate = false;
@@ -297,8 +297,8 @@ elation.require(['engine.external.leapmotion.leap'], function() {
         return fingersizes[i];
       }
       for (var i = 0; i < 4; i++) {
-        this.phalanges[i] = new THREE.Mesh(new THREE.CylinderBufferGeometry(fingerSize(i), fingerSize(i+1), 1, 6, 2, false), material);
-        this.joints[i] = new THREE.Mesh(new THREE.SphereBufferGeometry(fingerSize(i+1)), jointmaterial);
+        this.phalanges[i] = new THREE.Mesh(new THREE.CylinderGeometry(fingerSize(i), fingerSize(i+1), 1, 6, 2, false), material);
+        this.joints[i] = new THREE.Mesh(new THREE.SphereGeometry(fingerSize(i+1)), jointmaterial);
         this.joints[i].castShadow = true;
         this.joints[i].receiveShadow = true;
         this.phalanges[i].geometry.applyMatrix(new THREE.Matrix4().makeRotationX(Math.PI/2));
@@ -312,7 +312,7 @@ elation.require(['engine.external.leapmotion.leap'], function() {
           obj.add(this.joints[i]);
         }
       }
-      this.joints[4] = new THREE.Mesh(new THREE.SphereBufferGeometry(fingerSize(5)), tipmaterial.clone());
+      this.joints[4] = new THREE.Mesh(new THREE.SphereGeometry(fingerSize(5)), tipmaterial.clone());
       this.fingertip = this.joints[4];
       obj.add(this.joints[4]);
       return obj;

package/scripts/things/menu.js

@@ -161,7 +161,7 @@ elation.require(['engine.things.generic', 'engine.things.label'], function() {
       var emissive = (this.properties.disabled ? this.properties.disabledemissive : this.properties.emissive);
 
       // background plane
-      //var boxgeo = new THREE.PlaneBufferGeometry(this.properties.size * 10, this.properties.size * this.properties.lineheight);
+      //var boxgeo = new THREE.PlaneGeometry(this.properties.size * 10, this.properties.size * this.properties.lineheight);
       var boxgeo = new THREE.BoxGeometry(this.properties.size * 10, this.properties.size * this.properties.lineheight, .001);
       var mat = new THREE.MeshPhongMaterial({color: this.properties.backgroundcolor, emissive: emissive, opacity: .8, transparent: true, depthTest: false});
       var mesh = new THREE.Mesh(boxgeo, mat);