Update generated function definitions

Author: rycwo

examples/graph-builder.ts

@@ -0,0 +1,96 @@
+/*
+ * Check types and run:
+ * yarn tsc --module node16 --target es2022 --strict --verbatimModuleSyntax --noEmit examples/graph-builder.ts
+ * yarn tsx examples/graph-builder.ts -t <token> -p <project>
+ */
+import fs from "fs"
+import type { OptionValues } from "commander"
+import { program } from "commander"
+import MetafoldClient from "../src/metafold.js"
+import {
+  CSGIntersect,
+  CSGUnion,
+  CylinderPrimitive,
+  EllipsoidPrimitive,
+  GenerateSamplePoints,
+  POINT_SOURCE,
+  Redistance,
+  SampleSurfaceLattice,
+  Threshold,
+} from "../src/metafold.js"
+
+const f = Threshold(
+  Redistance(
+    CSGUnion(
+      CSGIntersect(
+        SampleSurfaceLattice(POINT_SOURCE, {
+          lattice_type: "Gyroid",
+          scale:        [0.1, 0.1, 0.1],
+        }),
+        EllipsoidPrimitive(POINT_SOURCE, { size: [2.0, 2.0, 2.0] }),
+      ),
+      CylinderPrimitive(POINT_SOURCE, {
+        size:  [2.0, 2.0, 0.15],
+        xform: [
+           1.0,   0.0,   0.0,   0.0,
+           0.0,   1.0,   0.0,   0.0,
+           0.0,   0.0,   1.0,   0.0,
+           0.0,   0.0,  -0.95,  1.0,
+        ],
+      }),
+      0.1, // Smoothing
+    ),
+  ),
+  {
+    width: 0.04075,
+  },
+)
+
+async function exec(opts: OptionValues) {
+  const token = opts.token ?? process.env.METAFOLD_ACCESS_TOKEN
+  if (!token) {
+    console.error("access token is required")
+    process.exit(1)
+  }
+
+  const metafold = new MetafoldClient(token, opts.project)
+
+  for (const res of [64, 128, 265]) {
+    const source = GenerateSamplePoints({
+      size:       [2.0, 2.0, 2.0],
+      offset:     [-1.0, -1.0, -1.0],
+      resolution: [res, res, res],
+    })
+    const graph = f.json(source)
+    const index = graph.operators.findIndex(({ type }) => type === "GenerateSamplePoints")
+
+    console.log("Running export_triangle_mesh job...")
+    const exportMesh = await metafold.jobs.run("export_triangle_mesh", {
+      graph,
+      point_source: index,
+      file_type: "obj",
+    })
+
+    console.log("Downloading generated mesh asset...")
+    const fd = fs.openSync(`out-${res}.obj`, "a")
+    try {
+      const r = await metafold.assets.download(exportMesh.assets[0].id)
+      for await (const chunk of r.data) {
+        fs.appendFileSync(fd, chunk)
+      }
+    } finally {
+      fs.closeSync(fd)
+    }
+  }
+}
+
+async function main() {
+  program
+    .option("-t, --token <token>", "access token")
+    .requiredOption("-p, --project <id>", "project id")
+    .action(exec)
+
+  await program.parseAsync(process.argv)
+}
+
+main()

package.json

@@ -1,6 +1,6 @@
 {
   "name": "metafold",
-  "version": "0.3.0",
+  "version": "0.3.1",
   "description": "Metafold SDK for Node.js",
   "main": "lib/metafold.js",
   "type": "module",

src/func.ts

@@ -30,7 +30,7 @@ import {
 } from "./func-types.js"
 
 /** Enum variants for CSG.operation. */
-export type CSG_Enum_operation = "Subtract" | "Union" | "Intersect"
+export type CSG_Enum_operation = "Union" | "Intersect" | "Subtract"
 
 /** Optional parameters for the CSG operator. */
 export interface CSG_Parameters {
@@ -100,7 +100,7 @@ export function GenerateSamplePoints(
 }
 
 /** Enum variants for GradeCellSize.shape_type. */
-export type GradeCellSize_Enum_shape_type = "Box" | "Ellipsoid" | "Plane" | "Cylinder"
+export type GradeCellSize_Enum_shape_type = "Cylinder" | "Box" | "Ellipsoid" | "Plane"
 
 /** Optional parameters for the GradeCellSize operator. */
 export interface GradeCellSize_Parameters {
@@ -193,7 +193,7 @@ export function LoadSamplePoints(
 }
 
 /** Enum variants for LoadVolume.component_type. */
-export type LoadVolume_Enum_component_type = "Integer" | "Vec2f" | "Vec3i" | "Vec3f" | "Vec4f" | "None" | "Byte" | "Float" | "Vec2i" | "Vec4i"
+export type LoadVolume_Enum_component_type = "None" | "Byte" | "Float" | "Vec3f" | "Vec4i" | "Vec4f" | "Integer" | "Vec2i" | "Vec2f" | "Vec3i"
 
 /** Optional parameters for the LoadVolume operator. */
 export interface LoadVolume_Parameters {
@@ -264,7 +264,7 @@ export function Redistance(
 }
 
 /** Enum variants for SampleBeam.node_type. */
-export type SampleBeam_Enum_node_type = "None" | "Sphere"
+export type SampleBeam_Enum_node_type = "Sphere" | "None"
 
 /** Enum variants for SampleBeam.section_type. */
 export type SampleBeam_Enum_section_type = "Circle" | "Cross" | "Box"
@@ -297,7 +297,7 @@ export function SampleBeam(
 }
 
 /** Enum variants for SampleBox.shape_type. */
-export type SampleBox_Enum_shape_type = "Box" | "Cylinder" | "Torus" | "Link" | "CappedCone" | "Ellipsoid" | "Capsule" | "BoxFrame" | "Plane"
+export type SampleBox_Enum_shape_type = "Cylinder" | "BoxFrame" | "Plane" | "Torus" | "Link" | "Box" | "Capsule" | "CappedCone" | "Ellipsoid"
 
 /** Optional parameters for the SampleBox operator. */
 export interface SampleBox_Parameters {
@@ -344,10 +344,10 @@ export function SampleCustomShape(
 }
 
 /** Enum variants for SampleLattice.node_type. */
-export type SampleLattice_Enum_node_type = "Sphere" | "None"
+export type SampleLattice_Enum_node_type = "None" | "Sphere"
 
 /** Enum variants for SampleLattice.section_type. */
-export type SampleLattice_Enum_section_type = "Box" | "Circle" | "Cross"
+export type SampleLattice_Enum_section_type = "Circle" | "Cross" | "Box"
 
 /** Optional parameters for the SampleLattice operator. */
 export interface SampleLattice_Parameters {
@@ -381,7 +381,7 @@ export function SampleLattice(
 }
 
 /** Enum variants for SampleSurfaceLattice.lattice_type. */
-export type SampleSurfaceLattice_Enum_lattice_type = "SchwarzW" | "None" | "SchwarzD" | "I2Y" | "P" | "W" | "PM_Y" | "SchwarzPW" | "S" | "D" | "IWP" | "CP" | "CY" | "C_Y" | "SchwarzN" | "Gyroid" | "CI2Y" | "CD" | "CS" | "Y" | "FRD" | "SD1" | "F" | "Schwarz" | "CPM_Y"
+export type SampleSurfaceLattice_Enum_lattice_type = "CS" | "W" | "Y" | "SchwarzN" | "None" | "D" | "IWP" | "CP" | "SchwarzD" | "CI2Y" | "SchwarzW" | "SchwarzPW" | "C_Y" | "CPM_Y" | "Gyroid" | "I2Y" | "F" | "CY" | "CD" | "PM_Y" | "FRD" | "S" | "SD1" | "P" | "Schwarz"
 
 /** Optional parameters for the SampleSurfaceLattice operator. */
 export interface SampleSurfaceLattice_Parameters {
@@ -485,14 +485,14 @@ export interface Threshold_Parameters {
 export function Threshold(
   samples: TypedFunc<FuncType.Float>,
   parameters?: Threshold_Parameters,
-): TypedFunc<FuncType.Float> {
-  return new TypedFunc<FuncType.Float>(
+): TypedFunc<FuncType.Byte> {
+  return new TypedFunc<FuncType.Byte>(
     "Threshold",
     {
       "Samples": samples,
     },
     parameters,
-    FuncType.Float,
+    FuncType.Byte,
   )
 }
 
@@ -562,7 +562,7 @@ export function TransformSphericalCoords(
 }
 
 /** Enum variants for TransformTwistCoords.axis. */
-export type TransformTwistCoords_Enum_axis = "Z" | "X" | "Y"
+export type TransformTwistCoords_Enum_axis = "Y" | "Z" | "X"
 
 /** Optional parameters for the TransformTwistCoords operator. */
 export interface TransformTwistCoords_Parameters {
@@ -592,20 +592,28 @@ export function TransformTwistCoords(
  * ----------------------------------------------------------------------------
  */
 
-/** Helper to generate the SDF for a Box primitive. */
-export function BoxPrimitive(
+/** Helper to generate the SDF for a Cylinder primitive. */
+export function CylinderPrimitive(
   points: TypedFunc<FuncType.Vec3f> = POINT_SOURCE,
   parameters: Omit<SampleBox_Parameters, "shape_type">,
 ): TypedFunc<FuncType.Float> {
-  return SampleBox(points, { ...parameters, shape_type: "Box" })
+  return SampleBox(points, { ...parameters, shape_type: "Cylinder" })
 }
 
-/** Helper to generate the SDF for a Cylinder primitive. */
-export function CylinderPrimitive(
+/** Helper to generate the SDF for a BoxFrame primitive. */
+export function BoxFramePrimitive(
   points: TypedFunc<FuncType.Vec3f> = POINT_SOURCE,
   parameters: Omit<SampleBox_Parameters, "shape_type">,
 ): TypedFunc<FuncType.Float> {
-  return SampleBox(points, { ...parameters, shape_type: "Cylinder" })
+  return SampleBox(points, { ...parameters, shape_type: "BoxFrame" })
+}
+
+/** Helper to generate the SDF for a Plane primitive. */
+export function PlanePrimitive(
+  points: TypedFunc<FuncType.Vec3f> = POINT_SOURCE,
+  parameters: Omit<SampleBox_Parameters, "shape_type">,
+): TypedFunc<FuncType.Float> {
+  return SampleBox(points, { ...parameters, shape_type: "Plane" })
 }
 
 /** Helper to generate the SDF for a Torus primitive. */
@@ -624,20 +632,12 @@ export function LinkPrimitive(
   return SampleBox(points, { ...parameters, shape_type: "Link" })
 }
 
-/** Helper to generate the SDF for a CappedCone primitive. */
-export function CappedConePrimitive(
-  points: TypedFunc<FuncType.Vec3f> = POINT_SOURCE,
-  parameters: Omit<SampleBox_Parameters, "shape_type">,
-): TypedFunc<FuncType.Float> {
-  return SampleBox(points, { ...parameters, shape_type: "CappedCone" })
-}
-
-/** Helper to generate the SDF for a Ellipsoid primitive. */
-export function EllipsoidPrimitive(
+/** Helper to generate the SDF for a Box primitive. */
+export function BoxPrimitive(
   points: TypedFunc<FuncType.Vec3f> = POINT_SOURCE,
   parameters: Omit<SampleBox_Parameters, "shape_type">,
 ): TypedFunc<FuncType.Float> {
-  return SampleBox(points, { ...parameters, shape_type: "Ellipsoid" })
+  return SampleBox(points, { ...parameters, shape_type: "Box" })
 }
 
 /** Helper to generate the SDF for a Capsule primitive. */
@@ -648,51 +648,51 @@ export function CapsulePrimitive(
   return SampleBox(points, { ...parameters, shape_type: "Capsule" })
 }
 
-/** Helper to generate the SDF for a BoxFrame primitive. */
-export function BoxFramePrimitive(
+/** Helper to generate the SDF for a CappedCone primitive. */
+export function CappedConePrimitive(
   points: TypedFunc<FuncType.Vec3f> = POINT_SOURCE,
   parameters: Omit<SampleBox_Parameters, "shape_type">,
 ): TypedFunc<FuncType.Float> {
-  return SampleBox(points, { ...parameters, shape_type: "BoxFrame" })
+  return SampleBox(points, { ...parameters, shape_type: "CappedCone" })
 }
 
-/** Helper to generate the SDF for a Plane primitive. */
-export function PlanePrimitive(
+/** Helper to generate the SDF for a Ellipsoid primitive. */
+export function EllipsoidPrimitive(
   points: TypedFunc<FuncType.Vec3f> = POINT_SOURCE,
   parameters: Omit<SampleBox_Parameters, "shape_type">,
 ): TypedFunc<FuncType.Float> {
-  return SampleBox(points, { ...parameters, shape_type: "Plane" })
+  return SampleBox(points, { ...parameters, shape_type: "Ellipsoid" })
 }
 
-/** Helper to subtract two SDFs. */
-export function CSGSubtract(
+/** Helper to union two SDFs. */
+export function CSGUnion(
   a: TypedFunc<FuncType.Float>,
   b: TypedFunc<FuncType.Float>,
   smoothing?: number,
 ): TypedFunc<FuncType.Float> {
-  const params: CSG_Parameters = { operation: "Subtract" }
+  const params: CSG_Parameters = { operation: "Union" }
   if (smoothing) { params.smoothing = smoothing }
   return CSG(a, b, params)
 }
 
-/** Helper to union two SDFs. */
-export function CSGUnion(
+/** Helper to intersect two SDFs. */
+export function CSGIntersect(
   a: TypedFunc<FuncType.Float>,
   b: TypedFunc<FuncType.Float>,
   smoothing?: number,
 ): TypedFunc<FuncType.Float> {
-  const params: CSG_Parameters = { operation: "Union" }
+  const params: CSG_Parameters = { operation: "Intersect" }
   if (smoothing) { params.smoothing = smoothing }
   return CSG(a, b, params)
 }
 
-/** Helper to intersect two SDFs. */
-export function CSGIntersect(
+/** Helper to subtract two SDFs. */
+export function CSGSubtract(
   a: TypedFunc<FuncType.Float>,
   b: TypedFunc<FuncType.Float>,
   smoothing?: number,
 ): TypedFunc<FuncType.Float> {
-  const params: CSG_Parameters = { operation: "Intersect" }
+  const params: CSG_Parameters = { operation: "Subtract" }
   if (smoothing) { params.smoothing = smoothing }
   return CSG(a, b, params)
 }