feat(webgl): add DefShaderOpts, rename ShaderOpts

- add DefShaderOpts - update defShader(), shaderSourceFromAST() - rename ShaderOpts => ShaderPresetOpts - update shader presets
thi-ng · Oct 8, 2021 · ef46bf5 · ef46bf5
1 parent a693a31
commit ef46bf5
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 12 deletions.
diff --git a/packages/webgl/src/api/shader.ts b/packages/webgl/src/api/shader.ts
@@ -284,7 +284,7 @@ export interface ShaderState {
     stencilMask: number;
 }
 
-export interface ShaderOpts<T> {
+export interface ShaderPresetOpts<T> {
     instancePos: string;
     instanceColor: string;
     color: string;
@@ -293,6 +293,13 @@ export interface ShaderOpts<T> {
     state: Partial<ShaderState>;
 }
 
+export interface DefShaderOpts {
+    /**
+     * Number of fractional digits for GLSL float literals
+     */
+    prec: number;
+}
+
 export interface IShader extends IBind<ModelSpec>, IRelease {
     gl: WebGLRenderingContext;
     attribs: IObjectOf<ShaderAttrib>;

diff --git a/packages/webgl/src/shader.ts b/packages/webgl/src/shader.ts
@@ -23,6 +23,7 @@ import type { GLSL } from "./api/glsl";
 import type { ModelAttributeSpecs, ModelSpec } from "./api/model";
 import {
     DEFAULT_OUTPUT,
+    DefShaderOpts,
     GLSLDeclPrefixes,
     IShader,
     ShaderAttrib,
@@ -203,15 +204,19 @@ export class Shader implements IShader {
     }
 }
 
-export const defShader = (gl: WebGLRenderingContext, spec: ShaderSpec) => {
+export const defShader = (
+    gl: WebGLRenderingContext,
+    spec: ShaderSpec,
+    opts?: Partial<DefShaderOpts>
+) => {
     const version = isGL2Context(gl)
         ? GLSLVersion.GLES_300
         : GLSLVersion.GLES_100;
     const srcVS = isFunction(spec.vs)
-        ? shaderSourceFromAST(spec, "vs", version)
+        ? shaderSourceFromAST(spec, "vs", version, opts)
         : prepareShaderSource(spec, "vs", version);
     const srcFS = isFunction(spec.fs)
-        ? shaderSourceFromAST(spec, "fs", version)
+        ? shaderSourceFromAST(spec, "fs", version, opts)
         : prepareShaderSource(spec, "fs", version);
     LOGGER.debug(srcVS);
     LOGGER.debug(srcFS);
@@ -342,7 +347,8 @@ const compileUniformDecls = (spec: ShaderSpec, acc: IObjectOf<Sym<any>>) => {
 export const shaderSourceFromAST = (
     spec: ShaderSpec,
     type: ShaderType,
-    version: GLSLVersion
+    version: GLSLVersion,
+    opts: Partial<DefShaderOpts> = {}
 ) => {
     let prelude = compilePrelude(spec, version);
     const inputs: IObjectOf<Sym<any>> = {};
@@ -374,6 +380,7 @@ export const shaderSourceFromAST = (
         type,
         version,
         prelude,
+        prec: opts.prec,
     });
     return (
         target(

diff --git a/packages/webgl/src/shaders/lambert.ts b/packages/webgl/src/shaders/lambert.ts
@@ -13,13 +13,13 @@ import { $ } from "@thi.ng/shader-ast/ast/swizzle";
 import { normalize } from "@thi.ng/shader-ast/builtin/math";
 import { texture } from "@thi.ng/shader-ast/builtin/texture";
 import type { Material } from "../api/material";
-import type { ShaderOpts, ShaderSpec } from "../api/shader";
+import type { ShaderPresetOpts, ShaderSpec } from "../api/shader";
 import { defMaterial } from "../material";
 import { autoNormalMatrix2 } from "../matrices";
 import { colorAttrib, positionAttrib } from "../utils";
 
 export interface LambertOpts
-    extends ShaderOpts<Pick<Material, "ambientCol" | "diffuseCol">> {
+    extends ShaderPresetOpts<Pick<Material, "ambientCol" | "diffuseCol">> {
     bidir: boolean;
 }
 

diff --git a/packages/webgl/src/shaders/phong.ts b/packages/webgl/src/shaders/phong.ts
@@ -10,12 +10,12 @@ import { $ } from "@thi.ng/shader-ast/ast/swizzle";
 import { sym } from "@thi.ng/shader-ast/ast/sym";
 import { dot, max, normalize, pow } from "@thi.ng/shader-ast/builtin/math";
 import type { Material } from "../api/material";
-import type { ShaderOpts, ShaderSpec } from "../api/shader";
+import type { ShaderPresetOpts, ShaderSpec } from "../api/shader";
 import { defMaterial } from "../material";
 import { autoNormalMatrix1 } from "../matrices";
 import { colorAttrib, positionAttrib } from "../utils";
 
-export type PhongOpts = ShaderOpts<
+export type PhongOpts = ShaderPresetOpts<
     Pick<Material, "ambientCol" | "diffuseCol" | "specularCol">
 >;
 

diff --git a/packages/webgl/src/utils.ts b/packages/webgl/src/utils.ts
@@ -1,10 +1,10 @@
 import type { IObjectOf } from "@thi.ng/api";
 import type { Sym, Term } from "@thi.ng/shader-ast";
 import { add, mul } from "@thi.ng/shader-ast/ast/ops";
-import type { ShaderOpts } from "./api/shader";
+import type { ShaderPresetOpts } from "./api/shader";
 
 export const positionAttrib = (
-    opts: Partial<ShaderOpts<any>>,
+    opts: Partial<ShaderPresetOpts<any>>,
     attribs: IObjectOf<Sym<any>>,
     pos = "position"
 ) =>
@@ -13,7 +13,7 @@ export const positionAttrib = (
         : attribs[pos];
 
 export const colorAttrib = (
-    opts: Partial<ShaderOpts<any>>,
+    opts: Partial<ShaderPresetOpts<any>>,
     attribs: IObjectOf<Sym<any>>,
     fallback: Sym<"vec3">
 ): Term<"vec3"> =>