@thi.ng/shader-ast-stdlib 0.13.13 → 0.13.15

package/sdf/smooth-sub.js

@@ -1,3 +1,4 @@
+import { F } from "@thi.ng/shader-ast/api/types";
 import { defn, ret } from "@thi.ng/shader-ast/ast/function";
 import { FLOAT1 } from "@thi.ng/shader-ast/ast/lit";
 import { add, div, mul, neg, sub } from "@thi.ng/shader-ast/ast/ops";
@@ -10,7 +11,7 @@ import { fit1101 } from "../math/fit.js";
  * @param d2 - float
  * @param k - float
  */
-export const sdfSmoothSubtract = defn("float", "sdOpSmoothSubtract", ["float", "float", "float"], (a, b, k) => {
+export const sdfSmoothSubtract = defn(F, "sdOpSmoothSubtract", [F, F, F], (a, b, k) => {
     let h;
     return [
         (h = sym(clamp01(fit1101(div(add(b, a), k))))),

package/sdf/smooth-union.js

@@ -1,3 +1,4 @@
+import { F } from "@thi.ng/shader-ast/api/types";
 import { defn, ret } from "@thi.ng/shader-ast/ast/function";
 import { FLOAT1 } from "@thi.ng/shader-ast/ast/lit";
 import { div, mul, sub } from "@thi.ng/shader-ast/ast/ops";
@@ -10,7 +11,7 @@ import { fit1101 } from "../math/fit.js";
  * @param d2 - float
  * @param k - float
  */
-export const sdfSmoothUnion = defn("float", "sdOpSmoothUnion", ["float", "float", "float"], (a, b, k) => {
+export const sdfSmoothUnion = defn(F, "sdOpSmoothUnion", [F, F, F], (a, b, k) => {
     let h;
     return [
         (h = sym(clamp01(fit1101(div(sub(b, a), k))))),

package/sdf/sphere.js

@@ -1,3 +1,4 @@
+import { F, V2, V3 } from "@thi.ng/shader-ast/api/types";
 import { defn, ret } from "@thi.ng/shader-ast/ast/function";
 import { sub } from "@thi.ng/shader-ast/ast/ops";
 import { length } from "@thi.ng/shader-ast/builtin/math";
@@ -7,11 +8,15 @@ import { length } from "@thi.ng/shader-ast/builtin/math";
  * @param p - vec2
  * @param r - float
  */
-export const sdfCircle = defn("float", "sdCircle", ["vec2", "float"], (p, r) => [ret(sub(length(p), r))]);
+export const sdfCircle = defn(F, "sdCircle", [V2, F], (p, r) => [
+    ret(sub(length(p), r)),
+]);
 /**
  * Returns signed distance from `p` to centered sphere of radius `r`.
  *
  * @param p - vec3
  * @param r - float
  */
-export const sdfSphere = defn("float", "sdSphere", ["vec3", "float"], (p, r) => [ret(sub(length(p), r))]);
+export const sdfSphere = defn(F, "sdSphere", [V3, F], (p, r) => [
+    ret(sub(length(p), r)),
+]);

package/sdf/torus.js

@@ -1,3 +1,4 @@
+import { F, V3 } from "@thi.ng/shader-ast/api/types";
 import { defn, ret } from "@thi.ng/shader-ast/ast/function";
 import { vec2 } from "@thi.ng/shader-ast/ast/lit";
 import { sub } from "@thi.ng/shader-ast/ast/ops";
@@ -11,6 +12,6 @@ import { length } from "@thi.ng/shader-ast/builtin/math";
  * @param r1 - float
  * @param r2 - float
  */
-export const sdfTorus = defn("float", "sdTorus", ["vec3", "float", "float"], (p, r1, r2) => [
+export const sdfTorus = defn(F, "sdTorus", [V3, F, F], (p, r1, r2) => [
     ret(sub(length(vec2(sub(length($(p, "xz")), r2), $y(p))), r1)),
 ]);

package/sdf/tri.js

@@ -1,3 +1,4 @@
+import { F, V2 } from "@thi.ng/shader-ast/api/types";
 import { defn, ret } from "@thi.ng/shader-ast/ast/function";
 import { vec2 } from "@thi.ng/shader-ast/ast/lit";
 import { div, mul, neg, sub } from "@thi.ng/shader-ast/ast/ops";
@@ -12,7 +13,7 @@ import { cross2 } from "../math/cross2.js";
  * @param b - vec2
  * @param c - vec2
  */
-export const sdfTriangle2 = defn("float", "sdTriangle", ["vec2", "vec2", "vec2", "vec2"], (p, a, b, c) => {
+export const sdfTriangle2 = defn(F, "sdTriangle", [V2, V2, V2, V2], (p, a, b, c) => {
     let e0, e1, e2;
     let v0, v1, v2;
     let pq0, pq1, pq2;

package/sdf/union.js

@@ -1,3 +1,4 @@
+import { V2 } from "@thi.ng/shader-ast/api/types";
 import { ternary } from "@thi.ng/shader-ast/ast/controlflow";
 import { defn, ret } from "@thi.ng/shader-ast/ast/function";
 import { lt } from "@thi.ng/shader-ast/ast/ops";
@@ -19,6 +20,6 @@ export const sdfUnion = (a, ...terms) => terms.reduce((a, b) => min(a, b), a);
  * @param a -
  * @param b -
  */
-export const sdfUnion2 = defn("vec2", "sdfUnion2", ["vec2", "vec2"], (a, b) => [
+export const sdfUnion2 = defn(V2, "sdfUnion2", [V2, V2], (a, b) => [
     ret(ternary(lt($x(a), $x(b)), a, b)),
 ]);

package/tex/blur.js

@@ -1,3 +1,4 @@
+import { V2, V4 } from "@thi.ng/shader-ast/api/types";
 import { assign } from "@thi.ng/shader-ast/ast/assign";
 import { defn, ret } from "@thi.ng/shader-ast/ast/function";
 import { vec2 } from "@thi.ng/shader-ast/ast/lit";
@@ -26,7 +27,7 @@ const singlePass = (col, tex, uv, off, k) => assign(col, add(col, mul(add(textur
  * @param uv -
  * @param dir - blur pass direction (`vec2(1,0)` or `vec2(0,1)`)
  */
-export const blur5 = defn("vec4", "blur5", ["sampler2D", "vec2", "vec2", "vec2"], (tex, res, uv, dir) => {
+export const blur5 = defn(V4, "blur5", ["sampler2D", V2, V2, V2], (tex, res, uv, dir) => {
     let col;
     let off;
     const k1 = 0.29411764705882354;
@@ -49,7 +50,7 @@ export const blur5 = defn("vec4", "blur5", ["sampler2D", "vec2", "vec2", "vec2"]
  * @param uv -
  * @param dir - blur pass direction (`vec2(1,0)` or `vec2(0,1)`)
  */
-export const blur9 = defn("vec4", "blur9", ["sampler2D", "vec2", "vec2", "vec2"], (tex, res, uv, dir) => {
+export const blur9 = defn(V4, "blur9", ["sampler2D", V2, V2, V2], (tex, res, uv, dir) => {
     let col;
     let off;
     let off2;
@@ -77,7 +78,7 @@ export const blur9 = defn("vec4", "blur9", ["sampler2D", "vec2", "vec2", "vec2"]
  * @param uv -
  * @param dir - blur pass direction (`vec2(1,0)` or `vec2(0,1)`)
  */
-export const blur13 = defn("vec4", "blur13", ["sampler2D", "vec2", "vec2", "vec2"], (tex, res, uv, dir) => {
+export const blur13 = defn(V4, "blur13", ["sampler2D", V2, V2, V2], (tex, res, uv, dir) => {
     let col;
     let off;
     let off2;

package/tex/index-uv.js

@@ -1,3 +1,4 @@
+import { I, V2 } from "@thi.ng/shader-ast/api/types";
 import { defn, ret } from "@thi.ng/shader-ast/ast/function";
 import { float, int, vec2 } from "@thi.ng/shader-ast/ast/lit";
 import { add, div, modi, mul } from "@thi.ng/shader-ast/ast/ops";
@@ -9,7 +10,7 @@ import { $x, $y } from "@thi.ng/shader-ast/ast/swizzle";
  * @param i -
  * @param size -
  */
-export const indexToUV = defn("vec2", "indexToUV", [["int", "i", { prec: "highp" }], ["ivec2"]], (i, size) => [
+export const indexToUV = defn(V2, "indexToUV", [[I, "i", { prec: "highp" }], ["ivec2"]], (i, size) => [
     ret(vec2(div(float(modi(i, $x(size))), float($x(size))), div(float(div(i, $x(size))), float($y(size))))),
 ]);
 /**
@@ -19,6 +20,6 @@ export const indexToUV = defn("vec2", "indexToUV", [["int", "i", { prec: "highp"
  * @param i -
  * @param width -
  */
-export const uvToIndex = defn("int", "uvToIndex", ["vec2", ["int", "width", { prec: "highp" }]], (uv, width) => [
+export const uvToIndex = defn(I, "uvToIndex", [V2, [I, "width", { prec: "highp" }]], (uv, width) => [
     ret(add(int(mul($x(uv), float(width))), int(mul($y(uv), float(mul(width, width)))))),
 ]);