Cargo.lock

@@ -245,6 +245,14 @@ dependencies = [
  "zmij",
 ]
 
+[[package]]
+name = "shape"
+version = "0.1.0"
+dependencies = [
+ "nodarium_macros",
+ "nodarium_utils",
+]
+
 [[package]]
 name = "stem"
 version = "0.1.0"

app/src/lib/graph-interface/graph-state.svelte.ts

@@ -186,15 +186,21 @@ export class GraphState {
     if (!node?.inputs) {
       return 5;
     }
-    const height = 5
-      + 10
-        * Object.keys(node.inputs).filter(
-          (p) =>
-            p !== 'seed'
-            && node?.inputs
-            && !(node?.inputs?.[p] !== undefined && 'setting' in node.inputs[p])
-            && node.inputs[p].hidden !== true
-        ).length;
+    let height = 5;
+
+    for (const key of Object.keys(node.inputs)) {
+      if (key === 'seed') continue;
+      if (!node.inputs) continue;
+      if (node?.inputs?.[key] === undefined) continue;
+      if ('setting' in node.inputs[key]) continue;
+      if (node.inputs[key].hidden) continue;
+      if (node.inputs[key].type === 'shape') {
+        height += 20;
+        continue;
+      }
+      height += 10;
+    }
+
     this.nodeHeightCache[nodeTypeId] = height;
     return height;
   }

app/src/lib/graph-interface/graph/mouse.events.ts

@@ -166,16 +166,15 @@ export class MouseEventManager {
 
     if (this.state.mouseDown) return;
     this.state.edgeEndPosition = null;
+    const target = event.target as HTMLElement;
 
-    if (event.target instanceof HTMLElement) {
     if (
-        event.target.nodeName !== 'CANVAS'
-        && !event.target.classList.contains('node')
-        && !event.target.classList.contains('content')
+      target.nodeName !== 'CANVAS'
+      && !target.classList.contains('node')
+      && !target.classList.contains('content')
     ) {
       return;
     }
-    }
 
     const mx = event.clientX - this.state.rect.x;
     const my = event.clientY - this.state.rect.y;

app/src/lib/graph-interface/node/NodeParameter.svelte

@@ -18,6 +18,7 @@
   const inputType = $derived(node?.state?.type?.inputs?.[id]);
 
   const socketId = $derived(`${node.id}-${id}`);
+  const height = $derived(input.type === 'shape' ? 200 : 100);
 
   const graphState = getGraphState();
   const graphId = graph?.id;
@@ -64,6 +65,7 @@
   class="wrapper"
   data-node-type={node.type}
   data-node-input={id}
+  style:height="{height}px"
   class:possible-socket={graphState?.possibleSocketIds.has(socketId)}
 >
   {#key id && graphId}
@@ -95,8 +97,6 @@
   <svg
     xmlns="http://www.w3.org/2000/svg"
     viewBox="0 0 100 100"
-    width="100"
-    height="100"
     preserveAspectRatio="none"
     style={`
       --path: path("${path}");
@@ -111,7 +111,6 @@
   .wrapper {
     position: relative;
     width: 100%;
-    height: 100px;
     transform: translateY(-0.5px);
   }
 

nodes/max/plantarium/shape/.gitignore

@@ -0,0 +1,6 @@
+/target
+**/*.rs.bk
+Cargo.lock
+bin/
+pkg/
+wasm-pack.log

nodes/max/plantarium/shape/Cargo.toml

@@ -0,0 +1,12 @@
+[package]
+name = "shape"
+version = "0.1.0"
+authors = ["Max Richter <jim-x@web.de>"]
+edition = "2018"
+
+[lib]
+crate-type = ["cdylib", "rlib"]
+
+[dependencies]
+nodarium_macros = { version = "0.1.0", path = "../../../../packages/macros" }
+nodarium_utils = { version = "0.1.0", path = "../../../../packages/utils" }

nodes/max/plantarium/shape/src/input.json

@@ -0,0 +1,26 @@
+{
+  "id": "max/plantarium/shape",
+  "outputs": [
+    "shape"
+  ],
+  "inputs": {
+    "shape": {
+      "type": "shape",
+      "value": [
+        47.8,
+        100,
+        47.8,
+        82.8,
+        30.9,
+        69.1,
+        23.2,
+        40.7,
+        27.1,
+        14.5,
+        42.5,
+        0
+      ],
+      "label": ""
+    }
+  }
+}

nodes/max/plantarium/shape/src/lib.rs

@@ -0,0 +1,13 @@
+use nodarium_macros::nodarium_definition_file;
+use nodarium_macros::nodarium_execute;
+use nodarium_utils::{concat_args, log, split_args};
+
+nodarium_definition_file!("src/input.json");
+
+#[nodarium_execute]
+pub fn execute(input: &[i32]) -> Vec<i32> {
+    let args = split_args(input);
+    log!("vec3 input: {:?}", input);
+    log!("vec3 args: {:?}", args);
+    concat_args(args)
+}

packages/types/src/inputs.ts

@@ -26,7 +26,6 @@ const DefaultOptionsSchema = z.object({
 export const NodeInputFloatSchema = z.object({
   ...DefaultOptionsSchema.shape,
   type: z.literal('float'),
-  element: z.literal('slider').optional(),
   value: z.number().optional(),
   min: z.number().optional(),
   max: z.number().optional(),
@@ -36,12 +35,17 @@ export const NodeInputFloatSchema = z.object({
 export const NodeInputIntegerSchema = z.object({
   ...DefaultOptionsSchema.shape,
   type: z.literal('integer'),
-  element: z.literal('slider').optional(),
   value: z.number().optional(),
   min: z.number().optional(),
   max: z.number().optional()
 });
 
+export const NodeInputShapeSchema = z.object({
+  ...DefaultOptionsSchema.shape,
+  type: z.literal('shape'),
+  value: z.array(z.number()).optional()
+});
+
 export const NodeInputBooleanSchema = z.object({
   ...DefaultOptionsSchema.shape,
   type: z.literal('boolean'),
@@ -84,6 +88,7 @@ export const NodeInputSchema = z.union([
   NodeInputBooleanSchema,
   NodeInputFloatSchema,
   NodeInputIntegerSchema,
+  NodeInputShapeSchema,
   NodeInputSelectSchema,
   NodeInputSeedSchema,
   NodeInputVec3Schema,

packages/types/src/lib.rs

@@ -103,6 +103,15 @@ pub struct NodeInputVec3 {
     pub value: Option<Vec<f64>>,
 }
 
+#[derive(Serialize, Deserialize)]
+pub struct NodeInputShape {
+    #[serde(flatten)]
+    pub default_options: DefaultOptions,
+
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub value: Option<Vec<f64>>,
+}
+
 #[derive(Serialize, Deserialize)]
 pub struct NodeInputGeometry {
     #[serde(flatten)]
@@ -125,6 +134,7 @@ pub enum NodeInput {
     select(NodeInputSelect),
     seed(NodeInputSeed),
     vec3(NodeInputVec3),
+    shape(NodeInputShape),
     geometry(NodeInputGeometry),
     path(NodeInputPath),
 }

packages/ui/src/lib/Input.svelte

@@ -1,7 +1,7 @@
 <script lang="ts">
   import type { NodeInput } from '@nodarium/types';
 
-  import { InputCheckbox, InputNumber, InputSelect, InputVec3 } from './index';
+  import { InputCheckbox, InputNumber, InputSelect, InputShape, InputVec3 } from './index';
 
   interface Props {
     input: NodeInput;
@@ -19,6 +19,8 @@
     max={input?.max}
     step={input?.step}
   />
+{:else if input.type === 'shape'}
+  <InputShape bind:value={value as number[]} />
 {:else if input.type === 'integer'}
   <InputNumber bind:value={value as number} min={input?.min} max={input?.max} step={1} />
 {:else if input.type === 'boolean'}

packages/ui/src/lib/inputs/InputSelect.svelte

@@ -18,7 +18,7 @@
   select {
     font-family: var(--font-family);
     outline: solid 1px var(--color-outline);
-    padding: 0.8em 1em;
+    padding: 0.5em 0.8em;
     border-radius: 5px;
     border: none;
   }

packages/ui/src/lib/inputs/InputShape.svelte

@@ -1,28 +1,26 @@
 <script lang="ts">
-  type Vec2 = [
-    number,
-    number
-  ];
-
-  let mouseDown = $state<Vec2>();
-  let activeCircle = $state<number>();
-  let downCirclePosition = $state<Vec2>();
+  let mouseDown = $state<number[]>();
+  let draggingIndex = $state<number>();
+  let downCirclePosition = $state<number[]>();
   let svgElement = $state<SVGElement>(null!);
   let svgRect = $state<DOMRect>(null!);
 
   type Props = {
-    points: Vec2[];
+    value: number[];
     mirror?: boolean;
   };
 
-  function defaultPoints(): Vec2[] {
-    return [
-      [0, 0],
-      [10, 10]
-    ];
+  function defaultPoints(): number[] {
+    return [47.8, 100, 47.8, 82.8, 30.9, 69.1, 23.2, 40.7, 27.1, 14.5, 42.5, 0];
   }
 
-  let { points = $bindable(), mirror = true }: Props = $props();
+  let { value: points = $bindable(), mirror = true }: Props = $props();
+
+  const getPt = (pts: number[], i: number) => [pts[i * 2], pts[i * 2 + 1]] as [number, number];
+  const setPt = (pts: number[], i: number, x: number, y: number) => {
+    pts[i * 2] = x;
+    pts[i * 2 + 1] = y;
+  };
 
   $effect(() => {
     if (!points.length) {
@@ -30,57 +28,42 @@
     }
   });
 
-  function mirrorPoints(pts: Vec2[]) {
-    const _pts: Vec2[] = [];
-
-    for (const pt of pts) {
-      _pts.push([
-        100 - pt[0],
-        pt[1]
-      ]);
+  function mirrorPoints(pts: number[]) {
+    const res: number[] = [];
+    for (let i = 0; i < pts.length; i += 2) {
+      res.push(100 - pts[i], pts[i + 1]);
+    }
+    return res;
   }
 
-    return _pts;
-  }
+  function calculatePath(pts: number[], mirror = false): string {
+    if (pts.length === 0) return '';
 
-  $effect(() => {
-    const pts = $state.snapshot(points)
-      .map((p, i) => [...p, i])
-      .sort((a, b) => {
-        if (a[1] !== b[1]) return b[1] - a[1];
-        return a[0] - b[0];
-      })
-      .map((p, i) => [...p, i]);
-
-    let diff = pts.find((p, i) => p[0] !== points[i][0] || p[1] !== points[i][1]);
-    if (diff) {
-      points = pts.map(p => [p[0], p[1]]);
-      const newActiveCircle = pts.find(p => p[2] === activeCircle);
-      if (newActiveCircle) {
-        activeCircle = newActiveCircle[3];
-      }
+    const arr = [...pts];
+    if (mirror) {
+      const sorted = [];
+      for (let i = 0; i < arr.length; i += 2) {
+        sorted.push({ x: arr[i], y: arr[i + 1], idx: i });
       }
+      sorted.sort((a, b) => {
+        if (a.y !== b.y) return b.y - a.y;
+        return a.x - b.x;
       });
-
-  function calculatePath(points: Vec2[], mirror = false): string {
-    if (points.length === 0) return '';
-
-    const pts = $state.snapshot(points);
-    if (mirror) {
-      pts.sort((a, b) => (a[1] > b[1] ? -1 : 1));
+      for (let i = 0; i < sorted.length; i++) {
+        arr[i * 2] = sorted[i].x;
+        arr[i * 2 + 1] = sorted[i].y;
+      }
     }
 
-    let d = `M ${pts[0][0]} ${pts[0][1]}`;
-
-    for (let i = 1; i < pts.length; i++) {
-      d += ` L ${pts[i][0]} ${pts[i][1]}`;
+    let d = `M ${arr[0]} ${arr[1]}`;
+    for (let i = 2; i < arr.length; i += 2) {
+      d += ` L ${arr[i]} ${arr[i + 1]}`;
     }
 
     if (mirror) {
-      for (let i = pts.length - 1; i >= 0; i--) {
-        const p = pts[i];
-        const x = mirror ? 100 - p[0] : p[0];
-        d += ` L ${x} ${p[1]}`;
+      for (let i = arr.length - 2; i >= 0; i -= 2) {
+        const x = 100 - arr[i];
+        d += ` L ${x} ${arr[i + 1]}`;
       }
       d += ' Z';
     }
@@ -92,7 +75,7 @@
   const round = (v: number) => Math.floor(v * 10) / 10;
 
   function handleMouseMove(ev: MouseEvent) {
-    if (mouseDown === undefined || activeCircle === undefined || !downCirclePosition) return;
+    if (mouseDown === undefined || draggingIndex === undefined || !downCirclePosition) return;
 
     let vx = (mouseDown[0] - ev.clientX) * (100 / svgRect.width);
     let vy = (mouseDown[1] - ev.clientY) * (100 / svgRect.height);
@@ -103,45 +86,43 @@
     x = clamp(x, 0, mirror ? 50 : 100);
     y = clamp(y, 0, 100);
 
-    points[activeCircle][0] = round(x);
-    points[activeCircle][1] = round(y);
+    setPt(points, draggingIndex, round(x), round(y));
   }
 
-  function clientToSvg(ev: MouseEvent): Vec2 {
+  function clientToSvg(ev: MouseEvent): [number, number] {
     svgRect = svgElement.getBoundingClientRect();
 
     const x = ((ev.clientX - svgRect.left) / svgRect.width) * 100;
     const y = ((ev.clientY - svgRect.top) / svgRect.height) * 100;
 
-    return [
-      round(clamp(x, 0, mirror ? 50 : 100)),
-      round(clamp(y, 0, 100))
-    ];
+    return [round(clamp(x, 0, mirror ? 50 : 100)), round(clamp(y, 0, 100))];
   }
 
-  function dist(a: Vec2, b: Vec2) {
+  function dist(a: [number, number], b: [number, number]) {
     return Math.hypot(a[0] - b[0], a[1] - b[1]);
   }
 
-  function insertBetween(newPt: Vec2) {
-    if (points.length < 2) {
-      points = [...points, newPt];
+  function insertBetween(newPt: [number, number]) {
+    const count = points.length / 2;
+    if (count < 2) {
+      points = [...points, newPt[0], newPt[1]];
       return;
     }
 
     let minDist = Infinity;
     let insertIdx = 0;
 
-    for (let i = 0; i < points.length - 1; i++) {
-      const d = dist(newPt, points[i]) + dist(newPt, points[i + 1])
-        - dist(points[i], points[i + 1]);
+    for (let i = 0; i < count - 1; i++) {
+      const a = getPt(points, i);
+      const b = getPt(points, i + 1);
+      const d = dist(newPt, a) + dist(newPt, b) - dist(a, b);
       if (d < minDist) {
         minDist = d;
         insertIdx = i + 1;
       }
     }
 
-    points.splice(insertIdx, 0, newPt);
+    points.splice(insertIdx * 2, 0, newPt[0], newPt[1]);
   }
 
   function handleMouseDown(ev: MouseEvent) {
@@ -154,28 +135,34 @@
     const index = target.dataset?.index;
 
     if (index !== undefined) {
-      activeCircle = parseInt(index);
-      downCirclePosition = [...points[activeCircle]];
+      draggingIndex = parseInt(index);
+      downCirclePosition = [...getPt(points, draggingIndex)];
     } else {
       const pt = clientToSvg(ev);
       if (mirror && pt[0] > 50) return;
       insertBetween(pt);
-      activeCircle = points.findIndex(p => p[0] === pt[0] && p[1] === pt[1]);
+      const count = points.length / 2;
+      draggingIndex = count - 1;
       downCirclePosition = [...pt];
     }
   }
 
-  function handleMouseUp() {
+  function handleMouseUp(ev: MouseEvent) {
     mouseDown = undefined;
+    if ((ev.target as HTMLElement).dataset?.index === undefined) {
+      draggingIndex = undefined;
+    }
+    console.log('MouseUp', ev.target);
   }
 
   function handleKeyDown(ev: KeyboardEvent) {
-    if (activeCircle === undefined) return;
+    if (draggingIndex === undefined) return;
     if (ev.key === 'Delete' || ev.key === 'Backspace') {
-      const pts = [...points];
-      pts.splice(activeCircle, 1);
-      points = pts;
-      activeCircle = undefined;
+      ev.preventDefault();
+      ev.stopImmediatePropagation();
+      points.splice(draggingIndex * 2, 2);
+      points = [...points];
+      draggingIndex = undefined;
     }
   }
 </script>
@@ -195,24 +182,30 @@
     <path d={calculatePath(points, mirror)} style:fill="var(--color-layer-3)" style:opacity={0.5} />
     <path d={calculatePath(points, mirror)} fill="none" stroke="var(--color-layer-2)" />
     {#if mirror}
-      {#each mirrorPoints(points) as point, i (i + '-' + point[0] + '-' + point[1])}
+      <!-- eslint-disable-next-line @typescript-eslint/no-unused-vars -->
+      {#each Array(points.length / 2) as _, i (i)}
+        {@const x = mirrorPoints(points)[i * 2]}
+        {@const y = mirrorPoints(points)[i * 2 + 1]}
         <circle
           class="disabled"
-          cx={point[0]}
-          cy={point[1]}
+          cx={x}
+          cy={y}
           r={2}
         >
         </circle>
       {/each}
     {/if}
 
-    {#each points as point, i (i + '-' + point[0] + '-' + point[1])}
+    <!-- eslint-disable-next-line @typescript-eslint/no-unused-vars -->
+    {#each Array(points.length / 2) as _, i (i)}
+      {@const x = points[i * 2]}
+      {@const y = points[i * 2 + 1]}
       <circle
-        class:active={activeCircle === i}
+        class:active={draggingIndex === i}
         class="interactive"
         data-index={i}
-        cx={point[0]}
-        cy={point[1]}
+        cx={x}
+        cy={y}
         r={2}
       >
       </circle>
@@ -229,6 +222,7 @@
   svg {
     height: 100%;
     width: 100%;
+    overflow: visible;
   }
 
   circle {

packages/ui/src/routes/+page.svelte

@@ -108,7 +108,7 @@
       </label>
       <p>{JSON.stringify(points)}</p>
     {/snippet}
-    <InputShape bind:points={points} mirror={mirrorShape} />
+    <InputShape bind:value={points} mirror={mirrorShape} />
   </Section>
 
   <Section title="Details" value={detailsOpen}>