kylefang/DefinitelyTyped
1
0
Fork 0
mirror of https://github.com/zhigang1992/DefinitelyTyped.git synced 2026-04-07 22:38:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #15841 from saabi/master

Browse Source 
Corrected definitions of BlendingSrcFactor and BlendingDstFactor in Three.js
This commit is contained in:
Ryan Cavanaugh
2017-04-17 15:20:46 -07:00
committed by GitHub
parent 23b5a1cbe6 ab2636474e
commit 3a4aa421a7
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
types/three/index.d.ts vendored
View File

@@ -95,11 +95,11 @@ declare namespace THREE {
export const OneMinusSrcAlphaFactor: BlendingDstFactor;
export const DstAlphaFactor: BlendingDstFactor;
export const OneMinusDstAlphaFactor: BlendingDstFactor;
export const DstColorFactor: BlendingDstFactor;
export const OneMinusDstColorFactor: BlendingDstFactor;
// custom blending src factors
export enum BlendingSrcFactor { }
export const DstColorFactor: BlendingSrcFactor;
export const OneMinusDstColorFactor: BlendingSrcFactor;
export const SrcAlphaSaturateFactor: BlendingSrcFactor;
// depth modes
@@ -2323,8 +2323,8 @@ declare namespace THREE {
opacity?: number;
transparent?: boolean;
blending?: Blending;
blendSrc?: BlendingDstFactor;
blendDst?: BlendingSrcFactor;
blendSrc?: BlendingSrcFactor | BlendingDstFactor;
blendDst?: BlendingDstFactor;
blendEquation?: BlendingEquation;
blendSrcAlpha?: number;
blendDstAlpha?: number;
@@ -2392,12 +2392,12 @@ declare namespace THREE {
/**
* Blending source. It's one of the blending mode constants defined in Three.js. Default is {@link SrcAlphaFactor}.
*/
blendSrc: BlendingDstFactor;
blendSrc: BlendingSrcFactor | BlendingDstFactor;
/**
* Blending destination. It's one of the blending mode constants defined in Three.js. Default is {@link OneMinusSrcAlphaFactor}.
*/
blendDst: BlendingSrcFactor;
blendDst: BlendingDstFactor;
/**
* Blending equation to use when applying blending. It's one of the constants defined in Three.js. Default is AddEquation.