refactor(shader-ast-stdlib): update cross2() as non-inline fn

thi-ng · May 5, 2022 · 59d631a · 59d631a
1 parent 07bd445
commit 59d631a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/packages/shader-ast-stdlib/src/math/cross2.ts b/packages/shader-ast-stdlib/src/math/cross2.ts
@@ -1,16 +1,18 @@
-import type { FloatTerm, Vec2Term } from "@thi.ng/shader-ast";
+import type { FloatTerm } from "@thi.ng/shader-ast";
+import { defn, ret } from "@thi.ng/shader-ast/ast/function";
 import { mul, sub } from "@thi.ng/shader-ast/ast/ops";
 import { $x, $y } from "@thi.ng/shader-ast/ast/swizzle";
 
 /**
- * Inline function. Computes 2D "cross product" of given vectors. See
+ * Computes 2D "cross product" of given vectors. Also see
  * {@link crossC2}.
  *
  * @param a -
  * @param b -
  */
-export const cross2 = (a: Vec2Term, b: Vec2Term) =>
-    crossC2($x(a), $y(a), $x(b), $y(b));
+export const cross2 = defn("float", "cross2", ["vec2", "vec2"], (a, b) => [
+    ret(sub(mul($x(a), $y(b)), mul($y(a), $x(b)))),
+]);
 
 /**
  * Inline function. Computes 2D cross product of given individual

diff --git a/packages/shader-ast-stdlib/src/sdf/union.ts b/packages/shader-ast-stdlib/src/sdf/union.ts
@@ -17,7 +17,8 @@ export const sdfUnion = (a: FloatTerm, ...terms: FloatTerm[]) =>
 
 /**
  * SDF shape union for vec2 terms, i.e. the common form where the X coord
- * defines distance and Y an object or material ID.
+ * defines distance and Y an object or material ID. Returns `a` or `b`,
+ * depending whose x-coord (dist) is smaller.
  *
  * @param a -
  * @param b -