Merge branch 'dev' into feature/add-type-isXXX

editor/js/Menubar.Help.js

@@ -48,4 +48,4 @@ var MenubarHelp = function ( editor ) {
 
 };
 
-export { MenubarHelp };
+export { MenubarHelp };

editor/js/commands/SetMaterialCommand.js

@@ -78,4 +78,4 @@ SetMaterialCommand.prototype = {
 
 };
 
-export { SetMaterialCommand };
+export { SetMaterialCommand };

editor/js/commands/SetMaterialMapCommand.js

@@ -134,4 +134,4 @@ SetMaterialMapCommand.prototype = {
 
 };
 
-export { SetMaterialMapCommand };
+export { SetMaterialMapCommand };

examples/js/loaders/VRMLLoader.js

@@ -2035,7 +2035,7 @@ THREE.VRMLLoader = ( function () {
 				// materials can be influenced by the geometry (e.g. vertex normals). cloning is necessary to avoid
 				// any side effects
 
-				return ( build.isObject3D || build.isMaterial ) ? build.clone() : build;
+				return ( build.isObject3D || build.isMaterial ) ? build.clone() : build;
 
 			}
 

examples/jsm/controls/TransformControls.d.ts

@@ -13,7 +13,7 @@ export class TransformControls extends Object3D {
 	// API
 
 	camera: Camera;
-	object: Object3D | undefined;
+	object: Object3D | undefined;
 	enabled: boolean;
 	axis: string | null;
 	mode: string;

examples/jsm/exporters/PLYExporter.d.ts

@@ -9,6 +9,6 @@ export class PLYExporter {
 
 	constructor();
 
-	parse( object: Object3D, onDone: ( res: string ) => void, options: PLYExporterOptions ): string | null;
+	parse( object: Object3D, onDone: ( res: string ) => void, options: PLYExporterOptions ): string | null;
 
 }

examples/jsm/lines/WireframeGeometry2.d.ts

@@ -7,7 +7,7 @@ import { LineSegmentsGeometry } from './LineSegmentsGeometry';
 
 export class WireframeGeometry2 extends LineSegmentsGeometry {
 
-	constructor( geometry: Geometry | BufferGeometry );
+	constructor( geometry: Geometry | BufferGeometry );
 	readonly sWireframeGeometry2: boolean;
 
 }

examples/jsm/loaders/BasisTextureLoader.d.ts

@@ -8,7 +8,7 @@ import {
 export class BasisTextureLoader extends Loader {
 
 	constructor( manager?: LoadingManager );
-	transcoderBinary: ArrayBuffer | null;
+	transcoderBinary: ArrayBuffer | null;
 	transcoderPath: string;
 	transcoderPending: Promise<void> | null;
 

examples/jsm/loaders/GLTFLoader.d.ts

@@ -29,8 +29,8 @@ export interface GLTF {
 export class GLTFLoader extends Loader {
 
 	constructor( manager?: LoadingManager );
-	dracoLoader: DRACOLoader | null;
-	ddsLoader: DDSLoader | null;
+	dracoLoader: DRACOLoader | null;
+	ddsLoader: DDSLoader | null;
 
 	load( url: string, onLoad: ( gltf: GLTF ) => void, onProgress?: ( event: ProgressEvent ) => void, onError?: ( event: ErrorEvent ) => void ) : void;
 	setDRACOLoader( dracoLoader: DRACOLoader ): GLTFLoader;

examples/jsm/loaders/VRMLLoader.js

@@ -2072,7 +2072,7 @@ var VRMLLoader = ( function () {
 				// materials can be influenced by the geometry (e.g. vertex normals). cloning is necessary to avoid
 				// any side effects
 
-				return ( build.isObject3D || build.isMaterial ) ? build.clone() : build;
+				return ( build.isObject3D || build.isMaterial ) ? build.clone() : build;
 
 			}
 

examples/jsm/misc/MorphAnimMesh.d.ts

@@ -9,7 +9,7 @@ import {
 
 export class MorphAnimMesh extends Mesh {
 
-	constructor( geometry: BufferGeometry | Geometry, material: Material );
+	constructor( geometry: BufferGeometry | Geometry, material: Material );
 	mixer: AnimationMixer;
 	activeAction: AnimationAction | null;
 

examples/jsm/misc/MorphBlendMesh.d.ts

@@ -7,7 +7,7 @@ import {
 
 export class MorphBlendMesh extends Mesh {
 
-	constructor( geometry: BufferGeometry | Geometry, material: Material );
+	constructor( geometry: BufferGeometry | Geometry, material: Material );
 	animationsMap: object;
 	animationsList: object[];
 

examples/jsm/nodes/accessors/CameraNode.d.ts

@@ -10,10 +10,10 @@ export class CameraNode extends TempNode {
 	constructor( scope?: string, camera?: Camera );
 
 	scope: string;
-	near: FloatNode | undefined;
-	far: FloatNode | undefined;
-	camera: Camera | undefined;
-	updateFrame: boolean | undefined;
+	near: FloatNode | undefined;
+	far: FloatNode | undefined;
+	camera: Camera | undefined;
+	updateFrame: boolean | undefined;
 	nodeType: string;
 
 	setCamera( camera: Camera ): void;

examples/jsm/nodes/core/FunctionNode.d.ts

@@ -15,15 +15,15 @@ export class FunctionNode extends TempNode {
 	nodeType: string;
 	useKeywords: boolean;
 
-	inputs: FunctionNodeInput[] | undefined;
-	includes: object[] | undefined;
-	extensions: object | undefined;
-	keywords: object | undefined;
+	inputs: FunctionNodeInput[] | undefined;
+	includes: object[] | undefined;
+	extensions: object | undefined;
+	keywords: object | undefined;
 
 	getShared( builder: NodeBuilder, output: string ): boolean;
 	getType( builder: NodeBuilder ): string;
 	getInputByName( name: string ): FunctionNodeInput | undefined;
-	getIncludeByName( name: string ): object | undefined;
+	getIncludeByName( name: string ): object | undefined;
 	parse( src: string, includes?: object[], extensions?: object, keywords?: object ): void;
 	copy( source: FunctionNode ): this;
 

examples/jsm/nodes/core/Node.d.ts

@@ -6,10 +6,10 @@ export class Node {
 
 	uuid: string;
 	name: string;
-	type: string | undefined;
+	type: string | undefined;
 	userData: object;
-	readonly isNode: true;
-	frameId: number | undefined;
+  readonly isNode: true;
+	frameId: number | undefined;
 
 	analyze( builder: NodeBuilder, settings?: object ): void;
 	analyzeAndFlow( builder: NodeBuilder, output: string, settings?: object ): object;

examples/jsm/nodes/core/NodeFrame.d.ts

@@ -10,9 +10,9 @@ export class NodeFrame {
 	constructor( time: number );
 	time: number;
 	id: number;
-	delta: number | undefined;
-	renderer: WebGLRenderer | undefined;
-	renderTexture: Texture | undefined;
+	delta: number | undefined;
+	renderer: WebGLRenderer | undefined;
+	renderTexture: Texture | undefined;
 
 	update( delta: number ): this;
 	setRenderer( renderer: WebGLRenderer ): this;

examples/jsm/nodes/core/NodeUniform.d.ts

@@ -10,10 +10,10 @@ export interface NodeUniformParams {
 export class NodeUniform {
 
 	constructor( params?: NodeUniformParams );
-	name: string | undefined;
-	type: string | undefined;
-	node: Node | undefined;
-	needsUpdate: boolean | undefined;
+	name: string | undefined;
+	type: string | undefined;
+	node: Node | undefined;
+	needsUpdate: boolean | undefined;
 	value: any;
 
 }

examples/jsm/nodes/effects/ColorAdjustmentNode.d.ts

@@ -8,7 +8,7 @@ export class ColorAdjustmentNode extends TempNode {
 	constructor( rgb: Node, adjustment?: FloatNode, method?: string );
 
 	rgb: Node;
-	adjustment: FloatNode | undefined;
+	adjustment: FloatNode | undefined;
 	method: string;
 	nodeType: string;
 

examples/jsm/nodes/inputs/ColorNode.d.ts

@@ -5,7 +5,7 @@ import { NodeBuilder } from '../core/NodeBuilder';
 
 export class ColorNode extends InputNode {
 
-	constructor( color: Color | number | string, g?: number, b?: number );
+	constructor( color: Color | number | string, g?: number, b?: number );
 
 	value: Color;
 	nodeType: string;

examples/jsm/nodes/inputs/CubeTextureNode.d.ts

@@ -9,8 +9,8 @@ export class CubeTextureNode extends InputNode {
 	constructor( value: CubeTexture, uv?: Node, bias?: Node );
 
 	value: CubeTexture;
-	uv: Node | undefined;
-	bias: Node | undefined;
+	uv: Node | undefined;
+	bias: Node | undefined;
 	nodeType: string;
 
 	getTexture( builder: NodeBuilder, output: string ): string;

examples/jsm/nodes/inputs/Vector2Node.d.ts

@@ -5,7 +5,7 @@ import { NodeBuilder } from '../core/NodeBuilder';
 
 export class Vector2Node extends InputNode {
 
-	constructor( x: Vector2 | number, y?: number );
+	constructor( x: Vector2 | number, y?: number );
 
 	value: Vector2;
 	nodeType: string;

examples/jsm/nodes/inputs/Vector3Node.d.ts

@@ -5,7 +5,7 @@ import { NodeBuilder } from '../core/NodeBuilder';
 
 export class Vector3Node extends InputNode {
 
-	constructor( x: Vector3 | number, y?: number, z?: number );
+	constructor( x: Vector3 | number, y?: number, z?: number );
 
 	value: Vector3;
 	nodeType: string;

examples/jsm/nodes/inputs/Vector4Node.d.ts

@@ -5,7 +5,7 @@ import { NodeBuilder } from '../core/NodeBuilder';
 
 export class Vector4Node extends InputNode {
 
-	constructor( x: Vector4 | number, y?: number, z?: number, w?: number );
+	constructor( x: Vector4 | number, y?: number, z?: number, w?: number );
 
 	value: Vector4;
 	nodeType: string;

examples/jsm/nodes/math/MathNode.d.ts

@@ -4,11 +4,11 @@ import { Node } from '../core/Node';
 
 export class MathNode extends TempNode {
 
-	constructor( a: Node, bOrMethod: Node | string, cOrMethod?: Node | string, method?: string );
+	constructor( a: Node, bOrMethod: Node | string, cOrMethod?: Node | string, method?: string );
 
 	a: Node;
 	b: Node | string | undefined;
-	c: Node | string | undefined;
+	c: Node | string | undefined;
 	method: string;
 	nodeType: string;
 

examples/jsm/nodes/utils/BypassNode.d.ts

@@ -5,7 +5,7 @@ export class BypassNode extends Node {
 	constructor( code: Node, value?: Node );
 
 	code: Node;
-	value: Node | undefined;
+	value: Node | undefined;
 	nodeType: string;
 
 	copy( source: BypassNode ): this;

examples/jsm/nodes/utils/ColorSpaceNode.d.ts

@@ -7,7 +7,7 @@ export class ColorSpaceNode extends TempNode {
 	constructor( input: Node, method?: string );
 
 	input: Node;
-	method: string | undefined;
+	method: string | undefined;
 	nodeType: string;
 
 	fromEncoding( encoding: number );

examples/jsm/nodes/utils/JoinNode.d.ts

@@ -6,8 +6,8 @@ export class JoinNode extends TempNode {
 
 	x: Node;
 	y: Node;
-	z: Node | undefined;
-	w: Node | undefined;
+	z: Node | undefined;
+	w: Node | undefined;
 	nodeType: string;
 
 	getNumElements(): number;

examples/jsm/nodes/utils/VelocityNode.d.ts

@@ -17,10 +17,10 @@ export class VelocityNode extends Vector3Node {
 	constructor( target: Object3D, params?: VelocityNodeParams );
 
 	velocity: Vector3;
-	moment: Vector3 | undefined;
-	speed: Vector3 | undefined;
-	springVelocity: Vector3 | undefined;
-	lastVelocity: Vector3 | undefined;
+	moment: Vector3 | undefined;
+	speed: Vector3 | undefined;
+	springVelocity: Vector3 | undefined;
+	lastVelocity: Vector3 | undefined;
 
 	nodeType: string;
 

examples/jsm/webxr/VRButton.d.ts

@@ -2,10 +2,10 @@ import {
 	WebGLRenderer
 } from '../../../src/Three';
 
-export interface WebXROptions {
+export interface WebXROptions {
 	referenceSpaceType: string;
 }
 
 export namespace VRButton {
-	export function createButton( renderer: WebGLRenderer, options?: WebXROptions  ): HTMLElement;
+	export function createButton( renderer: WebGLRenderer, options?: WebXROptions ): HTMLElement;
 }

examples/webgl_shading_physical.html

@@ -68,7 +68,7 @@
 
 				// CUBE CAMERA
 
-				cubeCamera = new THREE.CubeCamera( 1, 10000, 128, { encoding: THREE.sRGBEncoding } );
+				cubeCamera = new THREE.CubeCamera( 1, 10000, 128, { encoding: THREE.sRGBEncoding } );
 
 				// TEXTURES
 				var textureLoader = new THREE.TextureLoader();

src/audio/Audio.d.ts

@@ -19,7 +19,7 @@ export class Audio extends Object3D {
 	loopStart: number;
 	loopEnd: number;
 	offset: number;
-	duration: number | undefined;
+	duration: number | undefined;
 	playbackRate: number;
 	isPlaying: boolean;
 	hasPlaybackControl: boolean;

src/materials/MeshDepthMaterial.d.ts

@@ -4,9 +4,9 @@ import { Texture } from './../textures/Texture';
 
 export interface MeshDepthMaterialParameters extends MaterialParameters {
 	map?: Texture | null;
-	alphaMap?: Texture | null;
+	alphaMap?: Texture | null;
 	depthPacking?: DepthPackingStrategies;
-	displacementMap?: Texture | null;
+	displacementMap?: Texture | null;
 	displacementScale?: number;
 	displacementBias?: number;
 	wireframe?: boolean;
@@ -18,7 +18,7 @@ export class MeshDepthMaterial extends Material {
 	constructor( parameters?: MeshDepthMaterialParameters );
 
 	map: Texture | null;
-	alphaMap: Texture | null;
+	alphaMap: Texture | null;
 	depthPacking: DepthPackingStrategies;
 	displacementMap: Texture | null;
 	displacementScale: number;

src/materials/MeshDistanceMaterial.d.ts

@@ -4,8 +4,8 @@ import { Texture } from './../textures/Texture';
 
 export interface MeshDistanceMaterialParameters extends MaterialParameters {
 	map?: Texture | null;
-	alphaMap?: Texture | null;
-	displacementMap?: Texture | null;
+	alphaMap?: Texture | null;
+	displacementMap?: Texture | null;
 	displacementScale?: number;
 	displacementBias?: number;
 	farDistance?: number;
@@ -18,7 +18,7 @@ export class MeshDistanceMaterial extends Material {
 	constructor( parameters?: MeshDistanceMaterialParameters );
 
 	map: Texture | null;
-	alphaMap: Texture | null;
+	alphaMap: Texture | null;
 	displacementMap: Texture | null;
 	displacementScale: number;
 	displacementBias: number;

src/materials/MeshLambertMaterial.d.ts

@@ -7,15 +7,15 @@ export interface MeshLambertMaterialParameters extends MaterialParameters {
 	color?: Color | string | number;
 	emissive?: Color | string | number;
 	emissiveIntensity?: number;
-	emissiveMap?: Texture | null;
-	map?: Texture | null;
-	lightMap?: Texture | null;
+	emissiveMap?: Texture | null;
+	map?: Texture | null;
+	lightMap?: Texture | null;
 	lightMapIntensity?: number;
-	aoMap?: Texture | null;
+	aoMap?: Texture | null;
 	aoMapIntensity?: number;
-	specularMap?: Texture | null;
-	alphaMap?: Texture | null;
-	envMap?: Texture | null;
+	specularMap?: Texture | null;
+	alphaMap?: Texture | null;
+	envMap?: Texture | null;
 	combine?: Combine;
 	reflectivity?: number;
 	refractionRatio?: number;

src/materials/MeshMatcapMaterial.d.ts

@@ -7,17 +7,17 @@ import { NormalMapTypes } from '../constants';
 export interface MeshMatcapMaterialParameters extends MaterialParameters {
 
 	color?: Color | string | number;
-	matcap?: Texture | null;
-	map?: Texture | null;
-	bumpMap?: Texture | null;
+	matcap?: Texture | null;
+	map?: Texture | null;
+	bumpMap?: Texture | null;
 	bumpScale?: number;
-	normalMap?: Texture | null;
+	normalMap?: Texture | null;
 	normalMapType?: NormalMapTypes;
 	normalScale?: Vector2;
-	displacementMap?: Texture | null;
+	displacementMap?: Texture | null;
 	displacementScale?: number;
 	displacementBias?: number;
-	alphaMap?: Texture | null;
+	alphaMap?: Texture | null;
 	skinning?: boolean;
 	morphTargets?: boolean;
 	morphNormals?: boolean;

src/materials/MeshNormalMaterial.d.ts

@@ -5,12 +5,12 @@ import { NormalMapTypes } from '../constants';
 
 export interface MeshNormalMaterialParameters extends MaterialParameters {
 
-	bumpMap?: Texture | null;
+	bumpMap?: Texture | null;
 	bumpScale?: number;
-	normalMap?: Texture | null;
+	normalMap?: Texture | null;
 	normalMapType?: NormalMapTypes;
 	normalScale?: Vector2;
-	displacementMap?: Texture | null;
+	displacementMap?: Texture | null;
 	displacementScale?: number;
 	displacementBias?: number;
 	wireframe?: boolean;

src/materials/MeshPhongMaterial.d.ts

@@ -10,25 +10,25 @@ export interface MeshPhongMaterialParameters extends MaterialParameters {
 	specular?: Color | string | number;
 	shininess?: number;
 	opacity?: number;
-	map?: Texture | null;
-	lightMap?: Texture | null;
+	map?: Texture | null;
+	lightMap?: Texture | null;
 	lightMapIntensity?: number;
-	aoMap?: Texture | null;
+	aoMap?: Texture | null;
 	aoMapIntensity?: number;
 	emissive?: Color | string | number;
 	emissiveIntensity?: number;
-	emissiveMap?: Texture | null;
-	bumpMap?: Texture | null;
+	emissiveMap?: Texture | null;
+	bumpMap?: Texture | null;
 	bumpScale?: number;
-	normalMap?: Texture | null;
+	normalMap?: Texture | null;
 	normalMapType?: NormalMapTypes;
 	normalScale?: Vector2;
-	displacementMap?: Texture | null;
+	displacementMap?: Texture | null;
 	displacementScale?: number;
 	displacementBias?: number;
-	specularMap?: Texture | null;
-	alphaMap?: Texture | null;
-	envMap?: Texture | null;
+	specularMap?: Texture | null;
+	alphaMap?: Texture | null;
+	envMap?: Texture | null;
 	combine?: Combine;
 	reflectivity?: number;
 	refractionRatio?: number;

src/materials/MeshPhysicalMaterial.d.ts

@@ -15,7 +15,7 @@ export interface MeshPhysicalMaterialParameters
 	sheen?: Color;
 
 	clearcoatNormalScale?: Vector2;
-	clearcoatNormalMap?: Texture | null;
+	clearcoatNormalMap?: Texture | null;
 }
 
 export class MeshPhysicalMaterial extends MeshStandardMaterial {

src/materials/MeshStandardMaterial.d.ts

@@ -8,26 +8,26 @@ export interface MeshStandardMaterialParameters extends MaterialParameters {
 	color?: Color | string | number;
 	roughness?: number;
 	metalness?: number;
-	map?: Texture | null;
-	lightMap?: Texture | null;
+	map?: Texture | null;
+	lightMap?: Texture | null;
 	lightMapIntensity?: number;
-	aoMap?: Texture | null;
+	aoMap?: Texture | null;
 	aoMapIntensity?: number;
 	emissive?: Color | string | number;
 	emissiveIntensity?: number;
-	emissiveMap?: Texture | null;
-	bumpMap?: Texture | null;
+	emissiveMap?: Texture | null;
+	bumpMap?: Texture | null;
 	bumpScale?: number;
-	normalMap?: Texture | null;
+	normalMap?: Texture | null;
 	normalMapType?: NormalMapTypes;
 	normalScale?: Vector2;
-	displacementMap?: Texture | null;
+	displacementMap?: Texture | null;
 	displacementScale?: number;
 	displacementBias?: number;
-	roughnessMap?: Texture | null;
-	metalnessMap?: Texture | null;
-	alphaMap?: Texture | null;
-	envMap?: Texture | null;
+	roughnessMap?: Texture | null;
+	metalnessMap?: Texture | null;
+	alphaMap?: Texture | null;
+	envMap?: Texture | null;
 	envMapIntensity?: number;
 	refractionRatio?: number;
 	wireframe?: boolean;

src/materials/MeshToonMaterial.d.ts

@@ -10,25 +10,25 @@ export interface MeshToonMaterialParameters extends MaterialParameters {
 	specular?: Color | string | number;
 	shininess?: number;
 	opacity?: number;
-	gradientMap?: Texture | null;
-	map?: Texture | null;
-	lightMap?: Texture | null;
+	gradientMap?: Texture | null;
+	map?: Texture | null;
+	lightMap?: Texture | null;
 	lightMapIntensity?: number;
-	aoMap?: Texture | null;
+	aoMap?: Texture | null;
 	aoMapIntensity?: number;
 	emissive?: Color | string | number;
 	emissiveIntensity?: number;
-	emissiveMap?: Texture | null;
-	bumpMap?: Texture | null;
+	emissiveMap?: Texture | null;
+	bumpMap?: Texture | null;
 	bumpScale?: number;
-	normalMap?: Texture | null;
+	normalMap?: Texture | null;
 	normalMapType?: NormalMapTypes;
 	normalScale?: Vector2;
-	displacementMap?: Texture | null;
+	displacementMap?: Texture | null;
 	displacementScale?: number;
 	displacementBias?: number;
-	specularMap?: Texture | null;
-	alphaMap?: Texture | null;
+	specularMap?: Texture | null;
+	alphaMap?: Texture | null;
 	wireframe?: boolean;
 	wireframeLinewidth?: number;
 	wireframeLinecap?: string;
@@ -45,7 +45,7 @@ export class MeshToonMaterial extends Material {
 	color: Color;
 	specular: Color;
 	shininess: number;
-	gradientMap: Texture | null;
+	gradientMap: Texture | null;
 	map: Texture | null;
 	lightMap: Texture | null;
 	lightMapIntensity: number;

src/materials/PointsMaterial.d.ts

@@ -26,7 +26,7 @@ export class MultiMaterial extends Material {
 export interface PointsMaterialParameters extends MaterialParameters {
 	color?: Color | string | number;
 	map?: Texture | null;
-	alphaMap?: Texture | null;
+	alphaMap?: Texture | null;
 	size?: number;
 	sizeAttenuation?: boolean;
 }

src/materials/SpriteMaterial.d.ts

@@ -4,8 +4,8 @@ import { MaterialParameters, Material } from './Material';
 
 export interface SpriteMaterialParameters extends MaterialParameters {
 	color?: Color | string | number;
-	map?: Texture | null;
-	alphaMap?: Texture | null;
+	map?: Texture | null;
+	alphaMap?: Texture | null;
 	rotation?: number;
 	sizeAttenuation?: boolean;
 }