refactor(webgl): add type hints (TS 3.6.4)

thi-ng · Oct 13, 2019 · bd01c79 · bd01c79
1 parent a1582c0
commit bd01c79
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/packages/webgl/src/checks.ts b/packages/webgl/src/checks.ts
@@ -1,7 +1,7 @@
 import { ITexture, TextureType } from "./api/texture";
 
 export const isGL2Context = (
-    gl: WebGLRenderingContext
+    gl: WebGLRenderingContext | WebGL2RenderingContext
 ): gl is WebGL2RenderingContext =>
     typeof WebGL2RenderingContext !== "undefined" &&
     gl instanceof WebGL2RenderingContext;

diff --git a/packages/webgl/src/multipass.ts b/packages/webgl/src/multipass.ts
@@ -8,7 +8,7 @@ import {
 } from "@thi.ng/transducers";
 import { ExtensionBehaviors } from "./api/ext";
 import { Multipass, MultipassOpts, PassOpts } from "./api/multipass";
-import { ShaderSpec, ShaderUniformSpecs } from "./api/shader";
+import { ShaderOutputSpec, ShaderSpec, ShaderUniformSpecs } from "./api/shader";
 import { ITexture } from "./api/texture";
 import { compileModel } from "./buffer";
 import { isFloatTexture, isGL2Context } from "./checks";
@@ -46,7 +46,10 @@ export const multipass = (opts: MultipassOpts) => {
             },
             outputs: numOuts
                 ? transduce(
-                      map((i) => [`output${i}`, ["vec4", i]]),
+                      map<number, [string, ShaderOutputSpec]>((i) => [
+                          `output${i}`,
+                          ["vec4", i]
+                      ]),
                       assocObj(),
                       range(numOuts)
                   )