src/lights: move to es6 classes

src/lights/AmbientLight.js

@@ -1,20 +1,16 @@
 import { Light } from './Light.js';
 
-function AmbientLight( color, intensity ) {
+class AmbientLight extends Light {
 
-	Light.call( this, color, intensity );
+	constructor( color, intensity ) {
 
-	this.type = 'AmbientLight';
+		super( color, intensity );
 
-}
-
-AmbientLight.prototype = Object.assign( Object.create( Light.prototype ), {
-
-	constructor: AmbientLight,
+		this.type = 'AmbientLight';
+		Object.defineProperty( this, 'isAmbientLight', { value: true } );
 
-	isAmbientLight: true
-
-} );
+	}
 
+}
 
 export { AmbientLight };

src/lights/AmbientLightProbe.js

@@ -1,41 +1,39 @@
 import { Color } from '../math/Color.js';
 import { LightProbe } from './LightProbe.js';
 
-function AmbientLightProbe( color, intensity ) {
+class AmbientLightProbe extends LightProbe {
 
-	LightProbe.call( this, undefined, intensity );
+	constructor( color, intensity ) {
 
-	const color1 = new Color().set( color );
+		super( undefined, intensity );
 
-	// without extra factor of PI in the shader, would be 2 / Math.sqrt( Math.PI );
-	this.sh.coefficients[ 0 ].set( color1.r, color1.g, color1.b ).multiplyScalar( 2 * Math.sqrt( Math.PI ) );
+		Object.defineProperty( this, 'isAmbientLightProbe', { value: true } );
 
-}
-
-AmbientLightProbe.prototype = Object.assign( Object.create( LightProbe.prototype ), {
+		const color1 = new Color().set( color );
 
-	constructor: AmbientLightProbe,
+		// without extra factor of PI in the shader, would be 2 / Math.sqrt( Math.PI );
+		this.sh.coefficients[ 0 ].set( color1.r, color1.g, color1.b ).multiplyScalar( 2 * Math.sqrt( Math.PI ) );
 
-	isAmbientLightProbe: true,
+	}
 
-	copy: function ( source ) { // modifying color not currently supported
+	copy( source ) { // modifying color not currently supported
 
-		LightProbe.prototype.copy.call( this, source );
+		super.copy( source );
 
 		return this;
 
-	},
+	}
 
-	toJSON: function ( meta ) {
+	toJSON( meta ) {
 
-		const data = LightProbe.prototype.toJSON.call( this, meta );
+		const data = super.toJSON( meta );
 
 		// data.sh = this.sh.toArray(); // todo
 
 		return data;
 
 	}
 
-} );
+}
 
 export { AmbientLightProbe };

src/lights/DirectionalLight.js

@@ -2,30 +2,27 @@ import { Light } from './Light.js';
 import { DirectionalLightShadow } from './DirectionalLightShadow.js';
 import { Object3D } from '../core/Object3D.js';
 
-function DirectionalLight( color, intensity ) {
+class DirectionalLight extends Light {
 
-	Light.call( this, color, intensity );
+	constructor( color, intensity ) {
 
-	this.type = 'DirectionalLight';
+		super( color, intensity );
 
-	this.position.copy( Object3D.DefaultUp );
-	this.updateMatrix();
+		this.type = 'DirectionalLight';
+		Object.defineProperty( this, 'isDirectionalLight', { value: true } );
 
-	this.target = new Object3D();
+		this.position.copy( Object3D.DefaultUp );
+		this.updateMatrix();
 
-	this.shadow = new DirectionalLightShadow();
+		this.target = new Object3D();
 
-}
-
-DirectionalLight.prototype = Object.assign( Object.create( Light.prototype ), {
-
-	constructor: DirectionalLight,
+		this.shadow = new DirectionalLightShadow();
 
-	isDirectionalLight: true,
+	}
 
-	copy: function ( source ) {
+	copy( source ) {
 
-		Light.prototype.copy.call( this, source );
+		super.copy( source );
 
 		this.target = source.target.clone();
 
@@ -35,7 +32,6 @@ DirectionalLight.prototype = Object.assign( Object.create( Light.prototype ), {
 
 	}
 
-} );
-
+}
 
 export { DirectionalLight };

src/lights/DirectionalLightShadow.js

@@ -1,25 +1,22 @@
 import { LightShadow } from './LightShadow.js';
 import { OrthographicCamera } from '../cameras/OrthographicCamera.js';
 
-function DirectionalLightShadow() {
+class DirectionalLightShadow extends LightShadow {
 
-	LightShadow.call( this, new OrthographicCamera( - 5, 5, 5, - 5, 0.5, 500 ) );
+	constructor() {
 
-}
-
-DirectionalLightShadow.prototype = Object.assign( Object.create( LightShadow.prototype ), {
+		super( new OrthographicCamera( - 5, 5, 5, - 5, 0.5, 500 ) );
 
-	constructor: DirectionalLightShadow,
+		Object.defineProperty( this, 'isDirectionalLightShadow', { value: true } );
 
-	isDirectionalLightShadow: true,
+	}
 
-	updateMatrices: function ( light ) {
+	updateMatrices( light ) {
 
-		LightShadow.prototype.updateMatrices.call( this, light );
+		super.updateMatrices( light );
 
 	}
 
-} );
-
+}
 
 export { DirectionalLightShadow };

src/lights/HemisphereLight.js

@@ -2,36 +2,32 @@ import { Light } from './Light.js';
 import { Color } from '../math/Color.js';
 import { Object3D } from '../core/Object3D.js';
 
-function HemisphereLight( skyColor, groundColor, intensity ) {
+class HemisphereLight extends Light {
 
-	Light.call( this, skyColor, intensity );
+	constructor( skyColor, groundColor, intensity ) {
 
-	this.type = 'HemisphereLight';
+		super( skyColor, intensity );
 
-	this.position.copy( Object3D.DefaultUp );
-	this.updateMatrix();
+		this.type = 'HemisphereLight';
+		Object.defineProperty( this, 'isHemisphereLight', { value: true } );
 
-	this.groundColor = new Color( groundColor );
+		this.position.copy( Object3D.DefaultUp );
+		this.updateMatrix();
 
-}
-
-HemisphereLight.prototype = Object.assign( Object.create( Light.prototype ), {
-
-	constructor: HemisphereLight,
+		this.groundColor = new Color( groundColor );
 
-	isHemisphereLight: true,
+	}
 
-	copy: function ( source ) {
+	copy( source ) {
 
-		Light.prototype.copy.call( this, source );
+		super.copy( source );
 
 		this.groundColor.copy( source.groundColor );
 
 		return this;
 
 	}
 
-} );
-
+}
 
 export { HemisphereLight };

src/lights/HemisphereLightProbe.js

@@ -2,49 +2,47 @@ import { Color } from '../math/Color.js';
 import { Vector3 } from '../math/Vector3.js';
 import { LightProbe } from './LightProbe.js';
 
-function HemisphereLightProbe( skyColor, groundColor, intensity ) {
+class HemisphereLightProbe extends LightProbe {
 
-	LightProbe.call( this, undefined, intensity );
+	constructor( skyColor, groundColor, intensity ) {
 
-	const color1 = new Color().set( skyColor );
-	const color2 = new Color().set( groundColor );
+		super( undefined, intensity );
 
-	const sky = new Vector3( color1.r, color1.g, color1.b );
-	const ground = new Vector3( color2.r, color2.g, color2.b );
+		Object.defineProperty( this, 'isHemisphereLightProbe', { value: true } );
 
-	// without extra factor of PI in the shader, should = 1 / Math.sqrt( Math.PI );
-	const c0 = Math.sqrt( Math.PI );
-	const c1 = c0 * Math.sqrt( 0.75 );
+		const color1 = new Color().set( skyColor );
+		const color2 = new Color().set( groundColor );
 
-	this.sh.coefficients[ 0 ].copy( sky ).add( ground ).multiplyScalar( c0 );
-	this.sh.coefficients[ 1 ].copy( sky ).sub( ground ).multiplyScalar( c1 );
+		const sky = new Vector3( color1.r, color1.g, color1.b );
+		const ground = new Vector3( color2.r, color2.g, color2.b );
 
-}
-
-HemisphereLightProbe.prototype = Object.assign( Object.create( LightProbe.prototype ), {
+		// without extra factor of PI in the shader, should = 1 / Math.sqrt( Math.PI );
+		const c0 = Math.sqrt( Math.PI );
+		const c1 = c0 * Math.sqrt( 0.75 );
 
-	constructor: HemisphereLightProbe,
+		this.sh.coefficients[ 0 ].copy( sky ).add( ground ).multiplyScalar( c0 );
+		this.sh.coefficients[ 1 ].copy( sky ).sub( ground ).multiplyScalar( c1 );
 
-	isHemisphereLightProbe: true,
+	}
 
-	copy: function ( source ) { // modifying colors not currently supported
+	copy( source ) { // modifying colors not currently supported
 
-		LightProbe.prototype.copy.call( this, source );
+		super.copy( source );
 
 		return this;
 
-	},
+	}
 
-	toJSON: function ( meta ) {
+	toJSON( meta ) {
 
-		const data = LightProbe.prototype.toJSON.call( this, meta );
+		const data = super.toJSON( meta );
 
 		// data.sh = this.sh.toArray(); // todo
 
 		return data;
 
 	}
 
-} );
+}
 
 export { HemisphereLightProbe };

src/lights/Light.js

@@ -1,37 +1,34 @@
 import { Object3D } from '../core/Object3D.js';
 import { Color } from '../math/Color.js';
 
-function Light( color, intensity = 1 ) {
+class Light extends Object3D {
 
-	Object3D.call( this );
+	constructor( color, intensity = 1 ) {
 
-	this.type = 'Light';
+		super();
 
-	this.color = new Color( color );
-	this.intensity = intensity;
+		this.type = 'Light';
+		Object.defineProperty( this, 'isLight', { value: true } );
 
-}
-
-Light.prototype = Object.assign( Object.create( Object3D.prototype ), {
+		this.color = new Color( color );
+		this.intensity = intensity;
 
-	constructor: Light,
-
-	isLight: true,
+	}
 
-	copy: function ( source ) {
+	copy( source ) {
 
-		Object3D.prototype.copy.call( this, source );
+		super.copy( source );
 
 		this.color.copy( source.color );
 		this.intensity = source.intensity;
 
 		return this;
 
-	},
+	}
 
-	toJSON: function ( meta ) {
+	toJSON( meta ) {
 
-		const data = Object3D.prototype.toJSON.call( this, meta );
+		const data = super.toJSON( meta );
 
 		data.object.color = this.color.getHex();
 		data.object.intensity = this.intensity;
@@ -49,7 +46,6 @@ Light.prototype = Object.assign( Object.create( Object3D.prototype ), {
 
 	}
 
-} );
-
+}
 
 export { Light };