diff --git a/src/materials/MeshBasicMaterial.d.ts b/src/materials/MeshBasicMaterial.d.ts index 10e790696199dadf8653b0cb6f8a5bdae515cb3e..751b5c4f2ec7eb6728c81761a7300c164d648330 100644 --- a/src/materials/MeshBasicMaterial.d.ts +++ b/src/materials/MeshBasicMaterial.d.ts @@ -8,12 +8,12 @@ import { Combine } from '../constants'; export interface MeshBasicMaterialParameters extends MaterialParameters { color?: Color | string | number; opacity?: number; - map?: Texture; - aoMap?: Texture; + map?: Texture | null; + aoMap?: Texture | null; aoMapIntensity?: number; - specularMap?: Texture; - alphaMap?: Texture; - envMap?: Texture; + specularMap?: Texture | null; + alphaMap?: Texture | null; + envMap?: Texture | null; combine?: Combine; reflectivity?: number; refractionRatio?: number; @@ -27,7 +27,7 @@ export interface MeshBasicMaterialParameters extends MaterialParameters { export class MeshBasicMaterial extends Material { - constructor( parameters?: MeshBasicMaterialParameters ); + constructor(parameters?: MeshBasicMaterialParameters); color: Color; map: Texture | null; @@ -46,6 +46,6 @@ export class MeshBasicMaterial extends Material { skinning: boolean; morphTargets: boolean; - setValues( parameters: MeshBasicMaterialParameters ): void; + setValues(parameters: MeshBasicMaterialParameters): void; } diff --git a/src/materials/MeshDepthMaterial.d.ts b/src/materials/MeshDepthMaterial.d.ts index 275047de22618eaa6b072e2d83d7b150cc1c8083..4d169a8bb1da92bce6141c3ea930bdf6670221a5 100644 --- a/src/materials/MeshDepthMaterial.d.ts +++ b/src/materials/MeshDepthMaterial.d.ts @@ -4,7 +4,7 @@ import { Texture } from './../textures/Texture'; export interface MeshDepthMaterialParameters extends MaterialParameters { depthPacking?: DepthPackingStrategies; - displacementMap?: Texture; + displacementMap?: Texture | null; displacementScale?: number; displacementBias?: number; wireframe?: boolean; diff --git a/src/materials/MeshDistanceMaterial.d.ts b/src/materials/MeshDistanceMaterial.d.ts index 69373685f56a5f6f6a02a3a7ae1bc36144eb6d8a..840b5d4a3119d1ece87e6ef0b16c9704deab50f0 100644 --- a/src/materials/MeshDistanceMaterial.d.ts +++ b/src/materials/MeshDistanceMaterial.d.ts @@ -6,7 +6,7 @@ export interface MeshDistanceMaterialParameters extends MaterialParameters { referencePosition?: Vector3; nearDistance?: number; farDistance?: number; - displacementMap?: Texture; + displacementMap?: Texture | null; displacementScale?: number; displacementBias?: number; } diff --git a/src/materials/MeshLambertMaterial.d.ts b/src/materials/MeshLambertMaterial.d.ts index 7d4c6e47cee0013f5277710956607e6654cc0a19..787c578bf0b7733c0a027311f49160d652e94f3f 100644 --- a/src/materials/MeshLambertMaterial.d.ts +++ b/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; - map?: Texture; - lightMap?: Texture; + emissiveMap?: Texture | null; + map?: Texture | null; + lightMap?: Texture | null; lightMapIntensity?: number; - aoMap?: Texture; + aoMap?: Texture | null; aoMapIntensity?: number; - specularMap?: Texture; - alphaMap?: Texture; - envMap?: Texture; + specularMap?: Texture | null; + alphaMap?: Texture | null; + envMap?: Texture | null; combine?: Combine; reflectivity?: number; refractionRatio?: number; diff --git a/src/materials/MeshMatcapMaterial.d.ts b/src/materials/MeshMatcapMaterial.d.ts index f51b3b2d5c1968decb1721a332c8744611e7faae..c5426352781dde72b7bbdf1ea22abc7b600c37cf 100644 --- a/src/materials/MeshMatcapMaterial.d.ts +++ b/src/materials/MeshMatcapMaterial.d.ts @@ -7,17 +7,17 @@ import { NormalMapTypes } from '../constants'; export interface MeshMatcapMaterialParameters extends MaterialParameters { color?: Color | string | number; - matcap?: Texture; - map?: Texture; - bumpMap?: Texture; + matcap?: Texture | null; + map?: Texture | null; + bumpMap?: Texture | null; bumpScale?: number; - normalMap?: Texture; + normalMap?: Texture | null; normalMapType?: NormalMapTypes; normalScale?: Vector2; - displacementMap?: Texture; + displacementMap?: Texture | null; displacementScale?: number; displacementBias?: number; - alphaMap?: Texture; + alphaMap?: Texture | null; skinning?: boolean; morphTargets?: boolean; morphNormals?: boolean; diff --git a/src/materials/MeshNormalMaterial.d.ts b/src/materials/MeshNormalMaterial.d.ts index 0560ea4b62ad4d8bdfb6274795eb39e228b95298..965240c698caff3fac9bad64dfe1e045ba501257 100644 --- a/src/materials/MeshNormalMaterial.d.ts +++ b/src/materials/MeshNormalMaterial.d.ts @@ -5,12 +5,12 @@ import { NormalMapTypes } from '../constants'; export interface MeshNormalMaterialParameters extends MaterialParameters { - bumpMap?: Texture; + bumpMap?: Texture | null; bumpScale?: number; - normalMap?: Texture; + normalMap?: Texture | null; normalMapType?: NormalMapTypes; normalScale?: Vector2; - displacementMap?: Texture; + displacementMap?: Texture | null; displacementScale?: number; displacementBias?: number; wireframe?: boolean; diff --git a/src/materials/MeshPhongMaterial.d.ts b/src/materials/MeshPhongMaterial.d.ts index cc312cd6e21a7f4426770c70ac100ce5744fe00d..afbda64751ba778234a7479ef1b2a57aa1069490 100644 --- a/src/materials/MeshPhongMaterial.d.ts +++ b/src/materials/MeshPhongMaterial.d.ts @@ -10,25 +10,25 @@ export interface MeshPhongMaterialParameters extends MaterialParameters { specular?: Color | string | number; shininess?: number; opacity?: number; - map?: Texture; - lightMap?: Texture; + map?: Texture | null; + lightMap?: Texture | null; lightMapIntensity?: number; - aoMap?: Texture; + aoMap?: Texture | null; aoMapIntensity?: number; emissive?: Color | string | number; emissiveIntensity?: number; - emissiveMap?: Texture; - bumpMap?: Texture; + emissiveMap?: Texture | null; + bumpMap?: Texture | null; bumpScale?: number; - normalMap?: Texture; + normalMap?: Texture | null; normalMapType?: NormalMapTypes; normalScale?: Vector2; - displacementMap?: Texture; + displacementMap?: Texture | null; displacementScale?: number; displacementBias?: number; - specularMap?: Texture; - alphaMap?: Texture; - envMap?: Texture; + specularMap?: Texture | null; + alphaMap?: Texture | null; + envMap?: Texture | null; combine?: Combine; reflectivity?: number; refractionRatio?: number; diff --git a/src/materials/MeshPhysicalMaterial.d.ts b/src/materials/MeshPhysicalMaterial.d.ts index 07399cc9ef221da9c6df37d8a262bf7f3437b8fc..50aa34cc86145cfcc0f3cef72d7c66119870ba9e 100644 --- a/src/materials/MeshPhysicalMaterial.d.ts +++ b/src/materials/MeshPhysicalMaterial.d.ts @@ -15,7 +15,7 @@ export interface MeshPhysicalMaterialParameters sheen?: Color; clearcoatNormalScale?: Vector2; - clearcoatNormalMap?: Texture; + clearcoatNormalMap?: Texture | null; } export class MeshPhysicalMaterial extends MeshStandardMaterial { diff --git a/src/materials/MeshStandardMaterial.d.ts b/src/materials/MeshStandardMaterial.d.ts index a9c1eb1f4ce0d4458f67de64ec95d7193f5adfdb..53aef82a7967c4ac21fa8d6ca43ed8b02190af96 100644 --- a/src/materials/MeshStandardMaterial.d.ts +++ b/src/materials/MeshStandardMaterial.d.ts @@ -8,26 +8,26 @@ export interface MeshStandardMaterialParameters extends MaterialParameters { color?: Color | string | number; roughness?: number; metalness?: number; - map?: Texture; - lightMap?: Texture; + map?: Texture | null; + lightMap?: Texture | null; lightMapIntensity?: number; - aoMap?: Texture; + aoMap?: Texture | null; aoMapIntensity?: number; emissive?: Color | string | number; emissiveIntensity?: number; - emissiveMap?: Texture; - bumpMap?: Texture; + emissiveMap?: Texture | null; + bumpMap?: Texture | null; bumpScale?: number; - normalMap?: Texture; + normalMap?: Texture | null; normalMapType?: NormalMapTypes; normalScale?: Vector2; - displacementMap?: Texture; + displacementMap?: Texture | null; displacementScale?: number; displacementBias?: number; - roughnessMap?: Texture; - metalnessMap?: Texture; - alphaMap?: Texture; - envMap?: Texture; + roughnessMap?: Texture | null; + metalnessMap?: Texture | null; + alphaMap?: Texture | null; + envMap?: Texture | null; envMapIntensity?: number; refractionRatio?: number; wireframe?: boolean; diff --git a/src/materials/MeshToonMaterial.d.ts b/src/materials/MeshToonMaterial.d.ts index 2dde05d55811bf1a3647a7ef6180a8f6c97b0794..6b7192a13fcd0892c3e89212c6c8bc544e64153a 100644 --- a/src/materials/MeshToonMaterial.d.ts +++ b/src/materials/MeshToonMaterial.d.ts @@ -2,7 +2,7 @@ import { Texture } from './../textures/Texture'; import { MeshPhongMaterialParameters, MeshPhongMaterial } from './MeshPhongMaterial'; export interface MeshToonMaterialParameters extends MeshPhongMaterialParameters { - gradientMap?: Texture; + gradientMap?: Texture | null; } export class MeshToonMaterial extends MeshPhongMaterial { diff --git a/src/materials/SpriteMaterial.d.ts b/src/materials/SpriteMaterial.d.ts index e58fe166b5ed09776c70aa74fd436f5d3fb3f237..c28d5a27331f02798577cb1608df3e8b46c939f5 100644 --- a/src/materials/SpriteMaterial.d.ts +++ b/src/materials/SpriteMaterial.d.ts @@ -4,7 +4,7 @@ import { MaterialParameters, Material } from './Material'; export interface SpriteMaterialParameters extends MaterialParameters { color?: Color | string | number; - map?: Texture; + map?: Texture | null; rotation?: number; sizeAttenuation?: boolean; }