@thi.ng/webgl-msdf 2.1.114 → 2.1.115

package/CHANGELOG.md

@@ -1,6 +1,6 @@
 # Change Log
 
-- **Last updated**: 2024-01-30T21:37:19Z
+- **Last updated**: 2024-02-06T23:18:11Z
 - **Generator**: [thi.ng/monopub](https://thi.ng/monopub)
 
 All notable changes to this project will be documented in this file.
@@ -9,6 +9,12 @@ See [Conventional Commits](https://conventionalcommits.org/) for commit guidelin
 **Note:** Unlisted _patch_ versions only involve non-code or otherwise excluded changes
 and/or version bumps of transitive dependencies.
 
+### [2.1.115](https://github.com/thi-ng/umbrella/tree/@thi.ng/webgl-msdf@2.1.115) (2024-02-06)
+
+#### ♻️ Refactoring
+
+- use shader type consts ([b230780](https://github.com/thi-ng/umbrella/commit/b230780))
+
 ### [2.1.95](https://github.com/thi-ng/umbrella/tree/@thi.ng/webgl-msdf@2.1.95) (2023-11-09)
 
 #### ♻️ Refactoring

package/README.md

@@ -67,7 +67,7 @@ For Node.js REPL:
 const webglMsdf = await import("@thi.ng/webgl-msdf");
 ```
 
-Package sizes (brotli'd, pre-treeshake): ESM: 1.56 KB
+Package sizes (brotli'd, pre-treeshake): ESM: 1.57 KB
 
 ## Dependencies
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@thi.ng/webgl-msdf",
-  "version": "2.1.114",
+  "version": "2.1.115",
   "description": "Multi-channel SDF font rendering & basic text layout for WebGL",
   "type": "module",
   "module": "./index.js",
@@ -36,11 +36,11 @@
   },
   "dependencies": {
     "@thi.ng/api": "^8.9.22",
-    "@thi.ng/shader-ast": "^0.13.6",
-    "@thi.ng/transducers": "^8.8.26",
-    "@thi.ng/vector-pools": "^3.1.102",
-    "@thi.ng/vectors": "^7.10.4",
-    "@thi.ng/webgl": "^6.6.25"
+    "@thi.ng/shader-ast": "^0.13.7",
+    "@thi.ng/transducers": "^8.9.0",
+    "@thi.ng/vector-pools": "^3.1.103",
+    "@thi.ng/vectors": "^7.10.5",
+    "@thi.ng/webgl": "^6.6.26"
   },
   "devDependencies": {
     "@microsoft/api-extractor": "^7.39.0",
@@ -93,5 +93,5 @@
     "parent": "@thi.ng/webgl",
     "year": 2019
   },
-  "gitHead": "a86521dfac00768f7e51a607209325eb72004730\n"
+  "gitHead": "ce8202c237a367c4038d41919a8acf75e1122507\n"
 }

package/shader.js

@@ -1,3 +1,4 @@
+import { F, M4, S2D, V2, V3, V4 } from "@thi.ng/shader-ast/api/types";
 import { assign } from "@thi.ng/shader-ast/ast/assign";
 import { discard, ifThen } from "@thi.ng/shader-ast/ast/controlflow";
 import { defMain, defn, ret } from "@thi.ng/shader-ast/ast/function";
@@ -15,23 +16,18 @@ import { clamp, max, min, mix } from "@thi.ng/shader-ast/builtin/math";
 import { fwidth, texture } from "@thi.ng/shader-ast/builtin/texture";
 import { ONE4, ZERO4 } from "@thi.ng/vectors/api";
 import { BLEND_NORMAL } from "@thi.ng/webgl/api/blend";
-const median3 = defn("float", "median3", ["vec3"], (v) => [
+const median3 = defn(F, "median3", [V3], (v) => [
   ret(max(min($x(v), $y(v)), min(max($x(v), $y(v)), $z(v))))
 ]);
-const msdfSample = defn(
-  "vec2",
-  "msdfSample",
-  ["sampler2D", "vec2"],
-  (tex, uv) => {
-    let sd;
-    let w;
-    return [
-      sd = sym(sub(median3($xyz(texture(tex, uv))), FLOAT05)),
-      w = sym(clamp(add(div(sd, fwidth(sd)), FLOAT05), FLOAT0, FLOAT1)),
-      ret(vec2(sd, w))
-    ];
-  }
-);
+const msdfSample = defn(V2, "msdfSample", [S2D, V2], (tex, uv) => {
+  let sd;
+  let w;
+  return [
+    sd = sym(sub(median3($xyz(texture(tex, uv))), FLOAT05)),
+    w = sym(clamp(add(div(sd, fwidth(sd)), FLOAT05), FLOAT0, FLOAT1)),
+    ret(vec2(sd, w))
+  ];
+});
 const msdfShader = (opts = {}) => ({
   vs: (gl, unis, ins, outs) => [
     defMain(() => [
@@ -60,21 +56,21 @@ const msdfShader = (opts = {}) => ({
     OES_standard_derivatives: true
   },
   attribs: {
-    position: "vec3",
-    uv: "vec2",
-    ...opts.color ? { color: "vec4" } : null
+    position: V3,
+    uv: V2,
+    ...opts.color ? { color: V4 } : null
   },
   varying: {
-    vuv: "vec2",
-    ...opts.color ? { vcolor: "vec4" } : null
+    vuv: V2,
+    ...opts.color ? { vcolor: V4 } : null
   },
   uniforms: {
-    modelview: "mat4",
-    proj: "mat4",
-    tex: "sampler2D",
-    thresh: ["float", 1e-3],
-    bg: ["vec4", ZERO4],
-    ...!opts.color ? { fg: ["vec4", ONE4] } : null
+    modelview: M4,
+    proj: M4,
+    tex: S2D,
+    thresh: [F, 1e-3],
+    bg: [V4, ZERO4],
+    ...!opts.color ? { fg: [V4, ONE4] } : null
   },
   state: {
     blend: true,