fix(webgl): add LOGGER, update initUniforms()

- don't throw error when initializing unused uniforms
thi-ng · Nov 4, 2019 · 4719110 · 4719110
1 parent 3a6c469
commit 4719110
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 11 deletions.
diff --git a/packages/webgl/src/api/logger.ts b/packages/webgl/src/api/logger.ts
@@ -0,0 +1,5 @@
+import { ILogger, NULL_LOGGER } from "@thi.ng/api";
+
+export let LOGGER: ILogger = NULL_LOGGER;
+
+export const setLogger = (logger: ILogger) => (LOGGER = logger);
diff --git a/packages/webgl/src/index.ts b/packages/webgl/src/index.ts
@@ -3,6 +3,7 @@ export * from "./api/buffers";
 export * from "./api/canvas";
 export * from "./api/ext";
 export * from "./api/glsl";
+export * from "./api/logger";
 export * from "./api/material";
 export * from "./api/model";
 export * from "./api/shader";

diff --git a/packages/webgl/src/shader.ts b/packages/webgl/src/shader.ts
@@ -24,6 +24,7 @@ import {
     GL_EXT_INFO
 } from "./api/ext";
 import { GLSL } from "./api/glsl";
+import { LOGGER } from "./api/logger";
 import { ModelAttributeSpecs, ModelSpec } from "./api/model";
 import {
     DEFAULT_OUTPUT,
@@ -478,18 +479,21 @@ const initUniforms = (
             type = val;
         }
         const loc = gl.getUniformLocation(prog, id)!;
-        loc == null && error(`unknown uniform: ${id}`);
-        const setter = UNIFORM_SETTERS[type];
-        if (setter) {
-            res[id] = {
-                loc,
-                setter: setter(gl, loc, defaultVal),
-                defaultFn,
-                defaultVal,
-                type
-            };
+        if (loc != null) {
+            const setter = UNIFORM_SETTERS[type];
+            if (setter) {
+                res[id] = {
+                    loc,
+                    setter: setter(gl, loc, defaultVal),
+                    defaultFn,
+                    defaultVal,
+                    type
+                };
+            } else {
+                error(`invalid uniform type: ${type}`);
+            }
         } else {
-            error(`invalid uniform type: ${type}`);
+            LOGGER.warn(`unknown uniform: ${id}`);
         }
     }
     return res;