light.target optional + optional camera construction param

examples/js/loaders/GLTFLoader.js

@@ -291,6 +291,7 @@ THREE.GLTFLoader = ( function () {
 
 				case 'directional':
 					lightNode = new THREE.DirectionalLight( color );
+					lightNode.target = new THREE.Object3D();
 					lightNode.target.position.set( 0, 0, 1 );
 					lightNode.add( lightNode.target );
 					break;
@@ -309,6 +310,7 @@ THREE.GLTFLoader = ( function () {
 					lightDef.spot.outerConeAngle = lightDef.spot.outerConeAngle !== undefined ? lightDef.spot.outerConeAngle : Math.PI / 4.0;
 					lightNode.angle = lightDef.spot.outerConeAngle;
 					lightNode.penumbra = 1.0 - lightDef.spot.innerConeAngle / lightDef.spot.outerConeAngle;
+					lightNode.target = new THREE.Object3D();
 					lightNode.target.position.set( 0, 0, 1 );
 					lightNode.add( lightNode.target );
 					break;

examples/js/renderers/WebGLDeferredRenderer.js

@@ -890,14 +890,11 @@ THREE.WebGLDeferredRenderer = function ( parameters ) {
 		uniforms.lightAngle.value = originalLight.angle;
 		uniforms.lightColor.value.copy( originalLight.color );
 		uniforms.lightIntensity.value = originalLight.intensity;
-		uniforms.lightPositionVS.value.setFromMatrixPosition( originalLight.matrixWorld ).applyMatrix4( _currentCamera.matrixWorldInverse );
+		uniforms.lightPositionVS.value.setFromMatrixPosition( originalLight.matrixWorld )
+		uniforms.lightPositionVS.value.applyMatrix4( _currentCamera.matrixWorldInverse );
 
-		var vec = uniforms.lightDirectionVS.value;
-		var vec2 = _tmpVector3;
-
-		vec.setFromMatrixPosition( originalLight.matrixWorld );
-		vec2.setFromMatrixPosition( originalLight.target.matrixWorld );
-		vec.sub( vec2 ).normalize().transformDirection( _currentCamera.matrixWorldInverse );
+		originalLight.getWorldDirection( uniforms.lightDirectionVS.value ).negate();
+		uniforms.lightDirectionVS.value.transformDirection(  _currentCamera.matrixWorldInverse );
 
 		updateDeferredLightCommonUniforms( uniforms );
 
@@ -933,12 +930,8 @@ THREE.WebGLDeferredRenderer = function ( parameters ) {
 		uniforms.lightColor.value.copy( originalLight.color );
 		uniforms.lightIntensity.value = originalLight.intensity;
 
-		var vec = uniforms.lightDirectionVS.value;
-		var vec2 = _tmpVector3;
-
-		vec.setFromMatrixPosition( originalLight.matrixWorld );
-		vec2.setFromMatrixPosition( originalLight.target.matrixWorld );
-		vec.sub( vec2 ).normalize().transformDirection( _currentCamera.matrixWorldInverse );
+		originalLight.getWorldDirection( uniforms.lightDirectionVS.value ).negate();
+		uniforms.lightDirectionVS.value.transformDirection(  _currentCamera.matrixWorldInverse );
 
 		updateDeferredLightCommonUniforms( uniforms );
 

examples/webgl_lights_spotlight.html

@@ -82,6 +82,7 @@
 
 				spotLight = new THREE.SpotLight( 0xffffff, 1 );
 				spotLight.position.set( 15, 40, 35 );
+				spotLight.lookAt( 0, 0, 0 );
 				spotLight.angle = Math.PI / 4;
 				spotLight.penumbra = 0.05;
 				spotLight.decay = 2;

examples/webgl_lights_spotlights.html

@@ -132,6 +132,8 @@
 				newObj.shadow.mapSize.width = 1024;
 				newObj.shadow.mapSize.height = 1024;
 
+				newObj.target = scene;
+
 				return newObj;
 
 			}

examples/webgl_loader_md2_control.html

@@ -241,6 +241,7 @@
 
 					var gyro = new THREE.Gyroscope();
 					gyro.add( camera );
+					light.target = new THREE.Object3D();
 					gyro.add( light, light.target );
 
 					characters[ Math.floor( nSkins / 2 ) ].root.add( gyro );

examples/webgl_loader_nrrd.html

@@ -98,6 +98,7 @@
 				dirLight.position.set( 200, 200, 1000 ).normalize();
 
 				camera.add( dirLight );
+				dirLight.target = new THREE.Object3D();
 				camera.add( dirLight.target );
 
 				var loader = new THREE.NRRDLoader();

examples/webgl_loader_vrml.html

@@ -73,6 +73,7 @@
 				dirLight.position.set( 200, 200, 1000 ).normalize();
 
 				camera.add( dirLight );
+				dirLight.target = new THREE.Object3D();
 				camera.add( dirLight.target );
 
 				var loader = new THREE.VRMLLoader();

examples/webgl_loader_vtk.html

@@ -82,6 +82,7 @@
 				dirLight.position.set( 200, 200, 1000 ).normalize();
 
 				camera.add( dirLight );
+				dirLight.target = new THREE.Object3D();
 				camera.add( dirLight.target );
 
 				var material = new THREE.MeshLambertMaterial( { color: 0xffffff, side: THREE.DoubleSide } );

examples/webgl_materials_cubemap_dynamic.html

@@ -162,7 +162,7 @@
 
 				spotLight = new THREE.SpotLight( 0xffffff, 1, 0, Math.PI/2 );
 				spotLight.position.set( 0, 1800, 1500 );
-				spotLight.target.position.set( 0, 0, 0 );
+				spotLight.lookAt( 0, 0, 0 );
 				spotLight.castShadow = true;
 
 				spotLight.shadow.camera.near = 100;
@@ -947,8 +947,7 @@
 
 				// update shadows
 
-				spotLight.target.position.x = currentCar.root.position.x;
-				spotLight.target.position.z = currentCar.root.position.z;
+				spotLight.lookAt( currentCar.root.position.x, 0, currentCar.root.position.z );
 
 				// render cube map
 

examples/webgl_shadowmap.html

@@ -108,7 +108,7 @@
 
 				light = new THREE.SpotLight( 0xffffff, 1, 0, Math.PI / 2 );
 				light.position.set( 0, 1500, 1000 );
-				light.target.position.set( 0, 0, 0 );
+				light.lookAt( 0, 0, 0 );
 
 				light.castShadow = true;
 

examples/webgl_shadowmap_pcss.html

@@ -167,6 +167,7 @@
 
 				var light = new THREE.DirectionalLight( 0xdfebff, 1.75 );
 				light.position.set( 2, 8, 4 );
+				light.lookAt( 0, 0, 0 );
 
 				light.castShadow = true;
 				light.shadow.mapSize.width = 1024;

examples/webgl_shadowmap_performance.html

@@ -103,7 +103,7 @@
 
 				light = new THREE.SpotLight( 0xffffff, 1, 0, Math.PI/2 );
 				light.position.set( 0, 1500, 1000 );
-				light.target.position.set( 0, 0, 0 );
+				light.lookAt( 0, 0, 0 );
 
 				light.castShadow = true;
 

examples/webgl_shadowmap_viewer.html

@@ -75,6 +75,7 @@
 				spotLight.angle = Math.PI / 5;
 				spotLight.penumbra = 0.3;
 				spotLight.position.set( 10, 10, 5 );
+				spotLight.lookAt( 0, 0, 0 );
 				spotLight.castShadow = true;
 				spotLight.shadow.camera.near = 8;
 				spotLight.shadow.camera.far = 30;
@@ -87,6 +88,7 @@
 				dirLight = new THREE.DirectionalLight( 0xffffff, 1 );
 				dirLight.name = 'Dir. Light';
 				dirLight.position.set( 0, 10, 0 );
+				dirLight.lookAt( 0, 0, 0 );
 				dirLight.castShadow = true;
 				dirLight.shadow.camera.near = 1;
 				dirLight.shadow.camera.far = 10;

examples/webvr_sandbox.html

@@ -67,22 +67,20 @@
 
 				var light = new THREE.DirectionalLight( 0x8800ff );
 				light.position.set( - 1, 1.5, - 1.5 );
+				light.lookAt( 0, 0, - 2 );
 				light.castShadow = true;
 				light.shadow.camera.zoom = 4;
 				scene.add( light );
-				light.target.position.set( 0, 0, - 2 );
-				scene.add( light.target );
 
 				var helper = new THREE.CameraHelper( light.shadow.camera );
 				// scene.add( helper );
 
 				var light = new THREE.DirectionalLight( 0xff0000 );
 				light.position.set( 1, 1.5, - 2.5 );
+				light.lookAt( 0, 0, - 2 );
 				light.castShadow = true;
 				light.shadow.camera.zoom = 4;
 				scene.add( light );
-				light.target.position.set( 0, 0, - 2 );
-				scene.add( light.target );
 
 				var helper = new THREE.CameraHelper( light.shadow.camera );
 				// scene.add( helper );

src/helpers/DirectionalLightHelper.js

@@ -4,7 +4,6 @@
  * @author WestLangley / http://github.com/WestLangley
  */
 
-import { Vector3 } from '../math/Vector3.js';
 import { Object3D } from '../core/Object3D.js';
 import { Line } from '../objects/Line.js';
 import { Float32BufferAttribute } from '../core/BufferAttribute.js';
@@ -63,36 +62,19 @@ DirectionalLightHelper.prototype.dispose = function () {
 
 DirectionalLightHelper.prototype.update = function () {
 
-	var v1 = new Vector3();
-	var v2 = new Vector3();
-	var v3 = new Vector3();
+	if ( this.color !== undefined ) {
 
-	return function update() {
+		this.lightPlane.material.color.set( this.color );
+		this.targetLine.material.color.set( this.color );
 
-		v1.setFromMatrixPosition( this.light.matrixWorld );
-		v2.setFromMatrixPosition( this.light.target.matrixWorld );
-		v3.subVectors( v2, v1 );
+	} else {
 
-		this.lightPlane.lookAt( v3 );
+		this.lightPlane.material.color.copy( this.light.color );
+		this.targetLine.material.color.copy( this.light.color );
 
-		if ( this.color !== undefined ) {
+	}
 
-			this.lightPlane.material.color.set( this.color );
-			this.targetLine.material.color.set( this.color );
-
-		} else {
-
-			this.lightPlane.material.color.copy( this.light.color );
-			this.targetLine.material.color.copy( this.light.color );
-
-		}
-
-		this.targetLine.lookAt( v3 );
-		this.targetLine.scale.z = v3.length();
-
-	};
-
-}();
+};
 
 
 export { DirectionalLightHelper };

src/helpers/SpotLightHelper.js

@@ -4,7 +4,6 @@
  * @author WestLangley / http://github.com/WestLangley
  */
 
-import { Vector3 } from '../math/Vector3.js';
 import { Object3D } from '../core/Object3D.js';
 import { LineSegments } from '../objects/LineSegments.js';
 import { LineBasicMaterial } from '../materials/LineBasicMaterial.js';
@@ -68,36 +67,24 @@ SpotLightHelper.prototype.dispose = function () {
 
 SpotLightHelper.prototype.update = function () {
 
-	var vector = new Vector3();
-	var vector2 = new Vector3();
-
-	return function update() {
-
-		this.light.updateMatrixWorld();
-
-		var coneLength = this.light.distance ? this.light.distance : 1000;
-		var coneWidth = coneLength * Math.tan( this.light.angle );
-
-		this.cone.scale.set( coneWidth, coneWidth, coneLength );
-
-		vector.setFromMatrixPosition( this.light.matrixWorld );
-		vector2.setFromMatrixPosition( this.light.target.matrixWorld );
+	this.light.updateMatrixWorld();
 
-		this.cone.lookAt( vector2.sub( vector ) );
+	var coneLength = this.light.distance ? this.light.distance : 1000;
+	var coneWidth = coneLength * Math.tan( this.light.angle );
 
-		if ( this.color !== undefined ) {
+	this.cone.scale.set( coneWidth, coneWidth, coneLength );
 
-			this.cone.material.color.set( this.color );
+	if ( this.color !== undefined ) {
 
-		} else {
+		this.cone.material.color.set( this.color );
 
-			this.cone.material.color.copy( this.light.color );
+	} else {
 
-		}
+		this.cone.material.color.copy( this.light.color );
 
-	};
+	}
 
-}();
+};
 
 
 export { SpotLightHelper };

src/lights/DirectionalLight.js

@@ -14,12 +14,15 @@ function DirectionalLight( color, intensity ) {
 	this.type = 'DirectionalLight';
 
 	this.position.copy( Object3D.DefaultUp );
-	this.updateMatrix();
+	this.lookAt( 0, 0, 0 );
 
-	this.target = new Object3D();
+	this.target = undefined;
 
 	this.shadow = new DirectionalLightShadow();
 
+	this.add( this.shadow.camera );
+	this.shadow.camera.scale.set( - 1, 1, - 1 );
+
 }
 
 DirectionalLight.prototype = Object.assign( Object.create( Light.prototype ), {
@@ -32,7 +35,7 @@ DirectionalLight.prototype = Object.assign( Object.create( Light.prototype ), {
 
 		Light.prototype.copy.call( this, source );
 
-		this.target = source.target.clone();
+		this.target = source.target ? source.target.clone() : undefined;
 
 		this.shadow = source.shadow.clone();
 

src/lights/DirectionalLightShadow.js

@@ -5,9 +5,10 @@ import { OrthographicCamera } from '../cameras/OrthographicCamera.js';
  * @author mrdoob / http://mrdoob.com/
  */
 
-function DirectionalLightShadow( ) {
+function DirectionalLightShadow( camera ) {
 
-	LightShadow.call( this, new OrthographicCamera( - 5, 5, 5, - 5, 0.5, 500 ) );
+	camera = camera || new OrthographicCamera( - 5, 5, 5, - 5, 0.5, 500 );
+	LightShadow.call( this, camera );
 
 }
 

src/lights/SpotLight.js

@@ -13,9 +13,9 @@ function SpotLight( color, intensity, distance, angle, penumbra, decay ) {
 	this.type = 'SpotLight';
 
 	this.position.copy( Object3D.DefaultUp );
-	this.updateMatrix();
+	this.lookAt( 0, 0, 0 );
 
-	this.target = new Object3D();
+	this.target = undefined;
 
 	Object.defineProperty( this, 'power', {
 		get: function () {
@@ -41,6 +41,9 @@ function SpotLight( color, intensity, distance, angle, penumbra, decay ) {
 
 	this.shadow = new SpotLightShadow();
 
+	this.add( this.shadow.camera );
+	this.shadow.camera.scale.set( - 1, 1, - 1 );
+
 }
 
 SpotLight.prototype = Object.assign( Object.create( Light.prototype ), {
@@ -58,7 +61,7 @@ SpotLight.prototype = Object.assign( Object.create( Light.prototype ), {
 		this.penumbra = source.penumbra;
 		this.decay = source.decay;
 
-		this.target = source.target.clone();
+		this.target = source.target ? source.target.clone() : undefined;
 
 		this.shadow = source.shadow.clone();
 

src/lights/SpotLightShadow.js

@@ -6,9 +6,10 @@ import { PerspectiveCamera } from '../cameras/PerspectiveCamera.js';
  * @author mrdoob / http://mrdoob.com/
  */
 
-function SpotLightShadow() {
+function SpotLightShadow( camera ) {
 
-	LightShadow.call( this, new PerspectiveCamera( 50, 1, 0.5, 500 ) );
+	camera = camera || new PerspectiveCamera( 50, 1, 0.5, 500 );
+	LightShadow.call( this, camera );
 
 }