Merge pull request #12806 from randombk/fix/three-uniforms

three: Fix typing for shader uniforms
This commit is contained in:
Nathan Shively-Sanders
2016-11-21 09:16:21 -08:00
committed by GitHub
+2 -2
View File
@@ -2737,7 +2737,7 @@ declare namespace THREE {
constructor(parameters?: ShaderMaterialParameters);
defines: any;
uniforms: any; // type should be { [uniform: string]: { value: any }; }; but gives "Index signature is missing in type" error during compilation
uniforms: { [uniform: string]: IUniform };
vertexShader: string;
fragmentShader: string;
linewidth: number;
@@ -5115,7 +5115,7 @@ declare namespace THREE {
};
export interface Shader {
uniforms: IUniform;
uniforms: { [uniform: string]: IUniform };
vertexShader: string;
fragmentShader: string;
}