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

package/CHANGELOG.md

@@ -1,6 +1,6 @@
 # Change Log
 
-- **Last updated**: 2023-04-08T11:09:50Z
+- **Last updated**: 2023-05-05T21:29:28Z
 - **Generator**: [thi.ng/monopub](https://thi.ng/monopub)
 
 All notable changes to this project will be documented in this file.
@@ -9,6 +9,13 @@ 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.
 
+### [0.13.14](https://github.com/thi-ng/umbrella/tree/@thi.ng/shader-ast-stdlib@0.13.14) (2023-05-05)
+
+#### 🩹 Bug fixes
+
+- fix [#399](https://github.com/thi-ng/umbrella/issues/399) update HOF function naming ([f4b62d7](https://github.com/thi-ng/umbrella/commit/f4b62d7))
+  - ensure generated HOFs are using unique names to allow multiple instances
+
 ## [0.13.0](https://github.com/thi-ng/umbrella/tree/@thi.ng/shader-ast-stdlib@0.13.0) (2023-01-10)
 
 #### 🚀 Features

package/math/additive.js

@@ -1,7 +1,8 @@
 import { assign } from "@thi.ng/shader-ast/ast/assign";
 import { forLoop } from "@thi.ng/shader-ast/ast/controlflow";
 import { defn, ret } from "@thi.ng/shader-ast/ast/function";
-import { float, FLOAT0, FLOAT05 } from "@thi.ng/shader-ast/ast/lit";
+import { gensym } from "@thi.ng/shader-ast/ast/idgen";
+import { FLOAT0, FLOAT05, float } from "@thi.ng/shader-ast/ast/lit";
 import { add, inc, lt, mul } from "@thi.ng/shader-ast/ast/ops";
 import { sym } from "@thi.ng/shader-ast/ast/sym";
 /**
@@ -23,7 +24,7 @@ import { sym } from "@thi.ng/shader-ast/ast/sym";
  * @param oct -
  * @param name -
  */
-export const additive = (type, fn, oct = 4, name = "additive") => defn("float", name, [[type], [type], "float"], (pos, shift, decay) => {
+export const additive = (type, fn, oct = 4, name = gensym("additive_")) => defn("float", name, [[type], [type], "float"], (pos, shift, decay) => {
     let n;
     let amp;
     return [

package/noise/worley2.d.ts

@@ -2,17 +2,22 @@ import type { Func2 } from "@thi.ng/shader-ast";
 export declare const worleyDist: import("@thi.ng/shader-ast").TaggedFn2<"vec3", "vec3", "vec3">;
 export declare const worleyDistManhattan: import("@thi.ng/shader-ast").TaggedFn2<"vec3", "vec3", "vec3">;
 /**
- * Higher order function. Computes 2D Worley noise using provided
- * distance function. The returned function takes 2 args: position and
- * jitter amount, the latter in [0..1] interval. Returns noise
- * components as vec2, with the x component containing the distance from
- * closest simplex center and y the noise value. The vector components
- * can be used individually or combined (e.g. `noise.y - noise.x`)...
+ * Higher order function. Computes 2D Worley noise using provided distance
+ * function. The returned function takes 2 args: position and jitter amount, the
+ * latter in [0..1] interval. Returns noise components as vec2, with the x
+ * component containing the distance from closest simplex center and y the noise
+ * value. The vector components can be used individually or combined (e.g.
+ * `noise.y - noise.x`)...
  *
+ * THe optional `name` arg can be used to customize the name of the generated
+ * function.
+ *
+ * @remarks
  * Based on implementation by Stefan Gustavson:
  * http://webstaff.itn.liu.se/~stegu/GLSL-cellular/GLSL-cellular-notes.pdf
  *
  * @param distFn -
+ * @param name -
  */
-export declare const worley2: (distFn: Func2<"vec3", "vec3", "vec3">) => import("@thi.ng/shader-ast").TaggedFn2<"vec2", "float", "vec2">;
+export declare const worley2: (distFn: Func2<"vec3", "vec3", "vec3">, name?: string) => import("@thi.ng/shader-ast").TaggedFn2<"vec2", "float", "vec2">;
 //# sourceMappingURL=worley2.d.ts.map

package/noise/worley2.js

@@ -1,6 +1,7 @@
 import { assign } from "@thi.ng/shader-ast/ast/assign";
 import { ternary } from "@thi.ng/shader-ast/ast/controlflow";
 import { defn, ret } from "@thi.ng/shader-ast/ast/function";
+import { gensym } from "@thi.ng/shader-ast/ast/idgen";
 import { float, vec3 } from "@thi.ng/shader-ast/ast/lit";
 import { add, lt, mul, sub } from "@thi.ng/shader-ast/ast/ops";
 import { $, $x, $xy, $y, $z } from "@thi.ng/shader-ast/ast/swizzle";
@@ -10,19 +11,24 @@ import { permute3 } from "./permute.js";
 export const worleyDist = defn("vec3", "worleyDist", ["vec3", "vec3"], (a, b) => [ret(add(mul(a, a), mul(b, b)))]);
 export const worleyDistManhattan = defn("vec3", "worleyDistManhatten", ["vec3", "vec3"], (a, b) => [ret(add(abs(a), abs(b)))]);
 /**
- * Higher order function. Computes 2D Worley noise using provided
- * distance function. The returned function takes 2 args: position and
- * jitter amount, the latter in [0..1] interval. Returns noise
- * components as vec2, with the x component containing the distance from
- * closest simplex center and y the noise value. The vector components
- * can be used individually or combined (e.g. `noise.y - noise.x`)...
+ * Higher order function. Computes 2D Worley noise using provided distance
+ * function. The returned function takes 2 args: position and jitter amount, the
+ * latter in [0..1] interval. Returns noise components as vec2, with the x
+ * component containing the distance from closest simplex center and y the noise
+ * value. The vector components can be used individually or combined (e.g.
+ * `noise.y - noise.x`)...
  *
+ * THe optional `name` arg can be used to customize the name of the generated
+ * function.
+ *
+ * @remarks
  * Based on implementation by Stefan Gustavson:
  * http://webstaff.itn.liu.se/~stegu/GLSL-cellular/GLSL-cellular-notes.pdf
  *
  * @param distFn -
+ * @param name -
  */
-export const worley2 = (distFn) => defn("vec2", "worley2", ["vec2", "float"], (P, jitter) => {
+export const worley2 = (distFn, name = gensym("worley2_")) => defn("vec2", name, ["vec2", "float"], (P, jitter) => {
     const K = float(1 / 7);
     const Ko = float(3 / 7);
     const oI = sym(vec3(-1, 0, 1));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@thi.ng/shader-ast-stdlib",
-  "version": "0.13.13",
+  "version": "0.13.14",
   "description": "Function collection for modular GPGPU / shader programming with @thi.ng/shader-ast",
   "type": "module",
   "module": "./index.js",
@@ -35,7 +35,7 @@
   },
   "dependencies": {
     "@thi.ng/api": "^8.8.0",
-    "@thi.ng/shader-ast": "^0.12.50"
+    "@thi.ng/shader-ast": "^0.12.51"
   },
   "devDependencies": {
     "@microsoft/api-extractor": "^7.34.4",
@@ -330,5 +330,5 @@
     ],
     "year": 2019
   },
-  "gitHead": "ca22f02a137c0a4e3a38ef81e82e2bc7e3c43849\n"
+  "gitHead": "81dcbba93e7230c2f400bee87878145d902e975b\n"
 }

package/raymarch/ao.d.ts

@@ -7,6 +7,7 @@ import type { RaymarchScene } from "../api.js";
  *
  * @param scene -
  * @param numSamples -
+ * @param name -
  */
-export declare const raymarchAO: (scene: RaymarchScene, numSamples?: number) => import("@thi.ng/shader-ast").TaggedFn2<"vec3", "vec3", "float">;
+export declare const raymarchAO: (scene: RaymarchScene, numSamples?: number, name?: string) => import("@thi.ng/shader-ast").TaggedFn2<"vec3", "vec3", "float">;
 //# sourceMappingURL=ao.d.ts.map

package/raymarch/ao.js

@@ -1,7 +1,8 @@
 import { assign } from "@thi.ng/shader-ast/ast/assign";
 import { forLoop } from "@thi.ng/shader-ast/ast/controlflow";
 import { defn, ret } from "@thi.ng/shader-ast/ast/function";
-import { float, FLOAT0, FLOAT05, FLOAT1 } from "@thi.ng/shader-ast/ast/lit";
+import { gensym } from "@thi.ng/shader-ast/ast/idgen";
+import { FLOAT0, FLOAT05, FLOAT1, float } from "@thi.ng/shader-ast/ast/lit";
 import { add, inc, lte, mul, sub } from "@thi.ng/shader-ast/ast/ops";
 import { $x } from "@thi.ng/shader-ast/ast/swizzle";
 import { sym } from "@thi.ng/shader-ast/ast/sym";
@@ -14,8 +15,9 @@ import { clamp01 } from "../math/clamp.js";
  *
  * @param scene -
  * @param numSamples -
+ * @param name -
  */
-export const raymarchAO = (scene, numSamples = 5) => defn("float", "raymarchAO", ["vec3", "vec3"], (p, n) => {
+export const raymarchAO = (scene, numSamples = 5, name = gensym("raymarchAO_")) => defn("float", name, ["vec3", "vec3"], (p, n) => {
     let r;
     let w;
     let d0;

package/raymarch/normal.js

@@ -1,4 +1,5 @@
 import { defn, ret } from "@thi.ng/shader-ast/ast/function";
+import { gensym } from "@thi.ng/shader-ast/ast/idgen";
 import { vec2, vec3 } from "@thi.ng/shader-ast/ast/lit";
 import { add, sub } from "@thi.ng/shader-ast/ast/ops";
 import { $, $x } from "@thi.ng/shader-ast/ast/swizzle";
@@ -13,7 +14,7 @@ import { normalize } from "@thi.ng/shader-ast/builtin/math";
  * @param scene -
  * @param name -
  */
-export const raymarchNormal = (scene, name = "raymarchNormal") => defn("vec3", name, ["vec3", "float"], (p, smooth) => {
+export const raymarchNormal = (scene, name = gensym("raymarchNormal_")) => defn("vec3", name, ["vec3", "float"], (p, smooth) => {
     let dn;
     const comp = (id) => sub($x(scene(add(p, $(dn, id)))), $x(scene(sub(p, $(dn, id)))));
     return [

package/raymarch/scene.js

@@ -1,7 +1,8 @@
 import { assign } from "@thi.ng/shader-ast/ast/assign";
 import { brk, forLoop, ifThen } from "@thi.ng/shader-ast/ast/controlflow";
 import { defn, ret } from "@thi.ng/shader-ast/ast/function";
-import { float, int, INT0, vec2 } from "@thi.ng/shader-ast/ast/lit";
+import { gensym } from "@thi.ng/shader-ast/ast/idgen";
+import { INT0, float, int, vec2 } from "@thi.ng/shader-ast/ast/lit";
 import { gt, inc, lt, madd } from "@thi.ng/shader-ast/ast/ops";
 import { $x, $y } from "@thi.ng/shader-ast/ast/swizzle";
 import { sym } from "@thi.ng/shader-ast/ast/sym";
@@ -25,7 +26,7 @@ import { rayPointAt } from "./point-at.js";
  */
 export const raymarchScene = (scene, _opts) => {
     const opts = {
-        name: "raymarchScene",
+        name: gensym("raymarchScene_"),
         near: 0.1,
         far: 10,
         steps: 100,

package/sdf/polygon.js

@@ -2,11 +2,11 @@ import { assign } from "@thi.ng/shader-ast/ast/assign";
 import { forLoop, ifThen } from "@thi.ng/shader-ast/ast/controlflow";
 import { defn, ret } from "@thi.ng/shader-ast/ast/function";
 import { index } from "@thi.ng/shader-ast/ast/indexed";
-import { bvec3, FLOAT1, int, INT0 } from "@thi.ng/shader-ast/ast/lit";
+import { FLOAT1, INT0, bvec3, int } from "@thi.ng/shader-ast/ast/lit";
 import { div, gt, gte, inc, lt, mul, neg, not, or, sub, } from "@thi.ng/shader-ast/ast/ops";
 import { $x, $y } from "@thi.ng/shader-ast/ast/swizzle";
 import { sym } from "@thi.ng/shader-ast/ast/sym";
-import { all, _any } from "@thi.ng/shader-ast/builtin/bvec";
+import { _any, all } from "@thi.ng/shader-ast/builtin/bvec";
 import { dot, min, sqrt } from "@thi.ng/shader-ast/builtin/math";
 import { clamp01 } from "../math/clamp.js";
 /**