Merge pull request #18213 from mrdoob/helpers

Moved FaceNormalHelper, LightProbeHelper, PositionalAudioHelper, RectAreaLightHelper, VertexNormalsHelper and VertexTangentsHelper out of src

src/helpers/FaceNormalsHelper.d.ts → examples/jsm/helpers/FaceNormalsHelper.d.ts

-import { Object3D } from './../core/Object3D';
-import { LineSegments } from './../objects/LineSegments';
+import {
+	Object3D,
+	LineSegments
+} from '../../../src/Three';
 
 /**
  * @deprecated Use {@link EdgesGeometry THREE.EdgesGeometry}

src/helpers/FaceNormalsHelper.js → examples/jsm/helpers/FaceNormalsHelper.js

@@ -3,12 +3,14 @@
  * @author WestLangley / http://github.com/WestLangley
  */
 
-import { Matrix3 } from '../math/Matrix3.js';
-import { Vector3 } from '../math/Vector3.js';
-import { LineSegments } from '../objects/LineSegments.js';
-import { LineBasicMaterial } from '../materials/LineBasicMaterial.js';
-import { Float32BufferAttribute } from '../core/BufferAttribute.js';
-import { BufferGeometry } from '../core/BufferGeometry.js';
+import {
+	BufferGeometry,
+	Float32BufferAttribute,
+	LineSegments,
+	LineBasicMaterial,
+	Matrix3,
+	Vector3
+} from '../../../build/three.module.js';
 
 var _v1 = new Vector3();
 var _v2 = new Vector3();

src/helpers/LightProbeHelper.js → examples/jsm/helpers/LightProbeHelper.js

-import { Mesh } from '../objects/Mesh.js';
-import { ShaderMaterial } from '../materials/ShaderMaterial.js';
-import { SphereBufferGeometry } from '../geometries/SphereGeometry.js';
-
 /**
  * @author WestLangley / http://github.com/WestLangley
  */
 
+import {
+	Mesh,
+	ShaderMaterial,
+	SphereBufferGeometry
+} from '../../../build/three.module.js';
+
 function LightProbeHelper( lightProbe, size ) {
 
 	this.lightProbe = lightProbe;

src/helpers/PositionalAudioHelper.d.ts → examples/jsm/helpers/PositionalAudioHelper.d.ts

-import { PositionalAudio } from './../audio/PositionalAudio';
-import { Line } from './../objects/Line';
+import {
+	Line,
+	PositionalAudio
+} from '../../../src/Three';
 
 export class PositionalAudioHelper extends Line {
 

src/helpers/PositionalAudioHelper.js → examples/jsm/helpers/PositionalAudioHelper.js

@@ -2,11 +2,13 @@
  * @author Mugen87 / http://github.com/Mugen87
  */
 
-import { BufferGeometry } from '../core/BufferGeometry.js';
-import { BufferAttribute } from '../core/BufferAttribute.js';
-import { LineBasicMaterial } from '../materials/LineBasicMaterial.js';
-import { Line } from '../objects/Line.js';
-import { _Math } from '../math/Math.js';
+import {
+	BufferGeometry,
+	BufferAttribute,
+	LineBasicMaterial,
+	Line,
+	Math as _Math
+} from '../../../build/three.module.js';
 
 function PositionalAudioHelper( audio, range, divisionsInnerAngle, divisionsOuterAngle ) {
 

src/helpers/RectAreaLightHelper.d.ts → examples/jsm/helpers/RectAreaLightHelper.d.ts

-import { RectAreaLight } from './../lights/RectAreaLight';
-import { Color } from './../math/Color';
-import { Line } from '../objects/Line';
+import {
+	Color,
+	Line,
+	RectAreaLight
+} from '../../../src/Three';
 
 export class RectAreaLightHelper extends Line {
 

src/helpers/RectAreaLightHelper.js → examples/jsm/helpers/RectAreaLightHelper.js

@@ -6,13 +6,15 @@
  *  This helper must be added as a child of the light
  */
 
-import { Line } from '../objects/Line.js';
-import { Mesh } from '../objects/Mesh.js';
-import { LineBasicMaterial } from '../materials/LineBasicMaterial.js';
-import { MeshBasicMaterial } from '../materials/MeshBasicMaterial.js';
-import { Float32BufferAttribute } from '../core/BufferAttribute.js';
-import { BufferGeometry } from '../core/BufferGeometry.js';
-import { BackSide } from '../constants.js';
+import {
+	BackSide,
+	BufferGeometry,
+	Float32BufferAttribute,
+	Line,
+	LineBasicMaterial,
+	Mesh,
+	MeshBasicMaterial
+} from '../../../build/three.module.js';
 
 function RectAreaLightHelper( light, color ) {
 

src/helpers/VertexNormalsHelper.d.ts → examples/jsm/helpers/VertexNormalsHelper.d.ts

-import { Object3D } from './../core/Object3D';
-import { LineSegments } from './../objects/LineSegments';
+import {
+	Object3D,
+	LineSegments
+} from '../../../src/Three';
 
 export class VertexNormalsHelper extends LineSegments {
 

src/helpers/VertexNormalsHelper.js → examples/jsm/helpers/VertexNormalsHelper.js

@@ -3,12 +3,14 @@
  * @author WestLangley / http://github.com/WestLangley
  */
 
-import { Matrix3 } from '../math/Matrix3.js';
-import { Vector3 } from '../math/Vector3.js';
-import { LineSegments } from '../objects/LineSegments.js';
-import { LineBasicMaterial } from '../materials/LineBasicMaterial.js';
-import { Float32BufferAttribute } from '../core/BufferAttribute.js';
-import { BufferGeometry } from '../core/BufferGeometry.js';
+import {
+	BufferGeometry,
+	Float32BufferAttribute,
+	LineSegments,
+	LineBasicMaterial,
+	Matrix3,
+	Vector3
+} from '../../../build/three.module.js';
 
 var _v1 = new Vector3();
 var _v2 = new Vector3();

src/helpers/VertexTangentsHelper.d.ts → examples/jsm/helpers/VertexTangentsHelper.d.ts

-import { Object3D } from './../core/Object3D';
-import { LineSegments } from './../objects/LineSegments';
+import {
+	Object3D,
+	LineSegments
+} from '../../../src/Three';
 
 export class VertexTangentsHelper extends LineSegments {
 

src/helpers/VertexTangentsHelper.js → examples/jsm/helpers/VertexTangentsHelper.js

@@ -2,11 +2,13 @@
  * @author WestLangley / http://github.com/WestLangley
  */
 
-import { Vector3 } from '../math/Vector3.js';
-import { LineSegments } from '../objects/LineSegments.js';
-import { LineBasicMaterial } from '../materials/LineBasicMaterial.js';
-import { Float32BufferAttribute } from '../core/BufferAttribute.js';
-import { BufferGeometry } from '../core/BufferGeometry.js';
+import {
+	BufferGeometry,
+	Float32BufferAttribute,
+	LineSegments,
+	LineBasicMaterial,
+	Vector3
+} from '../../../build/three.module.js';
 
 var _v1 = new Vector3();
 var _v2 = new Vector3();

examples/webaudio_orientation.html

@@ -29,6 +29,7 @@
 		import * as THREE from '../build/three.module.js';
 
 		import { OrbitControls } from './jsm/controls/OrbitControls.js';
+		import { PositionalAudioHelper } from './jsm/helpers/PositionalAudioHelper.js';
 		import { GLTFLoader } from './jsm/loaders/GLTFLoader.js';
 
 		var scene, camera, renderer;
@@ -99,7 +100,7 @@
 			positionalAudio.setRefDistance( 1 );
 			positionalAudio.setDirectionalCone( 180, 230, 0.1 );
 
-			var helper = new THREE.PositionalAudioHelper( positionalAudio, 0.1 );
+			var helper = new PositionalAudioHelper( positionalAudio, 0.1 );
 			positionalAudio.add( helper );
 
 			//

examples/webgl_geometry_normals.html

@@ -21,6 +21,7 @@
 			import { GUI } from './jsm/libs/dat.gui.module.js';
 
 			import { OrbitControls } from './jsm/controls/OrbitControls.js';
+			import { VertexNormalsHelper } from './jsm/helpers/VertexNormalsHelper.js';
 
 			var container, stats, gui;
 			var camera, scene, renderer;
@@ -69,7 +70,7 @@
 				mesh = new THREE.Mesh( geometry, material );
 				scene.add( mesh );
 
-				var vertexNormalsHelper = new THREE.VertexNormalsHelper( mesh, 10 );
+				var vertexNormalsHelper = new VertexNormalsHelper( mesh, 10 );
 				mesh.add( vertexNormalsHelper );
 
 			}

examples/webgl_helpers.html

@@ -17,6 +17,9 @@
 
 			import { GLTFLoader } from './jsm/loaders/GLTFLoader.js';
 
+			import { VertexNormalsHelper } from './jsm/helpers/VertexNormalsHelper.js';
+			import { VertexTangentsHelper } from './jsm/helpers/VertexTangentsHelper.js';
+
 			import { BufferGeometryUtils } from './jsm/utils/BufferGeometryUtils.js';
 
 			var scene, renderer;
@@ -73,10 +76,10 @@
 
 					group.add( mesh );
 
-					vnh = new THREE.VertexNormalsHelper( mesh, 5 );
+					vnh = new VertexNormalsHelper( mesh, 5 );
 					scene.add( vnh );
 
-					vth = new THREE.VertexTangentsHelper( mesh, 5 );
+					vth = new VertexTangentsHelper( mesh, 5 );
 					scene.add( vth );
 
 					scene.add( new THREE.BoxHelper( mesh ) );

examples/webgl_lightprobe_cubecamera.html

@@ -17,6 +17,7 @@
 			import * as THREE from '../build/three.module.js';
 
 			import { OrbitControls } from './jsm/controls/OrbitControls.js';
+			import { LightProbeHelper } from './jsm/helpers/LightProbeHelper.js';
 			import { LightProbeGenerator } from './jsm/lights/LightProbeGenerator.js';
 
 			var renderer, scene, camera, cubeCamera;
@@ -80,7 +81,7 @@
 
 					lightProbe.copy( LightProbeGenerator.fromRenderTargetCube( renderer, cubeCamera.renderTarget ) );
 
-					scene.add( new THREE.LightProbeHelper( lightProbe, 5 ) );
+					scene.add( new LightProbeHelper( lightProbe, 5 ) );
 
 					render();
 

examples/webgl_loader_obj2_options.html

@@ -56,6 +56,7 @@
 			import { GUI } from './jsm/libs/dat.gui.module.js';
 
 			import { TrackballControls } from "./jsm/controls/TrackballControls.js";
+			import { VertexNormalsHelper } from "./jsm/helpers/VertexNormalsHelper.js";
 
 			import { MTLLoader } from "./jsm/loaders/MTLLoader.js";
 			import { MtlObjBridge } from "./jsm/loaders/obj2/bridge/MtlObjBridge.js";
@@ -289,7 +290,7 @@
 						let scale = 200.0;
 						mesh.scale.set( scale, scale, scale );
 						mesh.name = event.detail.meshName;
-						let helper = new THREE.VertexNormalsHelper( mesh, 2, 0x00ff00, 1 );
+						let helper = new VertexNormalsHelper( mesh, 2, 0x00ff00, 1 );
 						helper.name = 'VertexNormalsHelper';
 
 						override.addMesh( mesh );

examples/webgl_materials_envmaps_parallax.html

@@ -19,6 +19,7 @@
 
 			import { GUI } from './jsm/libs/dat.gui.module.js';
 			import { OrbitControls } from './jsm/controls/OrbitControls.js';
+			import { RectAreaLightHelper } from './jsm/helpers/RectAreaLightHelper.js';
 			import { RectAreaLightUniformsLib } from './jsm/lights/RectAreaLightUniformsLib.js';
 
 			// shader injection for box projected cube environment mapping
@@ -400,7 +401,7 @@
 				blueRectLight.lookAt( 0, 5, 0 );
 				scene.add( blueRectLight );
 
-				var blueRectLightHelper = new THREE.RectAreaLightHelper( blueRectLight, 0xffffff );
+				var blueRectLightHelper = new RectAreaLightHelper( blueRectLight, 0xffffff );
 				blueRectLight.add( blueRectLightHelper );
 
 				var redRectLight = new THREE.RectAreaLight( 0x9aaeff, intensity, width, height );
@@ -408,7 +409,7 @@
 				redRectLight.lookAt( 0, 5, 0 );
 				scene.add( redRectLight );
 
-				var redRectLightHelper = new THREE.RectAreaLightHelper( redRectLight, 0xffffff );
+				var redRectLightHelper = new RectAreaLightHelper( redRectLight, 0xffffff );
 				redRectLight.add( redRectLightHelper );
 
 				render();

src/Three.js

@@ -130,18 +130,12 @@ export { Quaternion } from './math/Quaternion.js';
 export { Color } from './math/Color.js';
 export { SphericalHarmonics3 } from './math/SphericalHarmonics3.js';
 export { ImmediateRenderObject } from './extras/objects/ImmediateRenderObject.js';
-export { VertexNormalsHelper } from './helpers/VertexNormalsHelper.js';
-export { VertexTangentsHelper } from './helpers/VertexTangentsHelper.js';
 export { SpotLightHelper } from './helpers/SpotLightHelper.js';
 export { SkeletonHelper } from './helpers/SkeletonHelper.js';
 export { PointLightHelper } from './helpers/PointLightHelper.js';
-export { RectAreaLightHelper } from './helpers/RectAreaLightHelper.js';
 export { HemisphereLightHelper } from './helpers/HemisphereLightHelper.js';
-export { LightProbeHelper } from './helpers/LightProbeHelper.js';
 export { GridHelper } from './helpers/GridHelper.js';
 export { PolarGridHelper } from './helpers/PolarGridHelper.js';
-export { PositionalAudioHelper } from './helpers/PositionalAudioHelper.js';
-export { FaceNormalsHelper } from './helpers/FaceNormalsHelper.js';
 export { DirectionalLightHelper } from './helpers/DirectionalLightHelper.js';
 export { CameraHelper } from './helpers/CameraHelper.js';
 export { BoxHelper } from './helpers/BoxHelper.js';