vhad/DefinitelyTyped
1
0
Fork 0
mirror of https://github.com/gosticks/DefinitelyTyped.git synced 2026-10-04 06:47:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #21986 from dhritzkiv/patch-5

Browse Source 
Color fields to accept `Color | string | number`
This commit is contained in:
Bowden Kelly
2017-12-06 10:51:45 -08:00
committed by GitHub
parent 1d0e4f8e20 e65d1a0bf4
commit 95872e8b68
1 changed files with 19 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
types/three/three-core.d.ts
Vendored
+19 -18
View File
@@ -1925,7 +1925,7 @@ export class AmbientLight extends Light {
* This creates a Ambientlight with a color.
* @param color Numeric value of the RGB component of the color or a Color instance.
*/
constructor(color?: number|string|Color, intensity?: number);
constructor(color?: Color | string | number, intensity?: number);
castShadow: boolean;
}
@@ -1942,7 +1942,7 @@ export class AmbientLight extends Light {
* @see <a href="https://github.com/mrdoob/three.js/blob/master/src/lights/DirectionalLight.js">src/lights/DirectionalLight.js</a>
*/
export class DirectionalLight extends Light {
constructor(color?: number|string|Color, intensity?: number);
constructor(color?: Color | string | number, intensity?: number);
/**
* Target used for shadow camera orientation.
@@ -1963,8 +1963,9 @@ export class DirectionalLightShadow extends LightShadow {
}
export class HemisphereLight extends Light {
constructor(skyColor?: number|string|Color, groundColor?: number|string|Color, intensity?: number);
constructor(skyColor?: Color | string | number, groundColor?: Color | string | number, intensity?: number);
skyColor: Color;
groundColor: Color;
intensity: number;
}
@@ -1978,7 +1979,7 @@ export class HemisphereLight extends Light {
* scene.add( light );
*/
export class PointLight extends Light {
constructor(color?: number|string|Color, intensity?: number, distance?: number, decay?: number);
constructor(color?: Color | string | number, intensity?: number, distance?: number, decay?: number);
/*
* Light's intensity.
@@ -2005,7 +2006,7 @@ export class PointLightShadow extends LightShadow {
* A point light that can cast shadow in one direction.
*/
export class SpotLight extends Light {
constructor(color?: number|string|Color, intensity?: number, distance?: number, angle?: number, exponent?: number, decay?: number);
constructor(color?: Color | string | number, intensity?: number, distance?: number, angle?: number, exponent?: number, decay?: number);
/**
* Spotlight focus points at target.position.
@@ -2600,7 +2601,7 @@ export class Material extends EventDispatcher {
}
export interface LineBasicMaterialParameters extends MaterialParameters {
color?: number|string|Color;
color?: Color | string | number;
linewidth?: number;
linecap?: string;
linejoin?: string;
@@ -2618,7 +2619,7 @@ export class LineBasicMaterial extends Material {
}
export interface LineDashedMaterialParameters extends MaterialParameters {
color?: number|string|Color;
color?: Color | string | number;
linewidth?: number;
scale?: number;
dashSize?: number;
@@ -2641,7 +2642,7 @@ export class LineDashedMaterial extends Material {
* parameters is an object with one or more properties defining the material's appearance.
*/
export interface MeshBasicMaterialParameters extends MaterialParameters {
color?: number|string|Color;
color?: Color | string | number;
opacity?: number;
map?: Texture;
aoMap?: Texture;
@@ -2700,8 +2701,8 @@ export class MeshDepthMaterial extends Material {
}
export interface MeshLambertMaterialParameters extends MaterialParameters {
color?: number|string|Color;
emissive?: number|string;
color?: Color | string | number;
emissive?: Color | string | number;
emissiveIntensity?: number;
emissiveMap?: Texture;
map?: Texture;
@@ -2754,7 +2755,7 @@ export class MeshLambertMaterial extends Material {
}
export interface MeshStandardMaterialParameters extends MaterialParameters {
color?: number|string|Color;
color?: Color | string | number;
roughness?: number;
metalness?: number;
map?: Texture;
@@ -2762,7 +2763,7 @@ export interface MeshStandardMaterialParameters extends MaterialParameters {
lightMapIntensity?: number;
aoMap?: Texture;
aoMapIntensity?: number;
emissive?: number|string|Color;
emissive?: Color | string | number;
emissiveIntensity?: number;
emissiveMap?: Texture;
bumpMap?: Texture;
@@ -2842,8 +2843,8 @@ export class MeshNormalMaterial extends Material {
export interface MeshPhongMaterialParameters extends MaterialParameters {
/** geometry color in hexadecimal. Default is 0xffffff. */
color?: number|string|Color;
specular?: number;
color?: Color | string | number;
specular?: Color | string | number;
shininess?: number;
opacity?: number;
map?: Texture;
@@ -2851,7 +2852,7 @@ export interface MeshPhongMaterialParameters extends MaterialParameters {
lightMapIntensity?: number;
aoMap?: Texture;
aoMapIntensity?: number;
emissive?: number;
emissive?: Color | string | number;
emissiveIntensity?: number;
emissiveMap?: Texture;
bumpMap?: Texture;
@@ -2879,7 +2880,7 @@ export interface MeshPhongMaterialParameters extends MaterialParameters {
export class MeshPhongMaterial extends Material {
constructor(parameters?: MeshPhongMaterialParameters);
color: Color; // diffuse
color: Color;
specular: Color;
shininess: number;
map: Texture;
@@ -2952,7 +2953,7 @@ export class MultiMaterial extends Material {
export class MeshFaceMaterial extends MultiMaterial {}
export interface PointsMaterialParameters extends MaterialParameters {
color?: number|string|Color;
color?: Color | string | number;
map?: Texture;
size?: number;
sizeAttenuation?: boolean;
@@ -3029,7 +3030,7 @@ export class RawShaderMaterial extends ShaderMaterial {
}
export interface SpriteMaterialParameters extends MaterialParameters {
color?: number|string|Color;
color?: Color | string | number;
map?: Texture;
rotation?: number;
}