PointLight/SpotLight: Deprecate distance parameter, auto-compute from intensity and decay.

editor/index.html

@@ -122,6 +122,20 @@
 
 						editor.selectByUuid( selected );
 
+						// Update PointLightHelper showRange for restored selection
+
+						for ( const id in editor.helpers ) {
+
+							const helper = editor.helpers[ id ];
+
+							if ( helper.isPointLightHelper ) {
+
+								helper.showRange = ( helper.light === editor.selected );
+
+							}
+
+						}
+
 					}
 
 				} );

editor/js/Editor.js

@@ -396,32 +396,6 @@ Editor.prototype = {
 
 					helper = new THREE.PointLightHelper( object, 1 );
 
-					helper.matrix = new THREE.Matrix4();
-					helper.matrixAutoUpdate = true;
-
-					const light = object;
-					const editor = this;
-
-					helper.updateMatrixWorld = function () {
-
-						light.getWorldPosition( this.position );
-
-						const distance = editor.viewportCamera.position.distanceTo( this.position );
-						this.scale.setScalar( distance / 30 );
-
-						this.updateMatrix();
-						this.matrixWorld.copy( this.matrix );
-
-						const children = this.children;
-
-						for ( let i = 0, l = children.length; i < l; i ++ ) {
-
-							children[ i ].updateMatrixWorld();
-
-						}
-
-					};
-
 				} else if ( object.isDirectionalLight ) {
 
 					helper = new THREE.DirectionalLightHelper( object, 1 );

editor/js/Menubar.Add.js

@@ -414,9 +414,8 @@ function MenubarAdd( editor ) {
 
 		const color = 0xffffff;
 		const intensity = 1;
-		const distance = 0;
 
-		const light = new THREE.PointLight( color, intensity, distance );
+		const light = new THREE.PointLight( color, intensity );
 		light.name = 'PointLight';
 
 		editor.execute( new AddObjectCommand( editor, light ) );
@@ -433,11 +432,10 @@ function MenubarAdd( editor ) {
 
 		const color = 0xffffff;
 		const intensity = 1;
-		const distance = 0;
 		const angle = Math.PI * 0.1;
 		const penumbra = 0;
 
-		const light = new THREE.SpotLight( color, intensity, distance, angle, penumbra );
+		const light = new THREE.SpotLight( color, intensity, 0, angle, penumbra );
 		light.name = 'SpotLight';
 		light.target.name = 'SpotLight Target';
 

editor/js/Sidebar.Object.js

@@ -245,16 +245,6 @@ function SidebarObject( editor ) {
 
 	container.add( objectGroundColorRow );
 
-	// distance
-
-	const objectDistanceRow = new UIRow();
-	const objectDistance = new UINumber().setRange( 0, Infinity ).onChange( update );
-
-	objectDistanceRow.add( new UIText( strings.getKey( 'sidebar/object/distance' ) ).setClass( 'Label' ) );
-	objectDistanceRow.add( objectDistance );
-
-	container.add( objectDistanceRow );
-
 	// angle
 
 	const objectAngleRow = new UIRow();
@@ -535,12 +525,6 @@ function SidebarObject( editor ) {
 
 			}
 
-			if ( object.distance !== undefined && Math.abs( object.distance - objectDistance.getValue() ) >= 0.01 ) {
-
-				editor.execute( new SetValueCommand( editor, object, 'distance', objectDistance.getValue() ) );
-
-			}
-
 			if ( object.angle !== undefined && Math.abs( object.angle - objectAngle.getValue() ) >= 0.01 ) {
 
 				editor.execute( new SetValueCommand( editor, object, 'angle', objectAngle.getValue() ) );
@@ -650,7 +634,6 @@ function SidebarObject( editor ) {
 			'intensity': objectIntensityRow,
 			'color': objectColorRow,
 			'groundColor': objectGroundColorRow,
-			'distance': objectDistanceRow,
 			'angle': objectAngleRow,
 			'penumbra': objectPenumbraRow,
 			'decay': objectDecayRow,
@@ -825,12 +808,6 @@ function SidebarObject( editor ) {
 
 		}
 
-		if ( object.distance !== undefined ) {
-
-			objectDistance.setValue( object.distance );
-
-		}
-
 		if ( object.angle !== undefined ) {
 
 			objectAngle.setValue( object.angle );

editor/js/Strings.js

@@ -137,7 +137,6 @@ function Strings( config ) {
 			'sidebar/object/intensity': 'شدت',
 			'sidebar/object/color': 'رنگ',
 			'sidebar/object/groundcolor': 'رنگ زمینه',
-			'sidebar/object/distance': 'مسافت',
 			'sidebar/object/angle': 'زاویه',
 			'sidebar/object/penumbra': 'نیم سایه',
 			'sidebar/object/decay': 'پوسیدگی',
@@ -539,7 +538,6 @@ function Strings( config ) {
 			'sidebar/object/intensity': 'Intensity',
 			'sidebar/object/color': 'Color',
 			'sidebar/object/groundcolor': 'Ground Color',
-			'sidebar/object/distance': 'Distance',
 			'sidebar/object/angle': 'Angle',
 			'sidebar/object/penumbra': 'Penumbra',
 			'sidebar/object/decay': 'Decay',
@@ -942,7 +940,6 @@ function Strings( config ) {
 			'sidebar/object/intensity': 'Intensité',
 			'sidebar/object/color': 'Couleur',
 			'sidebar/object/groundcolor': 'Couleur de fond',
-			'sidebar/object/distance': 'Distance',
 			'sidebar/object/angle': 'Angle',
 			'sidebar/object/penumbra': 'Pénombre',
 			'sidebar/object/decay': 'Affaiblissement',
@@ -1345,7 +1342,6 @@ function Strings( config ) {
 			'sidebar/object/intensity': '强度',
 			'sidebar/object/color': '颜色',
 			'sidebar/object/groundcolor': '基色',
-			'sidebar/object/distance': '距离',
 			'sidebar/object/angle': '角度',
 			'sidebar/object/penumbra': '边缘',
 			'sidebar/object/decay': '衰减',
@@ -1748,7 +1744,6 @@ function Strings( config ) {
 			'sidebar/object/intensity': '強度',
 			'sidebar/object/color': '色',
 			'sidebar/object/groundcolor': '地面の色',
-			'sidebar/object/distance': '距離',
 			'sidebar/object/angle': '角度',
 			'sidebar/object/penumbra': '半影',
 			'sidebar/object/decay': '減衰',
@@ -2150,7 +2145,6 @@ function Strings( config ) {
 			'sidebar/object/intensity': '강도',
 			'sidebar/object/color': '색',
 			'sidebar/object/groundcolor': '지면 색',
-			'sidebar/object/distance': '거리',
 			'sidebar/object/angle': '각도',
 			'sidebar/object/penumbra': '반음영',
 			'sidebar/object/decay': '감쇠',

editor/js/Viewport.js

@@ -412,6 +412,20 @@ function Viewport( editor ) {
 		selectionBox.visible = false;
 		transformControls.detach();
 
+		// Hide range on all PointLightHelpers, then show for selected
+
+		for ( const id in editor.helpers ) {
+
+			const helper = editor.helpers[ id ];
+
+			if ( helper.isPointLightHelper ) {
+
+				helper.showRange = ( helper.light === object );
+
+			}
+
+		}
+
 		if ( object !== null && object !== scene && object !== camera ) {
 
 			box.setFromObject( object, true );

examples/jsm/environments/RoomEnvironment.js

@@ -44,7 +44,7 @@ class RoomEnvironment extends Scene {
 		const roomMaterial = new MeshStandardMaterial( { side: BackSide } );
 		const boxMaterial = new MeshStandardMaterial();
 
-		const mainLight = new PointLight( 0xffffff, 900, 28, 2 );
+		const mainLight = new PointLight( 0xffffff, 900, 0, 2 );
 		mainLight.position.set( 0.418, 16.199, 0.300 );
 		this.add( mainLight );
 

examples/jsm/loaders/FBXLoader.js

@@ -1206,28 +1206,13 @@ class FBXTreeParser {
 
 			}
 
-			let distance = 0;
-			if ( lightAttribute.FarAttenuationEnd !== undefined ) {
-
-				if ( lightAttribute.EnableFarAttenuation !== undefined && lightAttribute.EnableFarAttenuation.value === 0 ) {
-
-					distance = 0;
-
-				} else {
-
-					distance = lightAttribute.FarAttenuationEnd.value;
-
-				}
-
-			}
-
 			// TODO: could this be calculated linearly from FarAttenuationStart to FarAttenuationEnd?
 			const decay = 1;
 
 			switch ( type ) {
 
 				case 0: // Point
-					model = new PointLight( color, intensity, distance, decay );
+					model = new PointLight( color, intensity, 0, decay );
 					break;
 
 				case 1: // Directional
@@ -1254,7 +1239,7 @@ class FBXTreeParser {
 
 					}
 
-					model = new SpotLight( color, intensity, distance, angle, penumbra, decay );
+					model = new SpotLight( color, intensity, 0, angle, penumbra, decay );
 					break;
 
 				default:

examples/jsm/objects/Lensflare.js

@@ -22,7 +22,7 @@ import {
  * When using {@link WebGPURenderer}, use {@link LensflareMesh}.
  *
  * ```js
- * const light = new THREE.PointLight( 0xffffff, 1.5, 2000 );
+ * const light = new THREE.PointLight( 0xffffff, 1.5 );
  *
  * const lensflare = new Lensflare();
  * lensflare.addElement( new LensflareElement( textureFlare0, 512, 0 ) );

examples/jsm/objects/LensflareMesh.js

@@ -25,7 +25,7 @@ import { texture, textureLoad, uv, ivec2, vec2, vec4, positionGeometry, referenc
  * When using {@link WebGLRenderer}, use {@link Lensflare}.
  *
  * ```js
- * const light = new THREE.PointLight( 0xffffff, 1.5, 2000 );
+ * const light = new THREE.PointLight( 0xffffff, 1.5 );
  *
  * const lensflare = new LensflareMesh();
  * lensflare.addElement( new LensflareElement( textureFlare0, 512, 0 ) );

examples/webgl_animation_walk.html

@@ -174,7 +174,7 @@
 				controls.floorDecale = ( size / repeat ) * 4;
 
 				const bulbGeometry = new THREE.SphereGeometry( 0.05, 16, 8 );
-				const bulbLight = new THREE.PointLight( 0xffee88, 2, 500, 2 );
+				const bulbLight = new THREE.PointLight( 0xffee88, 2, 0, 2 );
 
 				const bulbMat = new THREE.MeshStandardMaterial( { emissive: 0xffffee, emissiveIntensity: 1, color: 0x000000 } );
 				bulbLight.add( new THREE.Mesh( bulbGeometry, bulbMat ) );

examples/webgl_helpers.html

@@ -51,11 +51,11 @@
 
 				scene = new THREE.Scene();
 
-				light = new THREE.PointLight();
+				light = new THREE.PointLight( 0xffffff, 1, 0, 0 );
 				light.position.set( 200, 100, 150 );
 				scene.add( light );
 
-				scene.add( new THREE.PointLightHelper( light, 15 ) );
+				scene.add( new THREE.PointLightHelper( light, 1 ) );
 
 				const gridHelper = new THREE.GridHelper( 400, 40, 0x0000ff, 0x808080 );
 				gridHelper.position.y = - 150;

examples/webgl_lensflares.html

@@ -103,7 +103,7 @@
 
 				function addLight( h, s, l, x, y, z ) {
 
-					const light = new THREE.PointLight( 0xffffff, 1.5, 2000, 0 );
+					const light = new THREE.PointLight( 0xffffff, 1.5, 0, 0 );
 					light.color.setHSL( h, s, l );
 					light.position.set( x, y, z );
 					scene.add( light );

examples/webgl_lights_physical.html

@@ -91,7 +91,7 @@
 				scene = new THREE.Scene();
 
 				const bulbGeometry = new THREE.SphereGeometry( 0.02, 16, 8 );
-				bulbLight = new THREE.PointLight( 0xffee88, 1, 100, 2 );
+				bulbLight = new THREE.PointLight( 0xffee88, 1, 0, 2 );
 
 				bulbMat = new THREE.MeshStandardMaterial( {
 					emissive: 0xffffee,

examples/webgl_materials_subsurface_scattering.html

@@ -58,14 +58,14 @@
 			scene.add( directionalLight );
 
 			const pointLight1 = new THREE.Mesh( new THREE.SphereGeometry( 4, 8, 8 ), new THREE.MeshBasicMaterial( { color: 0xc1c1c1 } ) );
-			pointLight1.add( new THREE.PointLight( 0xc1c1c1, 4.0, 300, 0 ) );
+			pointLight1.add( new THREE.PointLight( 0xc1c1c1, 4.0, 0, 0 ) );
 			scene.add( pointLight1 );
 			pointLight1.position.x = 0;
 			pointLight1.position.y = - 50;
 			pointLight1.position.z = 350;
 
 			const pointLight2 = new THREE.Mesh( new THREE.SphereGeometry( 4, 8, 8 ), new THREE.MeshBasicMaterial( { color: 0xc1c100 } ) );
-			pointLight2.add( new THREE.PointLight( 0xc1c100, 0.75, 500, 0 ) );
+			pointLight2.add( new THREE.PointLight( 0xc1c100, 0.75, 0, 0 ) );
 			scene.add( pointLight2 );
 			pointLight2.position.x = - 100;
 			pointLight2.position.y = 20;

examples/webgl_materials_toon.html

@@ -147,7 +147,7 @@
 
 				scene.add( new THREE.AmbientLight( 0xc1c1c1, 3 ) );
 
-				const pointLight = new THREE.PointLight( 0xffffff, 2, 800, 0 );
+				const pointLight = new THREE.PointLight( 0xffffff, 2, 0, 0 );
 				particleLight.add( pointLight );
 
 				//

examples/webgl_mirror.html

@@ -162,19 +162,19 @@
 				scene.add( planeLeft );
 
 				// lights
-				const mainLight = new THREE.PointLight( 0xe7e7e7, 2.5, 250, 0 );
+				const mainLight = new THREE.PointLight( 0xe7e7e7, 2.5, 0, 0 );
 				mainLight.position.y = 60;
 				scene.add( mainLight );
 
-				const greenLight = new THREE.PointLight( 0x00ff00, 0.5, 1000, 0 );
+				const greenLight = new THREE.PointLight( 0x00ff00, 0.5, 0, 0 );
 				greenLight.position.set( 550, 50, 0 );
 				scene.add( greenLight );
 
-				const redLight = new THREE.PointLight( 0xff0000, 0.5, 1000, 0 );
+				const redLight = new THREE.PointLight( 0xff0000, 0.5, 0, 0 );
 				redLight.position.set( - 550, 50, 0 );
 				scene.add( redLight );
 
-				const blueLight = new THREE.PointLight( 0xbbbbfe, 0.5, 1000, 0 );
+				const blueLight = new THREE.PointLight( 0xbbbbfe, 0.5, 0, 0 );
 				blueLight.position.set( 0, 50, 550 );
 				scene.add( blueLight );
 

examples/webgl_portal.html

@@ -147,19 +147,19 @@
 				scene.add( planeLeft );
 
 				// lights
-				const mainLight = new THREE.PointLight( 0xe7e7e7, 2.5, 250, 0 );
+				const mainLight = new THREE.PointLight( 0xe7e7e7, 2.5, 0, 0 );
 				mainLight.position.y = 60;
 				scene.add( mainLight );
 
-				const greenLight = new THREE.PointLight( 0x00ff00, 0.5, 1000, 0 );
+				const greenLight = new THREE.PointLight( 0x00ff00, 0.5, 0, 0 );
 				greenLight.position.set( 550, 50, 0 );
 				scene.add( greenLight );
 
-				const redLight = new THREE.PointLight( 0xff0000, 0.5, 1000, 0 );
+				const redLight = new THREE.PointLight( 0xff0000, 0.5, 0, 0 );
 				redLight.position.set( - 550, 50, 0 );
 				scene.add( redLight );
 
-				const blueLight = new THREE.PointLight( 0xbbbbfe, 0.5, 1000, 0 );
+				const blueLight = new THREE.PointLight( 0xbbbbfe, 0.5, 0, 0 );
 				blueLight.position.set( 0, 50, 550 );
 				scene.add( blueLight );
 

examples/webgl_postprocessing_pixel.html

@@ -148,7 +148,7 @@
 			directionalLight.shadow.mapSize.set( 2048, 2048 );
 			scene.add( directionalLight );
 
-			const spotLight = new THREE.SpotLight( 0xffc100, 10, 10, Math.PI / 16, .02, 2 );
+			const spotLight = new THREE.SpotLight( 0xffc100, 10, 0, Math.PI / 16, .02, 2 );
 			spotLight.position.set( 2, 2, 0 );
 			const target = spotLight.target;
 			scene.add( target );