Merge pull request #10188 from Mugen87/helpers

Helpers: Clean up

src/extras/helpers/AxisHelper.js

@@ -1,7 +1,7 @@
 import { LineSegments } from '../../objects/LineSegments';
 import { VertexColors } from '../../constants';
 import { LineBasicMaterial } from '../../materials/LineBasicMaterial';
-import { BufferAttribute } from '../../core/BufferAttribute';
+import { Float32BufferAttribute } from '../../core/BufferAttribute';
 import { BufferGeometry } from '../../core/BufferGeometry';
 
 /**
@@ -13,21 +13,21 @@ function AxisHelper( size ) {
 
 	size = size || 1;
 
-	var vertices = new Float32Array( [
+	var vertices = [
 		0, 0, 0,  size, 0, 0,
 		0, 0, 0,  0, size, 0,
 		0, 0, 0,  0, 0, size
-	] );
+	];
 
-	var colors = new Float32Array( [
+	var colors = [
 		1, 0, 0,  1, 0.6, 0,
 		0, 1, 0,  0.6, 1, 0,
 		0, 0, 1,  0, 0.6, 1
-	] );
+	];
 
 	var geometry = new BufferGeometry();
-	geometry.addAttribute( 'position', new BufferAttribute( vertices, 3 ) );
-	geometry.addAttribute( 'color', new BufferAttribute( colors, 3 ) );
+	geometry.addAttribute( 'position', new Float32BufferAttribute( vertices, 3 ) );
+	geometry.addAttribute( 'color', new Float32BufferAttribute( colors, 3 ) );
 
 	var material = new LineBasicMaterial( { vertexColors: VertexColors } );
 

src/extras/helpers/BoundingBoxHelper.js

@@ -1,6 +1,6 @@
 import { Mesh } from '../../objects/Mesh';
 import { MeshBasicMaterial } from '../../materials/MeshBasicMaterial';
-import { BoxGeometry } from '../../geometries/BoxGeometry';
+import { BoxBufferGeometry } from '../../geometries/BoxBufferGeometry';
 import { Box3 } from '../../math/Box3';
 
 /**
@@ -17,7 +17,7 @@ function BoundingBoxHelper( object, hex ) {
 
 	this.box = new Box3();
 
-	Mesh.call( this, new BoxGeometry( 1, 1, 1 ), new MeshBasicMaterial( { color: color, wireframe: true } ) );
+	Mesh.call( this, new BoxBufferGeometry( 1, 1, 1 ), new MeshBasicMaterial( { color: color, wireframe: true } ) );
 
 }
 

src/extras/helpers/RectAreaLightHelper.js

@@ -2,108 +2,105 @@
  * @author abelnation / http://github.com/abelnation
  */
 
-import {Object3D} from '../../core/Object3D';
-import {Vector3} from '../../math/Vector3';
-import {Shape} from '../../extras/core/Shape';
-import {Mesh} from '../../objects/Mesh';
-import {MeshBasicMaterial} from '../../materials/MeshBasicMaterial';
-import {ShapeGeometry} from '../../geometries/ShapeGeometry';
+import { Object3D } from '../../core/Object3D';
+import { Vector3 } from '../../math/Vector3';
+import { Shape } from '../../extras/core/Shape';
+import { Mesh } from '../../objects/Mesh';
+import { MeshBasicMaterial } from '../../materials/MeshBasicMaterial';
+import { ShapeBufferGeometry } from '../../geometries/ShapeBufferGeometry';
 
-function RectAreaLightHelper(light) {
+function RectAreaLightHelper( light ) {
 
-    Object3D.call(this);
+	Object3D.call( this );
 
-    this.light = light;
-    this.light.updateMatrixWorld();
+	this.light = light;
+	this.light.updateMatrixWorld();
 
-    // this.matrix = light.matrixWorld;
-    // this.matrixAutoUpdate = false;
+	this.lightMat = new MeshBasicMaterial( {
+		color: light.color,
+		fog: false
+	} );
 
-    this.lightMat = new MeshBasicMaterial({
-        color: light.color,
-        fog: false
-    });
+	this.lightWireMat = new MeshBasicMaterial( {
+		color: light.color,
+		fog: false,
+		wireframe: true
+	} );
 
-    this.lightWireMat = new MeshBasicMaterial({
-        color: light.color,
-        fog: false,
-        wireframe: true
-    });
+	var hx = this.light.width / 2.0;
+	var hy = this.light.height / 2.0;
 
-    var hx = this.light.width / 2.0;
-    var hy = this.light.height / 2.0;
-    this.lightShape = new ShapeGeometry(new Shape([
-        new Vector3(-hx, hy, 0),
-        new Vector3(hx, hy, 0),
-        new Vector3(hx, -hy, 0),
-        new Vector3(-hx, -hy, 0)
-    ]));
+	this.lightShape = new ShapeBufferGeometry( new Shape( [
+		new Vector3( - hx,   hy, 0 ),
+		new Vector3(   hx,   hy, 0 ),
+		new Vector3(   hx, - hy, 0 ),
+		new Vector3( - hx, - hy, 0 )
+	] ) );
 
-    // shows the "front" of the light, e.g. where light comes from
-    this.lightMesh = new Mesh(this.lightShape, this.lightMat);
-    // shows the "back" of the light, which does not emit light
-    this.lightWireMesh = new Mesh(this.lightShape, this.lightWireMat);
+	// shows the "front" of the light, e.g. where light comes from
 
-    this.add(this.lightMesh);
-    this.add(this.lightWireMesh);
+	this.lightMesh = new Mesh( this.lightShape, this.lightMat );
 
-    this.update();
+	// shows the "back" of the light, which does not emit light
+
+	this.lightWireMesh = new Mesh( this.lightShape, this.lightWireMat );
+
+	this.add( this.lightMesh );
+	this.add( this.lightWireMesh );
+
+	this.update();
 
 }
 
-RectAreaLightHelper.prototype = Object.create(Object3D.prototype);
+RectAreaLightHelper.prototype = Object.create( Object3D.prototype );
 RectAreaLightHelper.prototype.constructor = RectAreaLightHelper;
 
 RectAreaLightHelper.prototype.dispose = function () {
 
-    this.lightMesh.geometry.dispose();
-    this.lightMesh.material.dispose();
-    this.lightWireMesh.geometry.dispose();
-    this.lightWireMesh.material.dispose();
+	this.lightMesh.geometry.dispose();
+	this.lightMesh.material.dispose();
+	this.lightWireMesh.geometry.dispose();
+	this.lightWireMesh.material.dispose();
 
 };
 
 RectAreaLightHelper.prototype.update = function () {
 
-    var vector = new Vector3();
-    var vector2 = new Vector3();
+	var vector = new Vector3();
+	var vector2 = new Vector3();
 
-    // TODO (abelnation) why not just make light helpers a child of the light object?
-    if (this.light.target) {
+	// TODO (abelnation) why not just make light helpers a child of the light object?
+	if ( this.light.target ) {
 
-        vector.setFromMatrixPosition(this.light.matrixWorld);
-        vector2.setFromMatrixPosition(this.light.target.matrixWorld);
+		vector.setFromMatrixPosition( this.light.matrixWorld );
+		vector2.setFromMatrixPosition( this.light.target.matrixWorld );
 
-        var lookVec = vector2.clone().sub(vector);
-        this.lightMesh.lookAt(lookVec);
-        this.lightWireMesh.lookAt(lookVec);
+		var lookVec = vector2.clone().sub( vector );
+		this.lightMesh.lookAt( lookVec );
+		this.lightWireMesh.lookAt( lookVec );
 
-    }
+	}
 
-    this.lightMesh.material.color
-        .copy(this.light.color)
-        .multiplyScalar(this.light.intensity);
+	this.lightMesh.material.color.copy( this.light.color ).multiplyScalar( this.light.intensity );
+	this.lightWireMesh.material.color.copy( this.light.color ).multiplyScalar( this.light.intensity );
 
-    this.lightWireMesh.material.color
-        .copy(this.light.color)
-        .multiplyScalar(this.light.intensity);
+	var oldShape = this.lightShape;
 
-    var oldShape = this.lightShape;
+	var hx = this.light.width / 2.0;
+	var hy = this.light.height / 2.0;
 
-    var hx = this.light.width / 2.0;
-    var hy = this.light.height / 2.0;
-    this.lightShape = new ShapeGeometry(new Shape([
-        new Vector3(-hx, hy, 0),
-        new Vector3(hx, hy, 0),
-        new Vector3(hx, -hy, 0),
-        new Vector3(-hx, -hy, 0)
-    ]));
+	this.lightShape = new ShapeBufferGeometry( new Shape( [
+		new Vector3( - hx,   hy, 0 ),
+		new Vector3(   hx,   hy, 0 ),
+		new Vector3(   hx, - hy, 0 ),
+		new Vector3( - hx, - hy, 0 )
+	] ) );
 
-    this.lightMesh.geometry = this.lightShape;
-    this.lightWireMesh.geometry = this.lightShape;
+	this.lightMesh.geometry = this.lightShape;
+	this.lightWireMesh.geometry = this.lightShape;
 
-    oldShape.dispose();
+	oldShape.dispose();
 
 };
 
-export {RectAreaLightHelper};
+export { RectAreaLightHelper };