@thi.ng/webgl 5.0.14 → 6.0.4

package/package.json

@@ -1,11 +1,11 @@
 {
     "name": "@thi.ng/webgl",
-    "version": "5.0.14",
+    "version": "6.0.4",
     "description": "WebGL & GLSL abstraction layer",
+    "type": "module",
     "module": "./index.js",
-    "main": "./lib/index.js",
-    "umd:main": "./lib/index.umd.js",
     "typings": "./index.d.ts",
+    "sideEffects": false,
     "repository": {
         "type": "git",
         "url": "https://github.com/thi-ng/umbrella.git"
@@ -24,45 +24,36 @@
     "author": "Karsten Schmidt <k+npm@thi.ng>",
     "license": "Apache-2.0",
     "scripts": {
-        "build": "yarn clean && yarn build:es6 && node ../../scripts/bundle-module",
-        "build:release": "yarn clean && yarn build:es6 && node ../../scripts/bundle-module all",
-        "build:es6": "tsc --declaration",
-        "build:test": "rimraf build && tsc -p test/tsconfig.json",
-        "build:check": "tsc --isolatedModules --noEmit",
-        "test": "mocha test",
-        "cover": "nyc mocha test && nyc report --reporter=lcov",
-        "clean": "rimraf *.js *.d.ts *.map .nyc_output build coverage doc lib api geo shaders textures",
-        "doc:readme": "ts-node -P ../../tools/tsconfig.json ../../tools/src/readme.ts",
-        "doc": "typedoc --excludePrivate --out doc --theme ../../tools/doc/typedoc-theme src/index.ts",
+        "build": "yarn clean && tsc --declaration",
+        "clean": "rimraf *.js *.d.ts *.map doc api geo shaders textures",
+        "doc": "typedoc --excludePrivate --excludeInternal --out doc src/index.ts",
         "doc:ae": "mkdir -p .ae/doc .ae/temp && node_modules/.bin/api-extractor run --local --verbose",
-        "pub": "yarn build:release && yarn publish --access public"
+        "doc:readme": "yarn doc:stats && ../../scripts/node-esm ../../tools/src/readme.ts",
+        "doc:stats": "../../scripts/node-esm ../../tools/src/module-stats.ts",
+        "pub": "yarn build && yarn publish --access public",
+        "test": "testament test"
     },
     "dependencies": {
-        "@thi.ng/adapt-dpi": "^1.0.23",
-        "@thi.ng/api": "^7.2.0",
-        "@thi.ng/associative": "^5.2.16",
-        "@thi.ng/checks": "^2.9.11",
-        "@thi.ng/equiv": "^1.0.45",
-        "@thi.ng/errors": "^1.3.4",
-        "@thi.ng/matrices": "^1.0.5",
-        "@thi.ng/memoize": "^2.1.21",
-        "@thi.ng/pixel": "^1.0.5",
-        "@thi.ng/shader-ast": "^0.10.4",
-        "@thi.ng/shader-ast-glsl": "^0.2.48",
-        "@thi.ng/shader-ast-stdlib": "^0.9.4",
-        "@thi.ng/transducers": "^7.9.2",
-        "@thi.ng/vector-pools": "^2.0.25",
-        "@thi.ng/vectors": "^6.2.0"
+        "@thi.ng/adapt-dpi": "^2.0.3",
+        "@thi.ng/api": "^8.0.3",
+        "@thi.ng/associative": "^6.0.3",
+        "@thi.ng/checks": "^3.0.3",
+        "@thi.ng/equiv": "^2.0.3",
+        "@thi.ng/errors": "^2.0.3",
+        "@thi.ng/logger": "^1.0.3",
+        "@thi.ng/matrices": "^2.0.3",
+        "@thi.ng/memoize": "^3.0.3",
+        "@thi.ng/pixel": "^2.1.2",
+        "@thi.ng/shader-ast": "^0.11.3",
+        "@thi.ng/shader-ast-glsl": "^0.3.3",
+        "@thi.ng/shader-ast-stdlib": "^0.10.3",
+        "@thi.ng/transducers": "^8.0.3",
+        "@thi.ng/vector-pools": "^3.0.3",
+        "@thi.ng/vectors": "^7.0.3"
+    },
+    "devDependencies": {
+        "@thi.ng/testament": "^0.1.3"
     },
-    "files": [
-        "*.js",
-        "*.d.ts",
-        "lib",
-        "api",
-        "geo",
-        "shaders",
-        "textures"
-    ],
     "keywords": [
         "2d",
         "3d",
@@ -85,7 +76,127 @@
     "publishConfig": {
         "access": "public"
     },
-    "sideEffects": false,
+    "engines": {
+        "node": ">=12.7"
+    },
+    "files": [
+        "*.js",
+        "*.d.ts",
+        "api",
+        "geo",
+        "shaders",
+        "textures"
+    ],
+    "exports": {
+        ".": {
+            "import": "./index.js"
+        },
+        "./api/blend": {
+            "import": "./api/blend.js"
+        },
+        "./api/buffers": {
+            "import": "./api/buffers.js"
+        },
+        "./api/canvas": {
+            "import": "./api/canvas.js"
+        },
+        "./api/ext": {
+            "import": "./api/ext.js"
+        },
+        "./api/glsl": {
+            "import": "./api/glsl.js"
+        },
+        "./api/material": {
+            "import": "./api/material.js"
+        },
+        "./api/model": {
+            "import": "./api/model.js"
+        },
+        "./api/multipass": {
+            "import": "./api/multipass.js"
+        },
+        "./api/shader": {
+            "import": "./api/shader.js"
+        },
+        "./api/stencil": {
+            "import": "./api/stencil.js"
+        },
+        "./api/texture": {
+            "import": "./api/texture.js"
+        },
+        "./buffer": {
+            "import": "./buffer.js"
+        },
+        "./canvas": {
+            "import": "./canvas.js"
+        },
+        "./checks": {
+            "import": "./checks.js"
+        },
+        "./draw": {
+            "import": "./draw.js"
+        },
+        "./error": {
+            "import": "./error.js"
+        },
+        "./fbo": {
+            "import": "./fbo.js"
+        },
+        "./geo/cube": {
+            "import": "./geo/cube.js"
+        },
+        "./geo/quad": {
+            "import": "./geo/quad.js"
+        },
+        "./logger": {
+            "import": "./logger.js"
+        },
+        "./material": {
+            "import": "./material.js"
+        },
+        "./matrices": {
+            "import": "./matrices.js"
+        },
+        "./multipass": {
+            "import": "./multipass.js"
+        },
+        "./rbo": {
+            "import": "./rbo.js"
+        },
+        "./readpixels": {
+            "import": "./readpixels.js"
+        },
+        "./shader": {
+            "import": "./shader.js"
+        },
+        "./shaders/lambert": {
+            "import": "./shaders/lambert.js"
+        },
+        "./shaders/phong": {
+            "import": "./shaders/phong.js"
+        },
+        "./shaders/pipeline": {
+            "import": "./shaders/pipeline.js"
+        },
+        "./syntax": {
+            "import": "./syntax.js"
+        },
+        "./texture": {
+            "import": "./texture.js"
+        },
+        "./textures/checkerboard": {
+            "import": "./textures/checkerboard.js"
+        },
+        "./textures/stripes": {
+            "import": "./textures/stripes.js"
+        },
+        "./uniforms": {
+            "import": "./uniforms.js"
+        },
+        "./utils": {
+            "import": "./utils.js"
+        }
+    },
     "thi.ng": {
         "related": [
             "ecs",
@@ -99,5 +210,5 @@
         ],
         "year": 2014
     },
-    "gitHead": "d971cb3f9b215a95483f78f1a8614015e331146f"
+    "gitHead": "1fb38cac74d6c009d96855c28784a267a81badf1"
 }

package/rbo.d.ts

@@ -1,4 +1,4 @@
-import type { IRenderBuffer, RboOpts } from "./api/buffers";
+import type { IRenderBuffer, RboOpts } from "./api/buffers.js";
 export declare class RBO implements IRenderBuffer {
     gl: WebGLRenderingContext;
     buffer: WebGLRenderbuffer;

package/rbo.js

@@ -1,4 +1,4 @@
-import { error } from "./error";
+import { error } from "./error.js";
 export class RBO {
     constructor(gl, opts) {
         this.gl = gl;

package/readpixels.d.ts

@@ -1,4 +1,4 @@
-import type { ITexture, ReadableTextureFormat, TextureType } from "./api/texture";
+import type { ITexture, ReadableTextureFormat, TextureType } from "./api/texture.js";
 export declare const readPixels: <T extends Uint8Array | Uint16Array | Uint32Array | Float32Array>(gl: WebGLRenderingContext, x: number, y: number, w: number, h: number, format: ReadableTextureFormat, type: TextureType, out: T) => T;
 export declare const readTexture: <T extends Uint8Array | Uint16Array | Uint32Array | Float32Array>(gl: WebGLRenderingContext, tex: ITexture, format: ReadableTextureFormat, type: TextureType, out: T) => T;
 //# sourceMappingURL=readpixels.d.ts.map

package/readpixels.js

@@ -1,4 +1,4 @@
-import { FBO } from "./fbo";
+import { FBO } from "./fbo.js";
 export const readPixels = (gl, x, y, w, h, format, type, out) => {
     gl.readPixels(x, y, w, h, format, type, out);
     return out;

package/shader.d.ts

@@ -1,7 +1,7 @@
-import { IObjectOf } from "@thi.ng/api";
-import { GLSLVersion } from "@thi.ng/shader-ast-glsl";
-import type { ModelAttributeSpecs, ModelSpec } from "./api/model";
-import { IShader, ShaderAttrib, ShaderSpec, ShaderState, ShaderType, ShaderUniforms, UniformValues } from "./api/shader";
+import type { IObjectOf } from "@thi.ng/api";
+import { GLSLVersion } from "@thi.ng/shader-ast-glsl/api";
+import type { ModelAttributeSpecs, ModelSpec } from "./api/model.js";
+import { DefShaderOpts, IShader, ShaderAttrib, ShaderSpec, ShaderState, ShaderType, ShaderUniforms, UniformValues } from "./api/shader.js";
 export declare class Shader implements IShader {
     gl: WebGLRenderingContext;
     program: WebGLProgram;
@@ -19,8 +19,8 @@ export declare class Shader implements IShader {
     prepareState(state?: Partial<ShaderState>): void;
     protected setState(id: number, val: GLenum | boolean): void;
 }
-export declare const defShader: (gl: WebGLRenderingContext, spec: ShaderSpec) => Shader;
-export declare const shaderSourceFromAST: (spec: ShaderSpec, type: ShaderType, version: GLSLVersion) => string;
+export declare const defShader: (gl: WebGLRenderingContext, spec: ShaderSpec, opts?: Partial<DefShaderOpts> | undefined) => Shader;
+export declare const shaderSourceFromAST: (spec: ShaderSpec, type: ShaderType, version: GLSLVersion, opts?: Partial<DefShaderOpts>) => string;
 export declare const prepareShaderSource: (spec: ShaderSpec, type: ShaderType, version: GLSLVersion) => string;
 export declare const compileShader: (gl: WebGLRenderingContext, type: GLenum, src: string) => WebGLShader;
 //# sourceMappingURL=shader.d.ts.map

package/shader.js

@@ -1,23 +1,29 @@
-import { asGLType, deref } from "@thi.ng/api";
-import { existsAndNotNull, isArray, isBoolean, isFunction, } from "@thi.ng/checks";
-import { unsupported } from "@thi.ng/errors";
-import { doOnce } from "@thi.ng/memoize";
-import { input, output, program, sym, uniform, } from "@thi.ng/shader-ast";
-import { GLSLVersion, targetGLSL } from "@thi.ng/shader-ast-glsl";
-import { vals } from "@thi.ng/transducers";
-import { GL_EXT_INFO, } from "./api/ext";
-import { LOGGER } from "./api/logger";
-import { DEFAULT_OUTPUT, } from "./api/shader";
-import { getExtensions } from "./canvas";
-import { isGL2Context } from "./checks";
-import { error } from "./error";
-import { GLSL_HEADER, NO_PREFIXES, SYNTAX } from "./syntax";
-import { UNIFORM_SETTERS } from "./uniforms";
+import { deref } from "@thi.ng/api/deref";
+import { asGLType } from "@thi.ng/api/typedarray";
+import { existsAndNotNull } from "@thi.ng/checks/exists-not-null";
+import { isArray } from "@thi.ng/checks/is-array";
+import { isBoolean } from "@thi.ng/checks/is-boolean";
+import { isFunction } from "@thi.ng/checks/is-function";
+import { unsupported } from "@thi.ng/errors/unsupported";
+import { doOnce } from "@thi.ng/memoize/do-once";
+import { GLSLVersion } from "@thi.ng/shader-ast-glsl/api";
+import { targetGLSL } from "@thi.ng/shader-ast-glsl/target";
+import { program } from "@thi.ng/shader-ast/ast/scope";
+import { input, output, sym, uniform } from "@thi.ng/shader-ast/ast/sym";
+import { vals } from "@thi.ng/transducers/vals";
+import { GL_EXT_INFO, } from "./api/ext.js";
+import { DEFAULT_OUTPUT, } from "./api/shader.js";
+import { getExtensions } from "./canvas.js";
+import { isGL2Context } from "./checks.js";
+import { error } from "./error.js";
+import { LOGGER } from "./logger.js";
+import { GLSL_HEADER, NO_PREFIXES, SYNTAX } from "./syntax.js";
+import { UNIFORM_SETTERS } from "./uniforms.js";
 const ERROR_REGEXP = /ERROR: \d+:(\d+): (.*)/;
 export class Shader {
     constructor(gl, program, attribs, uniforms, state) {
-        this.warnAttrib = doOnce((id) => LOGGER.warn(`unknown attrib: ${id}`));
-        this.warnUni = doOnce((id) => LOGGER.warn(`unknown uniform: ${id}`));
+        this.warnAttrib = doOnce((id) => LOGGER.warn(`unknown attrib: ${id} (no further warnings will be shown...)`));
+        this.warnUni = doOnce((id) => LOGGER.warn(`unknown uniform: ${id} (no further warnings will be shown...)`));
         this.gl = gl;
         this.program = program;
         this.attribs = attribs;
@@ -124,15 +130,15 @@ export class Shader {
         }
     }
 }
-export const defShader = (gl, spec) => {
+export const defShader = (gl, spec, opts) => {
     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);
@@ -221,7 +227,7 @@ const compileUniformDecls = (spec, acc) => {
             : uniform(u, id);
     }
 };
-export const shaderSourceFromAST = (spec, type, version) => {
+export const shaderSourceFromAST = (spec, type, version, opts = {}) => {
     let prelude = compilePrelude(spec, version);
     const inputs = {};
     const outputs = {};
@@ -255,17 +261,21 @@ export const shaderSourceFromAST = (spec, type, version) => {
         type,
         version,
         prelude,
+        prec: opts.prec,
     });
     return (target(program([
         ...vals(unis),
         ...vals(inputs),
         ...vals(outputs),
-        ...spec[type](target, unis, inputs, Object.assign(Object.assign({}, outputs), outputAliases)),
+        ...spec[type](target, unis, inputs, {
+            ...outputs,
+            ...outputAliases,
+        }),
     ])) + (spec.post ? "\n" + spec.post : ""));
 };
 export const prepareShaderSource = (spec, type, version) => {
     const syntax = SYNTAX[version];
-    const prefixes = Object.assign(Object.assign({}, NO_PREFIXES), spec.declPrefixes);
+    const prefixes = { ...NO_PREFIXES, ...spec.declPrefixes };
     const isVS = type === "vs";
     let src = "";
     src += `#version ${version}\n`;

package/shaders/lambert.d.ts

@@ -1,6 +1,6 @@
-import type { Material } from "../api/material";
-import type { ShaderOpts, ShaderSpec } from "../api/shader";
-export interface LambertOpts extends ShaderOpts<Pick<Material, "ambientCol" | "diffuseCol">> {
+import type { Material } from "../api/material.js";
+import type { ShaderPresetOpts, ShaderSpec } from "../api/shader.js";
+export interface LambertOpts extends ShaderPresetOpts<Pick<Material, "ambientCol" | "diffuseCol">> {
     bidir: boolean;
 }
 export declare const LAMBERT: (opts?: Partial<LambertOpts>) => ShaderSpec;

package/shaders/lambert.js

@@ -1,8 +1,16 @@
-import { $, assign, defMain, mul, normalize, texture, vec4, } from "@thi.ng/shader-ast";
-import { diffuseLighting, halfLambert, lambert, surfaceNormal, transformMVP, } from "@thi.ng/shader-ast-stdlib";
-import { defMaterial } from "../material";
-import { autoNormalMatrix2 } from "../matrices";
-import { colorAttrib, positionAttrib } from "../utils";
+import { diffuseLighting, halfLambert, lambert, } from "@thi.ng/shader-ast-stdlib/light/lambert";
+import { transformMVP } from "@thi.ng/shader-ast-stdlib/matrix/mvp";
+import { surfaceNormal } from "@thi.ng/shader-ast-stdlib/matrix/normal";
+import { assign } from "@thi.ng/shader-ast/ast/assign";
+import { defMain } from "@thi.ng/shader-ast/ast/function";
+import { vec4 } from "@thi.ng/shader-ast/ast/lit";
+import { mul } from "@thi.ng/shader-ast/ast/ops";
+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 { defMaterial } from "../material.js";
+import { autoNormalMatrix2 } from "../matrices.js";
+import { colorAttrib, positionAttrib } from "../utils.js";
 export const LAMBERT = (opts = {}) => ({
     vs: (gl, unis, ins, outs) => [
         defMain(() => [
@@ -20,10 +28,34 @@ export const LAMBERT = (opts = {}) => ({
         ]),
     ],
     // pre: ALIAS_TEXTURE,
-    attribs: Object.assign(Object.assign(Object.assign(Object.assign({ position: "vec3", normal: "vec3" }, (opts.uv ? { [opts.uv]: "vec2" } : null)), (opts.color && !opts.instanceColor
-        ? { [opts.color]: "vec3" }
-        : null)), (opts.instancePos ? { [opts.instancePos]: "vec3" } : null)), (opts.instanceColor ? { [opts.instanceColor]: "vec3" } : null)),
-    varying: Object.assign({ vcolor: "vec3", vnormal: "vec3" }, (opts.uv ? { vuv: "vec2" } : null)),
-    uniforms: Object.assign(Object.assign({ model: "mat4", view: "mat4", proj: "mat4", normalMat: ["mat4", autoNormalMatrix2()], lightDir: ["vec3", [0, 1, 0]], lightCol: ["vec3", [1, 1, 1]] }, defMaterial(Object.assign({ diffuseCol: [1, 1, 1] }, opts.material), { specularCol: false })), (opts.uv ? { tex: "sampler2D" } : null)),
-    state: Object.assign({ depth: true, cull: true }, opts.state),
+    attribs: {
+        position: "vec3",
+        normal: "vec3",
+        ...(opts.uv ? { [opts.uv]: "vec2" } : null),
+        ...(opts.color && !opts.instanceColor
+            ? { [opts.color]: "vec3" }
+            : null),
+        ...(opts.instancePos ? { [opts.instancePos]: "vec3" } : null),
+        ...(opts.instanceColor ? { [opts.instanceColor]: "vec3" } : null),
+    },
+    varying: {
+        vcolor: "vec3",
+        vnormal: "vec3",
+        ...(opts.uv ? { vuv: "vec2" } : null),
+    },
+    uniforms: {
+        model: "mat4",
+        view: "mat4",
+        proj: "mat4",
+        normalMat: ["mat4", autoNormalMatrix2()],
+        lightDir: ["vec3", [0, 1, 0]],
+        lightCol: ["vec3", [1, 1, 1]],
+        ...defMaterial({ diffuseCol: [1, 1, 1], ...opts.material }, { specularCol: false }),
+        ...(opts.uv ? { tex: "sampler2D" } : null),
+    },
+    state: {
+        depth: true,
+        cull: true,
+        ...opts.state,
+    },
 });

package/shaders/phong.d.ts

@@ -1,5 +1,5 @@
-import type { Material } from "../api/material";
-import type { ShaderOpts, ShaderSpec } from "../api/shader";
-export declare type PhongOpts = ShaderOpts<Pick<Material, "ambientCol" | "diffuseCol" | "specularCol">>;
+import type { Material } from "../api/material.js";
+import type { ShaderPresetOpts, ShaderSpec } from "../api/shader.js";
+export declare type PhongOpts = ShaderPresetOpts<Pick<Material, "ambientCol" | "diffuseCol" | "specularCol">>;
 export declare const PHONG: (opts?: Partial<PhongOpts>) => ShaderSpec;
 //# sourceMappingURL=phong.d.ts.map

package/shaders/phong.js

@@ -1,8 +1,16 @@
-import { $, add, assign, defMain, dot, FLOAT0, gt, max, mul, normalize, pow, sub, sym, ternary, vec4, } from "@thi.ng/shader-ast";
-import { diffuseLighting, surfaceNormal } from "@thi.ng/shader-ast-stdlib";
-import { defMaterial } from "../material";
-import { autoNormalMatrix1 } from "../matrices";
-import { colorAttrib, positionAttrib } from "../utils";
+import { diffuseLighting } from "@thi.ng/shader-ast-stdlib/light/lambert";
+import { surfaceNormal } from "@thi.ng/shader-ast-stdlib/matrix/normal";
+import { assign } from "@thi.ng/shader-ast/ast/assign";
+import { ternary } from "@thi.ng/shader-ast/ast/controlflow";
+import { defMain } from "@thi.ng/shader-ast/ast/function";
+import { FLOAT0, vec4 } from "@thi.ng/shader-ast/ast/lit";
+import { add, gt, mul, sub } from "@thi.ng/shader-ast/ast/ops";
+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 { defMaterial } from "../material.js";
+import { autoNormalMatrix1 } from "../matrices.js";
+import { colorAttrib, positionAttrib } from "../utils.js";
 export const PHONG = (opts = {}) => ({
     vs: (gl, unis, ins, outs) => [
         defMain(() => {
@@ -32,15 +40,35 @@ export const PHONG = (opts = {}) => ({
             ];
         }),
     ],
-    attribs: Object.assign(Object.assign(Object.assign({ position: "vec3", normal: "vec3" }, (opts.color && !opts.instanceColor
-        ? { [opts.color]: "vec3" }
-        : null)), (opts.instancePos ? { [opts.instancePos]: "vec3" } : null)), (opts.instanceColor ? { [opts.instanceColor]: "vec3" } : null)),
+    attribs: {
+        position: "vec3",
+        normal: "vec3",
+        ...(opts.color && !opts.instanceColor
+            ? { [opts.color]: "vec3" }
+            : null),
+        ...(opts.instancePos ? { [opts.instancePos]: "vec3" } : null),
+        ...(opts.instanceColor ? { [opts.instanceColor]: "vec3" } : null),
+    },
     varying: {
         vnormal: "vec3",
         veye: "vec3",
         vlight: "vec3",
         vcolor: "vec3",
     },
-    uniforms: Object.assign({ model: "mat4", normalMat: ["mat4", autoNormalMatrix1()], view: "mat4", proj: "mat4", shininess: ["float", 32], eyePos: "vec3", lightPos: ["vec3", [0, 0, 2]], lightCol: ["vec3", [1, 1, 1]] }, defMaterial(opts.material)),
-    state: Object.assign({ depth: true, cull: true }, opts.state),
+    uniforms: {
+        model: "mat4",
+        normalMat: ["mat4", autoNormalMatrix1()],
+        view: "mat4",
+        proj: "mat4",
+        shininess: ["float", 32],
+        eyePos: "vec3",
+        lightPos: ["vec3", [0, 0, 2]],
+        lightCol: ["vec3", [1, 1, 1]],
+        ...defMaterial(opts.material),
+    },
+    state: {
+        depth: true,
+        cull: true,
+        ...opts.state,
+    },
 });

package/shaders/pipeline.d.ts

@@ -1,4 +1,4 @@
-import type { ShaderFn, ShaderSpec } from "../api/shader";
+import type { ShaderFn, ShaderSpec } from "../api/shader.js";
 export declare const PASSTHROUGH_VS: ShaderFn;
 export declare const PASSTHROUGH_VS_UV: ShaderFn;
 export declare const PASSTHROUGH_FS: ShaderFn;

package/shaders/pipeline.js

@@ -1,4 +1,8 @@
-import { $xy, assign, defMain, FLOAT0, FLOAT1, texture, vec4, } from "@thi.ng/shader-ast";
+import { assign } from "@thi.ng/shader-ast/ast/assign";
+import { defMain } from "@thi.ng/shader-ast/ast/function";
+import { FLOAT0, FLOAT1, vec4 } from "@thi.ng/shader-ast/ast/lit";
+import { $xy } from "@thi.ng/shader-ast/ast/swizzle";
+import { texture } from "@thi.ng/shader-ast/builtin/texture";
 export const PASSTHROUGH_VS = (gl, _, ins) => [
     defMain(() => [assign(gl.gl_Position, vec4(ins.position, FLOAT0, FLOAT1))]),
 ];

package/syntax.d.ts

@@ -1,5 +1,5 @@
-import { GLSLVersion } from "@thi.ng/shader-ast-glsl";
-import type { GLSLDeclPrefixes, GLSLSyntax } from "./api/shader";
+import { GLSLVersion } from "@thi.ng/shader-ast-glsl/api";
+import type { GLSLDeclPrefixes, GLSLSyntax } from "./api/shader.js";
 export declare const PREFIXES: GLSLDeclPrefixes;
 export declare const NO_PREFIXES: GLSLDeclPrefixes;
 /**

package/syntax.js

@@ -1,5 +1,5 @@
-import { isArray } from "@thi.ng/checks";
-import { GLSLVersion } from "@thi.ng/shader-ast-glsl";
+import { isArray } from "@thi.ng/checks/is-array";
+import { GLSLVersion } from "@thi.ng/shader-ast-glsl/api";
 export const PREFIXES = {
     a: "a_",
     v: "v_",

package/texture.d.ts

@@ -1,4 +1,4 @@
-import { ITexture, TextureFilter, TextureFormat, TextureOpts, TextureRepeat, TextureTarget, TextureType } from "./api/texture";
+import { ITexture, TextureFilter, TextureFormat, TextureOpts, TextureRepeat, TextureTarget, TextureType } from "./api/texture.js";
 export declare const bindTextures: (textures?: ITexture[] | undefined) => void;
 export declare const unbindTextures: (textures?: ITexture[] | undefined) => void;
 export declare class Texture implements ITexture {

package/texture.js

@@ -1,8 +1,8 @@
-import { withoutKeysObj } from "@thi.ng/associative";
-import { isArray } from "@thi.ng/checks";
-import { TextureFilter, TextureFormat, TextureRepeat, TextureTarget, TEX_FORMATS, } from "./api/texture";
-import { isGL2Context } from "./checks";
-import { error } from "./error";
+import { withoutKeysObj } from "@thi.ng/associative/without-keys";
+import { isArray } from "@thi.ng/checks/is-array";
+import { TextureFilter, TextureFormat, TextureRepeat, TextureTarget, TEX_FORMATS, } from "./api/texture.js";
+import { isGL2Context } from "./checks.js";
+import { error } from "./error.js";
 const $bind = (op) => (textures) => {
     if (!textures)
         return;
@@ -16,7 +16,11 @@ export class Texture {
     constructor(gl, opts = {}) {
         this.gl = gl;
         this.tex = gl.createTexture() || error("error creating WebGL texture");
-        this.configure(Object.assign({ filter: TextureFilter.NEAREST, wrap: TextureRepeat.CLAMP }, opts));
+        this.configure({
+            filter: TextureFilter.NEAREST,
+            wrap: TextureRepeat.CLAMP,
+            ...opts,
+        });
     }
     configure(opts = {}, unbind = true) {
         const gl = this.gl;

package/textures/checkerboard.js

@@ -1,6 +1,13 @@
-import { ARGB8888, canvasPixels } from "@thi.ng/pixel";
+import { canvasPixels } from "@thi.ng/pixel/canvas";
+import { ARGB8888 } from "@thi.ng/pixel/format/argb8888";
 export const checkerboard = (opts) => {
-    opts = Object.assign({ size: 16, col1: 0xffffffff, col2: 0xff000000, cornerCols: [0xffff0000, 0xff00ff00, 0xff0000ff, 0xffffff00] }, opts);
+    opts = {
+        size: 16,
+        col1: 0xffffffff,
+        col2: 0xff000000,
+        cornerCols: [0xffff0000, 0xff00ff00, 0xff0000ff, 0xffffff00],
+        ...opts,
+    };
     const size = opts.size;
     const col1 = ARGB8888.toABGR(opts.col1);
     const col2 = ARGB8888.toABGR(opts.col2);

package/textures/stripes.js

@@ -1,6 +1,12 @@
-import { ARGB8888, canvasPixels } from "@thi.ng/pixel";
+import { canvasPixels } from "@thi.ng/pixel/canvas";
+import { ARGB8888 } from "@thi.ng/pixel/format/argb8888";
 export const stripes = (opts) => {
-    opts = Object.assign({ size: 16, col1: 0xffffffff, col2: 0xff000000 }, opts);
+    opts = {
+        size: 16,
+        col1: 0xffffffff,
+        col2: 0xff000000,
+        ...opts,
+    };
     const size = opts.size;
     const col1 = ARGB8888.toABGR(opts.col1);
     const col2 = ARGB8888.toABGR(opts.col2);

package/uniforms.d.ts

@@ -1,5 +1,5 @@
 import type { Fn, Fn3, IObjectOf } from "@thi.ng/api";
-import { ReadonlyVec } from "@thi.ng/vectors";
-import type { UniformValue } from "./api/shader";
+import { ReadonlyVec } from "@thi.ng/vectors/api";
+import type { UniformValue } from "./api/shader.js";
 export declare const UNIFORM_SETTERS: IObjectOf<Fn3<WebGLRenderingContext, WebGLUniformLocation, number | ReadonlyVec | undefined, Fn<UniformValue | undefined | null, void>>>;
 //# sourceMappingURL=uniforms.d.ts.map