31 Commits

Author SHA1 Message Date
f16ba2601f fix(ci): still trying to get gpg to work
All checks were successful
🚀 Lint & Test & Deploy / release (push) Successful in 3m54s
2026-02-13 02:43:02 +01:00
cc6b832f15 fix(ci): trying to get gpg to work
Some checks failed
🚀 Lint & Test & Deploy / release (push) Failing after 3m22s
2026-02-13 02:25:11 +01:00
dd5fd5bf17 fix(ci): better add updates to package.json
Some checks failed
🚀 Lint & Test & Deploy / release (push) Failing after 4m0s
2026-02-13 02:10:34 +01:00
38d0fffcf4 chore: update ci image
Some checks failed
🚀 Lint & Test & Deploy / release (push) Failing after 3m48s
2026-02-13 01:58:16 +01:00
bce06da456 ci: add gpg-agent to ci image
Some checks failed
Build & Push CI Image / build-and-push (push) Successful in 8m43s
🚀 Lint & Test & Deploy / release (push) Has been cancelled
2026-02-13 01:47:32 +01:00
af585d56ec feat: use new ci image with gpg
Some checks failed
🚀 Lint & Test & Deploy / release (push) Failing after 3m45s
2026-02-13 01:24:19 +01:00
0aa73a27c1 feat: install gpg in ci image
Some checks failed
Build & Push CI Image / build-and-push (push) Successful in 10m7s
🚀 Lint & Test & Deploy / release (push) Has been cancelled
2026-02-13 01:13:01 +01:00
c1ae70282c feat: add color to sockets
Some checks failed
🚀 Lint & Test & Deploy / release (push) Failing after 3m5s
Closes #34
2026-02-13 00:57:28 +01:00
4c7b03dfb8 feat: add gradient mesh line 2026-02-13 00:51:21 +01:00
144e8cc797 fix: correctly highlight possible outputs 2026-02-12 23:38:44 +01:00
12ff9c1518 Merge pull request 'feat/debug-node' (#41) from feat/debug-node into main
All checks were successful
🚀 Lint & Test & Deploy / release (push) Successful in 3m58s
Reviewed-on: #41
2026-02-12 23:20:58 +01:00
8d3ffe84ab Merge branch 'main' into feat/debug-node
All checks were successful
🚀 Lint & Test & Deploy / release (pull_request) Successful in 3m54s
2026-02-12 23:05:09 +01:00
95ec93eead feat: better handle ctrl+shift clicks and selections
All checks were successful
🚀 Lint & Test & Deploy / release (pull_request) Successful in 3m45s
2026-02-12 22:46:50 +01:00
d39185efaf feat: add "pnpm qa" command to check before commit
All checks were successful
🚀 Lint & Test & Deploy / release (pull_request) Successful in 3m52s
2026-02-12 22:33:37 +01:00
81580ccd8c fix: cleanup some type errors 2026-02-12 22:33:25 +01:00
bf6f632d27 feat: add shortcut to quick connect to debug
Some checks failed
🚀 Lint & Test & Deploy / release (pull_request) Failing after 1m22s
2026-02-12 22:27:11 +01:00
release-bot
e098be6013 fix: also execute all nodes before debug node
All checks were successful
🚀 Lint & Test & Deploy / release (pull_request) Successful in 3m56s
2026-02-12 21:57:33 +01:00
release-bot
ec13850e1c fix: make debug node work with runtime 2026-02-12 21:42:44 +01:00
release-bot
15e08a8163 feat: implement debug node
All checks were successful
🚀 Lint & Test & Deploy / release (pull_request) Successful in 3m53s
Closes #39
2026-02-12 21:33:47 +01:00
release-bot
48cee58ad3 chore: update test snapshots
All checks were successful
🚀 Lint & Test & Deploy / release (pull_request) Successful in 4m8s
2026-02-12 18:26:13 +01:00
release-bot
3235cae904 chore: fix lint and typecheck errors
Some checks failed
🚀 Lint & Test & Deploy / release (pull_request) Failing after 3m15s
2026-02-12 18:19:27 +01:00
release-bot
3f440728fc feat: implement variable height for node shader
Some checks failed
🚀 Lint & Test & Deploy / release (pull_request) Failing after 1m3s
2026-02-12 18:11:14 +01:00
release-bot
da09f8ba1e refactor: move debug node into runtime 2026-02-12 16:18:29 +01:00
release-bot
ddc3b4ce35 feat: allow variable height node parameters 2026-02-12 16:18:12 +01:00
release-bot
2690fc8712 chore: gitignore pnpm-store
All checks were successful
🚀 Lint & Test & Deploy / release (push) Successful in 4m6s
2026-02-12 15:42:38 +01:00
release-bot
072ab9063b feat: add initial debug node 2026-02-12 14:00:18 +01:00
release-bot
e23cad254d feat: add "*" datatype for inputs for debug node 2026-02-12 14:00:06 +01:00
release-bot
5b5c63c1a9 fix(ui): make arrows on inputnumber visible on lighttheme 2026-02-12 13:31:34 +01:00
release-bot
c9021f2383 refactor: merge all dev settings into one setting 2026-02-12 13:10:14 +01:00
9eecdd4fb8 Merge pull request 'feat: merge localState recursively with initial' (#38) from feat/debug-node into main
All checks were successful
🚀 Lint & Test & Deploy / release (push) Successful in 3m50s
Reviewed-on: #38
2026-02-12 12:51:28 +01:00
release-bot
7e71a41e52 feat: merge localState recursively with initial
All checks were successful
🚀 Lint & Test & Deploy / release (pull_request) Successful in 4m0s
Closes #17
2026-02-12 12:50:58 +01:00
43 changed files with 1030 additions and 387 deletions

View File

@@ -75,18 +75,22 @@ pnpm exec dprint fmt CHANGELOG.md
# ------------------------------------------------------------------- # -------------------------------------------------------------------
# 5. Setup GPG signing # 5. Setup GPG signing
# ------------------------------------------------------------------- # -------------------------------------------------------------------
echo "$BOT_PGP_PRIVATE_KEY" | base64 -d | gpg --batch --import -- echo "$BOT_PGP_PRIVATE_KEY" | base64 -d | gpg --batch --import
GPG_KEY_ID=$(gpg --list-secret-keys --keyid-format LONG nodarium-bot@max-richter.dev 2>/dev/null | grep sec | head -n1 | sed 's/.*\///' | tr -d ' ') GPG_KEY_ID=$(gpg --list-secret-keys --keyid-format LONG | grep sec | awk '{print $2}' | cut -d'/' -f2)
export GPG_TTY=$(tty)
echo "allow-loopback-pinentry" >>~/.gnupg/gpg-agent.conf
gpg-connect-agent reloadagent /bye
git config user.name "nodarium-bot" git config user.name "nodarium-bot"
git config user.email "nodarium-bot@max-richter.dev" git config user.email "nodarium-bot@max-richter.dev"
git config user.signingkey "$GPG_KEY_ID" git config --global user.signingkey "$GPG_KEY_ID"
git config commit.gpgsign true git config --global commit.gpgsign true
# ------------------------------------------------------------------- # -------------------------------------------------------------------
# 6. Create release commit # 6. Create release commit
# ------------------------------------------------------------------- # -------------------------------------------------------------------
git add CHANGELOG.md $(find . -name package.json ! -path "*/node_modules/*") git add CHANGELOG.md $(git ls-files '**/package.json')
if git diff --cached --quiet; then if git diff --cached --quiet; then
echo "No changes to commit for release $TAG" echo "No changes to commit for release $TAG"

View File

@@ -15,7 +15,7 @@ env:
jobs: jobs:
release: release:
runs-on: ubuntu-latest runs-on: ubuntu-latest
container: git.max-richter.dev/max/nodarium-ci:fd7268d6208aede435e1685817ae6b271c68bd83 container: git.max-richter.dev/max/nodarium-ci:bce06da456e3c008851ac006033cfff256015a47
steps: steps:
- name: 📑 Checkout Code - name: 📑 Checkout Code

2
.gitignore vendored
View File

@@ -5,3 +5,5 @@ node_modules/
/target /target
.direnv/ .direnv/
.pnpm-store/

View File

@@ -1,106 +0,0 @@
{
"name": "chokidar-cli",
"description": "Ultra-fast cross-platform command line utility to watch file system changes.",
"version": "0.0.4",
"keywords": [
"fs",
"watch",
"watchFile",
"watcher",
"watching",
"file",
"fsevents",
"chokidar",
"cli",
"command",
"shell",
"bash"
],
"bin": {
"chokidar": "index.js"
},
"homepage": "https://github.com/open-cli-tools/chokidar-cli",
"author": "Kimmo Brunfeldt <kimmobrunfeldt@gmail.com>",
"repository": {
"type": "git",
"url": "https://github.com/open-cli-tools/chokidar-cli.git"
},
"bugs": {
"url": "http://github.com/open-cli-tools/chokidar-cli/issues"
},
"license": "MIT",
"dependencies": {
"chokidar": "^3.5.2",
"lodash.debounce": "^4.0.8",
"lodash.throttle": "^4.1.1",
"yargs": "^18.0.0"
},
"devDependencies": {
"eslint": "^8.57.1",
"mocha": "^11.7.2"
},
"scripts": {
"lint": "eslint --report-unused-disable-directives --ignore-path .gitignore .",
"mocha": "mocha",
"test": "npm run lint && npm run mocha"
},
"engines": {
"node": ">= 20.0.0"
},
"files": [
"*.js"
],
"eslintConfig": {
"extends": "eslint:recommended",
"parserOptions": {
"ecmaVersion": 9,
"sourceType": "script"
},
"env": {
"node": true,
"es6": true
},
"rules": {
"array-callback-return": "error",
"indent": [
"error",
4
],
"no-empty": [
"error",
{
"allowEmptyCatch": true
}
],
"object-shorthand": "error",
"prefer-arrow-callback": [
"error",
{
"allowNamedFunctions": true
}
],
"prefer-const": [
"error",
{
"ignoreReadBeforeAssign": true
}
],
"prefer-destructuring": [
"error",
{
"object": true,
"array": false
}
],
"prefer-spread": "error",
"prefer-template": "error",
"radix": "error",
"strict": "error",
"quotes": [
"error",
"single"
],
"no-var": "error"
}
}
}

View File

@@ -6,6 +6,8 @@ ENV RUSTUP_HOME=/usr/local/rustup \
RUN apt-get update && apt-get install -y \ RUN apt-get update && apt-get install -y \
ca-certificates=20230311+deb12u1 \ ca-certificates=20230311+deb12u1 \
gpg=2.2.40-1.1+deb12u2 \
gpg-agent=2.2.40-1.1+deb12u2 \
curl=7.88.1-10+deb12u14 \ curl=7.88.1-10+deb12u14 \
git=1:2.39.5-0+deb12u3 \ git=1:2.39.5-0+deb12u3 \
jq=1.6-2.1+deb12u1 \ jq=1.6-2.1+deb12u1 \

Binary file not shown.

Before

Width:  |  Height:  |  Size: 42 KiB

After

Width:  |  Height:  |  Size: 43 KiB

View File

@@ -6,15 +6,12 @@
toneMapped: false toneMapped: false
}); });
let lineColor = $state(colors.outline.clone().convertSRGBToLinear());
$effect.root(() => { $effect.root(() => {
$effect(() => { $effect(() => {
if (appSettings.value.theme === undefined) { if (appSettings.value.theme === undefined) {
return; return;
} }
circleMaterial.color = colors.outline.clone().convertSRGBToLinear(); circleMaterial.color = colors.outline.clone().convertSRGBToLinear();
lineColor = colors.outline.clone().convertSRGBToLinear();
}); });
}); });
@@ -35,6 +32,7 @@
import { CubicBezierCurve } from 'three/src/extras/curves/CubicBezierCurve.js'; import { CubicBezierCurve } from 'three/src/extras/curves/CubicBezierCurve.js';
import { Vector2 } from 'three/src/math/Vector2.js'; import { Vector2 } from 'three/src/math/Vector2.js';
import { getGraphState } from '../graph-state.svelte'; import { getGraphState } from '../graph-state.svelte';
import MeshGradientLineMaterial from './MeshGradientLine/MeshGradientLineMaterial.svelte';
const graphState = getGraphState(); const graphState = getGraphState();
@@ -45,12 +43,17 @@
y2: number; y2: number;
z: number; z: number;
id?: string; id?: string;
inputType?: string;
outputType?: string;
}; };
const { x1, y1, x2, y2, z, id }: Props = $props(); const { x1, y1, x2, y2, z, inputType = 'unknown', outputType = 'unknown', id }: Props = $props();
const thickness = $derived(Math.max(0.001, 0.00082 * Math.exp(0.055 * z))); const thickness = $derived(Math.max(0.001, 0.00082 * Math.exp(0.055 * z)));
const inputColor = $derived(graphState.colors.getColor(inputType));
const outputColor = $derived(graphState.colors.getColor(outputType));
let points = $state<Vector3[]>([]); let points = $state<Vector3[]>([]);
let lastId: string | null = null; let lastId: string | null = null;
@@ -106,9 +109,9 @@
position.z={y1} position.z={y1}
position.y={0.8} position.y={0.8}
rotation.x={-Math.PI / 2} rotation.x={-Math.PI / 2}
material={circleMaterial}
> >
<T.CircleGeometry args={[0.5, 16]} /> <T.CircleGeometry args={[0.5, 16]} />
<T.MeshBasicMaterial color={inputColor} toneMapped={false} />
</T.Mesh> </T.Mesh>
<T.Mesh <T.Mesh
@@ -119,6 +122,7 @@
material={circleMaterial} material={circleMaterial}
> >
<T.CircleGeometry args={[0.5, 16]} /> <T.CircleGeometry args={[0.5, 16]} />
<T.MeshBasicMaterial color={outputColor} toneMapped={false} />
</T.Mesh> </T.Mesh>
{#if graphState.hoveredEdgeId === id} {#if graphState.hoveredEdgeId === id}
@@ -126,7 +130,8 @@
<MeshLineGeometry {points} /> <MeshLineGeometry {points} />
<MeshLineMaterial <MeshLineMaterial
width={thickness * 5} width={thickness * 5}
color={lineColor} color={inputColor}
tonemapped={false}
opacity={0.5} opacity={0.5}
transparent transparent
/> />
@@ -135,5 +140,10 @@
<T.Mesh position.x={x1} position.z={y1} position.y={0.1}> <T.Mesh position.x={x1} position.z={y1} position.y={0.1}>
<MeshLineGeometry {points} /> <MeshLineGeometry {points} />
<MeshLineMaterial width={thickness} color={lineColor} /> <MeshGradientLineMaterial
width={thickness}
colorStart={inputColor}
colorEnd={outputColor}
tonemapped={false}
/>
</T.Mesh> </T.Mesh>

View File

@@ -0,0 +1,112 @@
<script lang="ts">
import { T, useThrelte } from '@threlte/core';
import { Color, ShaderMaterial, Vector2 } from 'three';
import fragmentShader from './fragment.frag';
import type { MeshLineMaterialProps } from './types';
import vertexShader from './vertex.vert';
let {
opacity = 1,
colorStart = '#ffffff',
colorEnd = '#ffffff',
dashOffset = 0,
dashArray = 0,
dashRatio = 0,
attenuate = true,
width = 1,
scaleDown = 0,
alphaMap,
ref = $bindable(),
children,
...props
}: MeshLineMaterialProps = $props();
let { invalidate, size } = useThrelte();
// svelte-ignore state_referenced_locally
const uniforms = {
lineWidth: { value: width },
colorStart: { value: new Color(colorStart) },
colorEnd: { value: new Color(colorEnd) },
opacity: { value: opacity },
resolution: { value: new Vector2(1, 1) },
sizeAttenuation: { value: attenuate ? 1 : 0 },
dashArray: { value: dashArray },
useDash: { value: dashArray > 0 ? 1 : 0 },
dashOffset: { value: dashOffset },
dashRatio: { value: dashRatio },
scaleDown: { value: scaleDown / 10 },
alphaTest: { value: 0 },
alphaMap: { value: alphaMap },
useAlphaMap: { value: alphaMap ? 1 : 0 }
};
const material = new ShaderMaterial({ uniforms });
$effect.pre(() => {
uniforms.lineWidth.value = width;
invalidate();
});
$effect.pre(() => {
uniforms.opacity.value = opacity;
invalidate();
});
$effect.pre(() => {
uniforms.resolution.value.set($size.width, $size.height);
invalidate();
});
$effect.pre(() => {
uniforms.sizeAttenuation.value = attenuate ? 1 : 0;
invalidate();
});
$effect.pre(() => {
uniforms.dashArray.value = dashArray;
uniforms.useDash.value = dashArray > 0 ? 1 : 0;
invalidate();
});
$effect.pre(() => {
uniforms.dashOffset.value = dashOffset;
invalidate();
});
$effect.pre(() => {
uniforms.dashRatio.value = dashRatio;
invalidate();
});
$effect.pre(() => {
uniforms.scaleDown.value = scaleDown / 10;
invalidate();
});
$effect.pre(() => {
uniforms.alphaMap.value = alphaMap;
uniforms.useAlphaMap.value = alphaMap ? 1 : 0;
invalidate();
});
$effect.pre(() => {
uniforms.colorStart.value.set(colorStart);
invalidate();
});
$effect.pre(() => {
uniforms.colorEnd.value.set(colorEnd);
invalidate();
});
</script>
<T
is={material}
bind:ref
{fragmentShader}
{vertexShader}
{...props}
>
{@render children?.({ ref: material })}
</T>

View File

@@ -0,0 +1,30 @@
uniform vec3 colorStart;
uniform vec3 colorEnd;
uniform float useDash;
uniform float dashArray;
uniform float dashOffset;
uniform float dashRatio;
uniform sampler2D alphaMap;
uniform float useAlphaMap;
varying vec2 vUV;
varying vec4 vColor;
varying float vCounters;
vec4 CustomLinearTosRGB( in vec4 value ) {
return vec4( mix( pow( value.rgb, vec3( 0.41666 ) ) * 1.055 - vec3( 0.055 ), value.rgb * 12.92, vec3( lessThanEqual( value.rgb, vec3( 0.0031308 ) ) ) ), value.a );
}
void main() {
vec4 c = mix(vec4(colorStart,1.0),vec4(colorEnd, 1.0), vCounters);
if( useAlphaMap == 1. ) c.a *= texture2D( alphaMap, vUV ).r;
if( useDash == 1. ){
c.a *= ceil(mod(vCounters + dashOffset, dashArray) - (dashArray * dashRatio));
}
gl_FragColor = CustomLinearTosRGB(c);
}

View File

@@ -0,0 +1,68 @@
import type { Props } from '@threlte/core';
import type { BufferGeometry, Vector3 } from 'three';
import type { ColorRepresentation, ShaderMaterial, Texture } from 'three';
export type MeshLineGeometryProps = Props<BufferGeometry> & {
/**
* @default []
*/
points: Vector3[];
/**
* @default 'none'
*/
shape?: 'none' | 'taper' | 'custom';
/**
* @default () => 1
*/
shapeFunction?: (p: number) => number;
};
export type MeshLineMaterialProps =
& Omit<
Props<ShaderMaterial>,
'uniforms' | 'fragmentShader' | 'vertexShader'
>
& {
/**
* @default 1
*/
opacity?: number;
/**
* @default '#ffffff'
*/
color?: ColorRepresentation;
/**
* @default 0
*/
dashOffset?: number;
/**
* @default 0
*/
dashArray?: number;
/**
* @default 0
*/
dashRatio?: number;
/**
* @default true
*/
attenuate?: boolean;
/**
* @default 1
*/
width?: number;
/**
* @default 0
*/
scaleDown?: number;
alphaMap?: Texture | undefined;
};

View File

@@ -0,0 +1,83 @@
attribute vec3 previous;
attribute vec3 next;
attribute float side;
attribute float width;
attribute float counters;
uniform vec2 resolution;
uniform float lineWidth;
uniform vec3 color;
uniform float opacity;
uniform float sizeAttenuation;
uniform float scaleDown;
varying vec2 vUV;
varying vec4 vColor;
varying float vCounters;
vec2 intoScreen(vec4 i) {
return resolution * (0.5 * i.xy / i.w + 0.5);
}
void main() {
float aspect = resolution.y / resolution.x;
mat4 m = projectionMatrix * modelViewMatrix;
vec4 currentClip = m * vec4( position, 1.0 );
vec4 prevClip = m * vec4( previous, 1.0 );
vec4 nextClip = m * vec4( next, 1.0 );
vec4 currentNormed = currentClip / currentClip.w;
vec4 prevNormed = prevClip / prevClip.w;
vec4 nextNormed = nextClip / nextClip.w;
vec2 currentScreen = intoScreen(currentNormed);
vec2 prevScreen = intoScreen(prevNormed);
vec2 nextScreen = intoScreen(nextNormed);
float actualWidth = lineWidth * width;
vec2 dir;
if(nextScreen == currentScreen) {
dir = normalize( currentScreen - prevScreen );
} else if(prevScreen == currentScreen) {
dir = normalize( nextScreen - currentScreen );
} else {
vec2 inDir = currentScreen - prevScreen;
vec2 outDir = nextScreen - currentScreen;
vec2 fullDir = nextScreen - prevScreen;
if(length(fullDir) > 0.0) {
dir = normalize(fullDir);
} else if(length(inDir) > 0.0){
dir = normalize(inDir);
} else {
dir = normalize(outDir);
}
}
vec2 normal = vec2(-dir.y, dir.x);
if(sizeAttenuation != 0.0) {
normal /= currentClip.w;
normal *= min(resolution.x, resolution.y);
}
if (scaleDown > 0.0) {
float dist = length(nextNormed - prevNormed);
normal *= smoothstep(0.0, scaleDown, dist);
}
vec2 offsetInScreen = actualWidth * normal * side * 0.5;
vec2 withOffsetScreen = currentScreen + offsetInScreen;
vec3 withOffsetNormed = vec3((2.0 * withOffsetScreen/resolution - 1.0), currentNormed.z);
vCounters = counters;
vColor = vec4( color, opacity );
vUV = uv;
gl_Position = currentClip.w * vec4(withOffsetNormed, 1.0);
}

View File

@@ -29,8 +29,9 @@ function areSocketsCompatible(
output: string | undefined, output: string | undefined,
inputs: string | (string | undefined)[] | undefined inputs: string | (string | undefined)[] | undefined
) { ) {
if (output === '*') return true;
if (Array.isArray(inputs) && output) { if (Array.isArray(inputs) && output) {
return inputs.includes(output); return inputs.includes('*') || inputs.includes(output);
} }
return inputs === output; return inputs === output;
} }

View File

@@ -3,6 +3,8 @@ import { getContext, setContext } from 'svelte';
import { SvelteMap, SvelteSet } from 'svelte/reactivity'; import { SvelteMap, SvelteSet } from 'svelte/reactivity';
import type { OrthographicCamera, Vector3 } from 'three'; import type { OrthographicCamera, Vector3 } from 'three';
import type { GraphManager } from './graph-manager.svelte'; import type { GraphManager } from './graph-manager.svelte';
import { ColorGenerator } from './graph/colors';
import { getNodeHeight, getSocketPosition } from './helpers/nodeHelpers';
const graphStateKey = Symbol('graph-state'); const graphStateKey = Symbol('graph-state');
export function getGraphState() { export function getGraphState() {
@@ -27,7 +29,32 @@ type EdgeData = {
points: Vector3[]; points: Vector3[];
}; };
const predefinedColors = {
path: {
hue: 80,
lightness: 20,
saturation: 80
},
float: {
hue: 70,
lightness: 10,
saturation: 0
},
geometry: {
hue: 0,
lightness: 50,
saturation: 70
},
'*': {
hue: 200,
lightness: 20,
saturation: 100
}
} as const;
export class GraphState { export class GraphState {
colors = new ColorGenerator(predefinedColors);
constructor(private graph: GraphManager) { constructor(private graph: GraphManager) {
$effect.root(() => { $effect.root(() => {
$effect(() => { $effect(() => {
@@ -159,54 +186,27 @@ export class GraphState {
return 1; return 1;
} }
getSocketPosition( tryConnectToDebugNode(nodeId: number) {
node: NodeInstance, const node = this.graph.nodes.get(nodeId);
index: string | number if (!node) return;
): [number, number] { if (node.type.endsWith('/debug')) return;
if (typeof index === 'number') { if (!node.state.type?.outputs?.length) return;
return [ for (const _node of this.graph.nodes.values()) {
(node?.state?.x ?? node.position[0]) + 20, if (_node.type.endsWith('/debug')) {
(node?.state?.y ?? node.position[1]) + 2.5 + 10 * index this.graph.createEdge(node, 0, _node, 'input');
]; return;
} else {
const _index = Object.keys(node.state?.type?.inputs || {}).indexOf(index);
return [
node?.state?.x ?? node.position[0],
(node?.state?.y ?? node.position[1]) + 10 + 10 * _index
];
}
}
private nodeHeightCache: Record<string, number> = {};
getNodeHeight(nodeTypeId: string) {
if (nodeTypeId in this.nodeHeightCache) {
return this.nodeHeightCache[nodeTypeId];
}
const node = this.graph.getNodeType(nodeTypeId);
if (!node?.inputs) {
return 5;
}
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'
&& node.inputs[key].external !== true
&& node.inputs[key].internal !== false
) {
height += 20;
continue;
} }
height += 10;
} }
this.nodeHeightCache[nodeTypeId] = height; const debugNode = this.graph.createNode({
return height; type: 'max/plantarium/debug',
position: [node.position[0] + 30, node.position[1]],
props: {}
});
if (debugNode) {
this.graph.createEdge(node, 0, debugNode, 'input');
}
} }
copyNodes() { copyNodes() {
@@ -266,7 +266,7 @@ export class GraphState {
if (edge[3] === index) { if (edge[3] === index) {
node = edge[0]; node = edge[0];
index = edge[1]; index = edge[1];
position = this.getSocketPosition(node, index); position = getSocketPosition(node, index);
this.graph.removeEdge(edge); this.graph.removeEdge(edge);
break; break;
} }
@@ -286,7 +286,7 @@ export class GraphState {
return { return {
node, node,
index, index,
position: this.getSocketPosition(node, index) position: getSocketPosition(node, index)
}; };
}); });
} }
@@ -323,7 +323,7 @@ export class GraphState {
for (const node of this.graph.nodes.values()) { for (const node of this.graph.nodes.values()) {
const x = node.position[0]; const x = node.position[0];
const y = node.position[1]; const y = node.position[1];
const height = this.getNodeHeight(node.type); const height = getNodeHeight(node.state.type!);
if (downX > x && downX < x + 20 && downY > y && downY < y + height) { if (downX > x && downX < x + 20 && downY > y && downY < y + height) {
clickedNodeId = node.id; clickedNodeId = node.id;
break; break;
@@ -335,14 +335,12 @@ export class GraphState {
} }
isNodeInView(node: NodeInstance) { isNodeInView(node: NodeInstance) {
const height = this.getNodeHeight(node.type); const height = getNodeHeight(node.state.type!);
const width = 20; const width = 20;
return ( return node.position[0] > this.cameraBounds[0] - width
node.position[0] > this.cameraBounds[0] - width
&& node.position[0] < this.cameraBounds[1] && node.position[0] < this.cameraBounds[1]
&& node.position[1] > this.cameraBounds[2] - height && node.position[1] > this.cameraBounds[2] - height
&& node.position[1] < this.cameraBounds[3] && node.position[1] < this.cameraBounds[3];
);
} }
openNodePalette() { openNodePalette() {

View File

@@ -11,6 +11,7 @@
import Debug from '../debug/Debug.svelte'; import Debug from '../debug/Debug.svelte';
import EdgeEl from '../edges/Edge.svelte'; import EdgeEl from '../edges/Edge.svelte';
import { getGraphManager, getGraphState } from '../graph-state.svelte'; import { getGraphManager, getGraphState } from '../graph-state.svelte';
import { getSocketPosition } from '../helpers/nodeHelpers';
import NodeEl from '../node/Node.svelte'; import NodeEl from '../node/Node.svelte';
import { maxZoom, minZoom } from './constants'; import { maxZoom, minZoom } from './constants';
import { FileDropEventManager } from './drop.events'; import { FileDropEventManager } from './drop.events';
@@ -38,8 +39,8 @@
return [0, 0, 0, 0]; return [0, 0, 0, 0];
} }
const pos1 = graphState.getSocketPosition(fromNode, edge[1]); const pos1 = getSocketPosition(fromNode, edge[1]);
const pos2 = graphState.getSocketPosition(toNode, edge[3]); const pos2 = getSocketPosition(toNode, edge[3]);
return [pos1[0], pos1[1], pos2[0], pos2[1]]; return [pos1[0], pos1[1], pos2[0], pos2[1]];
} }
@@ -94,6 +95,13 @@
graphState.activeSocket = null; graphState.activeSocket = null;
graphState.addMenuPosition = null; graphState.addMenuPosition = null;
} }
function getSocketType(node: NodeInstance, index: number | string): string {
if (typeof index === 'string') {
return node.state.type?.inputs?.[index].type || 'unknown';
}
return node.state.type?.outputs?.[index] || 'unknown';
}
</script> </script>
<svelte:window <svelte:window
@@ -174,6 +182,8 @@
{#if graphState.activeSocket} {#if graphState.activeSocket}
<EdgeEl <EdgeEl
z={graphState.cameraPosition[2]} z={graphState.cameraPosition[2]}
inputType={getSocketType(graphState.activeSocket.node, graphState.activeSocket.index)}
outputType={getSocketType(graphState.activeSocket.node, graphState.activeSocket.index)}
x1={graphState.activeSocket.position[0]} x1={graphState.activeSocket.position[0]}
y1={graphState.activeSocket.position[1]} y1={graphState.activeSocket.position[1]}
x2={graphState.edgeEndPosition?.[0] ?? graphState.mousePosition[0]} x2={graphState.edgeEndPosition?.[0] ?? graphState.mousePosition[0]}
@@ -186,6 +196,8 @@
<EdgeEl <EdgeEl
id={graph.getEdgeId(edge)} id={graph.getEdgeId(edge)}
z={graphState.cameraPosition[2]} z={graphState.cameraPosition[2]}
inputType={getSocketType(edge[0], edge[1])}
outputType={getSocketType(edge[2], edge[3])}
{x1} {x1}
{y1} {y1}
{x2} {x2}
@@ -208,7 +220,6 @@
<NodeEl <NodeEl
{node} {node}
inView={graphState.isNodeInView(node)} inView={graphState.isNodeInView(node)}
z={graphState.cameraPosition[2]}
/> />
{/each} {/each}
</div> </div>

View File

@@ -0,0 +1,44 @@
type Color = { hue: number; saturation: number; lightness: number };
export class ColorGenerator {
private colors: Map<string, Color> = new Map();
private lightnessLevels = [10, 60];
constructor(predefined: Record<string, Color>) {
for (const [id, colorStr] of Object.entries(predefined)) {
this.colors.set(id, colorStr);
}
}
public getColor(id: string): string {
if (this.colors.has(id)) {
return this.colorToHsl(this.colors.get(id)!);
}
const newColor = this.generateNewColor();
this.colors.set(id, newColor);
return this.colorToHsl(newColor);
}
private generateNewColor(): Color {
const existingHues = Array.from(this.colors.values()).map(c => c.hue).sort();
let hue = existingHues[0];
let attempts = 0;
while (
existingHues.some(h => Math.abs(h - hue) < 30 || Math.abs(h - hue) > 330)
&& attempts < 360
) {
hue = (hue + 30) % 360;
attempts++;
}
const lightness = 60;
return { hue, lightness, saturation: 100 };
}
private colorToHsl(c: Color): string {
return `hsl(${c.hue}, ${c.saturation}%, ${c.lightness}%)`;
}
}

View File

@@ -3,6 +3,7 @@ import { type NodeInstance } from '@nodarium/types';
import type { GraphManager } from '../graph-manager.svelte'; import type { GraphManager } from '../graph-manager.svelte';
import { type GraphState } from '../graph-state.svelte'; import { type GraphState } from '../graph-state.svelte';
import { snapToGrid as snapPointToGrid } from '../helpers'; import { snapToGrid as snapPointToGrid } from '../helpers';
import { getNodeHeight } from '../helpers/nodeHelpers';
import { maxZoom, minZoom, zoomSpeed } from './constants'; import { maxZoom, minZoom, zoomSpeed } from './constants';
import { EdgeInteractionManager } from './edge.events'; import { EdgeInteractionManager } from './edge.events';
@@ -188,6 +189,10 @@ export class MouseEventManager {
// if we clicked on a node // if we clicked on a node
if (clickedNodeId !== -1) { if (clickedNodeId !== -1) {
if (event.ctrlKey && event.shiftKey) {
this.state.tryConnectToDebugNode(clickedNodeId);
return;
}
if (this.state.activeNodeId === -1) { if (this.state.activeNodeId === -1) {
this.state.activeNodeId = clickedNodeId; this.state.activeNodeId = clickedNodeId;
// if the selected node is the same as the clicked node // if the selected node is the same as the clicked node
@@ -289,7 +294,7 @@ export class MouseEventManager {
if (!node?.state) continue; if (!node?.state) continue;
const x = node.position[0]; const x = node.position[0];
const y = node.position[1]; const y = node.position[1];
const height = this.state.getNodeHeight(node.type); const height = getNodeHeight(node.state.type!);
if (x > x1 - 20 && x < x2 && y > y1 - height && y < y2) { if (x > x1 - 20 && x < x2 && y > y1 - height && y < y2) {
this.state.selectedNodes?.add(node.id); this.state.selectedNodes?.add(node.id);
} else { } else {

View File

@@ -35,6 +35,9 @@ export function createNodePath({
rightBump = false, rightBump = false,
aspectRatio = 1 aspectRatio = 1
} = {}) { } = {}) {
const leftBumpTopY = y + height / 2;
const leftBumpBottomY = y - height / 2;
return `M0,${cornerTop} return `M0,${cornerTop}
${ ${
cornerTop cornerTop
@@ -64,9 +67,7 @@ export function createNodePath({
} }
${ ${
leftBump leftBump
? ` V${y + height / 2} C${depth},${y + height / 2} ${depth},${y - height / 2} 0,${ ? ` V${leftBumpTopY} C${depth},${leftBumpTopY} ${depth},${leftBumpBottomY} 0,${leftBumpBottomY}`
y - height / 2
}`
: ` H0` : ` H0`
} }
Z`.replace(/\s+/g, ' '); Z`.replace(/\s+/g, ' ');

View File

@@ -0,0 +1,71 @@
import type { NodeDefinition, NodeInstance } from '@nodarium/types';
export function getParameterHeight(node: NodeDefinition, inputKey: string) {
const input = node.inputs?.[inputKey];
if (!input) {
return 0;
}
if (inputKey === 'seed') return 0;
if (!node.inputs) return 0;
if ('setting' in input) return 0;
if (input.hidden) return 0;
if (input.type === 'shape' && input.external !== true) {
return 200;
}
if (
input?.label !== '' && !input.external && input.type !== 'path'
&& input.type !== 'geometry'
) {
return 100;
}
return 50;
}
export function getSocketPosition(
node: NodeInstance,
index: string | number
): [number, number] {
if (typeof index === 'number') {
return [
(node?.state?.x ?? node.position[0]) + 20,
(node?.state?.y ?? node.position[1]) + 2.5 + 10 * index
];
} else {
let height = 5;
const nodeType = node.state.type!;
const inputs = nodeType.inputs || {};
for (const inputKey in inputs) {
const h = getParameterHeight(nodeType, inputKey) / 10;
if (inputKey === index) {
height += h / 2;
break;
}
height += h;
}
return [
node?.state?.x ?? node.position[0],
(node?.state?.y ?? node.position[1]) + height
];
}
}
const nodeHeightCache: Record<string, number> = {};
export function getNodeHeight(node: NodeDefinition) {
if (node.id in nodeHeightCache) {
return nodeHeightCache[node.id];
}
if (!node?.inputs) {
return 5;
}
let height = 5;
for (const key in node.inputs) {
const h = getParameterHeight(node, key) / 10;
height += h;
}
nodeHeightCache[node.id] = height;
return height;
}

View File

@@ -1,56 +1,88 @@
varying vec2 vUv; varying vec2 vUv;
uniform float uWidth; uniform float uWidth;
uniform float uHeight; uniform float uHeight;
uniform float uZoom;
uniform vec3 uColorDark; uniform vec3 uColorDark;
uniform vec3 uColorBright; uniform vec3 uColorBright;
uniform vec3 uStrokeColor; uniform vec3 uStrokeColor;
uniform float uStrokeWidth;
const float uHeaderHeight = 5.0;
uniform float uSectionHeights[16];
uniform int uNumSections;
float msign(in float x) { return (x < 0.0) ? -1.0 : 1.0; } float msign(in float x) { return (x < 0.0) ? -1.0 : 1.0; }
float sdCircle(vec2 p, float r) { return length(p) - r; }
vec4 roundedBoxSDF( in vec2 p, in vec2 b, in float r, in float s) { vec4 roundedBoxSDF( in vec2 p, in vec2 b, in float r, in float s) {
vec2 q = abs(p) - b + r; vec2 q = abs(p) - b + r;
float l = b.x + b.y + 1.570796 * r; float l = b.x + b.y + 1.570796 * r;
float k1 = min(max(q.x, q.y), 0.0) + length(max(q, 0.0)) - r; float k1 = min(max(q.x, q.y), 0.0) + length(max(q, 0.0)) - r;
float k2 = ((q.x > 0.0) ? atan(q.y, q.x) : 1.570796); float k2 = ((q.x > 0.0) ? atan(q.y, q.x) : 1.570796);
float k3 = 3.0 + 2.0 * msign(min(p.x, -p.y)) - msign(p.x); float k3 = 3.0 + 2.0 * msign(min(p.x, -p.y)) - msign(p.x);
float k4 = msign(p.x * p.y); float k4 = msign(p.x * p.y);
float k5 = r * k2 + max(-q.x, 0.0); float k5 = r * k2 + max(-q.x, 0.0);
float ra = s * round(k1 / s); float ra = s * round(k1 / s);
float l2 = l + 1.570796 * ra; float l2 = l + 1.570796 * ra;
return vec4(k1 - ra, k3 * l2 + k4 * (b.y + ((q.y > 0.0) ? k5 + k2 * ra : q.y)), 4.0 * l2, k1); return vec4(k1 - ra, k3 * l2 + k4 * (b.y + ((q.y > 0.0) ? k5 + k2 * ra : q.y)), 4.0 * l2, k1);
} }
void main(){ void main(){
float strokeWidth = mix(2.0, 0.5, uZoom);
float y = (1.0-vUv.y) * uHeight; float borderRadius = 0.5;
float dentRadius = 0.8;
float y = (1.0 - vUv.y) * uHeight;
float x = vUv.x * uWidth; float x = vUv.x * uWidth;
vec2 size = vec2(uWidth, uHeight); vec2 size = vec2(uWidth, uHeight);
vec2 uv = (vUv - 0.5) * 2.0; vec2 uvCenter = (vUv - 0.5) * 2.0;
float u_border_radius = 0.4; vec4 boxData = roundedBoxSDF(uvCenter * size, size, borderRadius * 2.0, 0.0);
vec4 distance = roundedBoxSDF(uv * size, size, u_border_radius*2.0, 0.0); float sceneSDF = boxData.w;
if (distance.w > 0.0 ) { vec2 headerDentPos = vec2(uWidth, uHeaderHeight * 0.5);
// outside float headerDentDist = sdCircle(vec2(x, y) - headerDentPos, dentRadius);
gl_FragColor = vec4(0.0,0.0,0.0, 0.0); sceneSDF = max(sceneSDF, -headerDentDist*2.0);
}else{
if (distance.w > -uStrokeWidth || mod(y+5.0, 10.0) < uStrokeWidth/2.0) { float currentYBoundary = uHeaderHeight;
// draw the outer stroke float previousYBoundary = uHeaderHeight;
gl_FragColor = vec4(uStrokeColor, 1.0);
}else if (y<5.0){ for (int i = 0; i < 16; i++) {
// draw the header if (i >= uNumSections) break;
gl_FragColor = vec4(uColorBright, 1.0);
}else{ float sectionHeight = uSectionHeights[i];
gl_FragColor = vec4(uColorDark, 1.0); currentYBoundary += sectionHeight;
}
float centerY = previousYBoundary + (sectionHeight * 0.5);
vec2 circlePos = vec2(0.0, centerY);
float circleDist = sdCircle(vec2(x, y) - circlePos, dentRadius);
sceneSDF = max(sceneSDF, -circleDist*2.0);
previousYBoundary = currentYBoundary;
}
if (sceneSDF > 0.05) {
gl_FragColor = vec4(0.0, 0.0, 0.0, 0.0);
return;
}
vec3 finalColor = (y < uHeaderHeight) ? uColorBright : uColorDark;
bool isDivider = false;
float dividerY = uHeaderHeight;
if (abs(y - dividerY) < strokeWidth * 0.25) isDivider = true;
for (int i = 0; i < 16; i++) {
if (i >= uNumSections - 1) break;
dividerY += uSectionHeights[i];
if (abs(y - dividerY) < strokeWidth * 0.25) isDivider = true;
}
if (sceneSDF > -strokeWidth || isDivider) {
gl_FragColor = vec4(uStrokeColor, 1.0);
} else {
gl_FragColor = vec4(finalColor, 1.0);
} }
} }

View File

@@ -5,6 +5,7 @@
import { type Mesh } from 'three'; import { type Mesh } from 'three';
import { getGraphState } from '../graph-state.svelte'; import { getGraphState } from '../graph-state.svelte';
import { colors } from '../graph/colors.svelte'; import { colors } from '../graph/colors.svelte';
import { getNodeHeight, getParameterHeight } from '../helpers/nodeHelpers';
import NodeFrag from './Node.frag'; import NodeFrag from './Node.frag';
import NodeVert from './Node.vert'; import NodeVert from './Node.vert';
import NodeHtml from './NodeHTML.svelte'; import NodeHtml from './NodeHTML.svelte';
@@ -14,9 +15,10 @@
type Props = { type Props = {
node: NodeInstance; node: NodeInstance;
inView: boolean; inView: boolean;
z: number;
}; };
let { node = $bindable(), inView, z }: Props = $props(); let { node = $bindable(), inView }: Props = $props();
const nodeType = $derived(node.state.type!);
const isActive = $derived(graphState.activeNodeId === node.id); const isActive = $derived(graphState.activeNodeId === node.id);
const isSelected = $derived(graphState.selectedNodes.has(node.id)); const isSelected = $derived(graphState.selectedNodes.has(node.id));
@@ -29,9 +31,18 @@
: colors.outline) : colors.outline)
); );
const sectionHeights = $derived(
Object
.keys(nodeType.inputs || {})
.map(key => getParameterHeight(nodeType, key) / 10)
.filter(b => !!b)
);
let meshRef: Mesh | undefined = $state(); let meshRef: Mesh | undefined = $state();
const height = graphState.getNodeHeight(node.type); const height = getNodeHeight(node.state.type!);
const zoom = $derived(graphState.cameraPosition[2]);
$effect(() => { $effect(() => {
if (meshRef && !node.state?.mesh) { if (meshRef && !node.state?.mesh) {
@@ -39,6 +50,10 @@
graphState.updateNodePosition(node); graphState.updateNodePosition(node);
} }
}); });
const zoomValue = $derived(
(Math.log(graphState.cameraPosition[2]) - Math.log(1)) / (Math.log(40) - Math.log(1))
);
// const zoomValue = (graphState.cameraPosition[2] - 1) / 39;
</script> </script>
<T.Mesh <T.Mesh
@@ -47,7 +62,7 @@
position.y={0.8} position.y={0.8}
rotation.x={-Math.PI / 2} rotation.x={-Math.PI / 2}
bind:ref={meshRef} bind:ref={meshRef}
visible={inView && z < 7} visible={inView && zoom < 7}
> >
<T.PlaneGeometry args={[20, height]} radius={1} /> <T.PlaneGeometry args={[20, height]} radius={1} />
<T.ShaderMaterial <T.ShaderMaterial
@@ -57,14 +72,19 @@
uniforms={{ uniforms={{
uColorBright: { value: colors['layer-2'] }, uColorBright: { value: colors['layer-2'] },
uColorDark: { value: colors['layer-1'] }, uColorDark: { value: colors['layer-1'] },
uStrokeColor: { value: colors['layer-2'].clone() }, uStrokeColor: { value: colors.outline.clone() },
uStrokeWidth: { value: 1.0 }, uSectionHeights: { value: [5, 10] },
uNumSections: { value: 2 },
uWidth: { value: 20 }, uWidth: { value: 20 },
uHeight: { value: height } uHeight: { value: 200 },
uZoom: { value: 1.0 }
}} }}
uniforms.uStrokeColor.value={strokeColor.clone()} uniforms.uZoom.value={zoomValue}
uniforms.uStrokeWidth.value={(7 - z) / 3} uniforms.uHeight.value={height}
uniforms.uSectionHeights.value={sectionHeights}
uniforms.uNumSections.value={sectionHeights.length}
uniforms.uStrokeColor.value={strokeColor}
/> />
</T.Mesh> </T.Mesh>
<NodeHtml bind:node {inView} {isActive} {isSelected} {z} /> <NodeHtml bind:node {inView} {isActive} {isSelected} z={zoom} />

View File

@@ -1,7 +1,9 @@
<script lang="ts"> <script lang="ts">
import type { NodeInstance } from '@nodarium/types'; import { appSettings } from '$lib/settings/app-settings.svelte';
import type { NodeInstance, Socket } from '@nodarium/types';
import { getGraphState } from '../graph-state.svelte'; import { getGraphState } from '../graph-state.svelte';
import { createNodePath } from '../helpers/index.js'; import { createNodePath } from '../helpers/index.js';
import { getSocketPosition } from '../helpers/nodeHelpers';
const graphState = getGraphState(); const graphState = getGraphState();
@@ -14,7 +16,7 @@
graphState.setDownSocket?.({ graphState.setDownSocket?.({
node, node,
index: 0, index: 0,
position: graphState.getSocketPosition?.(node, 0) position: getSocketPosition?.(node, 0)
}); });
} }
} }
@@ -43,14 +45,35 @@
aspectRatio aspectRatio
}) })
); );
const socketId = $derived(`${node.id}-${0}`);
function getSocketType(s: Socket | null) {
if (!s) return 'unknown';
if (typeof s.index === 'string') {
return s.node.state.type?.inputs?.[s.index].type || 'unknown';
}
return s.node.state.type?.outputs?.[s.index] || 'unknown';
}
const socketType = $derived(getSocketType(graphState.activeSocket));
const hoverColor = $derived(graphState.colors.getColor(socketType));
</script> </script>
<div class="wrapper" data-node-id={node.id} data-node-type={node.type}> <div
class="wrapper"
data-node-id={node.id}
data-node-type={node.type}
style:--socket-color={hoverColor}
class:possible-socket={graphState?.possibleSocketIds.has(socketId)}
>
<div class="content"> <div class="content">
{#if appSettings.value.debug.advancedMode}
<span class="bg-white text-black! mr-2 px-1 rounded-sm opacity-30">{node.id}</span>
{/if}
{node.type.split('/').pop()} {node.type.split('/').pop()}
</div> </div>
<div <div
class="click-target" class="target"
role="button" role="button"
tabindex="0" tabindex="0"
onmousedown={handleMouseDown} onmousedown={handleMouseDown}
@@ -78,7 +101,20 @@
height: 50px; height: 50px;
} }
.click-target { .possible-socket .target::before {
content: "";
position: absolute;
width: 30px;
height: 30px;
border-radius: 100%;
box-shadow: 0px 0px 10px var(--socket-color);
background-color: var(--socket-color);
outline: solid thin var(--socket-color);
opacity: 0.7;
z-index: -10;
}
.target {
position: absolute; position: absolute;
right: 0px; right: 0px;
top: 50%; top: 50%;
@@ -89,7 +125,7 @@
border-radius: 50%; border-radius: 50%;
} }
.click-target:hover + svg path { .target:hover + svg path {
d: var(--hover-path); d: var(--hover-path);
} }

View File

@@ -1,7 +1,8 @@
<script lang="ts"> <script lang="ts">
import type { NodeInput, NodeInstance } from '@nodarium/types'; import type { NodeInput, NodeInstance, Socket } from '@nodarium/types';
import { getGraphManager, getGraphState } from '../graph-state.svelte'; import { getGraphManager, getGraphState } from '../graph-state.svelte';
import { createNodePath } from '../helpers'; import { createNodePath } from '../helpers';
import { getParameterHeight, getSocketPosition } from '../helpers/nodeHelpers';
import NodeInputEl from './NodeInput.svelte'; import NodeInputEl from './NodeInput.svelte';
type Props = { type Props = {
@@ -12,19 +13,18 @@
}; };
const graph = getGraphManager(); const graph = getGraphManager();
const graphState = getGraphState();
const graphId = graph?.id;
const elementId = `input-${Math.random().toString(36).substring(7)}`;
let { node = $bindable(), input, id, isLast }: Props = $props(); let { node = $bindable(), input, id, isLast }: Props = $props();
const inputType = $derived(node?.state?.type?.inputs?.[id]); const nodeType = $derived(node.state.type!);
const inputType = $derived(nodeType.inputs?.[id]);
const socketId = $derived(`${node.id}-${id}`); const socketId = $derived(`${node.id}-${id}`);
const isShape = $derived(input.type === 'shape' && input.external !== true); const height = $derived(getParameterHeight(nodeType, id));
const height = $derived(isShape ? 200 : 100);
const graphState = getGraphState();
const graphId = graph?.id;
const elementId = `input-${Math.random().toString(36).substring(7)}`;
function handleMouseDown(ev: MouseEvent) { function handleMouseDown(ev: MouseEvent) {
ev.preventDefault(); ev.preventDefault();
@@ -32,18 +32,18 @@
graphState.setDownSocket({ graphState.setDownSocket({
node, node,
index: id, index: id,
position: graphState.getSocketPosition?.(node, id) position: getSocketPosition(node, id)
}); });
} }
const leftBump = $derived(node.state?.type?.inputs?.[id].internal !== true); const leftBump = $derived(nodeType.inputs?.[id].internal !== true);
const cornerBottom = $derived(isLast ? 5 : 0); const cornerBottom = $derived(isLast ? 5 : 0);
const aspectRatio = 0.5; const aspectRatio = 0.5;
const path = $derived( const path = $derived(
createNodePath({ createNodePath({
depth: 6, depth: 6,
height: 18, height: 2000 / height,
y: 50.5, y: 50.5,
cornerBottom, cornerBottom,
leftBump, leftBump,
@@ -53,13 +53,24 @@
const pathHover = $derived( const pathHover = $derived(
createNodePath({ createNodePath({
depth: 7, depth: 7,
height: 20, height: 2200 / height,
y: 50.5, y: 50.5,
cornerBottom, cornerBottom,
leftBump, leftBump,
aspectRatio aspectRatio
}) })
); );
function getSocketType(s: Socket | null) {
if (!s) return 'unknown';
if (typeof s.index === 'string') {
return s.node.state.type?.inputs?.[s.index].type || 'unknown';
}
return s.node.state.type?.outputs?.[s.index] || 'unknown';
}
const socketType = $derived(getSocketType(graphState.activeSocket));
const hoverColor = $derived(graphState.colors.getColor(socketType));
</script> </script>
<div <div
@@ -67,6 +78,7 @@
data-node-type={node.type} data-node-type={node.type}
data-node-input={id} data-node-input={id}
style:height="{height}px" style:height="{height}px"
style:--socket-color={hoverColor}
class:possible-socket={graphState?.possibleSocketIds.has(socketId)} class:possible-socket={graphState?.possibleSocketIds.has(socketId)}
> >
{#key id && graphId} {#key id && graphId}
@@ -74,10 +86,6 @@
{#if inputType?.label !== ''} {#if inputType?.label !== ''}
<label for={elementId} title={input.description}>{input.label || id}</label> <label for={elementId} title={input.description}>{input.label || id}</label>
{/if} {/if}
<span
class="absolute i-[tabler--help-circle] size-4 block top-2 right-2 opacity-30"
title={JSON.stringify(input, null, 2)}
></span>
{#if inputType?.external !== true} {#if inputType?.external !== true}
<NodeInputEl {graph} {elementId} bind:node {input} {id} /> <NodeInputEl {graph} {elementId} bind:node {input} {id} />
{/if} {/if}
@@ -99,10 +107,8 @@
xmlns="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg"
viewBox="0 0 100 100" viewBox="0 0 100 100"
preserveAspectRatio="none" preserveAspectRatio="none"
style={` style:--path={`path("${path}")`}
--path: path("${path}"); style:--hover-path={`path("${pathHover}")`}
--hover-path: path("${pathHover}");
`}
> >
<path vector-effect="non-scaling-stroke"></path> <path vector-effect="non-scaling-stroke"></path>
</svg> </svg>
@@ -124,9 +130,16 @@
transform: translateY(-50%) translateX(-50%); transform: translateY(-50%) translateX(-50%);
} }
.possible-socket .target { .possible-socket .target::before {
box-shadow: 0px 0px 10px rgba(255, 255, 255, 0.5); content: "";
background-color: rgba(255, 255, 255, 0.2); position: absolute;
width: 30px;
height: 30px;
border-radius: 100%;
box-shadow: 0px 0px 10px var(--socket-color);
background-color: var(--socket-color);
outline: solid thin var(--socket-color);
opacity: 0.5;
z-index: -10; z-index: -10;
} }
@@ -136,11 +149,12 @@
.content { .content {
position: relative; position: relative;
padding: 10px 20px;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
padding-inline: 20px;
height: 100%; height: 100%;
justify-content: space-around; justify-content: center;
gap: 10px;
box-sizing: border-box; box-sizing: border-box;
} }

View File

@@ -1,5 +1,37 @@
import { browser } from '$app/environment'; import { browser } from '$app/environment';
function mergeRecursive<T>(current: T, initial: T): T {
if (typeof initial === 'number') {
if (typeof current === 'number') return current;
return initial;
}
if (typeof initial === 'boolean') {
if (typeof current === 'boolean') return current;
return initial;
}
if (Array.isArray(initial)) {
if (Array.isArray(current)) return current;
return initial;
}
if (typeof initial === 'object' && initial) {
const merged = initial;
if (typeof current === 'object' && current) {
for (const key of Object.keys(initial)) {
if (key in current) {
// @ts-expect-error It's safe dont worry about it
merged[key] = mergeRecursive(current[key], initial[key]);
}
}
}
return merged;
}
return current;
}
export class LocalStore<T> { export class LocalStore<T> {
value = $state<T>() as T; value = $state<T>() as T;
key = ''; key = '';
@@ -10,7 +42,10 @@ export class LocalStore<T> {
if (browser) { if (browser) {
const item = localStorage.getItem(key); const item = localStorage.getItem(key);
if (item) this.value = this.deserialize(item); if (item) {
const storedValue = this.deserialize(item);
this.value = mergeRecursive(storedValue, value);
}
} }
$effect.root(() => { $effect.root(() => {

View File

@@ -0,0 +1,11 @@
export const debugNode = {
id: 'max/plantarium/debug',
inputs: {
input: {
type: '*'
}
},
execute(_data: Int32Array): Int32Array {
return _data;
}
} as const;

View File

@@ -15,8 +15,15 @@ export class RemoteNodeRegistry implements NodeRegistry {
constructor( constructor(
private url: string, private url: string,
public cache?: AsyncCache<ArrayBuffer | string> public cache?: AsyncCache<ArrayBuffer | string>,
) {} nodes?: NodeDefinition[]
) {
if (nodes?.length) {
for (const node of nodes) {
this.nodes.set(node.id, node);
}
}
}
async fetchJson(url: string, skipCache = false) { async fetchJson(url: string, skipCache = false) {
const finalUrl = `${this.url}/${url}`; const finalUrl = `${this.url}/${url}`;

View File

@@ -0,0 +1,19 @@
<script lang="ts">
import { T } from '@threlte/core';
import type { Group } from 'three';
import { updateDebugScene } from './debug';
type Props = {
debugData?: Record<number, { type: string; data: Int32Array }>;
};
let group = $state<Group>(null!);
const { debugData }: Props = $props();
$effect(() => {
if (!group || !debugData) return;
updateDebugScene(group, $state.snapshot(debugData));
});
</script>
<T.Group bind:ref={group} />

View File

@@ -1,33 +1,26 @@
<script lang="ts"> <script lang="ts">
import { colors } from '$lib/graph-interface/graph/colors.svelte'; import { colors } from '$lib/graph-interface/graph/colors.svelte';
import { T, useTask, useThrelte } from '@threlte/core'; import { T, useTask, useThrelte } from '@threlte/core';
import { Grid, MeshLineGeometry, MeshLineMaterial, Text } from '@threlte/extras'; import { Grid } from '@threlte/extras';
import { import { Box3, type BufferGeometry, type Group, Mesh, MeshBasicMaterial, Vector3 } from 'three';
Box3,
type BufferGeometry,
type Group,
Mesh,
MeshBasicMaterial,
Vector3,
type Vector3Tuple
} from 'three';
import { appSettings } from '../settings/app-settings.svelte'; import { appSettings } from '../settings/app-settings.svelte';
import Camera from './Camera.svelte'; import Camera from './Camera.svelte';
import Debug from './Debug.svelte';
const { renderStage, invalidate: _invalidate } = useThrelte(); const { renderStage, invalidate: _invalidate } = useThrelte();
type Props = { type Props = {
fps: number[]; fps: number[];
lines: Vector3[][]; debugData?: Record<number, { type: string; data: Int32Array }>;
scene: Group; scene: Group;
centerCamera: boolean; centerCamera: boolean;
}; };
let { let {
lines,
centerCamera, centerCamera,
fps = $bindable(), fps = $bindable(),
scene = $bindable() scene = $bindable(),
debugData
}: Props = $props(); }: Props = $props();
let geometries = $state.raw<BufferGeometry[]>([]); let geometries = $state.raw<BufferGeometry[]>([]);
@@ -91,18 +84,12 @@
}); });
_invalidate(); _invalidate();
}); });
function getPosition(geo: BufferGeometry, i: number) {
return [
geo.attributes.position.array[i],
geo.attributes.position.array[i + 1],
geo.attributes.position.array[i + 2]
] as Vector3Tuple;
}
</script> </script>
<Camera {center} {centerCamera} /> <Camera {center} {centerCamera} />
<Debug {debugData} />
{#if appSettings.value.showGrid} {#if appSettings.value.showGrid}
<Grid <Grid
cellColor={colors['outline']} cellColor={colors['outline']}
@@ -116,35 +103,4 @@
fadeOrigin={new Vector3(0, 0, 0)} fadeOrigin={new Vector3(0, 0, 0)}
/> />
{/if} {/if}
<T.Group bind:ref={scene}></T.Group>
<T.Group>
{#if geometries}
{#each geometries as geo (geo.id)}
{#if appSettings.value.debug.showIndices}
{#each geo.attributes.position.array, i (i)}
{#if i % 3 === 0}
<Text fontSize={0.25} position={getPosition(geo, i)} />
{/if}
{/each}
{/if}
{#if appSettings.value.debug.showVertices}
<T.Points visible={true}>
<T is={geo} />
<T.PointsMaterial size={0.25} />
</T.Points>
{/if}
{/each}
{/if}
<T.Group bind:ref={scene}></T.Group>
</T.Group>
{#if appSettings.value.debug.showStemLines && lines}
{#each lines as line (line[0].x + '-' + line[0].y + '-' + '' + line[0].z)}
<T.Mesh>
<MeshLineGeometry points={line} />
<MeshLineMaterial width={0.1} color="red" depthTest={false} />
</T.Mesh>
{/each}
{/if}

View File

@@ -1,10 +1,10 @@
<script lang="ts"> <script lang="ts">
import SmallPerformanceViewer from '$lib/performance/SmallPerformanceViewer.svelte'; import SmallPerformanceViewer from '$lib/performance/SmallPerformanceViewer.svelte';
import { appSettings } from '$lib/settings/app-settings.svelte'; import { appSettings } from '$lib/settings/app-settings.svelte';
import { decodeFloat, splitNestedArray } from '@nodarium/utils'; import { splitNestedArray } from '@nodarium/utils';
import type { PerformanceStore } from '@nodarium/utils'; import type { PerformanceStore } from '@nodarium/utils';
import { Canvas } from '@threlte/core'; import { Canvas } from '@threlte/core';
import { DoubleSide, Vector3 } from 'three'; import { DoubleSide } from 'three';
import { type Group, MeshMatcapMaterial, TextureLoader } from 'three'; import { type Group, MeshMatcapMaterial, TextureLoader } from 'three';
import { createGeometryPool, createInstancedGeometryPool } from './geometryPool'; import { createGeometryPool, createInstancedGeometryPool } from './geometryPool';
import Scene from './Scene.svelte'; import Scene from './Scene.svelte';
@@ -23,6 +23,7 @@
let geometryPool: ReturnType<typeof createGeometryPool>; let geometryPool: ReturnType<typeof createGeometryPool>;
let instancePool: ReturnType<typeof createInstancedGeometryPool>; let instancePool: ReturnType<typeof createInstancedGeometryPool>;
export function updateGeometries(inputs: Int32Array[], group: Group) { export function updateGeometries(inputs: Int32Array[], group: Group) {
geometryPool = geometryPool || createGeometryPool(group, material); geometryPool = geometryPool || createGeometryPool(group, material);
instancePool = instancePool || createInstancedGeometryPool(group, material); instancePool = instancePool || createInstancedGeometryPool(group, material);
@@ -40,44 +41,16 @@
scene: Group; scene: Group;
centerCamera: boolean; centerCamera: boolean;
perf: PerformanceStore; perf: PerformanceStore;
debugData?: Record<number, { type: string; data: Int32Array }>;
}; };
let { scene = $bindable(), centerCamera, perf }: Props = $props(); let { scene = $bindable(), centerCamera, debugData, perf }: Props = $props();
let lines = $state<Vector3[][]>([]);
function createLineGeometryFromEncodedData(encodedData: Int32Array) {
const positions: Vector3[] = [];
const amount = (encodedData.length - 1) / 4;
for (let i = 0; i < amount; i++) {
const x = decodeFloat(encodedData[2 + i * 4 + 0]);
const y = decodeFloat(encodedData[2 + i * 4 + 1]);
const z = decodeFloat(encodedData[2 + i * 4 + 2]);
positions.push(new Vector3(x, y, z));
}
return positions;
}
export const update = function update(result: Int32Array) { export const update = function update(result: Int32Array) {
perf.addPoint('split-result'); perf.addPoint('split-result');
const inputs = splitNestedArray(result); const inputs = splitNestedArray(result);
perf.endPoint(); perf.endPoint();
if (appSettings.value.debug.showStemLines) {
perf.addPoint('create-lines');
lines = inputs
.map((input) => {
if (input[0] === 0) {
return createLineGeometryFromEncodedData(input);
}
})
.filter(Boolean) as Vector3[][];
perf.endPoint();
}
perf.addPoint('update-geometries'); perf.addPoint('update-geometries');
const { totalVertices, totalFaces } = updateGeometries(inputs, scene); const { totalVertices, totalFaces } = updateGeometries(inputs, scene);
@@ -89,7 +62,7 @@
}; };
</script> </script>
{#if appSettings.value.debug.showPerformancePanel} {#if appSettings.value.debug.advancedMode}
<SmallPerformanceViewer {fps} store={perf} /> <SmallPerformanceViewer {fps} store={perf} />
{/if} {/if}
@@ -97,8 +70,8 @@
<Canvas> <Canvas>
<Scene <Scene
bind:this={sceneComponent} bind:this={sceneComponent}
{lines}
{centerCamera} {centerCamera}
{debugData}
bind:scene bind:scene
bind:fps bind:fps
/> />

View File

@@ -0,0 +1,90 @@
import { splitNestedArray } from '@nodarium/utils';
import {
BufferGeometry,
type Group,
InstancedMesh,
Line,
LineBasicMaterial,
Matrix4,
MeshBasicMaterial,
SphereGeometry,
Vector3
} from 'three';
function writePath(scene: Group, data: Int32Array): Vector3[] {
const positions: Vector3[] = [];
const f32 = new Float32Array(data.buffer);
for (let i = 2; i + 2 < f32.length; i += 4) {
const vec = new Vector3(f32[i], f32[i + 1], f32[i + 2]);
positions.push(vec);
}
// Path line
if (positions.length >= 2) {
const geometry = new BufferGeometry().setFromPoints(positions);
const line = new Line(
geometry,
new LineBasicMaterial({ color: 0xff0000, depthTest: false })
);
scene.add(line);
}
// Instanced spheres at points
if (positions.length > 0) {
const sphereGeometry = new SphereGeometry(0.05, 8, 8); // keep low-poly
const sphereMaterial = new MeshBasicMaterial({
color: 0xff0000,
depthTest: false
});
const spheres = new InstancedMesh(
sphereGeometry,
sphereMaterial,
positions.length
);
const matrix = new Matrix4();
for (let i = 0; i < positions.length; i++) {
matrix.makeTranslation(
positions[i].x,
positions[i].y,
positions[i].z
);
spheres.setMatrixAt(i, matrix);
}
spheres.instanceMatrix.needsUpdate = true;
scene.add(spheres);
}
return positions;
}
function clearGroup(group: Group) {
for (let i = group.children.length - 1; i >= 0; i--) {
const child = group.children[i];
group.remove(child);
// optional but correct: free GPU memory
// @ts-expect-error three.js runtime fields
child.geometry?.dispose?.();
// @ts-expect-error three.js runtime fields
child.material?.dispose?.();
}
}
export function updateDebugScene(
group: Group,
data: Record<number, { type: string; data: Int32Array }>
) {
clearGroup(group);
return Object.entries(data || {}).map(([, d]) => {
switch (d.type) {
case 'path':
splitNestedArray(d.data)
.forEach(p => writePath(group, p));
}
// eslint-disable-next-line @typescript-eslint/no-unused-vars
return (_g: Group) => {};
}).flat();
}

View File

@@ -59,6 +59,7 @@ export class MemoryRuntimeExecutor implements RuntimeExecutor {
private definitionMap: Map<string, NodeDefinition> = new Map(); private definitionMap: Map<string, NodeDefinition> = new Map();
private seed = Math.floor(Math.random() * 100000000); private seed = Math.floor(Math.random() * 100000000);
private debugData: Record<number, { type: string; data: Int32Array }> = {};
perf?: PerformanceStore; perf?: PerformanceStore;
@@ -124,10 +125,10 @@ export class MemoryRuntimeExecutor implements RuntimeExecutor {
} }
} }
const nodes = []; const nodes = new Map<number, RuntimeNode>();
// loop through all the nodes and assign each nodes its depth // loop through all the nodes and assign each nodes its depth
const stack = [outputNode]; const stack = [outputNode, ...graphNodes.filter(n => n.type.endsWith('/debug'))];
while (stack.length) { while (stack.length) {
const node = stack.pop(); const node = stack.pop();
if (!node) continue; if (!node) continue;
@@ -136,16 +137,31 @@ export class MemoryRuntimeExecutor implements RuntimeExecutor {
parent.state.depth = node.state.depth + 1; parent.state.depth = node.state.depth + 1;
stack.push(parent); stack.push(parent);
} }
nodes.push(node); nodes.set(node.id, node);
} }
return [outputNode, nodes] as const; for (const node of graphNodes) {
if (node.type.endsWith('/debug')) {
node.state = node.state || {};
const parent = node.state.parents[0];
if (parent) {
node.state.depth = parent.state.depth - 1;
parent.state.debugNode = true;
}
nodes.set(node.id, node);
}
}
const _nodes = [...nodes.values()];
return [outputNode, _nodes] as const;
} }
async execute(graph: Graph, settings: Record<string, unknown>) { async execute(graph: Graph, settings: Record<string, unknown>) {
this.perf?.addPoint('runtime'); this.perf?.addPoint('runtime');
let a = performance.now(); let a = performance.now();
this.debugData = {};
// Then we add some metadata to the graph // Then we add some metadata to the graph
const [outputNode, nodes] = await this.addMetaData(graph); const [outputNode, nodes] = await this.addMetaData(graph);
@@ -237,6 +253,12 @@ export class MemoryRuntimeExecutor implements RuntimeExecutor {
log.log(`Using cached value for ${node_type.id || node.id}`); log.log(`Using cached value for ${node_type.id || node.id}`);
this.perf?.addPoint('cache-hit', 1); this.perf?.addPoint('cache-hit', 1);
results[node.id] = cachedValue as Int32Array; results[node.id] = cachedValue as Int32Array;
if (node.state.debugNode && node_type.outputs) {
this.debugData[node.id] = {
type: node_type.outputs[0],
data: cachedValue
};
}
continue; continue;
} }
this.perf?.addPoint('cache-hit', 0); this.perf?.addPoint('cache-hit', 0);
@@ -245,6 +267,12 @@ export class MemoryRuntimeExecutor implements RuntimeExecutor {
log.log(`Inputs:`, inputs); log.log(`Inputs:`, inputs);
a = performance.now(); a = performance.now();
results[node.id] = node_type.execute(encoded_inputs); results[node.id] = node_type.execute(encoded_inputs);
if (node.state.debugNode && node_type.outputs) {
this.debugData[node.id] = {
type: node_type.outputs[0],
data: results[node.id]
};
}
log.log('Executed', node.type, node.id); log.log('Executed', node.type, node.id);
b = performance.now(); b = performance.now();
@@ -273,6 +301,10 @@ export class MemoryRuntimeExecutor implements RuntimeExecutor {
return res as unknown as Int32Array; return res as unknown as Int32Array;
} }
getDebugData() {
return this.debugData;
}
getPerformanceData() { getPerformanceData() {
return this.perf?.get(); return this.perf?.get();
} }

View File

@@ -5,6 +5,7 @@ type RuntimeState = {
parents: RuntimeNode[]; parents: RuntimeNode[];
children: RuntimeNode[]; children: RuntimeNode[];
inputNodes: Record<string, RuntimeNode>; inputNodes: Record<string, RuntimeNode>;
debugNode?: boolean;
}; };
export type RuntimeNode = SerializedNode & { state: RuntimeState }; export type RuntimeNode = SerializedNode & { state: RuntimeState };

View File

@@ -1,3 +1,4 @@
import { debugNode } from '$lib/node-registry/debugNode';
import { IndexDBCache, RemoteNodeRegistry } from '$lib/node-registry/index'; import { IndexDBCache, RemoteNodeRegistry } from '$lib/node-registry/index';
import type { Graph } from '@nodarium/types'; import type { Graph } from '@nodarium/types';
import { createPerformanceStore } from '@nodarium/utils'; import { createPerformanceStore } from '@nodarium/utils';
@@ -5,7 +6,7 @@ import { MemoryRuntimeExecutor } from './runtime-executor';
import { MemoryRuntimeCache } from './runtime-executor-cache'; import { MemoryRuntimeCache } from './runtime-executor-cache';
const indexDbCache = new IndexDBCache('node-registry'); const indexDbCache = new IndexDBCache('node-registry');
const nodeRegistry = new RemoteNodeRegistry('', indexDbCache); const nodeRegistry = new RemoteNodeRegistry('', indexDbCache, [debugNode]);
const cache = new MemoryRuntimeCache(); const cache = new MemoryRuntimeCache();
const executor = new MemoryRuntimeExecutor(nodeRegistry, cache); const executor = new MemoryRuntimeExecutor(nodeRegistry, cache);
@@ -43,3 +44,7 @@ export async function executeGraph(
export function getPerformanceData() { export function getPerformanceData() {
return performanceStore.get(); return performanceStore.get();
} }
export function getDebugData() {
return executor.getDebugData();
}

View File

@@ -6,12 +6,15 @@ export class WorkerRuntimeExecutor implements RuntimeExecutor {
new URL(`./worker-runtime-executor-backend.ts`, import.meta.url) new URL(`./worker-runtime-executor-backend.ts`, import.meta.url)
); );
async execute(graph: Graph, settings: Record<string, unknown>) { execute(graph: Graph, settings: Record<string, unknown>) {
return this.worker.executeGraph(graph, settings); return this.worker.executeGraph(graph, settings);
} }
async getPerformanceData() { getPerformanceData() {
return this.worker.getPerformanceData(); return this.worker.getPerformanceData();
} }
getDebugData() {
return this.worker.getDebugData();
}
set useRuntimeCache(useCache: boolean) { set useRuntimeCache(useCache: boolean) {
this.worker.setUseRuntimeCache(useCache); this.worker.setUseRuntimeCache(useCache);
} }

View File

@@ -59,34 +59,9 @@ export const AppSettingTypes = {
label: 'Execute in WebWorker', label: 'Execute in WebWorker',
value: true value: true
}, },
showIndices: { advancedMode: {
type: 'boolean', type: 'boolean',
label: 'Show Indices', label: 'Advanced Mode',
value: false
},
showPerformancePanel: {
type: 'boolean',
label: 'Show Performance Panel',
value: false
},
showBenchmarkPanel: {
type: 'boolean',
label: 'Show Benchmark Panel',
value: false
},
showVertices: {
type: 'boolean',
label: 'Show Vertices',
value: false
},
showStemLines: {
type: 'boolean',
label: 'Show Stem Lines',
value: false
},
showGraphJson: {
type: 'boolean',
label: 'Show Graph Source',
value: false value: false
}, },
cache: { cache: {

View File

@@ -42,11 +42,13 @@
const store: Store = {}; const store: Store = {};
Object.keys(inputs).forEach((key) => { Object.keys(inputs).forEach((key) => {
if (props) { if (props) {
const value = props[key] || inputs[key].value; const value = props[key] !== undefined ? props[key] : inputs[key].value;
if (Array.isArray(value) || typeof value === 'number') { if (Array.isArray(value) || typeof value === 'number') {
store[key] = value; store[key] = value;
} else if (typeof value === 'boolean') {
store[key] = value ? 1 : 0;
} else { } else {
console.error('Wrong error'); console.error('Wrong error', { value });
} }
} }
}); });

View File

@@ -4,6 +4,7 @@
import Grid from '$lib/grid'; import Grid from '$lib/grid';
import { debounceAsyncFunction } from '$lib/helpers'; import { debounceAsyncFunction } from '$lib/helpers';
import { createKeyMap } from '$lib/helpers/createKeyMap'; import { createKeyMap } from '$lib/helpers/createKeyMap';
import { debugNode } from '$lib/node-registry/debugNode.js';
import { IndexDBCache, RemoteNodeRegistry } from '$lib/node-registry/index'; import { IndexDBCache, RemoteNodeRegistry } from '$lib/node-registry/index';
import NodeStore from '$lib/node-store/NodeStore.svelte'; import NodeStore from '$lib/node-store/NodeStore.svelte';
import PerformanceViewer from '$lib/performance/PerformanceViewer.svelte'; import PerformanceViewer from '$lib/performance/PerformanceViewer.svelte';
@@ -32,7 +33,8 @@
const { data } = $props(); const { data } = $props();
const registryCache = new IndexDBCache('node-registry'); const registryCache = new IndexDBCache('node-registry');
const nodeRegistry = new RemoteNodeRegistry('', registryCache);
const nodeRegistry = new RemoteNodeRegistry('', registryCache, [debugNode]);
const workerRuntime = new WorkerRuntimeExecutor(); const workerRuntime = new WorkerRuntimeExecutor();
const runtimeCache = new MemoryRuntimeCache(); const runtimeCache = new MemoryRuntimeCache();
const memoryRuntime = new MemoryRuntimeExecutor(nodeRegistry, runtimeCache); const memoryRuntime = new MemoryRuntimeExecutor(nodeRegistry, runtimeCache);
@@ -66,6 +68,7 @@
let sidebarOpen = $state(false); let sidebarOpen = $state(false);
let graphInterface = $state<ReturnType<typeof GraphInterface>>(null!); let graphInterface = $state<ReturnType<typeof GraphInterface>>(null!);
let viewerComponent = $state<ReturnType<typeof Viewer>>(); let viewerComponent = $state<ReturnType<typeof Viewer>>();
let debugData = $state<Record<number, { type: string; data: Int32Array }>>();
const manager = $derived(graphInterface?.manager); const manager = $derived(graphInterface?.manager);
async function randomGenerate() { async function randomGenerate() {
@@ -105,6 +108,7 @@
if (appSettings.value.debug.useWorker) { if (appSettings.value.debug.useWorker) {
let perfData = await runtime.getPerformanceData(); let perfData = await runtime.getPerformanceData();
debugData = await runtime.getDebugData();
let lastRun = perfData?.at(-1); let lastRun = perfData?.at(-1);
if (lastRun?.total) { if (lastRun?.total) {
lastRun.runtime = lastRun.total; lastRun.runtime = lastRun.total;
@@ -163,6 +167,7 @@
bind:scene bind:scene
bind:this={viewerComponent} bind:this={viewerComponent}
perf={performanceStore} perf={performanceStore}
debugData={debugData}
centerCamera={appSettings.value.centerCamera} centerCamera={appSettings.value.centerCamera}
/> />
</Grid.Cell> </Grid.Cell>
@@ -216,7 +221,7 @@
<Panel <Panel
id="performance" id="performance"
title="Performance" title="Performance"
hidden={!appSettings.value.debug.showPerformancePanel} hidden={!appSettings.value.debug.advancedMode}
icon="i-[tabler--brand-speedtest] bg-red-400" icon="i-[tabler--brand-speedtest] bg-red-400"
> >
{#if $performanceStore} {#if $performanceStore}
@@ -229,7 +234,7 @@
<Panel <Panel
id="graph-source" id="graph-source"
title="Graph Source" title="Graph Source"
hidden={!appSettings.value.debug.showGraphJson} hidden={!appSettings.value.debug.advancedMode}
icon="i-[tabler--code]" icon="i-[tabler--code]"
> >
<GraphSource graph={pm.graph ?? manager?.serialize()} /> <GraphSource graph={pm.graph ?? manager?.serialize()} />
@@ -237,7 +242,7 @@
<Panel <Panel
id="benchmark" id="benchmark"
title="Benchmark" title="Benchmark"
hidden={!appSettings.value.debug.showBenchmarkPanel} hidden={!appSettings.value.debug.advancedMode}
icon="i-[tabler--graph] bg-red-400" icon="i-[tabler--graph] bg-red-400"
> >
<BenchmarkPanel run={randomGenerate} /> <BenchmarkPanel run={randomGenerate} />

View File

@@ -3,6 +3,7 @@
"scripts": { "scripts": {
"postinstall": "pnpm run -r --filter 'ui' build", "postinstall": "pnpm run -r --filter 'ui' build",
"lint": "pnpm run -r --parallel lint", "lint": "pnpm run -r --parallel lint",
"qa": "pnpm lint && pnpm check && pnpm test",
"format": "pnpm dprint fmt", "format": "pnpm dprint fmt",
"format:check": "pnpm dprint check", "format:check": "pnpm dprint check",
"test": "pnpm run -r --parallel test", "test": "pnpm run -r --parallel test",

View File

@@ -89,6 +89,12 @@ export const NodeInputPathSchema = z.object({
value: z.array(z.number()).optional() value: z.array(z.number()).optional()
}); });
export const NodeInputAnySchema = z.object({
...DefaultOptionsSchema.shape,
type: z.literal('*'),
value: z.any().optional()
});
export const NodeInputSchema = z.union([ export const NodeInputSchema = z.union([
NodeInputSeedSchema, NodeInputSeedSchema,
NodeInputBooleanSchema, NodeInputBooleanSchema,
@@ -100,7 +106,8 @@ export const NodeInputSchema = z.union([
NodeInputSeedSchema, NodeInputSeedSchema,
NodeInputVec3Schema, NodeInputVec3Schema,
NodeInputGeometrySchema, NodeInputGeometrySchema,
NodeInputPathSchema NodeInputPathSchema,
NodeInputAnySchema
]); ]);
export type NodeInput = z.infer<typeof NodeInputSchema>; export type NodeInput = z.infer<typeof NodeInputSchema>;

View File

@@ -3,10 +3,10 @@
prefix: "i"; prefix: "i";
} }
@source inline("{hover:,}{bg-,outline-,text-,}layer-0"); @source inline("{hover:,}{bg-,outline-,text-,}layer-0{/30,/50,}");
@source inline("{hover:,}{bg-,outline-,text-,}layer-1"); @source inline("{hover:,}{bg-,outline-,text-,}layer-1{/30,/50,}");
@source inline("{hover:,}{bg-,outline-,text-,}layer-2"); @source inline("{hover:,}{bg-,outline-,text-,}layer-2{/30,/50,}");
@source inline("{hover:,}{bg-,outline-,text-,}layer-3"); @source inline("{hover:,}{bg-,outline-,text-,}layer-3{/30,/50,}");
@source inline("{hover:,}{bg-,outline-,text-,}active"); @source inline("{hover:,}{bg-,outline-,text-,}active");
@source inline("{hover:,}{bg-,outline-,text-,}selected"); @source inline("{hover:,}{bg-,outline-,text-,}selected");
@source inline("{hover:,}{bg-,outline-,text-,}outline{!,}"); @source inline("{hover:,}{bg-,outline-,text-,}outline{!,}");
@@ -80,6 +80,7 @@ html {
--neutral-100: #e7e7e7; --neutral-100: #e7e7e7;
--neutral-200: #cecece; --neutral-200: #cecece;
--neutral-300: #7c7c7c; --neutral-300: #7c7c7c;
--neutral-350: #808080;
--neutral-400: #2d2d2d; --neutral-400: #2d2d2d;
--neutral-500: #171717; --neutral-500: #171717;
--neutral-800: #111111; --neutral-800: #111111;
@@ -107,7 +108,7 @@ body {
html.theme-light { html.theme-light {
--color-text: var(--neutral-800); --color-text: var(--neutral-800);
--color-outline: var(--neutral-300); --color-outline: var(--neutral-350);
--color-layer-0: var(--neutral-050); --color-layer-0: var(--neutral-050);
--color-layer-1: var(--neutral-100); --color-layer-1: var(--neutral-100);
--color-layer-2: var(--neutral-200); --color-layer-2: var(--neutral-200);

View File

@@ -126,7 +126,7 @@
<button <button
aria-label="step down" aria-label="step down"
onmousedown={stepDown} onmousedown={stepDown}
class="cursor-pointer w-4 bg-layer-3 opacity-30 hover:opacity-50" class="cursor-pointer w-4 bg-layer-3/30 hover:bg-layer-3/50"
> >
<span class="i-[tabler--chevron-compact-left] block h-full w-full text-outline!"></span> <span class="i-[tabler--chevron-compact-left] block h-full w-full text-outline!"></span>
</button> </button>
@@ -161,7 +161,7 @@
<button <button
aria-label="step up" aria-label="step up"
onmousedown={stepUp} onmousedown={stepUp}
class="cursor-pointer w-4 bg-layer-3 opacity-30 hover:opacity-50" class="cursor-pointer w-4 bg-layer-3/30 hover:bg-layer-3/50"
> >
<span class="i-[tabler--chevron-compact-right] block h-full w-full text-outline!"></span> <span class="i-[tabler--chevron-compact-right] block h-full w-full text-outline!"></span>
</button> </button>

View File

@@ -73,7 +73,7 @@
<InputCheckbox bind:value={mirrorShape} /> <InputCheckbox bind:value={mirrorShape} />
<p>mirror</p> <p>mirror</p>
</label> </label>
<p>{JSON.stringify(points)}</p> <p class="max-w-full overflow-hidden">{JSON.stringify(points)}</p>
{/snippet} {/snippet}
<div style:width="300px"> <div style:width="300px">
<InputShape bind:value={points} mirror={mirrorShape} /> <InputShape bind:value={points} mirror={mirrorShape} />

View File

@@ -12,7 +12,7 @@
<section class="border-outline border-1/2 bg-layer-1 rounded border mb-4 p-4 flex flex-col gap-4 {_class}"> <section class="border-outline border-1/2 bg-layer-1 rounded border mb-4 p-4 flex flex-col gap-4 {_class}">
<h3 class="flex gap-2 font-bold"> <h3 class="flex gap-2 font-bold">
{title} {title}
<div class="flex gap-4 w-full font-normal opacity-50 max-w-[75%] whitespace-pre overflow-hidden text-clip"> <div class="flex gap-4 w-full font-normal opacity-50 max-w-[75%]">
{#if header} {#if header}
{@render header()} {@render header()}
{:else} {:else}

View File

@@ -1,5 +1,10 @@
import { expect, test } from 'vitest'; import { expect, test } from 'vitest';
import { concatEncodedArrays, decodeNestedArray, encodeNestedArray } from './flatTree'; import {
concatEncodedArrays,
decodeNestedArray,
encodeNestedArray,
splitNestedArray
} from './flatTree';
test('it correctly concats nested arrays', () => { test('it correctly concats nested arrays', () => {
const input_a = encodeNestedArray([1, 2, 3]); const input_a = encodeNestedArray([1, 2, 3]);
@@ -82,3 +87,80 @@ test('it correctly handles arrays with mixed data types', () => {
const decoded = decodeNestedArray(encodeNestedArray(input)); const decoded = decodeNestedArray(encodeNestedArray(input));
expect(decoded).toEqual(input); expect(decoded).toEqual(input);
}); });
// Test splitNestedArray function
test('it splits nested array into segments based on structure', () => {
const input = [[1, 2], [3, 4]];
const encoded = new Int32Array(encodeNestedArray(input));
const split = splitNestedArray(encoded);
// Based on the actual behavior, splitNestedArray returns segments
// but the specific behavior needs to match the implementation
expect(Array.isArray(split)).toBe(true);
expect(split.length).toBe(2);
expect(split[0][0]).toBe(1);
expect(split[0][1]).toBe(2);
expect(split[1][0]).toBe(3);
expect(split[1][1]).toBe(4);
});
// Test splitNestedArray function
test('it splits nested array into segments based on structure 2', () => {
// dprint-ignore
const encoded = new Int32Array([
0, 1,
0, 19,
0, 1,
0, 0, 0, 1060487823,
1067592955, 1079491492, -1086248132, 1056069822,
-1078247113, 1086620820, 1073133800, 1047681214,
-1068353940, 1094067306, 1078792112, 0,
1, 1,
0, 19,
0, 1,
0, 0, 0, 1060487823,
-1089446963, 1080524584, 1041006274, 1056069822,
-1092176382, 1087031528, -1088851934, 1047681214,
1081482392, 1094426140, -1107842261, 0,
1, 1,
1, 1
]);
// Should be split into two seperate arrays
const split = splitNestedArray(encoded);
// Based on the actual behavior, splitNestedArray returns segments
// but the specific behavior needs to match the implementation
expect(Array.isArray(split)).toBe(true);
expect(split.length).toBe(2);
expect(split[0][0]).toBe(0);
expect(split[0][1]).toBe(1);
expect(split[1][0]).toBe(0);
expect(split[1][1]).toBe(1);
});
// Test splitNestedArray function
test('it splits nested array into segments based on structure 2', () => {
// dprint-ignore
const encoded = new Int32Array( [
0, 1,
0, 27,
0, 1,
0, 0, 0, 1065353216,
0, 1067757391, 0, 1061997773,
0, 1076145999, 0, 1058642330,
0, 1081542391, 0, 1053609164,
0, 1084534607, 0, 1045220556,
0, 1087232803, 0, 0,
1, 1,
1, 1
]);
// Should be split into two seperate arrays
const split = splitNestedArray(encoded);
// Based on the actual behavior, splitNestedArray returns segments
// but the specific behavior needs to match the implementation
expect(Array.isArray(split)).toBe(true);
expect(split.length).toBe(1);
});