core: Covert to es6 class.

Author: linbingquan

src/core/BufferAttribute.js

@@ -2,11 +2,9 @@
  * https://github.com/mrdoob/eventdispatcher.js/
  */
 
-function EventDispatcher() {}
+class EventDispatcher {
 
-Object.assign( EventDispatcher.prototype, {
-
-	addEventListener: function ( type, listener ) {
+	addEventListener( type, listener ) {
 
 		if ( this._listeners === undefined ) this._listeners = {};
 
@@ -24,19 +22,19 @@ Object.assign( EventDispatcher.prototype, {
 
 		}
 
-	},
+	}
 
-	hasEventListener: function ( type, listener ) {
+	hasEventListener( type, listener ) {
 
 		if ( this._listeners === undefined ) return false;
 
 		const listeners = this._listeners;
 
 		return listeners[ type ] !== undefined && listeners[ type ].indexOf( listener ) !== - 1;
 
-	},
+	}
 
-	removeEventListener: function ( type, listener ) {
+	removeEventListener( type, listener ) {
 
 		if ( this._listeners === undefined ) return;
 
@@ -55,9 +53,9 @@ Object.assign( EventDispatcher.prototype, {
 
 		}
 
-	},
+	}
 
-	dispatchEvent: function ( event ) {
+	dispatchEvent( event ) {
 
 		if ( this._listeners === undefined ) return;
 
@@ -81,7 +79,6 @@ Object.assign( EventDispatcher.prototype, {
 
 	}
 
-} );
-
+}
 
 export { EventDispatcher };

src/core/EventDispatcher.js

@@ -1,40 +1,38 @@
 import { BufferAttribute } from './BufferAttribute.js';
 
-function InstancedBufferAttribute( array, itemSize, normalized, meshPerAttribute ) {
+class InstancedBufferAttribute extends BufferAttribute {
 
-	if ( typeof ( normalized ) === 'number' ) {
+	constructor( array, itemSize, normalized, meshPerAttribute ) {
 
-		meshPerAttribute = normalized;
+		super( array, itemSize, normalized );
 
-		normalized = false;
+		Object.defineProperty( this, 'isInstancedBufferAttribute', { value: true } );
 
-		console.error( 'THREE.InstancedBufferAttribute: The constructor now expects normalized as the third argument.' );
+		if ( typeof ( normalized ) === 'number' ) {
 
-	}
-
-	BufferAttribute.call( this, array, itemSize, normalized );
+			meshPerAttribute = normalized;
 
-	this.meshPerAttribute = meshPerAttribute || 1;
+			normalized = false;
 
-}
+			console.error( 'THREE.InstancedBufferAttribute: The constructor now expects normalized as the third argument.' );
 
-InstancedBufferAttribute.prototype = Object.assign( Object.create( BufferAttribute.prototype ), {
+		}
 
-	constructor: InstancedBufferAttribute,
+		this.meshPerAttribute = meshPerAttribute || 1;
 
-	isInstancedBufferAttribute: true,
+	}
 
-	copy: function ( source ) {
+	copy( source ) {
 
 		BufferAttribute.prototype.copy.call( this, source );
 
 		this.meshPerAttribute = source.meshPerAttribute;
 
 		return this;
 
-	},
+	}
 
-	toJSON: function ()	{
+	toJSON()	{
 
 		const data = BufferAttribute.prototype.toJSON.call( this );
 
@@ -46,8 +44,6 @@ InstancedBufferAttribute.prototype = Object.assign( Object.create( BufferAttribu
 
 	}
 
-} );
-
-
+}
 
 export { InstancedBufferAttribute };

src/core/InstancedBufferAttribute.js

@@ -1,37 +1,35 @@
 import { BufferGeometry } from './BufferGeometry.js';
 
-function InstancedBufferGeometry() {
+class InstancedBufferGeometry extends BufferGeometry {
 
-	BufferGeometry.call( this );
+	constructor() {
 
-	this.type = 'InstancedBufferGeometry';
-	this.instanceCount = Infinity;
+		super();
 
-}
-
-InstancedBufferGeometry.prototype = Object.assign( Object.create( BufferGeometry.prototype ), {
+		Object.defineProperty( this, 'isInstancedBufferGeometry', { value: true } );
 
-	constructor: InstancedBufferGeometry,
+		this.type = 'InstancedBufferGeometry';
+		this.instanceCount = Infinity;
 
-	isInstancedBufferGeometry: true,
+	}
 
-	copy: function ( source ) {
+	copy( source ) {
 
 		BufferGeometry.prototype.copy.call( this, source );
 
 		this.instanceCount = source.instanceCount;
 
 		return this;
 
-	},
+	}
 
-	clone: function () {
+	clone() {
 
 		return new this.constructor().copy( this );
 
-	},
+	}
 
-	toJSON: function () {
+	toJSON() {
 
 		const data = BufferGeometry.prototype.toJSON.call( this );
 
@@ -43,6 +41,6 @@ InstancedBufferGeometry.prototype = Object.assign( Object.create( BufferGeometry
 
 	}
 
-} );
+}
 
 export { InstancedBufferGeometry };

src/core/InstancedBufferGeometry.js

@@ -1,40 +1,38 @@
 import { InterleavedBuffer } from './InterleavedBuffer.js';
 
-function InstancedInterleavedBuffer( array, stride, meshPerAttribute ) {
+class InstancedInterleavedBuffer extends InterleavedBuffer {
 
-	InterleavedBuffer.call( this, array, stride );
+	constructor( array, stride, meshPerAttribute ) {
 
-	this.meshPerAttribute = meshPerAttribute || 1;
+		super( array, stride );
 
-}
-
-InstancedInterleavedBuffer.prototype = Object.assign( Object.create( InterleavedBuffer.prototype ), {
+		Object.defineProperty( this, 'isInstancedInterleavedBuffer', { value: true } );
 
-	constructor: InstancedInterleavedBuffer,
+		this.meshPerAttribute = meshPerAttribute || 1;
 
-	isInstancedInterleavedBuffer: true,
+	}
 
-	copy: function ( source ) {
+	copy( source ) {
 
 		InterleavedBuffer.prototype.copy.call( this, source );
 
 		this.meshPerAttribute = source.meshPerAttribute;
 
 		return this;
 
-	},
+	}
 
-	clone: function ( data ) {
+	clone( data ) {
 
 		const ib = InterleavedBuffer.prototype.clone.call( this, data );
 
 		ib.meshPerAttribute = this.meshPerAttribute;
 
 		return ib;
 
-	},
+	}
 
-	toJSON: function ( data ) {
+	toJSON( data ) {
 
 		const json = InterleavedBuffer.prototype.toJSON.call( this, data );
 
@@ -45,6 +43,6 @@ InstancedInterleavedBuffer.prototype = Object.assign( Object.create( Interleaved
 
 	}
 
-} );
+}
 
 export { InstancedInterleavedBuffer };

src/core/InstancedInterleavedBuffer.js

@@ -1,46 +1,42 @@
 import { MathUtils } from '../math/MathUtils.js';
 import { StaticDrawUsage } from '../constants.js';
 
-function InterleavedBuffer( array, stride ) {
+class InterleavedBuffer {
 
-	this.array = array;
-	this.stride = stride;
-	this.count = array !== undefined ? array.length / stride : 0;
+	constructor( array, stride ) {
 
-	this.usage = StaticDrawUsage;
-	this.updateRange = { offset: 0, count: - 1 };
+		this.array = array;
+		this.stride = stride;
+		this.count = array !== undefined ? array.length / stride : 0;
 
-	this.version = 0;
+		this.isInterleavedBuffer = true;
 
-	this.uuid = MathUtils.generateUUID();
+		this.usage = StaticDrawUsage;
+		this.updateRange = { offset: 0, count: - 1 };
 
-}
-
-Object.defineProperty( InterleavedBuffer.prototype, 'needsUpdate', {
+		this.version = 0;
 
-	set: function ( value ) {
-
-		if ( value === true ) this.version ++;
+		this.uuid = MathUtils.generateUUID();
 
 	}
 
-} );
+	set needsUpdate( value ) {
 
-Object.assign( InterleavedBuffer.prototype, {
+		if ( value === true ) this.version ++;
 
-	isInterleavedBuffer: true,
+	}
 
-	onUploadCallback: function () {},
+	onUploadCallback() {}
 
-	setUsage: function ( value ) {
+	setUsage( value ) {
 
 		this.usage = value;
 
 		return this;
 
-	},
+	}
 
-	copy: function ( source ) {
+	copy( source ) {
 
 		this.array = new source.array.constructor( source.array );
 		this.count = source.count;
@@ -49,9 +45,9 @@ Object.assign( InterleavedBuffer.prototype, {
 
 		return this;
 
-	},
+	}
 
-	copyAt: function ( index1, attribute, index2 ) {
+	copyAt( index1, attribute, index2 ) {
 
 		index1 *= this.stride;
 		index2 *= attribute.stride;
@@ -64,17 +60,17 @@ Object.assign( InterleavedBuffer.prototype, {
 
 		return this;
 
-	},
+	}
 
-	set: function ( value, offset = 0 ) {
+	set( value, offset = 0 ) {
 
 		this.array.set( value, offset );
 
 		return this;
 
-	},
+	}
 
-	clone: function ( data ) {
+	clone( data ) {
 
 		if ( data.arrayBuffers === undefined ) {
 
@@ -101,17 +97,17 @@ Object.assign( InterleavedBuffer.prototype, {
 
 		return ib;
 
-	},
+	}
 
-	onUpload: function ( callback ) {
+	onUpload( callback ) {
 
 		this.onUploadCallback = callback;
 
 		return this;
 
-	},
+	}
 
-	toJSON: function ( data ) {
+	toJSON( data ) {
 
 		if ( data.arrayBuffers === undefined ) {
 
@@ -144,6 +140,6 @@ Object.assign( InterleavedBuffer.prototype, {
 
 	}
 
-} );
+}
 
 export { InterleavedBuffer };