Compare commits
68 Commits
db77a4fd94
...
feat/zig-b
| Author | SHA1 | Date | |
|---|---|---|---|
| 9b94159f8e | |||
| aa4d7f73a8 | |||
| 1efb94b09c | |||
|
|
5570d975f5 | ||
|
|
8c1ba2ee65 | ||
|
|
3e019e4e21 | ||
|
|
a58b19e935 | ||
|
|
6f5c5bb46e
|
||
|
7f2214f15c
|
|||
|
43ef563ae7
|
|||
|
|
714d01da94 | ||
|
|
92308fc43a | ||
|
|
5adf67ed52 | ||
|
|
f54cde734e | ||
| 70d8095869 | |||
|
|
2a90d5de3f | ||
|
d7e9e8b8de
|
|||
|
bdbaab25a4
|
|||
|
|
c7bfb0f05b | ||
|
|
d3a46af4c2 | ||
|
4c76c62a3e
|
|||
|
36cf9211d2
|
|||
|
97a2ffb683
|
|||
|
fffa8c7cdf
|
|||
| de799c2d55 | |||
| 24bef0460c | |||
|
93b64fc7dd
|
|||
|
64ac28f60c
|
|||
|
bd0c2eaacd
|
|||
|
8693c63d16
|
|||
| fbd82bbdfa | |||
| 63997ec262 | |||
|
a3d10d6094
|
|||
|
|
6b6038e546 | ||
|
|
3e3d41ae98 | ||
|
|
a8c76a846e | ||
|
f98b90dcd3
|
|||
|
1ea7d6629f
|
|||
|
617dfb0c9d
|
|||
|
|
c46bf9e64f | ||
|
|
0cfd1e5c96 | ||
|
|
ecfd4d5f2f | ||
|
|
03102fdc75 | ||
|
|
0bd00b0192 | ||
|
|
edbc71ed8f | ||
|
|
4485cef82b | ||
| cdef71265e | |||
|
8e5412c25c
|
|||
|
2904c13c41
|
|||
|
450262b4ae
|
|||
|
11de746c01
|
|||
|
83cb2bd950
|
|||
| e84c715f4c | |||
| f5cea555cd | |||
|
|
ecbcc814ed
|
||
|
|
be97387252
|
||
|
|
987ece2a4b
|
||
|
|
8d2e3f006b
|
||
|
|
80d3e117b4
|
||
|
|
8a540522dd
|
||
|
|
a11214072f
|
||
|
d068828b68
|
|||
|
3565a18364
|
|||
|
73be4fdd73
|
|||
|
702c3ee6cf
|
|||
|
98672eb702
|
|||
|
3eafdc50b1
|
|||
|
|
548e445eb7
|
70
.dprint.jsonc
Normal file
70
.dprint.jsonc
Normal file
@@ -0,0 +1,70 @@
|
|||||||
|
{
|
||||||
|
"$schema": "https://dprint.dev/schemas/v0.json",
|
||||||
|
"indentWidth": 2,
|
||||||
|
"lineWidth": 100,
|
||||||
|
"typescript": {
|
||||||
|
// https://dprint.dev/plugins/typescript/config/
|
||||||
|
"quoteStyle": "preferSingle",
|
||||||
|
"trailingCommas": "never",
|
||||||
|
},
|
||||||
|
"json": {
|
||||||
|
// https://dprint.dev/plugins/json/config/
|
||||||
|
},
|
||||||
|
"markdown": {
|
||||||
|
},
|
||||||
|
"toml": {
|
||||||
|
},
|
||||||
|
"dockerfile": {
|
||||||
|
},
|
||||||
|
"ruff": {
|
||||||
|
},
|
||||||
|
"jupyter": {
|
||||||
|
},
|
||||||
|
"malva": {
|
||||||
|
},
|
||||||
|
"markup": {
|
||||||
|
// https://dprint.dev/plugins/markup_fmt/config/
|
||||||
|
"scriptIndent": true,
|
||||||
|
"styleIndent": true,
|
||||||
|
},
|
||||||
|
"yaml": {
|
||||||
|
},
|
||||||
|
"graphql": {
|
||||||
|
},
|
||||||
|
"exec": {
|
||||||
|
"cwd": "${configDir}",
|
||||||
|
|
||||||
|
"commands": [{
|
||||||
|
"command": "rustfmt",
|
||||||
|
"exts": ["rs"],
|
||||||
|
"cacheKeyFiles": [
|
||||||
|
"rustfmt.toml",
|
||||||
|
"rust-toolchain.toml",
|
||||||
|
],
|
||||||
|
}],
|
||||||
|
},
|
||||||
|
"excludes": [
|
||||||
|
"**/node_modules",
|
||||||
|
"**/build",
|
||||||
|
"**/.svelte-kit",
|
||||||
|
"**/package",
|
||||||
|
"**/*-lock.yaml",
|
||||||
|
"**/yaml.lock",
|
||||||
|
"**/.DS_Store",
|
||||||
|
],
|
||||||
|
"plugins": [
|
||||||
|
"https://plugins.dprint.dev/typescript-0.95.13.wasm",
|
||||||
|
"https://plugins.dprint.dev/json-0.21.1.wasm",
|
||||||
|
"https://plugins.dprint.dev/markdown-0.20.0.wasm",
|
||||||
|
"https://plugins.dprint.dev/toml-0.7.0.wasm",
|
||||||
|
"https://plugins.dprint.dev/dockerfile-0.3.3.wasm",
|
||||||
|
"https://plugins.dprint.dev/ruff-0.6.11.wasm",
|
||||||
|
"https://plugins.dprint.dev/jupyter-0.2.1.wasm",
|
||||||
|
"https://plugins.dprint.dev/g-plane/malva-v0.15.1.wasm",
|
||||||
|
"https://plugins.dprint.dev/g-plane/markup_fmt-v0.25.3.wasm",
|
||||||
|
"https://plugins.dprint.dev/g-plane/pretty_yaml-v0.5.1.wasm",
|
||||||
|
"https://plugins.dprint.dev/g-plane/pretty_graphql-v0.2.3.wasm",
|
||||||
|
"https://plugins.dprint.dev/exec-0.6.0.json@a054130d458f124f9b5c91484833828950723a5af3f8ff2bd1523bd47b83b364",
|
||||||
|
"https://plugins.dprint.dev/biome-0.11.10.wasm",
|
||||||
|
],
|
||||||
|
}
|
||||||
1
.gitignore
vendored
1
.gitignore
vendored
@@ -4,3 +4,4 @@ node_modules/
|
|||||||
# Added by cargo
|
# Added by cargo
|
||||||
|
|
||||||
/target
|
/target
|
||||||
|
.direnv/
|
||||||
|
|||||||
367
Cargo.lock
generated
367
Cargo.lock
generated
@@ -1,176 +1,80 @@
|
|||||||
# This file is automatically @generated by Cargo.
|
# This file is automatically @generated by Cargo.
|
||||||
# It is not intended for manual editing.
|
# It is not intended for manual editing.
|
||||||
version = 3
|
version = 4
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "autocfg"
|
name = "autocfg"
|
||||||
version = "1.2.0"
|
version = "1.5.0"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
|
checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "box"
|
name = "box"
|
||||||
version = "0.1.0"
|
version = "0.1.0"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"console_error_panic_hook",
|
|
||||||
"nodarium_macros",
|
"nodarium_macros",
|
||||||
"nodarium_utils",
|
"nodarium_utils",
|
||||||
"serde",
|
|
||||||
"serde-wasm-bindgen",
|
|
||||||
"wasm-bindgen",
|
|
||||||
"wasm-bindgen-test",
|
|
||||||
"web-sys",
|
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "branch"
|
name = "branch"
|
||||||
version = "0.1.0"
|
version = "0.1.0"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"console_error_panic_hook",
|
|
||||||
"glam",
|
|
||||||
"nodarium_macros",
|
"nodarium_macros",
|
||||||
"nodarium_utils",
|
"nodarium_utils",
|
||||||
"serde",
|
|
||||||
"serde-wasm-bindgen",
|
|
||||||
"wasm-bindgen",
|
|
||||||
"wasm-bindgen-test",
|
|
||||||
"web-sys",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "bumpalo"
|
|
||||||
version = "3.16.0"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c"
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "cfg-if"
|
|
||||||
version = "1.0.0"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "console_error_panic_hook"
|
|
||||||
version = "0.1.7"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "a06aeb73f470f66dcdbf7223caeebb85984942f22f1adb2a088cf9668146bbbc"
|
|
||||||
dependencies = [
|
|
||||||
"cfg-if",
|
|
||||||
"wasm-bindgen",
|
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "float"
|
name = "float"
|
||||||
version = "0.1.0"
|
version = "0.1.0"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"console_error_panic_hook",
|
|
||||||
"nodarium_macros",
|
"nodarium_macros",
|
||||||
"nodarium_utils",
|
"nodarium_utils",
|
||||||
"serde",
|
|
||||||
"serde-wasm-bindgen",
|
|
||||||
"wasm-bindgen",
|
|
||||||
"wasm-bindgen-test",
|
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "glam"
|
name = "glam"
|
||||||
version = "0.27.0"
|
version = "0.30.10"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "9e05e7e6723e3455f4818c7b26e855439f7546cf617ef669d1adedb8669e5cb9"
|
checksum = "19fc433e8437a212d1b6f1e68c7824af3aed907da60afa994e7f542d18d12aa9"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "gravity"
|
name = "gravity"
|
||||||
version = "0.1.0"
|
version = "0.1.0"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"console_error_panic_hook",
|
|
||||||
"glam",
|
"glam",
|
||||||
"nodarium_macros",
|
"nodarium_macros",
|
||||||
"nodarium_utils",
|
"nodarium_utils",
|
||||||
"noise",
|
]
|
||||||
"serde",
|
|
||||||
"serde-wasm-bindgen",
|
[[package]]
|
||||||
"wasm-bindgen",
|
name = "instance"
|
||||||
"wasm-bindgen-test",
|
version = "0.1.0"
|
||||||
"web-sys",
|
dependencies = [
|
||||||
|
"glam",
|
||||||
|
"nodarium_macros",
|
||||||
|
"nodarium_utils",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "itoa"
|
name = "itoa"
|
||||||
version = "1.0.11"
|
version = "1.0.17"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"
|
checksum = "92ecc6618181def0457392ccd0ee51198e065e016d1d527a7ac1b6dc7c1f09d2"
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "js-sys"
|
|
||||||
version = "0.3.69"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d"
|
|
||||||
dependencies = [
|
|
||||||
"wasm-bindgen",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "log"
|
|
||||||
version = "0.4.21"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c"
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "math"
|
name = "math"
|
||||||
version = "0.1.0"
|
version = "0.1.0"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"console_error_panic_hook",
|
|
||||||
"nodarium_macros",
|
"nodarium_macros",
|
||||||
"nodarium_utils",
|
"nodarium_utils",
|
||||||
"serde",
|
|
||||||
"serde-wasm-bindgen",
|
|
||||||
"wasm-bindgen",
|
|
||||||
"wasm-bindgen-test",
|
|
||||||
"web-sys",
|
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "max-plantarium-triangle"
|
name = "memchr"
|
||||||
version = "0.1.0"
|
version = "2.7.6"
|
||||||
dependencies = [
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
"console_error_panic_hook",
|
checksum = "f52b00d39961fc5b2736ea853c9cc86238e165017a493d1d5c8eac6bdc4cc273"
|
||||||
"nodarium_macros",
|
|
||||||
"nodarium_utils",
|
|
||||||
"serde",
|
|
||||||
"serde-wasm-bindgen",
|
|
||||||
"wasm-bindgen",
|
|
||||||
"wasm-bindgen-test",
|
|
||||||
"web-sys",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "max-plantarium-vec3"
|
|
||||||
version = "0.1.0"
|
|
||||||
dependencies = [
|
|
||||||
"console_error_panic_hook",
|
|
||||||
"nodarium_macros",
|
|
||||||
"nodarium_utils",
|
|
||||||
"serde",
|
|
||||||
"serde-wasm-bindgen",
|
|
||||||
"wasm-bindgen",
|
|
||||||
"wasm-bindgen-test",
|
|
||||||
"web-sys",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "nodarium_instance"
|
|
||||||
version = "0.1.0"
|
|
||||||
dependencies = [
|
|
||||||
"console_error_panic_hook",
|
|
||||||
"glam",
|
|
||||||
"nodarium_macros",
|
|
||||||
"nodarium_utils",
|
|
||||||
"serde",
|
|
||||||
"serde-wasm-bindgen",
|
|
||||||
"wasm-bindgen",
|
|
||||||
"wasm-bindgen-test",
|
|
||||||
"web-sys",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "nodarium_macros"
|
name = "nodarium_macros"
|
||||||
@@ -180,7 +84,7 @@ dependencies = [
|
|||||||
"quote",
|
"quote",
|
||||||
"serde",
|
"serde",
|
||||||
"serde_json",
|
"serde_json",
|
||||||
"syn 1.0.109",
|
"syn",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@@ -195,29 +99,19 @@ dependencies = [
|
|||||||
name = "nodarium_utils"
|
name = "nodarium_utils"
|
||||||
version = "0.1.0"
|
version = "0.1.0"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"console_error_panic_hook",
|
|
||||||
"glam",
|
"glam",
|
||||||
"noise",
|
"noise 0.9.0",
|
||||||
"serde",
|
"serde",
|
||||||
"serde_json",
|
"serde_json",
|
||||||
"wasm-bindgen",
|
|
||||||
"web-sys",
|
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "nodes-noise"
|
name = "noise"
|
||||||
version = "0.1.0"
|
version = "0.1.0"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"console_error_panic_hook",
|
|
||||||
"glam",
|
|
||||||
"nodarium_macros",
|
"nodarium_macros",
|
||||||
"nodarium_utils",
|
"nodarium_utils",
|
||||||
"noise",
|
"noise 0.9.0",
|
||||||
"serde",
|
|
||||||
"serde-wasm-bindgen",
|
|
||||||
"wasm-bindgen",
|
|
||||||
"wasm-bindgen-test",
|
|
||||||
"web-sys",
|
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@@ -233,48 +127,35 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "num-traits"
|
name = "num-traits"
|
||||||
version = "0.2.18"
|
version = "0.2.19"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a"
|
checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"autocfg",
|
"autocfg",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "once_cell"
|
|
||||||
version = "1.19.0"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "output"
|
name = "output"
|
||||||
version = "0.1.0"
|
version = "0.1.0"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"console_error_panic_hook",
|
|
||||||
"glam",
|
|
||||||
"nodarium_macros",
|
"nodarium_macros",
|
||||||
"nodarium_utils",
|
"nodarium_utils",
|
||||||
"serde",
|
|
||||||
"serde_json",
|
|
||||||
"wasm-bindgen",
|
|
||||||
"wasm-bindgen-test",
|
|
||||||
"web-sys",
|
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "proc-macro2"
|
name = "proc-macro2"
|
||||||
version = "1.0.81"
|
version = "1.0.105"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "3d1597b0c024618f09a9c3b8655b7e430397a36d23fdafec26d6965e9eec3eba"
|
checksum = "535d180e0ecab6268a3e718bb9fd44db66bbbc256257165fc699dadf70d16fe7"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"unicode-ident",
|
"unicode-ident",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "quote"
|
name = "quote"
|
||||||
version = "1.0.36"
|
version = "1.0.43"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
|
checksum = "dc74d9a594b72ae6656596548f56f667211f8a97b3d4c3d467150794690dc40a"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"proc-macro2",
|
"proc-macro2",
|
||||||
]
|
]
|
||||||
@@ -307,103 +188,76 @@ dependencies = [
|
|||||||
name = "random"
|
name = "random"
|
||||||
version = "0.1.0"
|
version = "0.1.0"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"console_error_panic_hook",
|
|
||||||
"nodarium_macros",
|
"nodarium_macros",
|
||||||
"nodarium_utils",
|
"nodarium_utils",
|
||||||
"serde",
|
|
||||||
"serde-wasm-bindgen",
|
|
||||||
"wasm-bindgen",
|
|
||||||
"wasm-bindgen-test",
|
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "rotate"
|
name = "rotate"
|
||||||
version = "0.1.0"
|
version = "0.1.0"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"console_error_panic_hook",
|
|
||||||
"glam",
|
"glam",
|
||||||
"nodarium_macros",
|
"nodarium_macros",
|
||||||
"nodarium_utils",
|
"nodarium_utils",
|
||||||
"serde",
|
"serde",
|
||||||
"serde-wasm-bindgen",
|
|
||||||
"wasm-bindgen",
|
|
||||||
"wasm-bindgen-test",
|
|
||||||
"web-sys",
|
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "ryu"
|
|
||||||
version = "1.0.17"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1"
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "scoped-tls"
|
|
||||||
version = "1.0.1"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294"
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "serde"
|
name = "serde"
|
||||||
version = "1.0.198"
|
version = "1.0.228"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "9846a40c979031340571da2545a4e5b7c4163bdae79b301d5f86d03979451fcc"
|
checksum = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e"
|
||||||
|
dependencies = [
|
||||||
|
"serde_core",
|
||||||
|
"serde_derive",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "serde_core"
|
||||||
|
version = "1.0.228"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"serde_derive",
|
"serde_derive",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "serde-wasm-bindgen"
|
|
||||||
version = "0.4.5"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "e3b4c031cd0d9014307d82b8abf653c0290fbdaeb4c02d00c63cf52f728628bf"
|
|
||||||
dependencies = [
|
|
||||||
"js-sys",
|
|
||||||
"serde",
|
|
||||||
"wasm-bindgen",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "serde_derive"
|
name = "serde_derive"
|
||||||
version = "1.0.198"
|
version = "1.0.228"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "e88edab869b01783ba905e7d0153f9fc1a6505a96e4ad3018011eedb838566d9"
|
checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"proc-macro2",
|
"proc-macro2",
|
||||||
"quote",
|
"quote",
|
||||||
"syn 2.0.60",
|
"syn",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "serde_json"
|
name = "serde_json"
|
||||||
version = "1.0.116"
|
version = "1.0.149"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "3e17db7126d17feb94eb3fad46bf1a96b034e8aacbc2e775fe81505f8b0b2813"
|
checksum = "83fc039473c5595ace860d8c4fafa220ff474b3fc6bfdb4293327f1a37e94d86"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"itoa",
|
"itoa",
|
||||||
"ryu",
|
"memchr",
|
||||||
"serde",
|
"serde",
|
||||||
|
"serde_core",
|
||||||
|
"zmij",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "stem"
|
name = "stem"
|
||||||
version = "0.1.0"
|
version = "0.1.0"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"console_error_panic_hook",
|
|
||||||
"nodarium_macros",
|
"nodarium_macros",
|
||||||
"nodarium_utils",
|
"nodarium_utils",
|
||||||
"serde",
|
|
||||||
"serde-wasm-bindgen",
|
|
||||||
"wasm-bindgen",
|
|
||||||
"wasm-bindgen-test",
|
|
||||||
"web-sys",
|
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "syn"
|
name = "syn"
|
||||||
version = "1.0.109"
|
version = "2.0.114"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
|
checksum = "d4d107df263a3013ef9b1879b0df87d706ff80f65a86ea879bd9c31f9b307c2a"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"proc-macro2",
|
"proc-macro2",
|
||||||
"quote",
|
"quote",
|
||||||
@@ -411,119 +265,30 @@ dependencies = [
|
|||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "syn"
|
name = "triangle"
|
||||||
version = "2.0.60"
|
version = "0.1.0"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "909518bc7b1c9b779f1bbf07f2929d35af9f0f37e47c6e9ef7f9dddc1e1821f3"
|
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"proc-macro2",
|
"nodarium_macros",
|
||||||
"quote",
|
"nodarium_utils",
|
||||||
"unicode-ident",
|
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "unicode-ident"
|
name = "unicode-ident"
|
||||||
version = "1.0.12"
|
version = "1.0.22"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
|
checksum = "9312f7c4f6ff9069b165498234ce8be658059c6728633667c526e27dc2cf1df5"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "wasm-bindgen"
|
name = "vec3"
|
||||||
version = "0.2.92"
|
version = "0.1.0"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8"
|
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"cfg-if",
|
"nodarium_macros",
|
||||||
"wasm-bindgen-macro",
|
"nodarium_utils",
|
||||||
|
"serde",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "wasm-bindgen-backend"
|
name = "zmij"
|
||||||
version = "0.2.92"
|
version = "1.0.15"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da"
|
checksum = "94f63c051f4fe3c1509da62131a678643c5b6fbdc9273b2b79d4378ebda003d2"
|
||||||
dependencies = [
|
|
||||||
"bumpalo",
|
|
||||||
"log",
|
|
||||||
"once_cell",
|
|
||||||
"proc-macro2",
|
|
||||||
"quote",
|
|
||||||
"syn 2.0.60",
|
|
||||||
"wasm-bindgen-shared",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "wasm-bindgen-futures"
|
|
||||||
version = "0.4.42"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0"
|
|
||||||
dependencies = [
|
|
||||||
"cfg-if",
|
|
||||||
"js-sys",
|
|
||||||
"wasm-bindgen",
|
|
||||||
"web-sys",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "wasm-bindgen-macro"
|
|
||||||
version = "0.2.92"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726"
|
|
||||||
dependencies = [
|
|
||||||
"quote",
|
|
||||||
"wasm-bindgen-macro-support",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "wasm-bindgen-macro-support"
|
|
||||||
version = "0.2.92"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7"
|
|
||||||
dependencies = [
|
|
||||||
"proc-macro2",
|
|
||||||
"quote",
|
|
||||||
"syn 2.0.60",
|
|
||||||
"wasm-bindgen-backend",
|
|
||||||
"wasm-bindgen-shared",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "wasm-bindgen-shared"
|
|
||||||
version = "0.2.92"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96"
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "wasm-bindgen-test"
|
|
||||||
version = "0.3.42"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "d9bf62a58e0780af3e852044583deee40983e5886da43a271dd772379987667b"
|
|
||||||
dependencies = [
|
|
||||||
"console_error_panic_hook",
|
|
||||||
"js-sys",
|
|
||||||
"scoped-tls",
|
|
||||||
"wasm-bindgen",
|
|
||||||
"wasm-bindgen-futures",
|
|
||||||
"wasm-bindgen-test-macro",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "wasm-bindgen-test-macro"
|
|
||||||
version = "0.3.42"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "b7f89739351a2e03cb94beb799d47fb2cac01759b40ec441f7de39b00cbf7ef0"
|
|
||||||
dependencies = [
|
|
||||||
"proc-macro2",
|
|
||||||
"quote",
|
|
||||||
"syn 2.0.60",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "web-sys"
|
|
||||||
version = "0.3.69"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef"
|
|
||||||
dependencies = [
|
|
||||||
"js-sys",
|
|
||||||
"wasm-bindgen",
|
|
||||||
]
|
|
||||||
|
|||||||
@@ -6,7 +6,10 @@ members = [
|
|||||||
"packages/types",
|
"packages/types",
|
||||||
"packages/utils",
|
"packages/utils",
|
||||||
]
|
]
|
||||||
exclude = ["nodes/max/plantarium/.template"]
|
exclude = [
|
||||||
|
"nodes/max/plantarium/.template",
|
||||||
|
"nodes/max/plantarium/zig"
|
||||||
|
]
|
||||||
|
|
||||||
[profile.release]
|
[profile.release]
|
||||||
lto = true
|
lto = true
|
||||||
|
|||||||
@@ -2,10 +2,6 @@ FROM node:24-alpine
|
|||||||
|
|
||||||
RUN apk add --no-cache --update curl rclone g++
|
RUN apk add --no-cache --update curl rclone g++
|
||||||
|
|
||||||
RUN RUSTUP_URL="https://sh.rustup.rs" \
|
|
||||||
&& curl --silent --show-error --location --fail --retry 3 --proto '=https' --tlsv1.2 --output /tmp/rustup-linux-install.sh $RUSTUP_URL \
|
|
||||||
&& sh /tmp/rustup-linux-install.sh -y
|
|
||||||
|
|
||||||
ENV RUSTUP_HOME=/usr/local/rustup \
|
ENV RUSTUP_HOME=/usr/local/rustup \
|
||||||
CARGO_HOME=/usr/local/cargo \
|
CARGO_HOME=/usr/local/cargo \
|
||||||
PATH=/usr/local/cargo/bin:$PATH
|
PATH=/usr/local/cargo/bin:$PATH
|
||||||
@@ -15,7 +11,5 @@ RUN curl --silent --show-error --location --fail --retry 3 \
|
|||||||
--output /tmp/rustup-init.sh https://sh.rustup.rs \
|
--output /tmp/rustup-init.sh https://sh.rustup.rs \
|
||||||
&& sh /tmp/rustup-init.sh -y --no-modify-path --profile minimal \
|
&& sh /tmp/rustup-init.sh -y --no-modify-path --profile minimal \
|
||||||
&& rm /tmp/rustup-init.sh \
|
&& rm /tmp/rustup-init.sh \
|
||||||
&& rustup default stable \
|
|
||||||
&& rustup target add wasm32-unknown-unknown \
|
&& rustup target add wasm32-unknown-unknown \
|
||||||
&& cargo install wasm-pack \
|
|
||||||
&& npm i -g pnpm
|
&& npm i -g pnpm
|
||||||
|
|||||||
43
app/Dockerfile
Normal file
43
app/Dockerfile
Normal file
@@ -0,0 +1,43 @@
|
|||||||
|
FROM jimfx/nodes:latest AS builder
|
||||||
|
|
||||||
|
WORKDIR /app
|
||||||
|
|
||||||
|
COPY pnpm-lock.yaml pnpm-workspace.yaml package.json Cargo.lock Cargo.toml ./
|
||||||
|
|
||||||
|
COPY packages/ ./packages/
|
||||||
|
COPY nodes/ ./nodes/
|
||||||
|
COPY app/package.json ./app/
|
||||||
|
|
||||||
|
RUN --mount=type=cache,id=pnpm-store,target=/root/.local/share/pnpm/store \
|
||||||
|
--mount=type=cache,target=/usr/local/cargo/registry \
|
||||||
|
--mount=type=cache,target=/app/target \
|
||||||
|
pnpm install --frozen-lockfile
|
||||||
|
|
||||||
|
COPY . .
|
||||||
|
|
||||||
|
RUN --mount=type=cache,id=pnpm-store,target=/root/.local/share/pnpm/store \
|
||||||
|
--mount=type=cache,target=/usr/local/cargo/registry \
|
||||||
|
--mount=type=cache,target=/app/target \
|
||||||
|
pnpm build:nodes && \
|
||||||
|
pnpm --filter @nodarium/app... build
|
||||||
|
|
||||||
|
FROM nginx:alpine AS runner
|
||||||
|
|
||||||
|
RUN rm /etc/nginx/conf.d/default.conf
|
||||||
|
|
||||||
|
COPY <<EOF /etc/nginx/conf.d/app.conf
|
||||||
|
server {
|
||||||
|
listen 80;
|
||||||
|
server_name _;
|
||||||
|
root /app;
|
||||||
|
index index.html;
|
||||||
|
|
||||||
|
location / {
|
||||||
|
try_files \$uri \$uri/ /index.html;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
EOF
|
||||||
|
|
||||||
|
COPY --from=builder /app/app/build /app
|
||||||
|
|
||||||
|
EXPOSE 80
|
||||||
@@ -10,37 +10,38 @@
|
|||||||
"preview": "vite preview"
|
"preview": "vite preview"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@nodarium/registry": "link:../packages/registry",
|
"@nodarium/registry": "workspace:*",
|
||||||
"@nodarium/ui": "link:../packages/ui",
|
"@nodarium/ui": "workspace:*",
|
||||||
"@nodarium/utils": "link:../packages/utils",
|
"@nodarium/utils": "workspace:*",
|
||||||
"@sveltejs/kit": "^2.49.0",
|
"@sveltejs/kit": "^2.50.0",
|
||||||
"@threlte/core": "8.3.0",
|
"@tailwindcss/vite": "^4.1.18",
|
||||||
"@threlte/extras": "9.7.0",
|
"@threlte/core": "8.3.1",
|
||||||
"@types/three": "^0.181.0",
|
"@threlte/extras": "9.7.1",
|
||||||
"@unocss/reset": "^66.5.9",
|
|
||||||
"comlink": "^4.4.2",
|
"comlink": "^4.4.2",
|
||||||
"file-saver": "^2.0.5",
|
"file-saver": "^2.0.5",
|
||||||
"idb": "^8.0.3",
|
"idb": "^8.0.3",
|
||||||
"jsondiffpatch": "^0.7.3",
|
"jsondiffpatch": "^0.7.3",
|
||||||
"three": "^0.181.2"
|
"tailwindcss": "^4.1.18",
|
||||||
|
"three": "^0.182.0",
|
||||||
|
"wabt": "^1.0.39"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@iconify-json/tabler": "^1.2.23",
|
"@iconify-json/tabler": "^1.2.26",
|
||||||
"@nodarium/types": "link:../packages/types",
|
"@iconify/tailwind4": "^1.2.1",
|
||||||
|
"@nodarium/types": "workspace:",
|
||||||
"@sveltejs/adapter-static": "^3.0.10",
|
"@sveltejs/adapter-static": "^3.0.10",
|
||||||
"@sveltejs/vite-plugin-svelte": "^6.2.1",
|
"@sveltejs/vite-plugin-svelte": "^6.2.4",
|
||||||
"@tsconfig/svelte": "^5.0.6",
|
"@tsconfig/svelte": "^5.0.6",
|
||||||
"@types/file-saver": "^2.0.7",
|
"@types/file-saver": "^2.0.7",
|
||||||
"@unocss/preset-icons": "^66.5.9",
|
"@types/three": "^0.182.0",
|
||||||
"svelte": "^5.43.14",
|
"svelte": "^5.46.4",
|
||||||
"svelte-check": "^4.3.4",
|
"svelte-check": "^4.3.5",
|
||||||
"tslib": "^2.8.1",
|
"tslib": "^2.8.1",
|
||||||
"typescript": "^5.9.3",
|
"typescript": "^5.9.3",
|
||||||
"unocss": "^66.5.9",
|
"vite": "^7.3.1",
|
||||||
"vite": "^7.2.4",
|
|
||||||
"vite-plugin-comlink": "^5.3.0",
|
"vite-plugin-comlink": "^5.3.0",
|
||||||
"vite-plugin-glsl": "^1.5.4",
|
"vite-plugin-glsl": "^1.5.5",
|
||||||
"vite-plugin-wasm": "^3.5.0",
|
"vite-plugin-wasm": "^3.5.0",
|
||||||
"vitest": "^4.0.13"
|
"vitest": "^4.0.17"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
1576
app/pnpm-lock.yaml
generated
1576
app/pnpm-lock.yaml
generated
File diff suppressed because it is too large
Load Diff
6
app/src/app.css
Normal file
6
app/src/app.css
Normal file
@@ -0,0 +1,6 @@
|
|||||||
|
@import "tailwindcss";
|
||||||
|
@source "../../packages/ui/**/*.svelte";
|
||||||
|
@plugin "@iconify/tailwind4" {
|
||||||
|
prefix: "i";
|
||||||
|
icon-sets: from-folder(custom, "./src/lib/icons")
|
||||||
|
};
|
||||||
@@ -5,7 +5,6 @@
|
|||||||
<meta charset="utf-8" />
|
<meta charset="utf-8" />
|
||||||
<link rel="icon" href="%sveltekit.assets%/svelte.svg" />
|
<link rel="icon" href="%sveltekit.assets%/svelte.svg" />
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1" />
|
<meta name="viewport" content="width=device-width, initial-scale=1" />
|
||||||
<script defer src="https://umami.max-richter.dev/script.js" data-website-id="585c442b-0524-4874-8955-f9853b44b17e"></script>
|
|
||||||
%sveltekit.head%
|
%sveltekit.head%
|
||||||
<title>Nodes</title>
|
<title>Nodes</title>
|
||||||
<script>
|
<script>
|
||||||
|
|||||||
2
app/src/lib/config.ts
Normal file
2
app/src/lib/config.ts
Normal file
@@ -0,0 +1,2 @@
|
|||||||
|
import { PUBLIC_ANALYTIC_SCRIPT } from "$env/static/public";
|
||||||
|
export const ANALYTIC_SCRIPT = PUBLIC_ANALYTIC_SCRIPT;
|
||||||
@@ -1,8 +1,8 @@
|
|||||||
<script lang="ts">
|
<script lang="ts">
|
||||||
import { HTML } from "@threlte/extras";
|
import type { NodeId, NodeInstance } from '@nodarium/types';
|
||||||
import { onMount } from "svelte";
|
import { HTML } from '@threlte/extras';
|
||||||
import type { NodeInstance, NodeId } from "@nodarium/types";
|
import { onMount } from 'svelte';
|
||||||
import { getGraphManager, getGraphState } from "../graph/state.svelte";
|
import { getGraphManager, getGraphState } from '../graph-state.svelte';
|
||||||
|
|
||||||
type Props = {
|
type Props = {
|
||||||
onnode: (n: NodeInstance) => void;
|
onnode: (n: NodeInstance) => void;
|
||||||
@@ -14,6 +14,7 @@
|
|||||||
const graphState = getGraphState();
|
const graphState = getGraphState();
|
||||||
|
|
||||||
let input: HTMLInputElement;
|
let input: HTMLInputElement;
|
||||||
|
let wrapper: HTMLDivElement;
|
||||||
let value = $state<string>();
|
let value = $state<string>();
|
||||||
let activeNodeId = $state<NodeId>();
|
let activeNodeId = $state<NodeId>();
|
||||||
|
|
||||||
@@ -22,10 +23,10 @@
|
|||||||
: graph.getNodeDefinitions();
|
: graph.getNodeDefinitions();
|
||||||
|
|
||||||
function filterNodes() {
|
function filterNodes() {
|
||||||
return allNodes.filter((node) => node.id.includes(value ?? ""));
|
return allNodes.filter((node) => node.id.includes(value ?? ''));
|
||||||
}
|
}
|
||||||
|
|
||||||
const nodes = $derived(value === "" ? allNodes : filterNodes());
|
const nodes = $derived(value === '' ? allNodes : filterNodes());
|
||||||
$effect(() => {
|
$effect(() => {
|
||||||
if (nodes) {
|
if (nodes) {
|
||||||
if (activeNodeId === undefined) {
|
if (activeNodeId === undefined) {
|
||||||
@@ -39,38 +40,38 @@
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
function handleNodeCreation(nodeType: NodeInstance["type"]) {
|
function handleNodeCreation(nodeType: NodeInstance['type']) {
|
||||||
if (!graphState.addMenuPosition) return;
|
if (!graphState.addMenuPosition) return;
|
||||||
onnode?.({
|
onnode?.({
|
||||||
id: -1,
|
id: -1,
|
||||||
type: nodeType,
|
type: nodeType,
|
||||||
position: [...graphState.addMenuPosition],
|
position: [...graphState.addMenuPosition],
|
||||||
props: {},
|
props: {},
|
||||||
state: {},
|
state: {}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
function handleKeyDown(event: KeyboardEvent) {
|
function handleKeyDown(event: KeyboardEvent) {
|
||||||
event.stopImmediatePropagation();
|
event.stopImmediatePropagation();
|
||||||
|
|
||||||
if (event.key === "Escape") {
|
if (event.key === 'Escape') {
|
||||||
graphState.addMenuPosition = null;
|
graphState.addMenuPosition = null;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (event.key === "ArrowDown") {
|
if (event.key === 'ArrowDown') {
|
||||||
const index = nodes.findIndex((node) => node.id === activeNodeId);
|
const index = nodes.findIndex((node) => node.id === activeNodeId);
|
||||||
activeNodeId = nodes[(index + 1) % nodes.length].id;
|
activeNodeId = nodes[(index + 1) % nodes.length].id;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (event.key === "ArrowUp") {
|
if (event.key === 'ArrowUp') {
|
||||||
const index = nodes.findIndex((node) => node.id === activeNodeId);
|
const index = nodes.findIndex((node) => node.id === activeNodeId);
|
||||||
activeNodeId = nodes[(index - 1 + nodes.length) % nodes.length].id;
|
activeNodeId = nodes[(index - 1 + nodes.length) % nodes.length].id;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (event.key === "Enter") {
|
if (event.key === 'Enter') {
|
||||||
if (activeNodeId && graphState.addMenuPosition) {
|
if (activeNodeId && graphState.addMenuPosition) {
|
||||||
handleNodeCreation(activeNodeId);
|
handleNodeCreation(activeNodeId);
|
||||||
}
|
}
|
||||||
@@ -81,6 +82,16 @@
|
|||||||
onMount(() => {
|
onMount(() => {
|
||||||
input.disabled = false;
|
input.disabled = false;
|
||||||
setTimeout(() => input.focus(), 50);
|
setTimeout(() => input.focus(), 50);
|
||||||
|
|
||||||
|
const rect = wrapper.getBoundingClientRect();
|
||||||
|
const deltaY = rect.bottom - window.innerHeight;
|
||||||
|
const deltaX = rect.right - window.innerWidth;
|
||||||
|
if (deltaY > 0) {
|
||||||
|
wrapper.style.marginTop = `-${deltaY + 30}px`;
|
||||||
|
}
|
||||||
|
if (deltaX > 0) {
|
||||||
|
wrapper.style.marginLeft = `-${deltaX + 30}px`;
|
||||||
|
}
|
||||||
});
|
});
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
@@ -89,7 +100,7 @@
|
|||||||
position.z={graphState.addMenuPosition?.[1]}
|
position.z={graphState.addMenuPosition?.[1]}
|
||||||
transform={false}
|
transform={false}
|
||||||
>
|
>
|
||||||
<div class="add-menu-wrapper">
|
<div class="add-menu-wrapper" bind:this={wrapper}>
|
||||||
<div class="header">
|
<div class="header">
|
||||||
<input
|
<input
|
||||||
id="add-menu"
|
id="add-menu"
|
||||||
@@ -112,7 +123,7 @@
|
|||||||
tabindex="0"
|
tabindex="0"
|
||||||
aria-selected={node.id === activeNodeId}
|
aria-selected={node.id === activeNodeId}
|
||||||
onkeydown={(event) => {
|
onkeydown={(event) => {
|
||||||
if (event.key === "Enter") {
|
if (event.key === 'Enter') {
|
||||||
handleNodeCreation(node.id);
|
handleNodeCreation(node.id);
|
||||||
}
|
}
|
||||||
}}
|
}}
|
||||||
@@ -125,7 +136,7 @@
|
|||||||
activeNodeId = node.id;
|
activeNodeId = node.id;
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
{node.id.split("/").at(-1)}
|
{node.id.split('/').at(-1)}
|
||||||
</div>
|
</div>
|
||||||
{/each}
|
{/each}
|
||||||
</div>
|
</div>
|
||||||
@@ -167,6 +178,8 @@
|
|||||||
min-height: none;
|
min-height: none;
|
||||||
width: 100%;
|
width: 100%;
|
||||||
color: var(--text-color);
|
color: var(--text-color);
|
||||||
|
max-height: 300px;
|
||||||
|
overflow-y: auto;
|
||||||
}
|
}
|
||||||
|
|
||||||
.result {
|
.result {
|
||||||
|
|||||||
@@ -1,19 +1,44 @@
|
|||||||
<script lang="ts">
|
<script lang="ts">
|
||||||
import { MeshLineGeometry, MeshLineMaterial } from '@threlte/extras';
|
import { MeshLineGeometry, MeshLineMaterial } from "@threlte/extras";
|
||||||
import { points, lines } from './store.js';
|
import { points, lines, rects } from "./store.js";
|
||||||
import { T } from '@threlte/core';
|
import { T } from "@threlte/core";
|
||||||
|
import { Color } from "three";
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
{#each $points as point}
|
{#each $points as point}
|
||||||
<T.Mesh position.x={point.x} position.y={point.y} position.z={point.z} rotation.x={-Math.PI / 2}>
|
<T.Mesh
|
||||||
<T.CircleGeometry args={[0.2, 32]} />
|
position.x={point.x}
|
||||||
<T.MeshBasicMaterial color="red" />
|
position.y={point.y}
|
||||||
</T.Mesh>
|
position.z={point.z}
|
||||||
|
rotation.x={-Math.PI / 2}
|
||||||
|
>
|
||||||
|
<T.CircleGeometry args={[0.2, 32]} />
|
||||||
|
<T.MeshBasicMaterial color="red" />
|
||||||
|
</T.Mesh>
|
||||||
|
{/each}
|
||||||
|
|
||||||
|
{#each $rects as rect, i}
|
||||||
|
<T.Mesh
|
||||||
|
position.x={(rect.minX + rect.maxX) / 2}
|
||||||
|
position.y={0}
|
||||||
|
position.z={(rect.minY + rect.maxY) / 2}
|
||||||
|
rotation.x={-Math.PI / 2}
|
||||||
|
>
|
||||||
|
<T.PlaneGeometry args={[rect.maxX - rect.minX, rect.maxY - rect.minY]} />
|
||||||
|
<T.MeshBasicMaterial
|
||||||
|
color={new Color().setHSL((i * 1.77) % 1, 1, 0.5)}
|
||||||
|
opacity={0.9}
|
||||||
|
/>
|
||||||
|
</T.Mesh>
|
||||||
{/each}
|
{/each}
|
||||||
|
|
||||||
{#each $lines as line}
|
{#each $lines as line}
|
||||||
<T.Mesh>
|
<T.Mesh position.y={1}>
|
||||||
<MeshLineGeometry points={line} />
|
<MeshLineGeometry points={line.points} />
|
||||||
<MeshLineMaterial color="red" linewidth={1} attenuate={false} />
|
<MeshLineMaterial
|
||||||
</T.Mesh>
|
color={line.color || "red"}
|
||||||
|
linewidth={1}
|
||||||
|
attenuate={false}
|
||||||
|
/>
|
||||||
|
</T.Mesh>
|
||||||
{/each}
|
{/each}
|
||||||
|
|||||||
@@ -1,5 +1,8 @@
|
|||||||
import { Vector3 } from "three/src/math/Vector3.js";
|
import type { Box } from '@nodarium/types';
|
||||||
import { lines, points } from "./store";
|
import type { Color } from 'three';
|
||||||
|
import { Vector3 } from 'three/src/math/Vector3.js';
|
||||||
|
import Component from './Debug.svelte';
|
||||||
|
import { lines, points, rects } from './store';
|
||||||
|
|
||||||
export function debugPosition(x: number, y: number) {
|
export function debugPosition(x: number, y: number) {
|
||||||
points.update((p) => {
|
points.update((p) => {
|
||||||
@@ -8,18 +11,27 @@ export function debugPosition(x: number, y: number) {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function debugRect(rect: Box) {
|
||||||
|
rects.update((r) => {
|
||||||
|
r.push(rect);
|
||||||
|
return r;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
export function clear() {
|
export function clear() {
|
||||||
points.set([]);
|
points.set([]);
|
||||||
lines.set([]);
|
lines.set([]);
|
||||||
|
rects.set([]);
|
||||||
}
|
}
|
||||||
|
|
||||||
export function debugLine(line: Vector3[]) {
|
export function debugLine(points: Vector3[], color?: Color) {
|
||||||
lines.update((l) => {
|
lines.update((l) => {
|
||||||
l.push(line);
|
l.push({ points, color });
|
||||||
return l;
|
return l;
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
import Component from "./Debug.svelte";
|
export default Component;
|
||||||
|
export function clearLines() {
|
||||||
export default Component
|
lines.set([]);
|
||||||
|
}
|
||||||
|
|||||||
@@ -1,6 +1,8 @@
|
|||||||
import { writable } from "svelte/store";
|
import type { Box } from '@nodarium/types';
|
||||||
import { Vector3 } from "three/src/math/Vector3.js";
|
import { writable } from 'svelte/store';
|
||||||
|
import type { Color } from 'three';
|
||||||
|
import { Vector3 } from 'three/src/math/Vector3.js';
|
||||||
|
|
||||||
export const points = writable<Vector3[]>([]);
|
export const points = writable<Vector3[]>([]);
|
||||||
|
export const rects = writable<Box[]>([]);
|
||||||
export const lines = writable<Vector3[][]>([]);
|
export const lines = writable<{ points: Vector3[]; color?: Color }[]>([]);
|
||||||
|
|||||||
@@ -31,6 +31,10 @@
|
|||||||
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 { appSettings } from "$lib/settings/app-settings.svelte";
|
import { appSettings } from "$lib/settings/app-settings.svelte";
|
||||||
|
import { getGraphState } from "../graph-state.svelte";
|
||||||
|
import { onDestroy } from "svelte";
|
||||||
|
|
||||||
|
const graphState = getGraphState();
|
||||||
|
|
||||||
type Props = {
|
type Props = {
|
||||||
x1: number;
|
x1: number;
|
||||||
@@ -38,20 +42,21 @@
|
|||||||
x2: number;
|
x2: number;
|
||||||
y2: number;
|
y2: number;
|
||||||
z: number;
|
z: number;
|
||||||
|
id?: string;
|
||||||
};
|
};
|
||||||
|
|
||||||
const { x1, y1, x2, y2, z }: Props = $props();
|
const { x1, y1, x2, y2, z, 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)));
|
||||||
|
|
||||||
let points = $state<Vector3[]>([]);
|
let points = $state<Vector3[]>([]);
|
||||||
|
|
||||||
let lastId: string | null = null;
|
let lastId: string | null = null;
|
||||||
|
const curveId = $derived(`${x1}-${y1}-${x2}-${y2}`);
|
||||||
|
|
||||||
function update() {
|
function update() {
|
||||||
const new_x = x2 - x1;
|
const new_x = x2 - x1;
|
||||||
const new_y = y2 - y1;
|
const new_y = y2 - y1;
|
||||||
const curveId = `${x1}-${y1}-${x2}-${y2}`;
|
|
||||||
if (lastId === curveId) {
|
if (lastId === curveId) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -72,6 +77,15 @@
|
|||||||
.getPoints(samples)
|
.getPoints(samples)
|
||||||
.map((p) => new Vector3(p.x, 0, p.y))
|
.map((p) => new Vector3(p.x, 0, p.y))
|
||||||
.flat();
|
.flat();
|
||||||
|
|
||||||
|
if (id) {
|
||||||
|
graphState.setEdgeGeometry(
|
||||||
|
id,
|
||||||
|
x1,
|
||||||
|
y1,
|
||||||
|
$state.snapshot(points) as unknown as Vector3[],
|
||||||
|
);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
$effect(() => {
|
$effect(() => {
|
||||||
@@ -79,6 +93,10 @@
|
|||||||
update();
|
update();
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
onDestroy(() => {
|
||||||
|
if (id) graphState.removeEdgeGeometry(id);
|
||||||
|
});
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<T.Mesh
|
<T.Mesh
|
||||||
@@ -101,6 +119,18 @@
|
|||||||
<T.CircleGeometry args={[0.5, 16]} />
|
<T.CircleGeometry args={[0.5, 16]} />
|
||||||
</T.Mesh>
|
</T.Mesh>
|
||||||
|
|
||||||
|
{#if graphState.hoveredEdgeId === id}
|
||||||
|
<T.Mesh position.x={x1} position.z={y1} position.y={0.1}>
|
||||||
|
<MeshLineGeometry {points} />
|
||||||
|
<MeshLineMaterial
|
||||||
|
width={thickness * 5}
|
||||||
|
color={lineColor}
|
||||||
|
opacity={0.5}
|
||||||
|
transparent
|
||||||
|
/>
|
||||||
|
</T.Mesh>
|
||||||
|
{/if}
|
||||||
|
|
||||||
<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} />
|
<MeshLineMaterial width={thickness} color={lineColor} />
|
||||||
|
|||||||
@@ -1,31 +1,33 @@
|
|||||||
|
import throttle from '$lib/helpers/throttle';
|
||||||
|
import { RemoteNodeRegistry } from '@nodarium/registry';
|
||||||
import type {
|
import type {
|
||||||
Edge,
|
Edge,
|
||||||
Graph,
|
Graph,
|
||||||
NodeInstance,
|
|
||||||
NodeDefinition,
|
NodeDefinition,
|
||||||
NodeInput,
|
|
||||||
NodeRegistry,
|
|
||||||
NodeId,
|
NodeId,
|
||||||
Socket,
|
NodeInput,
|
||||||
} from "@nodarium/types";
|
NodeInstance,
|
||||||
import { fastHashString } from "@nodarium/utils";
|
NodeRegistry,
|
||||||
import { SvelteMap } from "svelte/reactivity";
|
Socket
|
||||||
import EventEmitter from "./helpers/EventEmitter";
|
} from '@nodarium/types';
|
||||||
import { createLogger } from "@nodarium/utils";
|
import { fastHashString } from '@nodarium/utils';
|
||||||
import throttle from "$lib/helpers/throttle";
|
import { createLogger } from '@nodarium/utils';
|
||||||
import { HistoryManager } from "./history-manager";
|
import { SvelteMap } from 'svelte/reactivity';
|
||||||
|
import EventEmitter from './helpers/EventEmitter';
|
||||||
|
import { HistoryManager } from './history-manager';
|
||||||
|
|
||||||
const logger = createLogger("graph-manager");
|
const logger = createLogger('graph-manager');
|
||||||
logger.mute();
|
logger.mute();
|
||||||
|
|
||||||
const clone =
|
const remoteRegistry = new RemoteNodeRegistry('');
|
||||||
"structuredClone" in self
|
|
||||||
? self.structuredClone
|
const clone = 'structuredClone' in self
|
||||||
: (args: any) => JSON.parse(JSON.stringify(args));
|
? self.structuredClone
|
||||||
|
: (args: any) => JSON.parse(JSON.stringify(args));
|
||||||
|
|
||||||
function areSocketsCompatible(
|
function areSocketsCompatible(
|
||||||
output: string | undefined,
|
output: string | undefined,
|
||||||
inputs: string | (string | undefined)[] | undefined,
|
inputs: string | (string | undefined)[] | undefined
|
||||||
) {
|
) {
|
||||||
if (Array.isArray(inputs) && output) {
|
if (Array.isArray(inputs) && output) {
|
||||||
return inputs.includes(output);
|
return inputs.includes(output);
|
||||||
@@ -34,24 +36,23 @@ function areSocketsCompatible(
|
|||||||
}
|
}
|
||||||
|
|
||||||
function areEdgesEqual(firstEdge: Edge, secondEdge: Edge) {
|
function areEdgesEqual(firstEdge: Edge, secondEdge: Edge) {
|
||||||
|
|
||||||
if (firstEdge[0].id !== secondEdge[0].id) {
|
if (firstEdge[0].id !== secondEdge[0].id) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (firstEdge[1] !== secondEdge[1]) {
|
if (firstEdge[1] !== secondEdge[1]) {
|
||||||
return false
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (firstEdge[2].id !== secondEdge[2].id) {
|
if (firstEdge[2].id !== secondEdge[2].id) {
|
||||||
return false
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (firstEdge[3] !== secondEdge[3]) {
|
if (firstEdge[3] !== secondEdge[3]) {
|
||||||
return false
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
return true
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
export class GraphManager extends EventEmitter<{
|
export class GraphManager extends EventEmitter<{
|
||||||
@@ -62,7 +63,7 @@ export class GraphManager extends EventEmitter<{
|
|||||||
values: Record<string, unknown>;
|
values: Record<string, unknown>;
|
||||||
};
|
};
|
||||||
}> {
|
}> {
|
||||||
status = $state<"loading" | "idle" | "error">();
|
status = $state<'loading' | 'idle' | 'error'>();
|
||||||
loaded = false;
|
loaded = false;
|
||||||
|
|
||||||
graph: Graph = { id: 0, nodes: [], edges: [] };
|
graph: Graph = { id: 0, nodes: [], edges: [] };
|
||||||
@@ -88,7 +89,7 @@ export class GraphManager extends EventEmitter<{
|
|||||||
history: HistoryManager = new HistoryManager();
|
history: HistoryManager = new HistoryManager();
|
||||||
execute = throttle(() => {
|
execute = throttle(() => {
|
||||||
if (this.loaded === false) return;
|
if (this.loaded === false) return;
|
||||||
this.emit("result", this.serialize());
|
this.emit('result', this.serialize());
|
||||||
}, 10);
|
}, 10);
|
||||||
|
|
||||||
constructor(public registry: NodeRegistry) {
|
constructor(public registry: NodeRegistry) {
|
||||||
@@ -100,21 +101,22 @@ export class GraphManager extends EventEmitter<{
|
|||||||
id: node.id,
|
id: node.id,
|
||||||
position: [...node.position],
|
position: [...node.position],
|
||||||
type: node.type,
|
type: node.type,
|
||||||
props: node.props,
|
props: node.props
|
||||||
})) as NodeInstance[];
|
})) as NodeInstance[];
|
||||||
const edges = this.edges.map((edge) => [
|
const edges = this.edges.map((edge) => [
|
||||||
edge[0].id,
|
edge[0].id,
|
||||||
edge[1],
|
edge[1],
|
||||||
edge[2].id,
|
edge[2].id,
|
||||||
edge[3],
|
edge[3]
|
||||||
]) as Graph["edges"];
|
]) as Graph['edges'];
|
||||||
const serialized = {
|
const serialized = {
|
||||||
id: this.graph.id,
|
id: this.graph.id,
|
||||||
settings: $state.snapshot(this.settings),
|
settings: $state.snapshot(this.settings),
|
||||||
|
meta: $state.snapshot(this.graph.meta),
|
||||||
nodes,
|
nodes,
|
||||||
edges,
|
edges
|
||||||
};
|
};
|
||||||
logger.log("serializing graph", serialized);
|
logger.log('serializing graph', serialized);
|
||||||
return clone($state.snapshot(serialized));
|
return clone($state.snapshot(serialized));
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -148,6 +150,97 @@ export class GraphManager extends EventEmitter<{
|
|||||||
return [...nodes.values()];
|
return [...nodes.values()];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
getEdgeId(e: Edge) {
|
||||||
|
return `${e[0].id}-${e[1]}-${e[2].id}-${e[3]}`;
|
||||||
|
}
|
||||||
|
|
||||||
|
getEdgeById(id: string): Edge | undefined {
|
||||||
|
return this.edges.find((e) => this.getEdgeId(e) === id);
|
||||||
|
}
|
||||||
|
|
||||||
|
dropNodeOnEdge(nodeId: number, edge: Edge) {
|
||||||
|
const draggedNode = this.getNode(nodeId);
|
||||||
|
if (!draggedNode || !draggedNode.state?.type) return;
|
||||||
|
|
||||||
|
const [fromNode, fromSocketIdx, toNode, toSocketKey] = edge;
|
||||||
|
|
||||||
|
const draggedInputs = Object.entries(draggedNode.state.type.inputs ?? {});
|
||||||
|
const draggedOutputs = draggedNode.state.type.outputs ?? [];
|
||||||
|
|
||||||
|
const edgeOutputSocketType = fromNode.state?.type?.outputs?.[fromSocketIdx];
|
||||||
|
const targetInput = toNode.state?.type?.inputs?.[toSocketKey];
|
||||||
|
const targetAcceptedTypes = [targetInput?.type, ...(targetInput?.accepts || [])];
|
||||||
|
|
||||||
|
const bestInputEntry = draggedInputs.find(([_, input]) => {
|
||||||
|
const accepted = [input.type, ...(input.accepts || [])];
|
||||||
|
return areSocketsCompatible(edgeOutputSocketType, accepted);
|
||||||
|
});
|
||||||
|
|
||||||
|
const bestOutputIdx = draggedOutputs.findIndex(outputType =>
|
||||||
|
areSocketsCompatible(outputType, targetAcceptedTypes)
|
||||||
|
);
|
||||||
|
|
||||||
|
if (!bestInputEntry || bestOutputIdx === -1) {
|
||||||
|
logger.error('Could not find compatible sockets for drop');
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
this.startUndoGroup();
|
||||||
|
|
||||||
|
this.removeEdge(edge, { applyDeletion: false });
|
||||||
|
|
||||||
|
this.createEdge(fromNode, fromSocketIdx, draggedNode, bestInputEntry[0], {
|
||||||
|
applyUpdate: false
|
||||||
|
});
|
||||||
|
|
||||||
|
this.createEdge(draggedNode, bestOutputIdx, toNode, toSocketKey, {
|
||||||
|
applyUpdate: false
|
||||||
|
});
|
||||||
|
|
||||||
|
this.saveUndoGroup();
|
||||||
|
this.execute();
|
||||||
|
}
|
||||||
|
|
||||||
|
getPossibleDropOnEdges(nodeId: number): Edge[] {
|
||||||
|
const draggedNode = this.getNode(nodeId);
|
||||||
|
if (!draggedNode || !draggedNode.state?.type) return [];
|
||||||
|
|
||||||
|
const draggedInputs = Object.values(draggedNode.state.type.inputs ?? {});
|
||||||
|
const draggedOutputs = draggedNode.state.type.outputs ?? [];
|
||||||
|
|
||||||
|
// Optimization: Pre-calculate parents to avoid cycles
|
||||||
|
const parentIds = new Set(this.getParentsOfNode(draggedNode).map(n => n.id));
|
||||||
|
|
||||||
|
return this.edges.filter((edge) => {
|
||||||
|
const [fromNode, fromSocketIdx, toNode, toSocketKey] = edge;
|
||||||
|
|
||||||
|
// 1. Prevent cycles: If the target node is already a parent, we can't drop here
|
||||||
|
if (parentIds.has(toNode.id)) return false;
|
||||||
|
|
||||||
|
// 2. Prevent self-dropping: Don't drop on edges already connected to this node
|
||||||
|
if (fromNode.id === nodeId || toNode.id === nodeId) return false;
|
||||||
|
|
||||||
|
// 3. Check if edge.source can plug into ANY draggedNode.input
|
||||||
|
const edgeOutputSocketType = fromNode.state?.type?.outputs?.[fromSocketIdx];
|
||||||
|
const canPlugIntoDragged = draggedInputs.some(input => {
|
||||||
|
const acceptedTypes = [input.type, ...(input.accepts || [])];
|
||||||
|
return areSocketsCompatible(edgeOutputSocketType, acceptedTypes);
|
||||||
|
});
|
||||||
|
|
||||||
|
if (!canPlugIntoDragged) return false;
|
||||||
|
|
||||||
|
// 4. Check if ANY draggedNode.output can plug into edge.target
|
||||||
|
const targetInput = toNode.state?.type?.inputs?.[toSocketKey];
|
||||||
|
const targetAcceptedTypes = [targetInput?.type, ...(targetInput?.accepts || [])];
|
||||||
|
|
||||||
|
const draggedCanPlugIntoTarget = draggedOutputs.some(outputType =>
|
||||||
|
areSocketsCompatible(outputType, targetAcceptedTypes)
|
||||||
|
);
|
||||||
|
|
||||||
|
return draggedCanPlugIntoTarget;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
getEdgesBetweenNodes(nodes: NodeInstance[]): [number, number, number, string][] {
|
getEdgesBetweenNodes(nodes: NodeInstance[]): [number, number, number, string][] {
|
||||||
const edges = [];
|
const edges = [];
|
||||||
for (const node of nodes) {
|
for (const node of nodes) {
|
||||||
@@ -155,14 +248,14 @@ export class GraphManager extends EventEmitter<{
|
|||||||
for (const child of children) {
|
for (const child of children) {
|
||||||
if (nodes.includes(child)) {
|
if (nodes.includes(child)) {
|
||||||
const edge = this.edges.find(
|
const edge = this.edges.find(
|
||||||
(e) => e[0].id === node.id && e[2].id === child.id,
|
(e) => e[0].id === node.id && e[2].id === child.id
|
||||||
);
|
);
|
||||||
if (edge) {
|
if (edge) {
|
||||||
edges.push([edge[0].id, edge[1], edge[2].id, edge[3]] as [
|
edges.push([edge[0].id, edge[1], edge[2].id, edge[3]] as [
|
||||||
number,
|
number,
|
||||||
number,
|
number,
|
||||||
number,
|
number,
|
||||||
string,
|
string
|
||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -179,18 +272,18 @@ export class GraphManager extends EventEmitter<{
|
|||||||
const n = node as NodeInstance;
|
const n = node as NodeInstance;
|
||||||
if (nodeType) {
|
if (nodeType) {
|
||||||
n.state = {
|
n.state = {
|
||||||
type: nodeType,
|
type: nodeType
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
return [node.id, n];
|
return [node.id, n];
|
||||||
}),
|
})
|
||||||
);
|
);
|
||||||
|
|
||||||
const edges = graph.edges.map((edge) => {
|
this.edges = graph.edges.map((edge) => {
|
||||||
const from = nodes.get(edge[0]);
|
const from = nodes.get(edge[0]);
|
||||||
const to = nodes.get(edge[2]);
|
const to = nodes.get(edge[2]);
|
||||||
if (!from || !to) {
|
if (!from || !to) {
|
||||||
throw new Error("Edge references non-existing node");
|
throw new Error('Edge references non-existing node');
|
||||||
}
|
}
|
||||||
from.state.children = from.state.children || [];
|
from.state.children = from.state.children || [];
|
||||||
from.state.children.push(to);
|
from.state.children.push(to);
|
||||||
@@ -199,8 +292,6 @@ export class GraphManager extends EventEmitter<{
|
|||||||
return [from, edge[1], to, edge[3]] as Edge;
|
return [from, edge[1], to, edge[3]] as Edge;
|
||||||
});
|
});
|
||||||
|
|
||||||
this.edges = [...edges];
|
|
||||||
|
|
||||||
this.nodes.clear();
|
this.nodes.clear();
|
||||||
for (const [id, node] of nodes) {
|
for (const [id, node] of nodes) {
|
||||||
this.nodes.set(id, node);
|
this.nodes.set(id, node);
|
||||||
@@ -214,21 +305,36 @@ export class GraphManager extends EventEmitter<{
|
|||||||
|
|
||||||
this.loaded = false;
|
this.loaded = false;
|
||||||
this.graph = graph;
|
this.graph = graph;
|
||||||
this.status = "loading";
|
this.status = 'loading';
|
||||||
this.id = graph.id;
|
this.id = graph.id;
|
||||||
|
|
||||||
logger.info("loading graph", $state.snapshot(graph));
|
logger.info('loading graph', { nodes: graph.nodes, edges: graph.edges, id: graph.id });
|
||||||
|
|
||||||
const nodeIds = Array.from(new Set([...graph.nodes.map((n) => n.type)]));
|
const nodeIds = Array.from(new Set([...graph.nodes.map((n) => n.type)]));
|
||||||
await this.registry.load(nodeIds);
|
await this.registry.load(nodeIds);
|
||||||
|
|
||||||
logger.info("loaded node types", this.registry.getAllNodes());
|
// Fetch all nodes from all collections of the loaded nodes
|
||||||
|
const allCollections = new Set<`${string}/${string}`>();
|
||||||
|
for (const id of nodeIds) {
|
||||||
|
const [user, collection] = id.split('/');
|
||||||
|
allCollections.add(`${user}/${collection}`);
|
||||||
|
}
|
||||||
|
for (const collection of allCollections) {
|
||||||
|
remoteRegistry
|
||||||
|
.fetchCollection(collection)
|
||||||
|
.then((collection: { nodes: { id: NodeId }[] }) => {
|
||||||
|
const ids = collection.nodes.map((n) => n.id);
|
||||||
|
return this.registry.load(ids);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
logger.info('loaded node types', this.registry.getAllNodes());
|
||||||
|
|
||||||
for (const node of this.graph.nodes) {
|
for (const node of this.graph.nodes) {
|
||||||
const nodeType = this.registry.getNode(node.type);
|
const nodeType = this.registry.getNode(node.type);
|
||||||
if (!nodeType) {
|
if (!nodeType) {
|
||||||
logger.error(`Node type not found: ${node.type}`);
|
logger.error(`Node type not found: ${node.type}`);
|
||||||
this.status = "error";
|
this.status = 'error';
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
// Turn into runtime node
|
// Turn into runtime node
|
||||||
@@ -253,11 +359,11 @@ export class GraphManager extends EventEmitter<{
|
|||||||
settingTypes[settingId] = {
|
settingTypes[settingId] = {
|
||||||
__node_type: type.id,
|
__node_type: type.id,
|
||||||
__node_input: key,
|
__node_input: key,
|
||||||
...type.inputs[key],
|
...type.inputs[key]
|
||||||
};
|
};
|
||||||
if (
|
if (
|
||||||
settingValues[settingId] === undefined &&
|
settingValues[settingId] === undefined
|
||||||
"value" in type.inputs[key]
|
&& 'value' in type.inputs[key]
|
||||||
) {
|
) {
|
||||||
settingValues[settingId] = type.inputs[key].value;
|
settingValues[settingId] = type.inputs[key].value;
|
||||||
}
|
}
|
||||||
@@ -267,14 +373,14 @@ export class GraphManager extends EventEmitter<{
|
|||||||
}
|
}
|
||||||
|
|
||||||
this.settings = settingValues;
|
this.settings = settingValues;
|
||||||
this.emit("settings", { types: settingTypes, values: settingValues });
|
this.emit('settings', { types: settingTypes, values: settingValues });
|
||||||
|
|
||||||
this.history.reset();
|
this.history.reset();
|
||||||
this._init(this.graph);
|
this._init(this.graph);
|
||||||
|
|
||||||
this.save();
|
this.save();
|
||||||
|
|
||||||
this.status = "idle";
|
this.status = 'idle';
|
||||||
|
|
||||||
this.loaded = true;
|
this.loaded = true;
|
||||||
logger.log(`Graph loaded in ${performance.now() - a}ms`);
|
logger.log(`Graph loaded in ${performance.now() - a}ms`);
|
||||||
@@ -307,9 +413,9 @@ export class GraphManager extends EventEmitter<{
|
|||||||
if (settingId) {
|
if (settingId) {
|
||||||
settingTypes[settingId] = nodeType.inputs[key];
|
settingTypes[settingId] = nodeType.inputs[key];
|
||||||
if (
|
if (
|
||||||
settingValues &&
|
settingValues
|
||||||
settingValues?.[settingId] === undefined &&
|
&& settingValues?.[settingId] === undefined
|
||||||
"value" in nodeType.inputs[key]
|
&& 'value' in nodeType.inputs[key]
|
||||||
) {
|
) {
|
||||||
settingValues[settingId] = nodeType.inputs[key].value;
|
settingValues[settingId] = nodeType.inputs[key].value;
|
||||||
}
|
}
|
||||||
@@ -319,7 +425,7 @@ export class GraphManager extends EventEmitter<{
|
|||||||
|
|
||||||
this.settings = settingValues;
|
this.settings = settingValues;
|
||||||
this.settingTypes = settingTypes;
|
this.settingTypes = settingTypes;
|
||||||
this.emit("settings", { types: settingTypes, values: settingValues });
|
this.emit('settings', { types: settingTypes, values: settingValues });
|
||||||
}
|
}
|
||||||
|
|
||||||
getChildren(node: NodeInstance) {
|
getChildren(node: NodeInstance) {
|
||||||
@@ -368,7 +474,7 @@ export class GraphManager extends EventEmitter<{
|
|||||||
const inputType = to?.state?.type?.inputs?.[toSocket]?.type;
|
const inputType = to?.state?.type?.inputs?.[toSocket]?.type;
|
||||||
if (outputType === inputType) {
|
if (outputType === inputType) {
|
||||||
this.createEdge(from, fromSocket, to, toSocket, {
|
this.createEdge(from, fromSocket, to, toSocket, {
|
||||||
applyUpdate: false,
|
applyUpdate: false
|
||||||
});
|
});
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
@@ -403,7 +509,7 @@ export class GraphManager extends EventEmitter<{
|
|||||||
// map old ids to new ids
|
// map old ids to new ids
|
||||||
const idMap = new Map<number, number>();
|
const idMap = new Map<number, number>();
|
||||||
|
|
||||||
let startId = this.createNodeId()
|
let startId = this.createNodeId();
|
||||||
|
|
||||||
nodes = nodes.map((node) => {
|
nodes = nodes.map((node) => {
|
||||||
const id = startId++;
|
const id = startId++;
|
||||||
@@ -420,7 +526,7 @@ export class GraphManager extends EventEmitter<{
|
|||||||
const to = nodes.find((n) => n.id === idMap.get(edge[2]));
|
const to = nodes.find((n) => n.id === idMap.get(edge[2]));
|
||||||
|
|
||||||
if (!from || !to) {
|
if (!from || !to) {
|
||||||
throw new Error("Edge references non-existing node");
|
throw new Error('Edge references non-existing node');
|
||||||
}
|
}
|
||||||
|
|
||||||
to.state.parents = to.state.parents || [];
|
to.state.parents = to.state.parents || [];
|
||||||
@@ -445,11 +551,11 @@ export class GraphManager extends EventEmitter<{
|
|||||||
createNode({
|
createNode({
|
||||||
type,
|
type,
|
||||||
position,
|
position,
|
||||||
props = {},
|
props = {}
|
||||||
}: {
|
}: {
|
||||||
type: NodeInstance["type"];
|
type: NodeInstance['type'];
|
||||||
position: NodeInstance["position"];
|
position: NodeInstance['position'];
|
||||||
props: NodeInstance["props"];
|
props: NodeInstance['props'];
|
||||||
}) {
|
}) {
|
||||||
const nodeType = this.registry.getNode(type);
|
const nodeType = this.registry.getNode(type);
|
||||||
if (!nodeType) {
|
if (!nodeType) {
|
||||||
@@ -462,14 +568,14 @@ export class GraphManager extends EventEmitter<{
|
|||||||
type,
|
type,
|
||||||
position,
|
position,
|
||||||
state: { type: nodeType },
|
state: { type: nodeType },
|
||||||
props,
|
props
|
||||||
});
|
});
|
||||||
|
|
||||||
this.nodes.set(node.id, node);
|
this.nodes.set(node.id, node);
|
||||||
|
|
||||||
this.save();
|
this.save();
|
||||||
|
|
||||||
return node
|
return node;
|
||||||
}
|
}
|
||||||
|
|
||||||
createEdge(
|
createEdge(
|
||||||
@@ -477,17 +583,16 @@ export class GraphManager extends EventEmitter<{
|
|||||||
fromSocket: number,
|
fromSocket: number,
|
||||||
to: NodeInstance,
|
to: NodeInstance,
|
||||||
toSocket: string,
|
toSocket: string,
|
||||||
{ applyUpdate = true } = {},
|
{ applyUpdate = true } = {}
|
||||||
): Edge | undefined {
|
): Edge | undefined {
|
||||||
|
|
||||||
const existingEdges = this.getEdgesToNode(to);
|
const existingEdges = this.getEdgesToNode(to);
|
||||||
|
|
||||||
// check if this exact edge already exists
|
// check if this exact edge already exists
|
||||||
const existingEdge = existingEdges.find(
|
const existingEdge = existingEdges.find(
|
||||||
(e) => e[0].id === from.id && e[1] === fromSocket && e[3] === toSocket,
|
(e) => e[0].id === from.id && e[1] === fromSocket && e[3] === toSocket
|
||||||
);
|
);
|
||||||
if (existingEdge) {
|
if (existingEdge) {
|
||||||
logger.error("Edge already exists", existingEdge);
|
logger.error('Edge already exists', existingEdge);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -500,13 +605,13 @@ export class GraphManager extends EventEmitter<{
|
|||||||
|
|
||||||
if (!areSocketsCompatible(fromSocketType, toSocketType)) {
|
if (!areSocketsCompatible(fromSocketType, toSocketType)) {
|
||||||
logger.error(
|
logger.error(
|
||||||
`Socket types do not match: ${fromSocketType} !== ${toSocketType}`,
|
`Socket types do not match: ${fromSocketType} !== ${toSocketType}`
|
||||||
);
|
);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
const edgeToBeReplaced = this.edges.find(
|
const edgeToBeReplaced = this.edges.find(
|
||||||
(e) => e[2].id === to.id && e[3] === toSocket,
|
(e) => e[2].id === to.id && e[3] === toSocket
|
||||||
);
|
);
|
||||||
if (edgeToBeReplaced) {
|
if (edgeToBeReplaced) {
|
||||||
this.removeEdge(edgeToBeReplaced, { applyDeletion: false });
|
this.removeEdge(edgeToBeReplaced, { applyDeletion: false });
|
||||||
@@ -533,7 +638,7 @@ export class GraphManager extends EventEmitter<{
|
|||||||
const nextState = this.history.undo();
|
const nextState = this.history.undo();
|
||||||
if (nextState) {
|
if (nextState) {
|
||||||
this._init(nextState);
|
this._init(nextState);
|
||||||
this.emit("save", this.serialize());
|
this.emit('save', this.serialize());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -541,7 +646,7 @@ export class GraphManager extends EventEmitter<{
|
|||||||
const nextState = this.history.redo();
|
const nextState = this.history.redo();
|
||||||
if (nextState) {
|
if (nextState) {
|
||||||
this._init(nextState);
|
this._init(nextState);
|
||||||
this.emit("save", this.serialize());
|
this.emit('save', this.serialize());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -558,8 +663,15 @@ export class GraphManager extends EventEmitter<{
|
|||||||
if (this.currentUndoGroup) return;
|
if (this.currentUndoGroup) return;
|
||||||
const state = this.serialize();
|
const state = this.serialize();
|
||||||
this.history.save(state);
|
this.history.save(state);
|
||||||
this.emit("save", state);
|
|
||||||
logger.log("saving graphs", state);
|
// This is some stupid race condition where the graph-manager emits a save event
|
||||||
|
// when the graph is not fully loaded
|
||||||
|
if (this.nodes.size === 0 && this.edges.length === 0) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
this.emit('save', state);
|
||||||
|
logger.log('saving graphs', state);
|
||||||
}
|
}
|
||||||
|
|
||||||
getParentsOfNode(node: NodeInstance) {
|
getParentsOfNode(node: NodeInstance) {
|
||||||
@@ -567,7 +679,7 @@ export class GraphManager extends EventEmitter<{
|
|||||||
const stack = node.state?.parents?.slice(0);
|
const stack = node.state?.parents?.slice(0);
|
||||||
while (stack?.length) {
|
while (stack?.length) {
|
||||||
if (parents.length > 1000000) {
|
if (parents.length > 1000000) {
|
||||||
logger.warn("Infinite loop detected");
|
logger.warn('Infinite loop detected');
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
const parent = stack.pop();
|
const parent = stack.pop();
|
||||||
@@ -586,26 +698,28 @@ export class GraphManager extends EventEmitter<{
|
|||||||
return [];
|
return [];
|
||||||
}
|
}
|
||||||
|
|
||||||
const definitions = typeof socket.index === "string"
|
const definitions = typeof socket.index === 'string'
|
||||||
? allDefinitions.filter(s => {
|
? allDefinitions.filter(s => {
|
||||||
return s.outputs?.find(_s => Object
|
return s.outputs?.find(_s =>
|
||||||
.values(nodeType?.inputs || {})
|
Object
|
||||||
.map(s => s.type)
|
.values(nodeType?.inputs || {})
|
||||||
.includes(_s as NodeInput["type"])
|
.map(s => s.type)
|
||||||
)
|
.includes(_s as NodeInput['type'])
|
||||||
|
);
|
||||||
})
|
})
|
||||||
: allDefinitions.filter(s => Object
|
: allDefinitions.filter(s =>
|
||||||
.values(s.inputs ?? {})
|
Object
|
||||||
.find(s => {
|
.values(s.inputs ?? {})
|
||||||
if (s.hidden) return false;
|
.find(s => {
|
||||||
if (nodeType.outputs?.includes(s.type)) {
|
if (s.hidden) return false;
|
||||||
return true
|
if (nodeType.outputs?.includes(s.type)) {
|
||||||
}
|
return true;
|
||||||
return s.accepts?.find(a => nodeType.outputs?.includes(a))
|
}
|
||||||
}))
|
return s.accepts?.find(a => nodeType.outputs?.includes(a));
|
||||||
|
})
|
||||||
return definitions
|
);
|
||||||
|
|
||||||
|
return definitions;
|
||||||
}
|
}
|
||||||
|
|
||||||
getPossibleSockets({ node, index }: Socket): [NodeInstance, string | number][] {
|
getPossibleSockets({ node, index }: Socket): [NodeInstance, string | number][] {
|
||||||
@@ -615,11 +729,11 @@ export class GraphManager extends EventEmitter<{
|
|||||||
const sockets: [NodeInstance, string | number][] = [];
|
const sockets: [NodeInstance, string | number][] = [];
|
||||||
|
|
||||||
// if index is a string, we are an input looking for outputs
|
// if index is a string, we are an input looking for outputs
|
||||||
if (typeof index === "string") {
|
if (typeof index === 'string') {
|
||||||
// filter out self and child nodes
|
// filter out self and child nodes
|
||||||
const children = new Set(this.getChildren(node).map((n) => n.id));
|
const children = new Set(this.getChildren(node).map((n) => n.id));
|
||||||
const nodes = this.getAllNodes().filter(
|
const nodes = this.getAllNodes().filter(
|
||||||
(n) => n.id !== node.id && !children.has(n.id),
|
(n) => n.id !== node.id && !children.has(n.id)
|
||||||
);
|
);
|
||||||
|
|
||||||
const ownType = nodeType?.inputs?.[index].type;
|
const ownType = nodeType?.inputs?.[index].type;
|
||||||
@@ -634,20 +748,20 @@ export class GraphManager extends EventEmitter<{
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else if (typeof index === "number") {
|
} else if (typeof index === 'number') {
|
||||||
// if index is a number, we are an output looking for inputs
|
// if index is a number, we are an output looking for inputs
|
||||||
|
|
||||||
// filter out self and parent nodes
|
// filter out self and parent nodes
|
||||||
const parents = new Set(this.getParentsOfNode(node).map((n) => n.id));
|
const parents = new Set(this.getParentsOfNode(node).map((n) => n.id));
|
||||||
const nodes = this.getAllNodes().filter(
|
const nodes = this.getAllNodes().filter(
|
||||||
(n) => n.id !== node.id && !parents.has(n.id),
|
(n) => n.id !== node.id && !parents.has(n.id)
|
||||||
);
|
);
|
||||||
|
|
||||||
// get edges from this socket
|
// get edges from this socket
|
||||||
const edges = new Map(
|
const edges = new Map(
|
||||||
this.getEdgesFromNode(node)
|
this.getEdgesFromNode(node)
|
||||||
.filter((e) => e[1] === index)
|
.filter((e) => e[1] === index)
|
||||||
.map((e) => [e[2].id, e[3]]),
|
.map((e) => [e[2].id, e[3]])
|
||||||
);
|
);
|
||||||
|
|
||||||
const ownType = nodeType.outputs?.[index];
|
const ownType = nodeType.outputs?.[index];
|
||||||
@@ -660,8 +774,8 @@ export class GraphManager extends EventEmitter<{
|
|||||||
otherType.push(...(inputs[key].accepts || []));
|
otherType.push(...(inputs[key].accepts || []));
|
||||||
|
|
||||||
if (
|
if (
|
||||||
areSocketsCompatible(ownType, otherType) &&
|
areSocketsCompatible(ownType, otherType)
|
||||||
edges.get(node.id) !== key
|
&& edges.get(node.id) !== key
|
||||||
) {
|
) {
|
||||||
sockets.push([node, key]);
|
sockets.push([node, key]);
|
||||||
}
|
}
|
||||||
@@ -674,7 +788,7 @@ export class GraphManager extends EventEmitter<{
|
|||||||
|
|
||||||
removeEdge(
|
removeEdge(
|
||||||
edge: Edge,
|
edge: Edge,
|
||||||
{ applyDeletion = true }: { applyDeletion?: boolean } = {},
|
{ applyDeletion = true }: { applyDeletion?: boolean } = {}
|
||||||
) {
|
) {
|
||||||
const id0 = edge[0].id;
|
const id0 = edge[0].id;
|
||||||
const sid0 = edge[1];
|
const sid0 = edge[1];
|
||||||
@@ -682,21 +796,20 @@ export class GraphManager extends EventEmitter<{
|
|||||||
const sid2 = edge[3];
|
const sid2 = edge[3];
|
||||||
|
|
||||||
const _edge = this.edges.find(
|
const _edge = this.edges.find(
|
||||||
(e) =>
|
(e) => e[0].id === id0 && e[1] === sid0 && e[2].id === id2 && e[3] === sid2
|
||||||
e[0].id === id0 && e[1] === sid0 && e[2].id === id2 && e[3] === sid2,
|
|
||||||
);
|
);
|
||||||
|
|
||||||
if (!_edge) return;
|
if (!_edge) return;
|
||||||
|
|
||||||
if (edge[0].state.children) {
|
if (edge[0].state.children) {
|
||||||
edge[0].state.children = edge[0].state.children.filter(
|
edge[0].state.children = edge[0].state.children.filter(
|
||||||
(n: NodeInstance) => n.id !== id2,
|
(n: NodeInstance) => n.id !== id2
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (edge[2].state.parents) {
|
if (edge[2].state.parents) {
|
||||||
edge[2].state.parents = edge[2].state.parents.filter(
|
edge[2].state.parents = edge[2].state.parents.filter(
|
||||||
(n: NodeInstance) => n.id !== id0,
|
(n: NodeInstance) => n.id !== id0
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -705,7 +818,6 @@ export class GraphManager extends EventEmitter<{
|
|||||||
this.execute();
|
this.execute();
|
||||||
this.save();
|
this.save();
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
getEdgesToNode(node: NodeInstance) {
|
getEdgesToNode(node: NodeInstance) {
|
||||||
|
|||||||
@@ -1,41 +1,70 @@
|
|||||||
import type { NodeInstance, Socket } from "@nodarium/types";
|
import type { NodeInstance, Socket } from '@nodarium/types';
|
||||||
import { getContext, setContext } from "svelte";
|
import { getContext, setContext } from 'svelte';
|
||||||
import { SvelteSet } from "svelte/reactivity";
|
import { SvelteSet } from 'svelte/reactivity';
|
||||||
import type { GraphManager } from "../graph-manager.svelte";
|
import type { OrthographicCamera, Vector3 } from 'three';
|
||||||
import type { OrthographicCamera } from "three";
|
import type { GraphManager } from './graph-manager.svelte';
|
||||||
|
|
||||||
|
const graphStateKey = Symbol('graph-state');
|
||||||
const graphStateKey = Symbol("graph-state");
|
|
||||||
export function getGraphState() {
|
export function getGraphState() {
|
||||||
return getContext<GraphState>(graphStateKey);
|
return getContext<GraphState>(graphStateKey);
|
||||||
}
|
}
|
||||||
export function setGraphState(graphState: GraphState) {
|
export function setGraphState(graphState: GraphState) {
|
||||||
return setContext(graphStateKey, graphState)
|
return setContext(graphStateKey, graphState);
|
||||||
}
|
}
|
||||||
|
|
||||||
const graphManagerKey = Symbol("graph-manager");
|
const graphManagerKey = Symbol('graph-manager');
|
||||||
export function getGraphManager() {
|
export function getGraphManager() {
|
||||||
return getContext<GraphManager>(graphManagerKey)
|
return getContext<GraphManager>(graphManagerKey);
|
||||||
}
|
}
|
||||||
|
|
||||||
export function setGraphManager(manager: GraphManager) {
|
export function setGraphManager(manager: GraphManager) {
|
||||||
return setContext(graphManagerKey, manager);
|
return setContext(graphManagerKey, manager);
|
||||||
}
|
}
|
||||||
|
|
||||||
export class GraphState {
|
type EdgeData = {
|
||||||
|
x1: number;
|
||||||
|
y1: number;
|
||||||
|
points: Vector3[];
|
||||||
|
};
|
||||||
|
|
||||||
constructor(private graph: GraphManager) { }
|
export class GraphState {
|
||||||
|
constructor(private graph: GraphManager) {
|
||||||
|
$effect.root(() => {
|
||||||
|
$effect(() => {
|
||||||
|
localStorage.setItem(
|
||||||
|
'cameraPosition',
|
||||||
|
`[${this.cameraPosition[0]},${this.cameraPosition[1]},${this.cameraPosition[2]}]`
|
||||||
|
);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
const storedPosition = localStorage.getItem('cameraPosition');
|
||||||
|
if (storedPosition) {
|
||||||
|
try {
|
||||||
|
const d = JSON.parse(storedPosition);
|
||||||
|
this.cameraPosition[0] = d[0];
|
||||||
|
this.cameraPosition[1] = d[1];
|
||||||
|
this.cameraPosition[2] = d[2];
|
||||||
|
} catch (e) {
|
||||||
|
console.log('Failed to parsed stored camera position', e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
width = $state(100);
|
width = $state(100);
|
||||||
height = $state(100);
|
height = $state(100);
|
||||||
|
|
||||||
|
hoveredEdgeId = $state<string | null>(null);
|
||||||
|
edges = new Map<string, EdgeData>();
|
||||||
|
|
||||||
wrapper = $state<HTMLDivElement>(null!);
|
wrapper = $state<HTMLDivElement>(null!);
|
||||||
rect: DOMRect = $derived(
|
rect: DOMRect = $derived(
|
||||||
(this.wrapper && this.width && this.height) ? this.wrapper.getBoundingClientRect() : new DOMRect(0, 0, 0, 0),
|
(this.wrapper && this.width && this.height)
|
||||||
|
? this.wrapper.getBoundingClientRect()
|
||||||
|
: new DOMRect(0, 0, 0, 0)
|
||||||
);
|
);
|
||||||
|
|
||||||
camera = $state<OrthographicCamera>(null!);
|
camera = $state<OrthographicCamera>(null!);
|
||||||
cameraPosition: [number, number, number] = $state([0, 0, 4]);
|
cameraPosition: [number, number, number] = $state([140, 100, 3.5]);
|
||||||
|
|
||||||
clipboard: null | {
|
clipboard: null | {
|
||||||
nodes: NodeInstance[];
|
nodes: NodeInstance[];
|
||||||
@@ -46,7 +75,7 @@ export class GraphState {
|
|||||||
this.cameraPosition[0] - this.width / this.cameraPosition[2] / 2,
|
this.cameraPosition[0] - this.width / this.cameraPosition[2] / 2,
|
||||||
this.cameraPosition[0] + this.width / this.cameraPosition[2] / 2,
|
this.cameraPosition[0] + this.width / this.cameraPosition[2] / 2,
|
||||||
this.cameraPosition[1] - this.height / this.cameraPosition[2] / 2,
|
this.cameraPosition[1] - this.height / this.cameraPosition[2] / 2,
|
||||||
this.cameraPosition[1] + this.height / this.cameraPosition[2] / 2,
|
this.cameraPosition[1] + this.height / this.cameraPosition[2] / 2
|
||||||
]);
|
]);
|
||||||
|
|
||||||
boxSelection = $state(false);
|
boxSelection = $state(false);
|
||||||
@@ -54,8 +83,8 @@ export class GraphState {
|
|||||||
addMenuPosition = $state<[number, number] | null>(null);
|
addMenuPosition = $state<[number, number] | null>(null);
|
||||||
|
|
||||||
snapToGrid = $state(false);
|
snapToGrid = $state(false);
|
||||||
showGrid = $state(true)
|
showGrid = $state(true);
|
||||||
showHelp = $state(false)
|
showHelp = $state(false);
|
||||||
|
|
||||||
cameraDown = [0, 0];
|
cameraDown = [0, 0];
|
||||||
mouseDownNodeId = -1;
|
mouseDownNodeId = -1;
|
||||||
@@ -71,51 +100,49 @@ export class GraphState {
|
|||||||
hoveredSocket = $state<Socket | null>(null);
|
hoveredSocket = $state<Socket | null>(null);
|
||||||
possibleSockets = $state<Socket[]>([]);
|
possibleSockets = $state<Socket[]>([]);
|
||||||
possibleSocketIds = $derived(
|
possibleSocketIds = $derived(
|
||||||
new Set(this.possibleSockets.map((s) => `${s.node.id}-${s.index}`)),
|
new Set(this.possibleSockets.map((s) => `${s.node.id}-${s.index}`))
|
||||||
);
|
);
|
||||||
|
|
||||||
|
getEdges() {
|
||||||
|
return $state.snapshot(this.edges);
|
||||||
|
}
|
||||||
|
|
||||||
clearSelection() {
|
clearSelection() {
|
||||||
this.selectedNodes.clear();
|
this.selectedNodes.clear();
|
||||||
}
|
}
|
||||||
|
|
||||||
isBodyFocused = () => document?.activeElement?.nodeName !== "INPUT";
|
isBodyFocused = () => document?.activeElement?.nodeName !== 'INPUT';
|
||||||
|
|
||||||
setCameraTransform(
|
setEdgeGeometry(edgeId: string, x1: number, y1: number, points: Vector3[]) {
|
||||||
x = this.cameraPosition[0],
|
this.edges.set(edgeId, { x1, y1, points });
|
||||||
y = this.cameraPosition[1],
|
|
||||||
z = this.cameraPosition[2],
|
|
||||||
) {
|
|
||||||
if (this.camera) {
|
|
||||||
this.camera.position.x = x;
|
|
||||||
this.camera.position.z = y;
|
|
||||||
this.camera.zoom = z;
|
|
||||||
}
|
|
||||||
this.cameraPosition = [x, y, z];
|
|
||||||
localStorage.setItem("cameraPosition", JSON.stringify(this.cameraPosition));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
removeEdgeGeometry(edgeId: string) {
|
||||||
|
this.edges.delete(edgeId);
|
||||||
|
}
|
||||||
|
|
||||||
|
getEdgeData() {
|
||||||
|
return this.edges;
|
||||||
|
}
|
||||||
|
|
||||||
updateNodePosition(node: NodeInstance) {
|
updateNodePosition(node: NodeInstance) {
|
||||||
if (node.state.ref && node.state.mesh) {
|
if (
|
||||||
if (node.state["x"] !== undefined && node.state["y"] !== undefined) {
|
node.state.x === node.position[0]
|
||||||
node.state.ref.style.setProperty("--nx", `${node.state.x * 10}px`);
|
&& node.state.y === node.position[1]
|
||||||
node.state.ref.style.setProperty("--ny", `${node.state.y * 10}px`);
|
) {
|
||||||
node.state.mesh.position.x = node.state.x + 10;
|
delete node.state.x;
|
||||||
node.state.mesh.position.z = node.state.y + this.getNodeHeight(node.type) / 2;
|
delete node.state.y;
|
||||||
if (
|
}
|
||||||
node.state.x === node.position[0] &&
|
|
||||||
node.state.y === node.position[1]
|
if (node.state['x'] !== undefined && node.state['y'] !== undefined) {
|
||||||
) {
|
if (node.state.ref) {
|
||||||
delete node.state.x;
|
node.state.ref.style.setProperty('--nx', `${node.state.x * 10}px`);
|
||||||
delete node.state.y;
|
node.state.ref.style.setProperty('--ny', `${node.state.y * 10}px`);
|
||||||
}
|
}
|
||||||
this.graph.edges = [...this.graph.edges];
|
} else {
|
||||||
} else {
|
if (node.state.ref) {
|
||||||
node.state.ref.style.setProperty("--nx", `${node.position[0] * 10}px`);
|
node.state.ref.style.setProperty('--nx', `${node.position[0] * 10}px`);
|
||||||
node.state.ref.style.setProperty("--ny", `${node.position[1] * 10}px`);
|
node.state.ref.style.setProperty('--ny', `${node.position[1] * 10}px`);
|
||||||
node.state.mesh.position.x = node.position[0] + 10;
|
|
||||||
node.state.mesh.position.z =
|
|
||||||
node.position[1] + this.getNodeHeight(node.type) / 2;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -135,18 +162,18 @@ export class GraphState {
|
|||||||
|
|
||||||
getSocketPosition(
|
getSocketPosition(
|
||||||
node: NodeInstance,
|
node: NodeInstance,
|
||||||
index: string | number,
|
index: string | number
|
||||||
): [number, number] {
|
): [number, number] {
|
||||||
if (typeof index === "number") {
|
if (typeof index === 'number') {
|
||||||
return [
|
return [
|
||||||
(node?.state?.x ?? node.position[0]) + 20,
|
(node?.state?.x ?? node.position[0]) + 20,
|
||||||
(node?.state?.y ?? node.position[1]) + 2.5 + 10 * index,
|
(node?.state?.y ?? node.position[1]) + 2.5 + 10 * index
|
||||||
];
|
];
|
||||||
} else {
|
} else {
|
||||||
const _index = Object.keys(node.state?.type?.inputs || {}).indexOf(index);
|
const _index = Object.keys(node.state?.type?.inputs || {}).indexOf(index);
|
||||||
return [
|
return [
|
||||||
node?.state?.x ?? node.position[0],
|
node?.state?.x ?? node.position[0],
|
||||||
(node?.state?.y ?? node.position[1]) + 10 + 10 * _index,
|
(node?.state?.y ?? node.position[1]) + 10 + 10 * _index
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -160,26 +187,26 @@ export class GraphState {
|
|||||||
if (!node?.inputs) {
|
if (!node?.inputs) {
|
||||||
return 5;
|
return 5;
|
||||||
}
|
}
|
||||||
const height =
|
const height = 5
|
||||||
5 +
|
+ 10
|
||||||
10 *
|
* Object.keys(node.inputs).filter(
|
||||||
Object.keys(node.inputs).filter(
|
(p) =>
|
||||||
(p) =>
|
p !== 'seed'
|
||||||
p !== "seed" &&
|
&& node?.inputs
|
||||||
node?.inputs &&
|
&& !('setting' in node?.inputs?.[p])
|
||||||
!("setting" in node?.inputs?.[p]) &&
|
&& node.inputs[p].hidden !== true
|
||||||
node.inputs[p].hidden !== true,
|
).length;
|
||||||
).length;
|
|
||||||
this.nodeHeightCache[nodeTypeId] = height;
|
this.nodeHeightCache[nodeTypeId] = height;
|
||||||
return height;
|
return height;
|
||||||
}
|
}
|
||||||
|
|
||||||
copyNodes() {
|
copyNodes() {
|
||||||
if (this.activeNodeId === -1 && !this.selectedNodes?.size)
|
if (this.activeNodeId === -1 && !this.selectedNodes?.size) {
|
||||||
return;
|
return;
|
||||||
|
}
|
||||||
let nodes = [
|
let nodes = [
|
||||||
this.activeNodeId,
|
this.activeNodeId,
|
||||||
...(this.selectedNodes?.values() || []),
|
...(this.selectedNodes?.values() || [])
|
||||||
]
|
]
|
||||||
.map((id) => this.graph.getNode(id))
|
.map((id) => this.graph.getNode(id))
|
||||||
.filter(b => !!b);
|
.filter(b => !!b);
|
||||||
@@ -189,14 +216,14 @@ export class GraphState {
|
|||||||
...node,
|
...node,
|
||||||
position: [
|
position: [
|
||||||
this.mousePosition[0] - node.position[0],
|
this.mousePosition[0] - node.position[0],
|
||||||
this.mousePosition[1] - node.position[1],
|
this.mousePosition[1] - node.position[1]
|
||||||
],
|
],
|
||||||
tmp: undefined,
|
tmp: undefined
|
||||||
}));
|
}));
|
||||||
|
|
||||||
this.clipboard = {
|
this.clipboard = {
|
||||||
nodes: nodes,
|
nodes: nodes,
|
||||||
edges: edges,
|
edges: edges
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -218,14 +245,13 @@ export class GraphState {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
setDownSocket(socket: Socket) {
|
setDownSocket(socket: Socket) {
|
||||||
this.activeSocket = socket;
|
this.activeSocket = socket;
|
||||||
|
|
||||||
let { node, index, position } = socket;
|
let { node, index, position } = socket;
|
||||||
|
|
||||||
// remove existing edge
|
// remove existing edge
|
||||||
if (typeof index === "string") {
|
if (typeof index === 'string') {
|
||||||
const edges = this.graph.getEdgesToNode(node);
|
const edges = this.graph.getEdgesToNode(node);
|
||||||
for (const edge of edges) {
|
for (const edge of edges) {
|
||||||
if (edge[3] === index) {
|
if (edge[3] === index) {
|
||||||
@@ -242,7 +268,7 @@ export class GraphState {
|
|||||||
this.activeSocket = {
|
this.activeSocket = {
|
||||||
node,
|
node,
|
||||||
index,
|
index,
|
||||||
position,
|
position
|
||||||
};
|
};
|
||||||
|
|
||||||
this.possibleSockets = this.graph
|
this.possibleSockets = this.graph
|
||||||
@@ -251,18 +277,17 @@ export class GraphState {
|
|||||||
return {
|
return {
|
||||||
node,
|
node,
|
||||||
index,
|
index,
|
||||||
position: this.getSocketPosition(node, index),
|
position: this.getSocketPosition(node, index)
|
||||||
};
|
};
|
||||||
});
|
});
|
||||||
};
|
}
|
||||||
|
|
||||||
|
|
||||||
projectScreenToWorld(x: number, y: number): [number, number] {
|
projectScreenToWorld(x: number, y: number): [number, number] {
|
||||||
return [
|
return [
|
||||||
this.cameraPosition[0] +
|
this.cameraPosition[0]
|
||||||
(x - this.width / 2) / this.cameraPosition[2],
|
+ (x - this.width / 2) / this.cameraPosition[2],
|
||||||
this.cameraPosition[1] +
|
this.cameraPosition[1]
|
||||||
(y - this.height / 2) / this.cameraPosition[2],
|
+ (y - this.height / 2) / this.cameraPosition[2]
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -275,8 +300,8 @@ export class GraphState {
|
|||||||
if (event.button === 0) {
|
if (event.button === 0) {
|
||||||
// check if the clicked element is a node
|
// check if the clicked element is a node
|
||||||
if (event.target instanceof HTMLElement) {
|
if (event.target instanceof HTMLElement) {
|
||||||
const nodeElement = event.target.closest(".node");
|
const nodeElement = event.target.closest('.node');
|
||||||
const nodeId = nodeElement?.getAttribute?.("data-node-id");
|
const nodeId = nodeElement?.getAttribute?.('data-node-id');
|
||||||
if (nodeId) {
|
if (nodeId) {
|
||||||
clickedNodeId = parseInt(nodeId, 10);
|
clickedNodeId = parseInt(nodeId, 10);
|
||||||
}
|
}
|
||||||
@@ -304,10 +329,14 @@ export class GraphState {
|
|||||||
const height = this.getNodeHeight(node.type);
|
const height = this.getNodeHeight(node.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() {
|
||||||
|
this.addMenuPosition = [this.mousePosition[0], this.mousePosition[1]];
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@@ -1,22 +1,23 @@
|
|||||||
<script lang="ts">
|
<script lang="ts">
|
||||||
import type { Edge, NodeInstance } from "@nodarium/types";
|
import type { Edge, NodeInstance } from '@nodarium/types';
|
||||||
import { onMount } from "svelte";
|
import { Canvas } from '@threlte/core';
|
||||||
import { createKeyMap } from "../../helpers/createKeyMap";
|
import { HTML } from '@threlte/extras';
|
||||||
import AddMenu from "../components/AddMenu.svelte";
|
import { createKeyMap } from '../../helpers/createKeyMap';
|
||||||
import Background from "../background/Background.svelte";
|
import Background from '../background/Background.svelte';
|
||||||
import BoxSelection from "../components/BoxSelection.svelte";
|
import AddMenu from '../components/AddMenu.svelte';
|
||||||
import EdgeEl from "../edges/Edge.svelte";
|
import BoxSelection from '../components/BoxSelection.svelte';
|
||||||
import NodeEl from "../node/Node.svelte";
|
import Camera from '../components/Camera.svelte';
|
||||||
import Camera from "../components/Camera.svelte";
|
import HelpView from '../components/HelpView.svelte';
|
||||||
import { Canvas } from "@threlte/core";
|
import Debug from '../debug/Debug.svelte';
|
||||||
import HelpView from "../components/HelpView.svelte";
|
import EdgeEl from '../edges/Edge.svelte';
|
||||||
import { getGraphManager, getGraphState } from "./state.svelte";
|
import { getGraphManager, getGraphState } from '../graph-state.svelte';
|
||||||
import { HTML } from "@threlte/extras";
|
import NodeEl from '../node/Node.svelte';
|
||||||
import { FileDropEventManager, MouseEventManager } from "./events";
|
import { maxZoom, minZoom } from './constants';
|
||||||
import { maxZoom, minZoom } from "./constants";
|
import { FileDropEventManager } from './drop.events';
|
||||||
|
import { MouseEventManager } from './mouse.events';
|
||||||
|
|
||||||
const {
|
const {
|
||||||
keymap,
|
keymap
|
||||||
}: {
|
}: {
|
||||||
keymap: ReturnType<typeof createKeyMap>;
|
keymap: ReturnType<typeof createKeyMap>;
|
||||||
} = $props();
|
} = $props();
|
||||||
@@ -44,19 +45,18 @@
|
|||||||
const newNode = graph.createNode({
|
const newNode = graph.createNode({
|
||||||
type: node.type,
|
type: node.type,
|
||||||
position: node.position,
|
position: node.position,
|
||||||
props: node.props,
|
props: node.props
|
||||||
});
|
});
|
||||||
if (!newNode) return;
|
if (!newNode) return;
|
||||||
|
|
||||||
if (graphState.activeSocket) {
|
if (graphState.activeSocket) {
|
||||||
if (typeof graphState.activeSocket.index === "number") {
|
if (typeof graphState.activeSocket.index === 'number') {
|
||||||
const socketType =
|
const socketType = graphState.activeSocket.node.state?.type?.outputs?.[
|
||||||
graphState.activeSocket.node.state?.type?.outputs?.[
|
graphState.activeSocket.index
|
||||||
graphState.activeSocket.index
|
];
|
||||||
];
|
|
||||||
|
|
||||||
const input = Object.entries(newNode?.state?.type?.inputs || {}).find(
|
const input = Object.entries(newNode?.state?.type?.inputs || {}).find(
|
||||||
(inp) => inp[1].type === socketType,
|
(inp) => inp[1].type === socketType
|
||||||
);
|
);
|
||||||
|
|
||||||
if (input) {
|
if (input) {
|
||||||
@@ -64,14 +64,13 @@
|
|||||||
graphState.activeSocket.node,
|
graphState.activeSocket.node,
|
||||||
graphState.activeSocket.index,
|
graphState.activeSocket.index,
|
||||||
newNode,
|
newNode,
|
||||||
input[0],
|
input[0]
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
const socketType =
|
const socketType = graphState.activeSocket.node.state?.type?.inputs?.[
|
||||||
graphState.activeSocket.node.state?.type?.inputs?.[
|
graphState.activeSocket.index
|
||||||
graphState.activeSocket.index
|
];
|
||||||
];
|
|
||||||
|
|
||||||
const output = newNode.state?.type?.outputs?.find((out) => {
|
const output = newNode.state?.type?.outputs?.find((out) => {
|
||||||
if (socketType?.type === out) return true;
|
if (socketType?.type === out) return true;
|
||||||
@@ -84,7 +83,7 @@
|
|||||||
newNode,
|
newNode,
|
||||||
output.indexOf(output),
|
output.indexOf(output),
|
||||||
graphState.activeSocket.node,
|
graphState.activeSocket.node,
|
||||||
graphState.activeSocket.index,
|
graphState.activeSocket.index
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -93,26 +92,18 @@
|
|||||||
graphState.activeSocket = null;
|
graphState.activeSocket = null;
|
||||||
graphState.addMenuPosition = null;
|
graphState.addMenuPosition = null;
|
||||||
}
|
}
|
||||||
|
|
||||||
onMount(() => {
|
|
||||||
if (localStorage.getItem("cameraPosition")) {
|
|
||||||
const cPosition = JSON.parse(localStorage.getItem("cameraPosition")!);
|
|
||||||
if (Array.isArray(cPosition)) {
|
|
||||||
graphState.setCameraTransform(cPosition[0], cPosition[1], cPosition[2]);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
});
|
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<svelte:window
|
<svelte:window
|
||||||
onmousemove={(ev) => mouseEvents.handleMouseMove(ev)}
|
onmousemove={(ev) => mouseEvents.handleWindowMouseMove(ev)}
|
||||||
onmouseup={(ev) => mouseEvents.handleMouseUp(ev)}
|
onmouseup={(ev) => mouseEvents.handleWindowMouseUp(ev)}
|
||||||
/>
|
/>
|
||||||
|
|
||||||
<div
|
<div
|
||||||
onwheel={(ev) => mouseEvents.handleMouseScroll(ev)}
|
onwheel={(ev) => mouseEvents.handleMouseScroll(ev)}
|
||||||
bind:this={graphState.wrapper}
|
bind:this={graphState.wrapper}
|
||||||
class="graph-wrapper"
|
class="graph-wrapper"
|
||||||
|
style="height: 100%"
|
||||||
class:is-panning={graphState.isPanning}
|
class:is-panning={graphState.isPanning}
|
||||||
class:is-hovering={graphState.hoveredNodeId !== -1}
|
class:is-hovering={graphState.hoveredNodeId !== -1}
|
||||||
aria-label="Graph"
|
aria-label="Graph"
|
||||||
@@ -122,6 +113,7 @@
|
|||||||
bind:clientHeight={graphState.height}
|
bind:clientHeight={graphState.height}
|
||||||
onkeydown={(ev) => keymap.handleKeyboardEvent(ev)}
|
onkeydown={(ev) => keymap.handleKeyboardEvent(ev)}
|
||||||
onmousedown={(ev) => mouseEvents.handleMouseDown(ev)}
|
onmousedown={(ev) => mouseEvents.handleMouseDown(ev)}
|
||||||
|
oncontextmenu={(ev) => mouseEvents.handleContextMenu(ev)}
|
||||||
{...fileDropEvents.getEventListenerProps()}
|
{...fileDropEvents.getEventListenerProps()}
|
||||||
>
|
>
|
||||||
<input
|
<input
|
||||||
@@ -154,20 +146,18 @@
|
|||||||
<BoxSelection
|
<BoxSelection
|
||||||
cameraPosition={graphState.cameraPosition}
|
cameraPosition={graphState.cameraPosition}
|
||||||
p1={{
|
p1={{
|
||||||
x:
|
x: graphState.cameraPosition[0]
|
||||||
graphState.cameraPosition[0] +
|
+ (graphState.mouseDown[0] - graphState.width / 2)
|
||||||
(graphState.mouseDown[0] - graphState.width / 2) /
|
/ graphState.cameraPosition[2],
|
||||||
graphState.cameraPosition[2],
|
y: graphState.cameraPosition[1]
|
||||||
y:
|
+ (graphState.mouseDown[1] - graphState.height / 2)
|
||||||
graphState.cameraPosition[1] +
|
/ graphState.cameraPosition[2]
|
||||||
(graphState.mouseDown[1] - graphState.height / 2) /
|
|
||||||
graphState.cameraPosition[2],
|
|
||||||
}}
|
}}
|
||||||
p2={{ x: graphState.mousePosition[0], y: graphState.mousePosition[1] }}
|
p2={{ x: graphState.mousePosition[0], y: graphState.mousePosition[1] }}
|
||||||
/>
|
/>
|
||||||
{/if}
|
{/if}
|
||||||
|
|
||||||
{#if graph.status === "idle"}
|
{#if graph.status === 'idle'}
|
||||||
{#if graphState.addMenuPosition}
|
{#if graphState.addMenuPosition}
|
||||||
<AddMenu onnode={handleNodeCreation} />
|
<AddMenu onnode={handleNodeCreation} />
|
||||||
{/if}
|
{/if}
|
||||||
@@ -184,9 +174,18 @@
|
|||||||
|
|
||||||
{#each graph.edges as edge}
|
{#each graph.edges as edge}
|
||||||
{@const [x1, y1, x2, y2] = getEdgePosition(edge)}
|
{@const [x1, y1, x2, y2] = getEdgePosition(edge)}
|
||||||
<EdgeEl z={graphState.cameraPosition[2]} {x1} {y1} {x2} {y2} />
|
<EdgeEl
|
||||||
|
id={graph.getEdgeId(edge)}
|
||||||
|
z={graphState.cameraPosition[2]}
|
||||||
|
{x1}
|
||||||
|
{y1}
|
||||||
|
{x2}
|
||||||
|
{y2}
|
||||||
|
/>
|
||||||
{/each}
|
{/each}
|
||||||
|
|
||||||
|
<Debug />
|
||||||
|
|
||||||
<HTML transform={false}>
|
<HTML transform={false}>
|
||||||
<div
|
<div
|
||||||
role="tree"
|
role="tree"
|
||||||
@@ -205,9 +204,9 @@
|
|||||||
{/each}
|
{/each}
|
||||||
</div>
|
</div>
|
||||||
</HTML>
|
</HTML>
|
||||||
{:else if graph.status === "loading"}
|
{:else if graph.status === 'loading'}
|
||||||
<span>Loading</span>
|
<span>Loading</span>
|
||||||
{:else if graph.status === "error"}
|
{:else if graph.status === 'error'}
|
||||||
<span>Error</span>
|
<span>Error</span>
|
||||||
{/if}
|
{/if}
|
||||||
</Canvas>
|
</Canvas>
|
||||||
|
|||||||
@@ -3,11 +3,15 @@
|
|||||||
import GraphEl from "./Graph.svelte";
|
import GraphEl from "./Graph.svelte";
|
||||||
import { GraphManager } from "../graph-manager.svelte";
|
import { GraphManager } from "../graph-manager.svelte";
|
||||||
import { createKeyMap } from "$lib/helpers/createKeyMap";
|
import { createKeyMap } from "$lib/helpers/createKeyMap";
|
||||||
import { GraphState, setGraphManager, setGraphState } from "./state.svelte";
|
import {
|
||||||
|
GraphState,
|
||||||
|
setGraphManager,
|
||||||
|
setGraphState,
|
||||||
|
} from "../graph-state.svelte";
|
||||||
import { setupKeymaps } from "../keymaps";
|
import { setupKeymaps } from "../keymaps";
|
||||||
|
|
||||||
type Props = {
|
type Props = {
|
||||||
graph: Graph;
|
graph?: Graph;
|
||||||
registry: NodeRegistry;
|
registry: NodeRegistry;
|
||||||
|
|
||||||
settings?: Record<string, any>;
|
settings?: Record<string, any>;
|
||||||
@@ -66,12 +70,6 @@
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
$effect(() => {
|
|
||||||
if (settingTypes && settings) {
|
|
||||||
manager.setSettings(settings);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
manager.on("settings", (_settings) => {
|
manager.on("settings", (_settings) => {
|
||||||
settingTypes = { ...settingTypes, ..._settings.types };
|
settingTypes = { ...settingTypes, ..._settings.types };
|
||||||
settings = _settings.values;
|
settings = _settings.values;
|
||||||
@@ -81,7 +79,11 @@
|
|||||||
|
|
||||||
manager.on("save", (save) => onsave?.(save));
|
manager.on("save", (save) => onsave?.(save));
|
||||||
|
|
||||||
manager.load(graph);
|
$effect(() => {
|
||||||
|
if (graph) {
|
||||||
|
manager.load(graph);
|
||||||
|
}
|
||||||
|
});
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<GraphEl {keymap} />
|
<GraphEl {keymap} />
|
||||||
|
|||||||
107
app/src/lib/graph-interface/graph/drop.events.ts
Normal file
107
app/src/lib/graph-interface/graph/drop.events.ts
Normal file
@@ -0,0 +1,107 @@
|
|||||||
|
import { GraphSchema, type NodeId } from '@nodarium/types';
|
||||||
|
import type { GraphManager } from '../graph-manager.svelte';
|
||||||
|
import type { GraphState } from '../graph-state.svelte';
|
||||||
|
|
||||||
|
export class FileDropEventManager {
|
||||||
|
constructor(
|
||||||
|
private graph: GraphManager,
|
||||||
|
private state: GraphState
|
||||||
|
) { }
|
||||||
|
|
||||||
|
handleFileDrop(event: DragEvent) {
|
||||||
|
event.preventDefault();
|
||||||
|
this.state.isDragging = false;
|
||||||
|
if (!event.dataTransfer) return;
|
||||||
|
const nodeId = event.dataTransfer.getData('data/node-id') as NodeId;
|
||||||
|
let mx = event.clientX - this.state.rect.x;
|
||||||
|
let my = event.clientY - this.state.rect.y;
|
||||||
|
|
||||||
|
if (nodeId) {
|
||||||
|
let nodeOffsetX = event.dataTransfer.getData('data/node-offset-x');
|
||||||
|
let nodeOffsetY = event.dataTransfer.getData('data/node-offset-y');
|
||||||
|
if (nodeOffsetX && nodeOffsetY) {
|
||||||
|
mx += parseInt(nodeOffsetX);
|
||||||
|
my += parseInt(nodeOffsetY);
|
||||||
|
}
|
||||||
|
|
||||||
|
let props = {};
|
||||||
|
let rawNodeProps = event.dataTransfer.getData('data/node-props');
|
||||||
|
if (rawNodeProps) {
|
||||||
|
try {
|
||||||
|
props = JSON.parse(rawNodeProps);
|
||||||
|
} catch (e) { }
|
||||||
|
}
|
||||||
|
|
||||||
|
const pos = this.state.projectScreenToWorld(mx, my);
|
||||||
|
this.graph.registry.load([nodeId]).then(() => {
|
||||||
|
this.graph.createNode({
|
||||||
|
type: nodeId,
|
||||||
|
props,
|
||||||
|
position: pos
|
||||||
|
});
|
||||||
|
});
|
||||||
|
} else if (event.dataTransfer.files.length) {
|
||||||
|
const file = event.dataTransfer.files[0];
|
||||||
|
|
||||||
|
if (file.type === 'application/wasm') {
|
||||||
|
const reader = new FileReader();
|
||||||
|
reader.onload = async (e) => {
|
||||||
|
const buffer = e.target?.result;
|
||||||
|
if (buffer?.constructor === ArrayBuffer) {
|
||||||
|
const nodeType = await this.graph.registry.register(buffer);
|
||||||
|
|
||||||
|
this.graph.createNode({
|
||||||
|
type: nodeType.id,
|
||||||
|
props: {},
|
||||||
|
position: this.state.projectScreenToWorld(mx, my)
|
||||||
|
});
|
||||||
|
}
|
||||||
|
};
|
||||||
|
reader.readAsArrayBuffer(file);
|
||||||
|
} else if (file.type === 'application/json') {
|
||||||
|
const reader = new FileReader();
|
||||||
|
reader.onload = (e) => {
|
||||||
|
const buffer = e.target?.result as ArrayBuffer;
|
||||||
|
if (buffer) {
|
||||||
|
const state = GraphSchema.parse(JSON.parse(buffer.toString()));
|
||||||
|
this.graph.load(state);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
reader.readAsText(file);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
handleMouseLeave() {
|
||||||
|
this.state.isDragging = false;
|
||||||
|
this.state.isPanning = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
handleDragEnter(e: DragEvent) {
|
||||||
|
e.preventDefault();
|
||||||
|
this.state.isDragging = true;
|
||||||
|
this.state.isPanning = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
handleDragOver(e: DragEvent) {
|
||||||
|
e.preventDefault();
|
||||||
|
this.state.isDragging = true;
|
||||||
|
this.state.isPanning = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
handleDragEnd(e: DragEvent) {
|
||||||
|
e.preventDefault();
|
||||||
|
this.state.isDragging = true;
|
||||||
|
this.state.isPanning = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
getEventListenerProps() {
|
||||||
|
return {
|
||||||
|
ondragenter: (ev: DragEvent) => this.handleDragEnter(ev),
|
||||||
|
ondragover: (ev: DragEvent) => this.handleDragOver(ev),
|
||||||
|
ondragexit: (ev: DragEvent) => this.handleDragEnd(ev),
|
||||||
|
ondrop: (ev: DragEvent) => this.handleFileDrop(ev),
|
||||||
|
onmouseleave: () => this.handleMouseLeave()
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
||||||
110
app/src/lib/graph-interface/graph/edge.events.ts
Normal file
110
app/src/lib/graph-interface/graph/edge.events.ts
Normal file
@@ -0,0 +1,110 @@
|
|||||||
|
import type { Box } from '@nodarium/types';
|
||||||
|
import type { GraphManager } from '../graph-manager.svelte';
|
||||||
|
import type { GraphState } from '../graph-state.svelte';
|
||||||
|
import { distanceFromPointToSegment } from '../helpers';
|
||||||
|
|
||||||
|
export class EdgeInteractionManager {
|
||||||
|
constructor(
|
||||||
|
private graph: GraphManager,
|
||||||
|
private state: GraphState
|
||||||
|
) { }
|
||||||
|
|
||||||
|
private MIN_DISTANCE = 3;
|
||||||
|
|
||||||
|
private _boundingBoxes = new Map<string, Box>();
|
||||||
|
|
||||||
|
handleMouseDown() {
|
||||||
|
this._boundingBoxes.clear();
|
||||||
|
|
||||||
|
const possibleEdges = this.graph
|
||||||
|
.getPossibleDropOnEdges(this.state.activeNodeId)
|
||||||
|
.map(e => this.graph.getEdgeId(e));
|
||||||
|
|
||||||
|
const edges = this.state.getEdges();
|
||||||
|
for (const edge of edges) {
|
||||||
|
const edgeId = edge[0];
|
||||||
|
if (!possibleEdges.includes(edgeId)) {
|
||||||
|
edges.delete(edgeId);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
for (const [edgeId, data] of edges) {
|
||||||
|
const points = data.points;
|
||||||
|
let minX = points[0].x + data.x1;
|
||||||
|
let maxX = points[0].x + data.x1;
|
||||||
|
let minY = points[0].z + data.y1;
|
||||||
|
let maxY = points[0].z + data.y1;
|
||||||
|
|
||||||
|
// Iterate through all points to find the true bounds
|
||||||
|
for (let i = 0; i < points.length; i++) {
|
||||||
|
const x = data.x1 + points[i].x;
|
||||||
|
const y = data.y1 + points[i].z;
|
||||||
|
if (x < minX) minX = x;
|
||||||
|
if (x > maxX) maxX = x;
|
||||||
|
if (y < minY) minY = y;
|
||||||
|
if (y > maxY) maxY = y;
|
||||||
|
}
|
||||||
|
|
||||||
|
const boundingBox = {
|
||||||
|
minX: minX - this.MIN_DISTANCE,
|
||||||
|
maxX: maxX + this.MIN_DISTANCE,
|
||||||
|
minY: minY - this.MIN_DISTANCE,
|
||||||
|
maxY: maxY + this.MIN_DISTANCE
|
||||||
|
};
|
||||||
|
|
||||||
|
this._boundingBoxes.set(edgeId, boundingBox);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
handleMouseMove() {
|
||||||
|
const [mouseX, mouseY] = this.state.mousePosition;
|
||||||
|
const hoveredEdgeIds: string[] = [];
|
||||||
|
|
||||||
|
const edges = this.state.getEdges();
|
||||||
|
|
||||||
|
// Check if mouse is inside any bounding box
|
||||||
|
for (const [edgeId, box] of this._boundingBoxes) {
|
||||||
|
const isInside = mouseX >= box.minX
|
||||||
|
&& mouseX <= box.maxX
|
||||||
|
&& mouseY >= box.minY
|
||||||
|
&& mouseY <= box.maxY;
|
||||||
|
|
||||||
|
if (isInside) {
|
||||||
|
hoveredEdgeIds.push(edgeId);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
let hoveredEdgeId: string | null = null;
|
||||||
|
let hoveredEdgeDistance = Infinity;
|
||||||
|
|
||||||
|
const DENSITY = 10; // higher DENSITY = less points checked (yes density might not be the best name :-)
|
||||||
|
for (const edgeId of hoveredEdgeIds) {
|
||||||
|
const edge = edges.get(edgeId)!;
|
||||||
|
for (let i = 0; i < edge.points.length - DENSITY; i += DENSITY) {
|
||||||
|
const pointAx = edge.points[i].x + edge.x1;
|
||||||
|
const pointAy = edge.points[i].z + edge.y1;
|
||||||
|
const pointBx = edge.points[i + DENSITY].x + edge.x1;
|
||||||
|
const pointBy = edge.points[i + DENSITY].z + edge.y1;
|
||||||
|
const distance = distanceFromPointToSegment(pointAx, pointAy, pointBx, pointBy, mouseX, mouseY);
|
||||||
|
if (distance < this.MIN_DISTANCE) {
|
||||||
|
if (distance < hoveredEdgeDistance) {
|
||||||
|
hoveredEdgeDistance = distance;
|
||||||
|
hoveredEdgeId = edgeId;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
this.state.hoveredEdgeId = hoveredEdgeId;
|
||||||
|
}
|
||||||
|
|
||||||
|
handleMouseUp() {
|
||||||
|
if (this.state.hoveredEdgeId) {
|
||||||
|
const edge = this.graph.getEdgeById(this.state.hoveredEdgeId);
|
||||||
|
if (edge) {
|
||||||
|
this.graph.dropNodeOnEdge(this.state.activeNodeId, edge);
|
||||||
|
}
|
||||||
|
this.state.hoveredEdgeId = null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,127 +1,23 @@
|
|||||||
import { GraphSchema, type NodeId, type NodeInstance } from "@nodarium/types";
|
import { animate, lerp } from '$lib/helpers';
|
||||||
import type { GraphManager } from "../graph-manager.svelte";
|
import { type NodeInstance } from '@nodarium/types';
|
||||||
import type { GraphState } from "./state.svelte";
|
import type { GraphManager } from '../graph-manager.svelte';
|
||||||
import { animate, lerp } from "$lib/helpers";
|
import { type GraphState } from '../graph-state.svelte';
|
||||||
import { snapToGrid as snapPointToGrid } from "../helpers";
|
import { snapToGrid as snapPointToGrid } from '../helpers';
|
||||||
import { maxZoom, minZoom, zoomSpeed } from "./constants";
|
import { maxZoom, minZoom, zoomSpeed } from './constants';
|
||||||
|
import { EdgeInteractionManager } from './edge.events';
|
||||||
|
|
||||||
export class FileDropEventManager {
|
|
||||||
|
|
||||||
constructor(
|
|
||||||
private graph: GraphManager,
|
|
||||||
private state: GraphState
|
|
||||||
) { }
|
|
||||||
|
|
||||||
handleFileDrop(event: DragEvent) {
|
|
||||||
event.preventDefault();
|
|
||||||
this.state.isDragging = false;
|
|
||||||
if (!event.dataTransfer) return;
|
|
||||||
const nodeId = event.dataTransfer.getData("data/node-id") as NodeId;
|
|
||||||
let mx = event.clientX - this.state.rect.x;
|
|
||||||
let my = event.clientY - this.state.rect.y;
|
|
||||||
|
|
||||||
if (nodeId) {
|
|
||||||
let nodeOffsetX = event.dataTransfer.getData("data/node-offset-x");
|
|
||||||
let nodeOffsetY = event.dataTransfer.getData("data/node-offset-y");
|
|
||||||
if (nodeOffsetX && nodeOffsetY) {
|
|
||||||
mx += parseInt(nodeOffsetX);
|
|
||||||
my += parseInt(nodeOffsetY);
|
|
||||||
}
|
|
||||||
|
|
||||||
let props = {};
|
|
||||||
let rawNodeProps = event.dataTransfer.getData("data/node-props");
|
|
||||||
if (rawNodeProps) {
|
|
||||||
try {
|
|
||||||
props = JSON.parse(rawNodeProps);
|
|
||||||
} catch (e) { }
|
|
||||||
}
|
|
||||||
|
|
||||||
const pos = this.state.projectScreenToWorld(mx, my);
|
|
||||||
this.graph.registry.load([nodeId]).then(() => {
|
|
||||||
this.graph.createNode({
|
|
||||||
type: nodeId,
|
|
||||||
props,
|
|
||||||
position: pos,
|
|
||||||
});
|
|
||||||
});
|
|
||||||
} else if (event.dataTransfer.files.length) {
|
|
||||||
const file = event.dataTransfer.files[0];
|
|
||||||
|
|
||||||
if (file.type === "application/wasm") {
|
|
||||||
const reader = new FileReader();
|
|
||||||
reader.onload = async (e) => {
|
|
||||||
const buffer = e.target?.result;
|
|
||||||
if (buffer?.constructor === ArrayBuffer) {
|
|
||||||
const nodeType = await this.graph.registry.register(buffer);
|
|
||||||
|
|
||||||
this.graph.createNode({
|
|
||||||
type: nodeType.id,
|
|
||||||
props: {},
|
|
||||||
position: this.state.projectScreenToWorld(mx, my),
|
|
||||||
});
|
|
||||||
}
|
|
||||||
};
|
|
||||||
reader.readAsArrayBuffer(file);
|
|
||||||
} else if (file.type === "application/json") {
|
|
||||||
const reader = new FileReader();
|
|
||||||
reader.onload = (e) => {
|
|
||||||
const buffer = e.target?.result as ArrayBuffer;
|
|
||||||
if (buffer) {
|
|
||||||
const state = GraphSchema.parse(JSON.parse(buffer.toString()));
|
|
||||||
this.graph.load(state);
|
|
||||||
}
|
|
||||||
};
|
|
||||||
reader.readAsText(file);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
handleMouseLeave() {
|
|
||||||
this.state.isDragging = false;
|
|
||||||
this.state.isPanning = false;
|
|
||||||
}
|
|
||||||
|
|
||||||
handleDragEnter(e: DragEvent) {
|
|
||||||
e.preventDefault();
|
|
||||||
this.state.isDragging = true;
|
|
||||||
this.state.isPanning = false;
|
|
||||||
}
|
|
||||||
|
|
||||||
handleDragOver(e: DragEvent) {
|
|
||||||
e.preventDefault();
|
|
||||||
this.state.isDragging = true;
|
|
||||||
this.state.isPanning = false;
|
|
||||||
}
|
|
||||||
|
|
||||||
handleDragEnd(e: DragEvent) {
|
|
||||||
e.preventDefault();
|
|
||||||
this.state.isDragging = true;
|
|
||||||
this.state.isPanning = false;
|
|
||||||
}
|
|
||||||
|
|
||||||
getEventListenerProps() {
|
|
||||||
return {
|
|
||||||
ondragenter: (ev: DragEvent) => this.handleDragEnter(ev),
|
|
||||||
ondragover: (ev: DragEvent) => this.handleDragOver(ev),
|
|
||||||
ondragexit: (ev: DragEvent) => this.handleDragEnd(ev),
|
|
||||||
ondrop: (ev: DragEvent) => this.handleFileDrop(ev),
|
|
||||||
onmouseleave: () => this.handleMouseLeave(),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
export class MouseEventManager {
|
export class MouseEventManager {
|
||||||
|
edgeInteractionManager: EdgeInteractionManager;
|
||||||
|
|
||||||
constructor(
|
constructor(
|
||||||
private graph: GraphManager,
|
private graph: GraphManager,
|
||||||
private state: GraphState
|
private state: GraphState
|
||||||
) { }
|
) {
|
||||||
|
this.edgeInteractionManager = new EdgeInteractionManager(graph, state);
|
||||||
|
}
|
||||||
|
|
||||||
|
handleWindowMouseUp(event: MouseEvent) {
|
||||||
handleMouseUp(event: MouseEvent) {
|
this.edgeInteractionManager.handleMouseUp();
|
||||||
this.state.isPanning = false;
|
this.state.isPanning = false;
|
||||||
if (!this.state.mouseDown) return;
|
if (!this.state.mouseDown) return;
|
||||||
|
|
||||||
@@ -145,25 +41,23 @@ export class MouseEventManager {
|
|||||||
const snapLevel = this.state.getSnapLevel();
|
const snapLevel = this.state.getSnapLevel();
|
||||||
activeNode.position[0] = snapPointToGrid(
|
activeNode.position[0] = snapPointToGrid(
|
||||||
activeNode?.state?.x ?? activeNode.position[0],
|
activeNode?.state?.x ?? activeNode.position[0],
|
||||||
5 / snapLevel,
|
5 / snapLevel
|
||||||
);
|
);
|
||||||
activeNode.position[1] = snapPointToGrid(
|
activeNode.position[1] = snapPointToGrid(
|
||||||
activeNode?.state?.y ?? activeNode.position[1],
|
activeNode?.state?.y ?? activeNode.position[1],
|
||||||
5 / snapLevel,
|
5 / snapLevel
|
||||||
);
|
);
|
||||||
} else {
|
} else {
|
||||||
activeNode.position[0] = activeNode?.state?.x ?? activeNode.position[0];
|
activeNode.position[0] = activeNode?.state?.x ?? activeNode.position[0];
|
||||||
activeNode.position[1] = activeNode?.state?.y ?? activeNode.position[1];
|
activeNode.position[1] = activeNode?.state?.y ?? activeNode.position[1];
|
||||||
}
|
}
|
||||||
const nodes = [
|
const nodes = [
|
||||||
...[...(this.state.selectedNodes?.values() || [])].map((id) =>
|
...[...(this.state.selectedNodes?.values() || [])].map((id) => this.graph.getNode(id))
|
||||||
this.graph.getNode(id),
|
|
||||||
),
|
|
||||||
] as NodeInstance[];
|
] as NodeInstance[];
|
||||||
|
|
||||||
const vec = [
|
const vec = [
|
||||||
activeNode.position[0] - (activeNode?.state.x || 0),
|
activeNode.position[0] - (activeNode?.state.x || 0),
|
||||||
activeNode.position[1] - (activeNode?.state.y || 0),
|
activeNode.position[1] - (activeNode?.state.y || 0)
|
||||||
];
|
];
|
||||||
|
|
||||||
for (const node of nodes) {
|
for (const node of nodes) {
|
||||||
@@ -179,9 +73,9 @@ export class MouseEventManager {
|
|||||||
animate(500, (a: number) => {
|
animate(500, (a: number) => {
|
||||||
for (const node of nodes) {
|
for (const node of nodes) {
|
||||||
if (
|
if (
|
||||||
node?.state &&
|
node?.state
|
||||||
node.state["x"] !== undefined &&
|
&& node.state['x'] !== undefined
|
||||||
node.state["y"] !== undefined
|
&& node.state['y'] !== undefined
|
||||||
) {
|
) {
|
||||||
node.state.x = lerp(node.state.x, node.position[0], a);
|
node.state.x = lerp(node.state.x, node.position[0], a);
|
||||||
node.state.y = lerp(node.state.y, node.position[1], a);
|
node.state.y = lerp(node.state.y, node.position[1], a);
|
||||||
@@ -195,24 +89,24 @@ export class MouseEventManager {
|
|||||||
this.graph.save();
|
this.graph.save();
|
||||||
} else if (this.state.hoveredSocket && this.state.activeSocket) {
|
} else if (this.state.hoveredSocket && this.state.activeSocket) {
|
||||||
if (
|
if (
|
||||||
typeof this.state.hoveredSocket.index === "number" &&
|
typeof this.state.hoveredSocket.index === 'number'
|
||||||
typeof this.state.activeSocket.index === "string"
|
&& typeof this.state.activeSocket.index === 'string'
|
||||||
) {
|
) {
|
||||||
this.graph.createEdge(
|
this.graph.createEdge(
|
||||||
this.state.hoveredSocket.node,
|
this.state.hoveredSocket.node,
|
||||||
this.state.hoveredSocket.index || 0,
|
this.state.hoveredSocket.index || 0,
|
||||||
this.state.activeSocket.node,
|
this.state.activeSocket.node,
|
||||||
this.state.activeSocket.index,
|
this.state.activeSocket.index
|
||||||
);
|
);
|
||||||
} else if (
|
} else if (
|
||||||
typeof this.state.activeSocket.index == "number" &&
|
typeof this.state.activeSocket.index == 'number'
|
||||||
typeof this.state.hoveredSocket.index === "string"
|
&& typeof this.state.hoveredSocket.index === 'string'
|
||||||
) {
|
) {
|
||||||
this.graph.createEdge(
|
this.graph.createEdge(
|
||||||
this.state.activeSocket.node,
|
this.state.activeSocket.node,
|
||||||
this.state.activeSocket.index || 0,
|
this.state.activeSocket.index || 0,
|
||||||
this.state.hoveredSocket.node,
|
this.state.hoveredSocket.node,
|
||||||
this.state.hoveredSocket.index,
|
this.state.hoveredSocket.index
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
this.graph.save();
|
this.graph.save();
|
||||||
@@ -220,18 +114,18 @@ export class MouseEventManager {
|
|||||||
// Handle automatic adding of nodes on ctrl+mouseUp
|
// Handle automatic adding of nodes on ctrl+mouseUp
|
||||||
this.state.edgeEndPosition = [
|
this.state.edgeEndPosition = [
|
||||||
this.state.mousePosition[0],
|
this.state.mousePosition[0],
|
||||||
this.state.mousePosition[1],
|
this.state.mousePosition[1]
|
||||||
];
|
];
|
||||||
|
|
||||||
if (typeof this.state.activeSocket.index === "number") {
|
if (typeof this.state.activeSocket.index === 'number') {
|
||||||
this.state.addMenuPosition = [
|
this.state.addMenuPosition = [
|
||||||
this.state.mousePosition[0],
|
this.state.mousePosition[0],
|
||||||
this.state.mousePosition[1] - 25 / this.state.cameraPosition[2],
|
this.state.mousePosition[1] - 25 / this.state.cameraPosition[2]
|
||||||
];
|
];
|
||||||
} else {
|
} else {
|
||||||
this.state.addMenuPosition = [
|
this.state.addMenuPosition = [
|
||||||
this.state.mousePosition[0] - 155 / this.state.cameraPosition[2],
|
this.state.mousePosition[0] - 155 / this.state.cameraPosition[2],
|
||||||
this.state.mousePosition[1] - 25 / this.state.cameraPosition[2],
|
this.state.mousePosition[1] - 25 / this.state.cameraPosition[2]
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
return;
|
return;
|
||||||
@@ -239,11 +133,11 @@ export class MouseEventManager {
|
|||||||
|
|
||||||
// check if camera moved
|
// check if camera moved
|
||||||
if (
|
if (
|
||||||
clickedNodeId === -1 &&
|
clickedNodeId === -1
|
||||||
!this.state.boxSelection &&
|
&& !this.state.boxSelection
|
||||||
this.state.cameraDown[0] === this.state.cameraPosition[0] &&
|
&& this.state.cameraDown[0] === this.state.cameraPosition[0]
|
||||||
this.state.cameraDown[1] === this.state.cameraPosition[1] &&
|
&& this.state.cameraDown[1] === this.state.cameraPosition[1]
|
||||||
this.state.isBodyFocused()
|
&& this.state.isBodyFocused()
|
||||||
) {
|
) {
|
||||||
this.state.activeNodeId = -1;
|
this.state.activeNodeId = -1;
|
||||||
this.state.clearSelection();
|
this.state.clearSelection();
|
||||||
@@ -257,16 +151,27 @@ export class MouseEventManager {
|
|||||||
this.state.addMenuPosition = null;
|
this.state.addMenuPosition = null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
handleContextMenu(event: MouseEvent) {
|
||||||
|
if (!this.state.addMenuPosition) {
|
||||||
|
event.preventDefault();
|
||||||
|
this.state.openNodePalette();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
handleMouseDown(event: MouseEvent) {
|
handleMouseDown(event: MouseEvent) {
|
||||||
|
// Right click
|
||||||
|
if (event.button === 2) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
if (this.state.mouseDown) return;
|
if (this.state.mouseDown) return;
|
||||||
this.state.edgeEndPosition = null;
|
this.state.edgeEndPosition = null;
|
||||||
|
|
||||||
if (event.target instanceof HTMLElement) {
|
if (event.target instanceof HTMLElement) {
|
||||||
if (
|
if (
|
||||||
event.target.nodeName !== "CANVAS" &&
|
event.target.nodeName !== 'CANVAS'
|
||||||
!event.target.classList.contains("node") &&
|
&& !event.target.classList.contains('node')
|
||||||
!event.target.classList.contains("content")
|
&& !event.target.classList.contains('content')
|
||||||
) {
|
) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -288,7 +193,7 @@ export class MouseEventManager {
|
|||||||
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
|
||||||
} else if (this.state.activeNodeId === clickedNodeId) {
|
} else if (this.state.activeNodeId === clickedNodeId) {
|
||||||
//$activeNodeId = -1;
|
// $activeNodeId = -1;
|
||||||
// if the clicked node is different from the selected node and secondary
|
// if the clicked node is different from the selected node and secondary
|
||||||
} else if (event.ctrlKey) {
|
} else if (event.ctrlKey) {
|
||||||
this.state.selectedNodes.add(this.state.activeNodeId);
|
this.state.selectedNodes.add(this.state.activeNodeId);
|
||||||
@@ -312,6 +217,7 @@ export class MouseEventManager {
|
|||||||
this.state.activeNodeId = clickedNodeId;
|
this.state.activeNodeId = clickedNodeId;
|
||||||
this.state.clearSelection();
|
this.state.clearSelection();
|
||||||
}
|
}
|
||||||
|
this.edgeInteractionManager.handleMouseDown();
|
||||||
} else if (event.ctrlKey) {
|
} else if (event.ctrlKey) {
|
||||||
this.state.boxSelection = true;
|
this.state.boxSelection = true;
|
||||||
}
|
}
|
||||||
@@ -335,8 +241,7 @@ export class MouseEventManager {
|
|||||||
this.state.edgeEndPosition = null;
|
this.state.edgeEndPosition = null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
handleWindowMouseMove(event: MouseEvent) {
|
||||||
handleMouseMove(event: MouseEvent) {
|
|
||||||
let mx = event.clientX - this.state.rect.x;
|
let mx = event.clientX - this.state.rect.x;
|
||||||
let my = event.clientY - this.state.rect.y;
|
let my = event.clientY - this.state.rect.y;
|
||||||
|
|
||||||
@@ -351,8 +256,8 @@ export class MouseEventManager {
|
|||||||
let _socket;
|
let _socket;
|
||||||
for (const socket of this.state.possibleSockets) {
|
for (const socket of this.state.possibleSockets) {
|
||||||
const dist = Math.sqrt(
|
const dist = Math.sqrt(
|
||||||
(socket.position[0] - this.state.mousePosition[0]) ** 2 +
|
(socket.position[0] - this.state.mousePosition[0]) ** 2
|
||||||
(socket.position[1] - this.state.mousePosition[1]) ** 2,
|
+ (socket.position[1] - this.state.mousePosition[1]) ** 2
|
||||||
);
|
);
|
||||||
if (dist < smallestDist) {
|
if (dist < smallestDist) {
|
||||||
smallestDist = dist;
|
smallestDist = dist;
|
||||||
@@ -375,7 +280,7 @@ export class MouseEventManager {
|
|||||||
event.stopPropagation();
|
event.stopPropagation();
|
||||||
const mouseD = this.state.projectScreenToWorld(
|
const mouseD = this.state.projectScreenToWorld(
|
||||||
this.state.mouseDown[0],
|
this.state.mouseDown[0],
|
||||||
this.state.mouseDown[1],
|
this.state.mouseDown[1]
|
||||||
);
|
);
|
||||||
const x1 = Math.min(mouseD[0], this.state.mousePosition[0]);
|
const x1 = Math.min(mouseD[0], this.state.mousePosition[0]);
|
||||||
const x2 = Math.max(mouseD[0], this.state.mousePosition[0]);
|
const x2 = Math.max(mouseD[0], this.state.mousePosition[0]);
|
||||||
@@ -397,6 +302,7 @@ export class MouseEventManager {
|
|||||||
|
|
||||||
// here we are handling dragging of nodes
|
// here we are handling dragging of nodes
|
||||||
if (this.state.activeNodeId !== -1 && this.state.mouseDownNodeId !== -1) {
|
if (this.state.activeNodeId !== -1 && this.state.mouseDownNodeId !== -1) {
|
||||||
|
this.edgeInteractionManager.handleMouseMove();
|
||||||
const node = this.graph.getNode(this.state.activeNodeId);
|
const node = this.graph.getNode(this.state.activeNodeId);
|
||||||
if (!node || event.buttons !== 1) return;
|
if (!node || event.buttons !== 1) return;
|
||||||
|
|
||||||
@@ -405,10 +311,8 @@ export class MouseEventManager {
|
|||||||
const oldX = node.state.downX || 0;
|
const oldX = node.state.downX || 0;
|
||||||
const oldY = node.state.downY || 0;
|
const oldY = node.state.downY || 0;
|
||||||
|
|
||||||
let newX =
|
let newX = oldX + (mx - this.state.mouseDown[0]) / this.state.cameraPosition[2];
|
||||||
oldX + (mx - this.state.mouseDown[0]) / this.state.cameraPosition[2];
|
let newY = oldY + (my - this.state.mouseDown[1]) / this.state.cameraPosition[2];
|
||||||
let newY =
|
|
||||||
oldY + (my - this.state.mouseDown[1]) / this.state.cameraPosition[2];
|
|
||||||
|
|
||||||
if (event.ctrlKey) {
|
if (event.ctrlKey) {
|
||||||
const snapLevel = this.state.getSnapLevel();
|
const snapLevel = this.state.getSnapLevel();
|
||||||
@@ -448,22 +352,19 @@ export class MouseEventManager {
|
|||||||
|
|
||||||
// here we are handling panning of camera
|
// here we are handling panning of camera
|
||||||
this.state.isPanning = true;
|
this.state.isPanning = true;
|
||||||
let newX =
|
let newX = this.state.cameraDown[0]
|
||||||
this.state.cameraDown[0] -
|
- (mx - this.state.mouseDown[0]) / this.state.cameraPosition[2];
|
||||||
(mx - this.state.mouseDown[0]) / this.state.cameraPosition[2];
|
let newY = this.state.cameraDown[1]
|
||||||
let newY =
|
- (my - this.state.mouseDown[1]) / this.state.cameraPosition[2];
|
||||||
this.state.cameraDown[1] -
|
|
||||||
(my - this.state.mouseDown[1]) / this.state.cameraPosition[2];
|
|
||||||
|
|
||||||
this.state.setCameraTransform(newX, newY);
|
this.state.cameraPosition[0] = newX;
|
||||||
|
this.state.cameraPosition[1] = newY;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
handleMouseScroll(event: WheelEvent) {
|
handleMouseScroll(event: WheelEvent) {
|
||||||
const bodyIsFocused =
|
const bodyIsFocused = document.activeElement === document.body
|
||||||
document.activeElement === document.body ||
|
|| document.activeElement === this.state.wrapper
|
||||||
document.activeElement === this.state.wrapper ||
|
|| document?.activeElement?.id === 'graph';
|
||||||
document?.activeElement?.id === "graph";
|
|
||||||
if (!bodyIsFocused) return;
|
if (!bodyIsFocused) return;
|
||||||
|
|
||||||
// Define zoom speed and clamp it between -1 and 1
|
// Define zoom speed and clamp it between -1 and 1
|
||||||
@@ -478,23 +379,19 @@ export class MouseEventManager {
|
|||||||
maxZoom,
|
maxZoom,
|
||||||
isNegative
|
isNegative
|
||||||
? this.state.cameraPosition[2] / delta
|
? this.state.cameraPosition[2] / delta
|
||||||
: this.state.cameraPosition[2] * delta,
|
: this.state.cameraPosition[2] * delta
|
||||||
),
|
)
|
||||||
);
|
);
|
||||||
|
|
||||||
// Calculate the ratio of the new zoom to the original zoom
|
// Calculate the ratio of the new zoom to the original zoom
|
||||||
const zoomRatio = newZoom / this.state.cameraPosition[2];
|
const zoomRatio = newZoom / this.state.cameraPosition[2];
|
||||||
|
|
||||||
// Update camera position and zoom level
|
// Update camera position and zoom level
|
||||||
this.state.setCameraTransform(
|
this.state.cameraPosition[0] = this.state.mousePosition[0]
|
||||||
this.state.mousePosition[0] -
|
- (this.state.mousePosition[0] - this.state.cameraPosition[0])
|
||||||
(this.state.mousePosition[0] - this.state.cameraPosition[0]) /
|
/ zoomRatio;
|
||||||
zoomRatio,
|
this.state.cameraPosition[1] = this.state.mousePosition[1]
|
||||||
this.state.mousePosition[1] -
|
- (this.state.mousePosition[1] - this.state.cameraPosition[1])
|
||||||
(this.state.mousePosition[1] - this.state.cameraPosition[1]) /
|
/ zoomRatio, this.state.cameraPosition[2] = newZoom;
|
||||||
zoomRatio,
|
|
||||||
newZoom,
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -8,7 +8,7 @@ export function lerp(a: number, b: number, t: number) {
|
|||||||
|
|
||||||
export function animate(
|
export function animate(
|
||||||
duration: number,
|
duration: number,
|
||||||
callback: (progress: number) => void | false,
|
callback: (progress: number) => void | false
|
||||||
) {
|
) {
|
||||||
const start = performance.now();
|
const start = performance.now();
|
||||||
const loop = (time: number) => {
|
const loop = (time: number) => {
|
||||||
@@ -33,41 +33,37 @@ export function createNodePath({
|
|||||||
cornerBottom = 0,
|
cornerBottom = 0,
|
||||||
leftBump = false,
|
leftBump = false,
|
||||||
rightBump = false,
|
rightBump = false,
|
||||||
aspectRatio = 1,
|
aspectRatio = 1
|
||||||
} = {}) {
|
} = {}) {
|
||||||
return `M0,${cornerTop}
|
return `M0,${cornerTop}
|
||||||
${
|
${cornerTop
|
||||||
cornerTop
|
? ` V${cornerTop}
|
||||||
? ` V${cornerTop}
|
|
||||||
Q0,0 ${cornerTop * aspectRatio},0
|
Q0,0 ${cornerTop * aspectRatio},0
|
||||||
H${100 - cornerTop * aspectRatio}
|
H${100 - cornerTop * aspectRatio}
|
||||||
Q100,0 100,${cornerTop}
|
Q100,0 100,${cornerTop}
|
||||||
`
|
`
|
||||||
: ` V0
|
: ` V0
|
||||||
H100
|
H100
|
||||||
`
|
`
|
||||||
}
|
}
|
||||||
V${y - height / 2}
|
V${y - height / 2}
|
||||||
${
|
${rightBump
|
||||||
rightBump
|
? ` C${100 - depth},${y - height / 2} ${100 - depth},${y + height / 2} 100,${y + height / 2}`
|
||||||
? ` C${100 - depth},${y - height / 2} ${100 - depth},${y + height / 2} 100,${y + height / 2}`
|
: ` H100`
|
||||||
: ` H100`
|
}
|
||||||
}
|
${cornerBottom
|
||||||
${
|
? ` V${100 - cornerBottom}
|
||||||
cornerBottom
|
|
||||||
? ` V${100 - cornerBottom}
|
|
||||||
Q100,100 ${100 - cornerBottom * aspectRatio},100
|
Q100,100 ${100 - cornerBottom * aspectRatio},100
|
||||||
H${cornerBottom * aspectRatio}
|
H${cornerBottom * aspectRatio}
|
||||||
Q0,100 0,${100 - cornerBottom}
|
Q0,100 0,${100 - cornerBottom}
|
||||||
`
|
`
|
||||||
: `${leftBump ? `V100 H0` : `V100`}`
|
: `${leftBump ? `V100 H0` : `V100`}`
|
||||||
}
|
}
|
||||||
${
|
${leftBump
|
||||||
leftBump
|
? ` V${y + height / 2} C${depth},${y + height / 2} ${depth},${y - height / 2} 0,${y - height / 2}`
|
||||||
? ` V${y + height / 2} C${depth},${y + height / 2} ${depth},${y - height / 2} 0,${y - height / 2}`
|
: ` H0`
|
||||||
: ` H0`
|
}
|
||||||
}
|
Z`.replace(/\s+/g, ' ');
|
||||||
Z`.replace(/\s+/g, " ");
|
|
||||||
}
|
}
|
||||||
|
|
||||||
export const debounce = (fn: Function, ms = 300) => {
|
export const debounce = (fn: Function, ms = 300) => {
|
||||||
@@ -78,14 +74,13 @@ export const debounce = (fn: Function, ms = 300) => {
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
export const clone: <T>(v: T) => T =
|
export const clone: <T>(v: T) => T = 'structedClone' in globalThis
|
||||||
"structedClone" in globalThis
|
? globalThis.structuredClone
|
||||||
? globalThis.structuredClone
|
: (obj) => JSON.parse(JSON.stringify(obj));
|
||||||
: (obj) => JSON.parse(JSON.stringify(obj));
|
|
||||||
|
|
||||||
export function withSubComponents<A, B extends Record<string, any>>(
|
export function withSubComponents<A, B extends Record<string, any>>(
|
||||||
component: A,
|
component: A,
|
||||||
subcomponents: B,
|
subcomponents: B
|
||||||
): A & B {
|
): A & B {
|
||||||
Object.keys(subcomponents).forEach((key) => {
|
Object.keys(subcomponents).forEach((key) => {
|
||||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
||||||
@@ -93,3 +88,27 @@ export function withSubComponents<A, B extends Record<string, any>>(
|
|||||||
});
|
});
|
||||||
return component as A & B;
|
return component as A & B;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function distanceFromPointToSegment(
|
||||||
|
x1: number,
|
||||||
|
y1: number,
|
||||||
|
x2: number,
|
||||||
|
y2: number,
|
||||||
|
x0: number,
|
||||||
|
y0: number
|
||||||
|
): number {
|
||||||
|
const dx = x2 - x1;
|
||||||
|
const dy = y2 - y1;
|
||||||
|
|
||||||
|
if (dx === 0 && dy === 0) {
|
||||||
|
return Math.hypot(x0 - x1, y0 - y1);
|
||||||
|
}
|
||||||
|
|
||||||
|
const t = ((x0 - x1) * dx + (y0 - y1) * dy) / (dx * dx + dy * dy);
|
||||||
|
const clampedT = Math.max(0, Math.min(1, t));
|
||||||
|
|
||||||
|
const px = x1 + clampedT * dx;
|
||||||
|
const py = y1 + clampedT * dy;
|
||||||
|
|
||||||
|
return Math.hypot(x0 - px, y0 - py);
|
||||||
|
}
|
||||||
|
|||||||
@@ -1,16 +1,15 @@
|
|||||||
import { animate, lerp } from "$lib/helpers";
|
import { animate, lerp } from '$lib/helpers';
|
||||||
import type { createKeyMap } from "$lib/helpers/createKeyMap";
|
import type { createKeyMap } from '$lib/helpers/createKeyMap';
|
||||||
import FileSaver from "file-saver";
|
import { panelState } from '$lib/sidebar/PanelState.svelte';
|
||||||
import type { GraphManager } from "./graph-manager.svelte";
|
import FileSaver from 'file-saver';
|
||||||
import type { GraphState } from "./graph/state.svelte";
|
import type { GraphManager } from './graph-manager.svelte';
|
||||||
|
import type { GraphState } from './graph-state.svelte';
|
||||||
|
|
||||||
type Keymap = ReturnType<typeof createKeyMap>;
|
type Keymap = ReturnType<typeof createKeyMap>;
|
||||||
export function setupKeymaps(keymap: Keymap, graph: GraphManager, graphState: GraphState) {
|
export function setupKeymaps(keymap: Keymap, graph: GraphManager, graphState: GraphState) {
|
||||||
|
|
||||||
|
|
||||||
keymap.addShortcut({
|
keymap.addShortcut({
|
||||||
key: "l",
|
key: 'l',
|
||||||
description: "Select linked nodes",
|
description: 'Select linked nodes',
|
||||||
callback: () => {
|
callback: () => {
|
||||||
const activeNode = graph.getNode(graphState.activeNodeId);
|
const activeNode = graph.getNode(graphState.activeNodeId);
|
||||||
if (activeNode) {
|
if (activeNode) {
|
||||||
@@ -20,56 +19,52 @@ export function setupKeymaps(keymap: Keymap, graph: GraphManager, graphState: Gr
|
|||||||
graphState.selectedNodes.add(node.id);
|
graphState.selectedNodes.add(node.id);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
keymap.addShortcut({
|
keymap.addShortcut({
|
||||||
key: "?",
|
key: '?',
|
||||||
description: "Toggle Help",
|
description: 'Toggle Help',
|
||||||
callback: () => {
|
callback: () => {
|
||||||
// TODO: fix this
|
panelState.setActivePanel('shortcuts');
|
||||||
// showHelp = !showHelp;
|
}
|
||||||
},
|
|
||||||
});
|
});
|
||||||
|
|
||||||
keymap.addShortcut({
|
keymap.addShortcut({
|
||||||
key: "c",
|
key: 'c',
|
||||||
ctrl: true,
|
ctrl: true,
|
||||||
description: "Copy active nodes",
|
description: 'Copy active nodes',
|
||||||
callback: () => graphState.copyNodes(),
|
callback: () => graphState.copyNodes()
|
||||||
});
|
});
|
||||||
|
|
||||||
keymap.addShortcut({
|
keymap.addShortcut({
|
||||||
key: "v",
|
key: 'v',
|
||||||
ctrl: true,
|
ctrl: true,
|
||||||
description: "Paste nodes",
|
description: 'Paste nodes',
|
||||||
callback: () => graphState.pasteNodes(),
|
callback: () => graphState.pasteNodes()
|
||||||
});
|
});
|
||||||
|
|
||||||
keymap.addShortcut({
|
keymap.addShortcut({
|
||||||
key: "Escape",
|
key: 'Escape',
|
||||||
description: "Deselect nodes",
|
description: 'Deselect nodes',
|
||||||
callback: () => {
|
callback: () => {
|
||||||
graphState.activeNodeId = -1;
|
graphState.activeNodeId = -1;
|
||||||
graphState.clearSelection();
|
graphState.clearSelection();
|
||||||
graphState.edgeEndPosition = null;
|
graphState.edgeEndPosition = null;
|
||||||
(document.activeElement as HTMLElement)?.blur();
|
(document.activeElement as HTMLElement)?.blur();
|
||||||
},
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
keymap.addShortcut({
|
keymap.addShortcut({
|
||||||
key: "A",
|
key: 'A',
|
||||||
shift: true,
|
shift: true,
|
||||||
description: "Add new Node",
|
description: 'Add new Node',
|
||||||
callback: () => {
|
callback: () => graphState.openNodePalette()
|
||||||
graphState.addMenuPosition = [graphState.mousePosition[0], graphState.mousePosition[1]];
|
|
||||||
},
|
|
||||||
});
|
});
|
||||||
|
|
||||||
keymap.addShortcut({
|
keymap.addShortcut({
|
||||||
key: ".",
|
key: '.',
|
||||||
description: "Center camera",
|
description: 'Center camera',
|
||||||
callback: () => {
|
callback: () => {
|
||||||
if (!graphState.isBodyFocused()) return;
|
if (!graphState.isBodyFocused()) return;
|
||||||
|
|
||||||
@@ -88,71 +83,69 @@ export function setupKeymaps(keymap: Keymap, graph: GraphManager, graphState: Gr
|
|||||||
const ease = (t: number) => (t < 0.5 ? 2 * t * t : -1 + (4 - 2 * t) * t);
|
const ease = (t: number) => (t < 0.5 ? 2 * t * t : -1 + (4 - 2 * t) * t);
|
||||||
|
|
||||||
animate(500, (a: number) => {
|
animate(500, (a: number) => {
|
||||||
graphState.setCameraTransform(
|
graphState.cameraPosition[0] = lerp(camX, average[0], ease(a));
|
||||||
lerp(camX, average[0], ease(a)),
|
graphState.cameraPosition[1] = lerp(camY, average[1], ease(a));
|
||||||
lerp(camY, average[1], ease(a)),
|
graphState.cameraPosition[2] = lerp(camZ, 2, ease(a));
|
||||||
lerp(camZ, 2, ease(a)),
|
|
||||||
);
|
|
||||||
if (graphState.mouseDown) return false;
|
if (graphState.mouseDown) return false;
|
||||||
});
|
});
|
||||||
},
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
keymap.addShortcut({
|
keymap.addShortcut({
|
||||||
key: "a",
|
key: 'a',
|
||||||
ctrl: true,
|
ctrl: true,
|
||||||
preventDefault: true,
|
preventDefault: true,
|
||||||
description: "Select all nodes",
|
description: 'Select all nodes',
|
||||||
callback: () => {
|
callback: () => {
|
||||||
if (!graphState.isBodyFocused()) return;
|
if (!graphState.isBodyFocused()) return;
|
||||||
for (const node of graph.nodes.keys()) {
|
for (const node of graph.nodes.keys()) {
|
||||||
graphState.selectedNodes.add(node);
|
graphState.selectedNodes.add(node);
|
||||||
}
|
}
|
||||||
},
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
keymap.addShortcut({
|
keymap.addShortcut({
|
||||||
key: "z",
|
key: 'z',
|
||||||
ctrl: true,
|
ctrl: true,
|
||||||
description: "Undo",
|
description: 'Undo',
|
||||||
callback: () => {
|
callback: () => {
|
||||||
if (!graphState.isBodyFocused()) return;
|
if (!graphState.isBodyFocused()) return;
|
||||||
graph.undo();
|
graph.undo();
|
||||||
for (const node of graph.nodes.values()) {
|
for (const node of graph.nodes.values()) {
|
||||||
graphState.updateNodePosition(node);
|
graphState.updateNodePosition(node);
|
||||||
}
|
}
|
||||||
},
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
keymap.addShortcut({
|
keymap.addShortcut({
|
||||||
key: "y",
|
key: 'y',
|
||||||
ctrl: true,
|
ctrl: true,
|
||||||
description: "Redo",
|
description: 'Redo',
|
||||||
callback: () => {
|
callback: () => {
|
||||||
graph.redo();
|
graph.redo();
|
||||||
for (const node of graph.nodes.values()) {
|
for (const node of graph.nodes.values()) {
|
||||||
graphState.updateNodePosition(node);
|
graphState.updateNodePosition(node);
|
||||||
}
|
}
|
||||||
},
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
keymap.addShortcut({
|
keymap.addShortcut({
|
||||||
key: "s",
|
key: 's',
|
||||||
ctrl: true,
|
ctrl: true,
|
||||||
description: "Save",
|
description: 'Save',
|
||||||
preventDefault: true,
|
preventDefault: true,
|
||||||
callback: () => {
|
callback: () => {
|
||||||
const state = graph.serialize();
|
const state = graph.serialize();
|
||||||
const blob = new Blob([JSON.stringify(state)], {
|
const blob = new Blob([JSON.stringify(state)], {
|
||||||
type: "application/json;charset=utf-8",
|
type: 'application/json;charset=utf-8'
|
||||||
});
|
});
|
||||||
FileSaver.saveAs(blob, "nodarium-graph.json");
|
FileSaver.saveAs(blob, 'nodarium-graph.json');
|
||||||
},
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
keymap.addShortcut({
|
keymap.addShortcut({
|
||||||
key: ["Delete", "Backspace", "x"],
|
key: ['Delete', 'Backspace', 'x'],
|
||||||
description: "Delete selected nodes",
|
description: 'Delete selected nodes',
|
||||||
callback: (event) => {
|
callback: (event) => {
|
||||||
if (!graphState.isBodyFocused()) return;
|
if (!graphState.isBodyFocused()) return;
|
||||||
graph.startUndoGroup();
|
graph.startUndoGroup();
|
||||||
@@ -173,20 +166,18 @@ export function setupKeymaps(keymap: Keymap, graph: GraphManager, graphState: Gr
|
|||||||
graphState.clearSelection();
|
graphState.clearSelection();
|
||||||
}
|
}
|
||||||
graph.saveUndoGroup();
|
graph.saveUndoGroup();
|
||||||
},
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
keymap.addShortcut({
|
keymap.addShortcut({
|
||||||
key: "f",
|
key: 'f',
|
||||||
description: "Smart Connect Nodes",
|
description: 'Smart Connect Nodes',
|
||||||
callback: () => {
|
callback: () => {
|
||||||
const nodes = [...graphState.selectedNodes.values()]
|
const nodes = [...graphState.selectedNodes.values()]
|
||||||
.map((g) => graph.getNode(g))
|
.map((g) => graph.getNode(g))
|
||||||
.filter((n) => !!n);
|
.filter((n) => !!n);
|
||||||
const edge = graph.smartConnect(nodes[0], nodes[1]);
|
const edge = graph.smartConnect(nodes[0], nodes[1]);
|
||||||
if (!edge) graph.smartConnect(nodes[1], nodes[0]);
|
if (!edge) graph.smartConnect(nodes[1], nodes[0]);
|
||||||
},
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
<script lang="ts">
|
<script lang="ts">
|
||||||
import type { NodeInstance } from "@nodarium/types";
|
import type { NodeInstance } from "@nodarium/types";
|
||||||
import { getGraphState } from "../graph/state.svelte";
|
import { getGraphState } from "../graph-state.svelte";
|
||||||
import { T } from "@threlte/core";
|
import { T } from "@threlte/core";
|
||||||
import { type Mesh } from "three";
|
import { type Mesh } from "three";
|
||||||
import NodeFrag from "./Node.frag";
|
import NodeFrag from "./Node.frag";
|
||||||
@@ -16,7 +16,7 @@
|
|||||||
inView: boolean;
|
inView: boolean;
|
||||||
z: number;
|
z: number;
|
||||||
};
|
};
|
||||||
let { node, inView, z }: Props = $props();
|
let { node = $bindable(), inView, z }: Props = $props();
|
||||||
|
|
||||||
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));
|
||||||
@@ -42,8 +42,8 @@
|
|||||||
</script>
|
</script>
|
||||||
|
|
||||||
<T.Mesh
|
<T.Mesh
|
||||||
position.x={node.position[0] + 10}
|
position.x={(node.state.x ?? node.position[0]) + 10}
|
||||||
position.z={node.position[1] + height / 2}
|
position.z={(node.state.y ?? node.position[1]) + height / 2}
|
||||||
position.y={0.8}
|
position.y={0.8}
|
||||||
rotation.x={-Math.PI / 2}
|
rotation.x={-Math.PI / 2}
|
||||||
bind:ref={meshRef}
|
bind:ref={meshRef}
|
||||||
@@ -67,4 +67,4 @@
|
|||||||
/>
|
/>
|
||||||
</T.Mesh>
|
</T.Mesh>
|
||||||
|
|
||||||
<NodeHtml {node} {inView} {isActive} {isSelected} {z} />
|
<NodeHtml bind:node {inView} {isActive} {isSelected} {z} />
|
||||||
|
|||||||
@@ -1,15 +1,15 @@
|
|||||||
<script lang="ts">
|
<script lang="ts">
|
||||||
import type { NodeInstance, SerializedNode } from "@nodarium/types";
|
import type { NodeInstance } from "@nodarium/types";
|
||||||
import NodeHeader from "./NodeHeader.svelte";
|
import NodeHeader from "./NodeHeader.svelte";
|
||||||
import NodeParameter from "./NodeParameter.svelte";
|
import NodeParameter from "./NodeParameter.svelte";
|
||||||
import { getGraphState } from "../graph/state.svelte";
|
import { getGraphState } from "../graph-state.svelte";
|
||||||
|
|
||||||
let ref: HTMLDivElement;
|
let ref: HTMLDivElement;
|
||||||
|
|
||||||
const graphState = getGraphState();
|
const graphState = getGraphState();
|
||||||
|
|
||||||
type Props = {
|
type Props = {
|
||||||
node: SerializedNode | NodeInstance;
|
node: NodeInstance;
|
||||||
position?: "absolute" | "fixed" | "relative";
|
position?: "absolute" | "fixed" | "relative";
|
||||||
isActive?: boolean;
|
isActive?: boolean;
|
||||||
isSelected?: boolean;
|
isSelected?: boolean;
|
||||||
@@ -30,15 +30,10 @@
|
|||||||
const zOffset = Math.random() - 0.5;
|
const zOffset = Math.random() - 0.5;
|
||||||
const zLimit = 2 - zOffset;
|
const zLimit = 2 - zOffset;
|
||||||
|
|
||||||
const parameters =
|
const parameters = Object.entries(node.state?.type?.inputs || {}).filter(
|
||||||
"state" in node
|
(p) =>
|
||||||
? Object.entries(node.state?.type?.inputs || {}).filter(
|
p[1].type !== "seed" && !("setting" in p[1]) && p[1]?.hidden !== true,
|
||||||
(p) =>
|
);
|
||||||
p[1].type !== "seed" &&
|
|
||||||
!("setting" in p[1]) &&
|
|
||||||
p[1]?.hidden !== true,
|
|
||||||
)
|
|
||||||
: [];
|
|
||||||
|
|
||||||
$effect(() => {
|
$effect(() => {
|
||||||
if ("state" in node && !node.state.ref) {
|
if ("state" in node && !node.state.ref) {
|
||||||
|
|||||||
@@ -1,11 +1,11 @@
|
|||||||
<script lang="ts">
|
<script lang="ts">
|
||||||
import { getGraphState } from "../graph/state.svelte.js";
|
import { getGraphState } from "../graph-state.svelte";
|
||||||
import { createNodePath } from "../helpers/index.js";
|
import { createNodePath } from "../helpers/index.js";
|
||||||
import type { NodeInstance, SerializedNode } from "@nodarium/types";
|
import type { NodeInstance } from "@nodarium/types";
|
||||||
|
|
||||||
const graphState = getGraphState();
|
const graphState = getGraphState();
|
||||||
|
|
||||||
const { node }: { node: NodeInstance | SerializedNode } = $props();
|
const { node }: { node: NodeInstance } = $props();
|
||||||
|
|
||||||
function handleMouseDown(event: MouseEvent) {
|
function handleMouseDown(event: MouseEvent) {
|
||||||
event.stopPropagation();
|
event.stopPropagation();
|
||||||
@@ -20,8 +20,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
const cornerTop = 10;
|
const cornerTop = 10;
|
||||||
const rightBump =
|
const rightBump = !!node?.state?.type?.outputs?.length;
|
||||||
"state" in node ? !!node?.state?.type?.outputs?.length : false;
|
|
||||||
const aspectRatio = 0.25;
|
const aspectRatio = 0.25;
|
||||||
|
|
||||||
const path = createNodePath({
|
const path = createNodePath({
|
||||||
|
|||||||
@@ -1,16 +1,12 @@
|
|||||||
<script lang="ts">
|
<script lang="ts">
|
||||||
import type {
|
import type { NodeInput, NodeInstance } from "@nodarium/types";
|
||||||
NodeInput as NodeInputType,
|
import { createNodePath } from "../helpers";
|
||||||
NodeInstance,
|
import NodeInputEl from "./NodeInput.svelte";
|
||||||
SerializedNode,
|
import { getGraphManager, getGraphState } from "../graph-state.svelte";
|
||||||
} from "@nodarium/types";
|
|
||||||
import { createNodePath } from "../helpers/index.js";
|
|
||||||
import NodeInput from "./NodeInput.svelte";
|
|
||||||
import { getGraphManager, getGraphState } from "../graph/state.svelte.js";
|
|
||||||
|
|
||||||
type Props = {
|
type Props = {
|
||||||
node: NodeInstance | SerializedNode;
|
node: NodeInstance;
|
||||||
input: NodeInputType;
|
input: NodeInput;
|
||||||
id: string;
|
id: string;
|
||||||
isLast?: boolean;
|
isLast?: boolean;
|
||||||
};
|
};
|
||||||
@@ -77,10 +73,16 @@
|
|||||||
{#key id && graphId}
|
{#key id && graphId}
|
||||||
<div class="content" class:disabled={graph?.inputSockets?.has(socketId)}>
|
<div class="content" class:disabled={graph?.inputSockets?.has(socketId)}>
|
||||||
{#if inputType.label !== ""}
|
{#if inputType.label !== ""}
|
||||||
<label for={elementId}>{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}
|
||||||
<NodeInput {graph} {elementId} bind:node {input} {id} />
|
<NodeInputEl {graph} {elementId} bind:node {input} {id} />
|
||||||
{/if}
|
{/if}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
@@ -185,9 +187,6 @@
|
|||||||
.content.disabled {
|
.content.disabled {
|
||||||
opacity: 0.2;
|
opacity: 0.2;
|
||||||
}
|
}
|
||||||
.content.disabled > * {
|
|
||||||
pointer-events: none;
|
|
||||||
}
|
|
||||||
|
|
||||||
.disabled svg path {
|
.disabled svg path {
|
||||||
d: var(--hover-path-disabled) !important;
|
d: var(--hover-path-disabled) !important;
|
||||||
|
|||||||
@@ -1,12 +1,16 @@
|
|||||||
<script lang="ts">
|
<script lang="ts">
|
||||||
import { getContext } from "svelte";
|
import { getContext, type Snippet } from "svelte";
|
||||||
|
|
||||||
let index = -1;
|
let index = $state(-1);
|
||||||
let wrapper: HTMLDivElement;
|
let wrapper: HTMLDivElement;
|
||||||
|
|
||||||
$: if (index === -1) {
|
const { children } = $props<{ children?: Snippet }>();
|
||||||
index = getContext<() => number>("registerCell")();
|
|
||||||
}
|
$effect(() => {
|
||||||
|
if (index === -1) {
|
||||||
|
index = getContext<() => number>("registerCell")();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
const sizes = getContext<{ value: string[] }>("sizes");
|
const sizes = getContext<{ value: string[] }>("sizes");
|
||||||
|
|
||||||
@@ -31,8 +35,8 @@
|
|||||||
</script>
|
</script>
|
||||||
|
|
||||||
<svelte:window
|
<svelte:window
|
||||||
on:mouseup={() => (mouseDown = false)}
|
onmouseup={() => (mouseDown = false)}
|
||||||
on:mousemove={handleMouseMove}
|
onmousemove={handleMouseMove}
|
||||||
/>
|
/>
|
||||||
|
|
||||||
{#if index > 0}
|
{#if index > 0}
|
||||||
@@ -40,12 +44,12 @@
|
|||||||
class="seperator"
|
class="seperator"
|
||||||
role="button"
|
role="button"
|
||||||
tabindex="0"
|
tabindex="0"
|
||||||
on:mousedown={handleMouseDown}
|
onmousedown={handleMouseDown}
|
||||||
></div>
|
></div>
|
||||||
{/if}
|
{/if}
|
||||||
|
|
||||||
<div class="cell" bind:this={wrapper}>
|
<div class="cell" bind:this={wrapper}>
|
||||||
<slot />
|
{@render children?.()}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<style>
|
<style>
|
||||||
|
|||||||
@@ -1,9 +1,9 @@
|
|||||||
<script lang="ts">
|
<script lang="ts">
|
||||||
import { setContext } from "svelte";
|
import { setContext, type Snippet } from "svelte";
|
||||||
|
|
||||||
export let id = "grid-0";
|
const { children, id } = $props<{ children?: Snippet; id?: string }>();
|
||||||
|
|
||||||
setContext("grid-id", id);
|
setContext("grid-id", id);
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<slot {id} />
|
{@render children({ id })}
|
||||||
|
|||||||
@@ -126,7 +126,7 @@ export function humanizeDuration(durationInMilliseconds: number) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (millis > 0 || durationString === '') {
|
if (millis > 0 || durationString === '') {
|
||||||
durationString += millis + 'ms';
|
durationString += Math.floor(millis) + 'ms';
|
||||||
}
|
}
|
||||||
|
|
||||||
return durationString.trim();
|
return durationString.trim();
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
|
<svg viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||||
<rect x="17" y="8" width="5" height="7" rx="1" stroke="currentColor" stroke-width="2"/>
|
<rect x="17" y="8" width="5" height="7" rx="1" stroke="currentColor" stroke-width="2"/>
|
||||||
<rect x="2" y="3" width="5" height="7" rx="1" stroke="currentColor" stroke-width="2"/>
|
<rect x="2" y="3" width="5" height="7" rx="1" stroke="currentColor" stroke-width="2"/>
|
||||||
<rect x="2" y="14" width="5" height="7" rx="1" stroke="currentColor" stroke-width="2"/>
|
<rect x="2" y="14" width="5" height="7" rx="1" stroke="currentColor" stroke-width="2"/>
|
||||||
|
|||||||
|
Before Width: | Height: | Size: 519 B After Width: | Height: | Size: 496 B |
@@ -1,9 +1,9 @@
|
|||||||
import { createWasmWrapper } from "@nodarium/utils";
|
import { createWasmWrapper } from '@nodarium/utils';
|
||||||
import fs from "fs/promises";
|
import fs from 'fs/promises';
|
||||||
import path from "path";
|
import path from 'path';
|
||||||
|
|
||||||
export async function getWasm(id: `${string}/${string}/${string}`) {
|
export async function getWasm(id: `${string}/${string}/${string}`) {
|
||||||
const filePath = path.resolve(`../nodes/${id}/pkg/index_bg.wasm`);
|
const filePath = path.resolve(`./static/nodes/${id}`);
|
||||||
|
|
||||||
try {
|
try {
|
||||||
await fs.access(filePath);
|
await fs.access(filePath);
|
||||||
@@ -36,12 +36,12 @@ export async function getNode(id: `${string}/${string}/${string}`) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
export async function getCollectionNodes(userId: `${string}/${string}`) {
|
export async function getCollectionNodes(userId: `${string}/${string}`) {
|
||||||
const nodes = await fs.readdir(path.resolve(`../nodes/${userId}`));
|
const nodes = await fs.readdir(path.resolve(`./static/nodes/${userId}`));
|
||||||
return nodes
|
return nodes
|
||||||
.filter((n) => n !== "pkg" && n !== ".template")
|
.filter((n) => n !== 'pkg' && n !== '.template')
|
||||||
.map((n) => {
|
.map((n) => {
|
||||||
return {
|
return {
|
||||||
id: `${userId}/${n}`,
|
id: `${userId}/${n}`
|
||||||
};
|
};
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
@@ -50,20 +50,20 @@ export async function getCollection(userId: `${string}/${string}`) {
|
|||||||
const nodes = await getCollectionNodes(userId);
|
const nodes = await getCollectionNodes(userId);
|
||||||
return {
|
return {
|
||||||
id: userId,
|
id: userId,
|
||||||
nodes,
|
nodes
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
export async function getUserCollections(userId: string) {
|
export async function getUserCollections(userId: string) {
|
||||||
const collections = await fs.readdir(path.resolve(`../nodes/${userId}`));
|
const collections = await fs.readdir(path.resolve(`./static/nodes/${userId}`));
|
||||||
return Promise.all(
|
return Promise.all(
|
||||||
collections.map(async (n) => {
|
collections.map(async (n) => {
|
||||||
const nodes = await getCollectionNodes(`${userId}/${n}`);
|
const nodes = await getCollectionNodes(`${userId}/${n}`);
|
||||||
return {
|
return {
|
||||||
id: `${userId}/${n}`,
|
id: `${userId}/${n}`,
|
||||||
nodes,
|
nodes
|
||||||
};
|
};
|
||||||
}),
|
})
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -71,20 +71,20 @@ export async function getUser(userId: string) {
|
|||||||
const collections = await getUserCollections(userId);
|
const collections = await getUserCollections(userId);
|
||||||
return {
|
return {
|
||||||
id: userId,
|
id: userId,
|
||||||
collections,
|
collections
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
export async function getUsers() {
|
export async function getUsers() {
|
||||||
const nodes = await fs.readdir(path.resolve("../nodes"));
|
const nodes = await fs.readdir(path.resolve('./static/nodes'));
|
||||||
const users = await Promise.all(
|
const users = await Promise.all(
|
||||||
nodes.map(async (n) => {
|
nodes.map(async (n) => {
|
||||||
const collections = await getUserCollections(n);
|
const collections = await getUserCollections(n);
|
||||||
return {
|
return {
|
||||||
id: n,
|
id: n,
|
||||||
collections,
|
collections
|
||||||
};
|
};
|
||||||
}),
|
})
|
||||||
);
|
);
|
||||||
return users;
|
return users;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,10 +1,11 @@
|
|||||||
<script lang="ts">
|
<script lang="ts">
|
||||||
import { Select } from "@nodarium/ui";
|
import { Select } from "@nodarium/ui";
|
||||||
import type { Writable } from "svelte/store";
|
|
||||||
|
|
||||||
let activeStore = 0;
|
let activeStore = $state(0);
|
||||||
export let activeId: Writable<string>;
|
let { activeId }: { activeId: string } = $props();
|
||||||
$: [activeUser, activeCollection, activeNode] = $activeId.split(`/`);
|
const [activeUser, activeCollection, activeNode] = $derived(
|
||||||
|
activeId.split(`/`),
|
||||||
|
);
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<div class="breadcrumbs">
|
<div class="breadcrumbs">
|
||||||
@@ -12,16 +13,16 @@
|
|||||||
<Select id="root" options={["root"]} bind:value={activeStore}></Select>
|
<Select id="root" options={["root"]} bind:value={activeStore}></Select>
|
||||||
{#if activeCollection}
|
{#if activeCollection}
|
||||||
<button
|
<button
|
||||||
on:click={() => {
|
onclick={() => {
|
||||||
$activeId = activeUser;
|
activeId = activeUser;
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
{activeUser}
|
{activeUser}
|
||||||
</button>
|
</button>
|
||||||
{#if activeNode}
|
{#if activeNode}
|
||||||
<button
|
<button
|
||||||
on:click={() => {
|
onclick={() => {
|
||||||
$activeId = `${activeUser}/${activeCollection}`;
|
activeId = `${activeUser}/${activeCollection}`;
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
{activeCollection}
|
{activeCollection}
|
||||||
|
|||||||
@@ -1,17 +1,17 @@
|
|||||||
<script lang="ts">
|
<script lang="ts">
|
||||||
import NodeHtml from "$lib/graph-interface/node/NodeHTML.svelte";
|
import NodeHtml from "$lib/graph-interface/node/NodeHTML.svelte";
|
||||||
import type { SerializedNode } from "@nodarium/types";
|
import type { NodeDefinition, NodeId, NodeInstance } from "@nodarium/types";
|
||||||
|
|
||||||
const { node }: { node: SerializedNode } = $props();
|
const { node }: { node: NodeDefinition } = $props();
|
||||||
|
|
||||||
let dragging = $state(false);
|
let dragging = $state(false);
|
||||||
|
|
||||||
let nodeData = $state({
|
let nodeData = $state<NodeInstance>({
|
||||||
id: 0,
|
id: 0,
|
||||||
type: node?.id,
|
type: node.id as unknown as NodeId,
|
||||||
position: [0, 0] as [number, number],
|
position: [0, 0] as [number, number],
|
||||||
props: {},
|
props: {},
|
||||||
tmp: {
|
state: {
|
||||||
type: node,
|
type: node,
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
@@ -46,7 +46,7 @@
|
|||||||
tabindex="0"
|
tabindex="0"
|
||||||
ondragstart={handleDragStart}
|
ondragstart={handleDragStart}
|
||||||
>
|
>
|
||||||
<NodeHtml inView={true} position={"relative"} z={5} bind:node={nodeData} />
|
<NodeHtml bind:node={nodeData} inView={true} position={"relative"} z={5} />
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|||||||
@@ -1,19 +1,16 @@
|
|||||||
<script lang="ts">
|
<script lang="ts">
|
||||||
import { writable } from "svelte/store";
|
|
||||||
import BreadCrumbs from "./BreadCrumbs.svelte";
|
import BreadCrumbs from "./BreadCrumbs.svelte";
|
||||||
import DraggableNode from "./DraggableNode.svelte";
|
import DraggableNode from "./DraggableNode.svelte";
|
||||||
import type { RemoteNodeRegistry } from "@nodarium/registry";
|
import type { RemoteNodeRegistry } from "@nodarium/registry";
|
||||||
|
|
||||||
export let registry: RemoteNodeRegistry;
|
const { registry }: { registry: RemoteNodeRegistry } = $props();
|
||||||
|
|
||||||
const activeId = writable("max/plantarium");
|
let activeId = $state("max/plantarium");
|
||||||
let showBreadCrumbs = false;
|
let showBreadCrumbs = false;
|
||||||
|
|
||||||
// const activeId = localStore<
|
const [activeUser, activeCollection, activeNode] = $derived(
|
||||||
// `${string}` | `${string}/${string}` | `${string}/${string}/${string}`
|
activeId.split(`/`),
|
||||||
// >("nodes.store.activeId", "");
|
);
|
||||||
|
|
||||||
$: [activeUser, activeCollection, activeNode] = $activeId.split(`/`);
|
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
{#if showBreadCrumbs}
|
{#if showBreadCrumbs}
|
||||||
@@ -27,8 +24,8 @@
|
|||||||
{:then users}
|
{:then users}
|
||||||
{#each users as user}
|
{#each users as user}
|
||||||
<button
|
<button
|
||||||
on:click={() => {
|
onclick={() => {
|
||||||
$activeId = user.id;
|
activeId = user.id;
|
||||||
}}>{user.id}</button
|
}}>{user.id}</button
|
||||||
>
|
>
|
||||||
{/each}
|
{/each}
|
||||||
@@ -41,8 +38,8 @@
|
|||||||
{:then user}
|
{:then user}
|
||||||
{#each user.collections as collection}
|
{#each user.collections as collection}
|
||||||
<button
|
<button
|
||||||
on:click={() => {
|
onclick={() => {
|
||||||
$activeId = collection.id;
|
activeId = collection.id;
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
{collection.id.split(`/`)[1]}
|
{collection.id.split(`/`)[1]}
|
||||||
|
|||||||
@@ -1,8 +1,12 @@
|
|||||||
<script lang="ts">
|
<script lang="ts">
|
||||||
export let labels: string[] = [];
|
type Props = {
|
||||||
export let values: number[] = [];
|
labels: string[];
|
||||||
|
values: number[];
|
||||||
|
};
|
||||||
|
|
||||||
$: total = values.reduce((acc, v) => acc + v, 0);
|
const { labels, values }: Props = $props();
|
||||||
|
|
||||||
|
const total = $derived(values.reduce((acc, v) => acc + v, 0));
|
||||||
|
|
||||||
let colors = ["red", "green", "blue"];
|
let colors = ["red", "green", "blue"];
|
||||||
</script>
|
</script>
|
||||||
@@ -10,7 +14,10 @@
|
|||||||
<div class="wrapper">
|
<div class="wrapper">
|
||||||
<div class="bars">
|
<div class="bars">
|
||||||
{#each values as value, i}
|
{#each values as value, i}
|
||||||
<div class="bar bg-{colors[i]}" style="width: {(value / total) * 100}%;">
|
<div
|
||||||
|
class="bar bg-{colors[i]}-400"
|
||||||
|
style="width: {(value / total) * 100}%;"
|
||||||
|
>
|
||||||
{Math.round(value)}ms
|
{Math.round(value)}ms
|
||||||
</div>
|
</div>
|
||||||
{/each}
|
{/each}
|
||||||
@@ -18,12 +25,11 @@
|
|||||||
|
|
||||||
<div class="labels mt-2">
|
<div class="labels mt-2">
|
||||||
{#each values as _label, i}
|
{#each values as _label, i}
|
||||||
<div class="text-{colors[i]}">{labels[i]}</div>
|
<div class="text-{colors[i]}-400">{labels[i]}</div>
|
||||||
{/each}
|
{/each}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<span
|
<span
|
||||||
class="bg-red bg-green bg-yellow bg-blue text-red text-green text-yellow text-blue"
|
class="bg-red-400 bg-green-400 bg-blue-400 text-red-400 text-green-400 text-blue-400"
|
||||||
></span>
|
></span>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|||||||
@@ -1,52 +1,59 @@
|
|||||||
<script lang="ts">
|
<script lang="ts">
|
||||||
export let points: number[];
|
type Props = {
|
||||||
|
points: number[];
|
||||||
|
type?: string;
|
||||||
|
title?: string;
|
||||||
|
max?: number;
|
||||||
|
min?: number;
|
||||||
|
};
|
||||||
|
|
||||||
export let type = "ms";
|
let {
|
||||||
export let title = "Performance";
|
points,
|
||||||
export let max: number | undefined = undefined;
|
type = "ms",
|
||||||
export let min: number | undefined = undefined;
|
title = "Performance",
|
||||||
|
max,
|
||||||
|
min,
|
||||||
|
}: Props = $props();
|
||||||
|
|
||||||
function getMax(m?: number) {
|
let internalMax = $derived(max ?? Math.max(...points));
|
||||||
|
let internalMin = $derived(min ?? Math.min(...points))!;
|
||||||
|
|
||||||
|
const maxText = $derived.by(() => {
|
||||||
if (type === "%") {
|
if (type === "%") {
|
||||||
return 100;
|
return 100;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (m !== undefined) {
|
if (internalMax !== undefined) {
|
||||||
if (m < 1) {
|
if (internalMax < 1) {
|
||||||
return Math.floor(m * 100) / 100;
|
return Math.floor(internalMax * 100) / 100;
|
||||||
}
|
}
|
||||||
if (m < 10) {
|
if (internalMax < 10) {
|
||||||
return Math.floor(m * 10) / 10;
|
return Math.floor(internalMax * 10) / 10;
|
||||||
}
|
}
|
||||||
return Math.floor(m);
|
return Math.floor(internalMax);
|
||||||
}
|
}
|
||||||
|
|
||||||
return 1;
|
return 1;
|
||||||
}
|
});
|
||||||
|
|
||||||
function constructPath() {
|
const path = $derived(
|
||||||
max = max !== undefined ? max : Math.max(...points);
|
points
|
||||||
min = min !== undefined ? min : Math.min(...points);
|
|
||||||
const mi = min as number;
|
|
||||||
const ma = max as number;
|
|
||||||
return points
|
|
||||||
.map((point, i) => {
|
.map((point, i) => {
|
||||||
const x = (i / (points.length - 1)) * 100;
|
const x = (i / (points.length - 1)) * 100;
|
||||||
const y = 100 - ((point - mi) / (ma - mi)) * 100;
|
const y =
|
||||||
|
100 - ((point - internalMin) / (internalMax - internalMin)) * 100;
|
||||||
return `${x},${y}`;
|
return `${x},${y}`;
|
||||||
})
|
})
|
||||||
.join(" ");
|
.join(" "),
|
||||||
}
|
);
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<div class="wrapper">
|
<div class="wrapper">
|
||||||
<p>{title}</p>
|
<p>{title}</p>
|
||||||
<span class="min">{Math.floor(min || 0)}{type}</span>
|
<span class="min">{Math.floor(internalMin || 0)}{type}</span>
|
||||||
<span class="max">{getMax(max)}{type}</span>
|
<span class="max">{maxText}{type}</span>
|
||||||
<svg preserveAspectRatio="none" viewBox="0 0 100 100">
|
<svg preserveAspectRatio="none" viewBox="0 0 100 100">
|
||||||
{#key points}
|
<polyline vector-effect="non-scaling-stroke" points={path} />
|
||||||
<polyline vector-effect="non-scaling-stroke" points={constructPath()} />
|
|
||||||
{/key}
|
|
||||||
</svg>
|
</svg>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|||||||
@@ -2,23 +2,13 @@
|
|||||||
import Monitor from "./Monitor.svelte";
|
import Monitor from "./Monitor.svelte";
|
||||||
import { humanizeNumber } from "$lib/helpers";
|
import { humanizeNumber } from "$lib/helpers";
|
||||||
import { Checkbox } from "@nodarium/ui";
|
import { Checkbox } from "@nodarium/ui";
|
||||||
import localStore from "$lib/helpers/localStore";
|
import type { PerformanceData } from "@nodarium/utils";
|
||||||
import { type PerformanceData } from "@nodarium/utils";
|
|
||||||
import BarSplit from "./BarSplit.svelte";
|
import BarSplit from "./BarSplit.svelte";
|
||||||
|
|
||||||
export let data: PerformanceData;
|
const { data }: { data: PerformanceData } = $props();
|
||||||
|
|
||||||
let activeType = localStore<string>("nodes.performance.active-type", "total");
|
let activeType = $state("total");
|
||||||
let showAverage = true;
|
let showAverage = $state(true);
|
||||||
|
|
||||||
function getAverage(key: string) {
|
|
||||||
return (
|
|
||||||
data
|
|
||||||
.map((run) => run[key]?.[0])
|
|
||||||
.filter((v) => v !== undefined)
|
|
||||||
.reduce((acc, run) => acc + run, 0) / data.length
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
function round(v: number) {
|
function round(v: number) {
|
||||||
if (v < 1) {
|
if (v < 1) {
|
||||||
@@ -30,45 +20,15 @@
|
|||||||
return Math.floor(v);
|
return Math.floor(v);
|
||||||
}
|
}
|
||||||
|
|
||||||
function getAverages() {
|
function getTitle(t: string) {
|
||||||
let lastRun = data.at(-1);
|
if (t.includes("/")) {
|
||||||
if (!lastRun) return {};
|
return `Node ${t.split("/").slice(-1).join("/")}`;
|
||||||
return Object.keys(lastRun).reduce(
|
|
||||||
(acc, key) => {
|
|
||||||
acc[key] = getAverage(key);
|
|
||||||
return acc;
|
|
||||||
},
|
|
||||||
{} as Record<string, number>,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
function getLast(key: string) {
|
|
||||||
return data.at(-1)?.[key]?.[0] || 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
function getLasts() {
|
|
||||||
return data.at(-1) || {};
|
|
||||||
}
|
|
||||||
|
|
||||||
function getTotalPerformance(onlyLast = false) {
|
|
||||||
if (onlyLast) {
|
|
||||||
return (
|
|
||||||
getLast("runtime") +
|
|
||||||
getLast("update-geometries") +
|
|
||||||
getLast("worker-transfer")
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
return (
|
|
||||||
getAverage("runtime") +
|
|
||||||
getAverage("update-geometries") +
|
|
||||||
getAverage("worker-transfer")
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
function getCacheRatio(onlyLast = false) {
|
return t
|
||||||
let ratio = onlyLast ? getLast("cache-hit") : getAverage("cache-hit");
|
.split("-")
|
||||||
|
.map((v) => v[0].toUpperCase() + v.slice(1))
|
||||||
return Math.floor(ratio * 100);
|
.join(" ");
|
||||||
}
|
}
|
||||||
|
|
||||||
const viewerKeys = [
|
const viewerKeys = [
|
||||||
@@ -78,10 +38,53 @@
|
|||||||
"split-result",
|
"split-result",
|
||||||
];
|
];
|
||||||
|
|
||||||
function getPerformanceData(onlyLast: boolean = false) {
|
// --- Small helpers that query `data` directly ---
|
||||||
let data = onlyLast ? getLasts() : getAverages();
|
function getAverage(key: string) {
|
||||||
|
const vals = data
|
||||||
|
.map((run) => run[key]?.[0])
|
||||||
|
.filter((v) => v !== undefined) as number[];
|
||||||
|
|
||||||
return Object.entries(data)
|
if (vals.length === 0) return 0;
|
||||||
|
return vals.reduce((acc, v) => acc + v, 0) / vals.length;
|
||||||
|
}
|
||||||
|
|
||||||
|
function getLast(key: string) {
|
||||||
|
return data.at(-1)?.[key]?.[0] || 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
const averages = $derived.by(() => {
|
||||||
|
const lr = data.at(-1);
|
||||||
|
if (!lr) return {} as Record<string, number>;
|
||||||
|
return Object.keys(lr).reduce((acc: Record<string, number>, key) => {
|
||||||
|
acc[key] = getAverage(key);
|
||||||
|
return acc;
|
||||||
|
}, {});
|
||||||
|
});
|
||||||
|
|
||||||
|
const lasts = $derived.by(() => data.at(-1) || {});
|
||||||
|
|
||||||
|
const totalPerformance = $derived.by(() => {
|
||||||
|
const onlyLast =
|
||||||
|
getLast("runtime") +
|
||||||
|
getLast("update-geometries") +
|
||||||
|
getLast("worker-transfer");
|
||||||
|
const average =
|
||||||
|
getAverage("runtime") +
|
||||||
|
getAverage("update-geometries") +
|
||||||
|
getAverage("worker-transfer");
|
||||||
|
return { onlyLast, average };
|
||||||
|
});
|
||||||
|
|
||||||
|
const cacheRatio = $derived.by(() => {
|
||||||
|
return {
|
||||||
|
onlyLast: Math.floor(getLast("cache-hit") * 100),
|
||||||
|
average: Math.floor(getAverage("cache-hit") * 100),
|
||||||
|
};
|
||||||
|
});
|
||||||
|
|
||||||
|
const performanceData = $derived.by(() => {
|
||||||
|
const source = showAverage ? averages : lasts;
|
||||||
|
return Object.entries(source)
|
||||||
.filter(
|
.filter(
|
||||||
([key]) =>
|
([key]) =>
|
||||||
!key.startsWith("node/") &&
|
!key.startsWith("node/") &&
|
||||||
@@ -90,19 +93,18 @@
|
|||||||
!viewerKeys.includes(key),
|
!viewerKeys.includes(key),
|
||||||
)
|
)
|
||||||
.sort((a, b) => b[1] - a[1]);
|
.sort((a, b) => b[1] - a[1]);
|
||||||
}
|
});
|
||||||
|
|
||||||
function getNodePerformanceData(onlyLast: boolean = false) {
|
const nodePerformanceData = $derived.by(() => {
|
||||||
let data = onlyLast ? getLasts() : getAverages();
|
const source = showAverage ? averages : lasts;
|
||||||
|
return Object.entries(source)
|
||||||
return Object.entries(data)
|
|
||||||
.filter(([key]) => key.startsWith("node/"))
|
.filter(([key]) => key.startsWith("node/"))
|
||||||
.sort((a, b) => b[1] - a[1]);
|
.sort((a, b) => b[1] - a[1]);
|
||||||
}
|
});
|
||||||
|
|
||||||
function getViewerPerformanceData(onlyLast: boolean = false) {
|
const viewerPerformanceData = $derived.by(() => {
|
||||||
let data = onlyLast ? getLasts() : getAverages();
|
const source = showAverage ? averages : lasts;
|
||||||
return Object.entries(data)
|
return Object.entries(source)
|
||||||
.filter(
|
.filter(
|
||||||
([key]) =>
|
([key]) =>
|
||||||
key !== "total-vertices" &&
|
key !== "total-vertices" &&
|
||||||
@@ -110,14 +112,29 @@
|
|||||||
viewerKeys.includes(key),
|
viewerKeys.includes(key),
|
||||||
)
|
)
|
||||||
.sort((a, b) => b[1] - a[1]);
|
.sort((a, b) => b[1] - a[1]);
|
||||||
}
|
});
|
||||||
|
|
||||||
function getTotalPoints() {
|
const splitValues = $derived.by(() => {
|
||||||
|
if (showAverage) {
|
||||||
|
return [
|
||||||
|
getAverage("worker-transfer"),
|
||||||
|
getAverage("runtime"),
|
||||||
|
getAverage("update-geometries"),
|
||||||
|
];
|
||||||
|
}
|
||||||
|
return [
|
||||||
|
getLast("worker-transfer"),
|
||||||
|
getLast("runtime"),
|
||||||
|
getLast("update-geometries"),
|
||||||
|
];
|
||||||
|
});
|
||||||
|
|
||||||
|
const totalPoints = $derived.by(() => {
|
||||||
if (showAverage) {
|
if (showAverage) {
|
||||||
return data.map((run) => {
|
return data.map((run) => {
|
||||||
return (
|
return (
|
||||||
run["runtime"].reduce((acc, v) => acc + v, 0) +
|
(run["runtime"]?.reduce((acc, v) => acc + v, 0) || 0) +
|
||||||
run["update-geometries"].reduce((acc, v) => acc + v, 0) +
|
(run["update-geometries"]?.reduce((acc, v) => acc + v, 0) || 0) +
|
||||||
(run["worker-transfer"]?.reduce((acc, v) => acc + v, 0) || 0)
|
(run["worker-transfer"]?.reduce((acc, v) => acc + v, 0) || 0)
|
||||||
);
|
);
|
||||||
});
|
});
|
||||||
@@ -125,16 +142,16 @@
|
|||||||
|
|
||||||
return data.map((run) => {
|
return data.map((run) => {
|
||||||
return (
|
return (
|
||||||
run["runtime"][0] +
|
(run["runtime"]?.[0] || 0) +
|
||||||
run["update-geometries"][0] +
|
(run["update-geometries"]?.[0] || 0) +
|
||||||
(run["worker-transfer"]?.[0] || 0)
|
(run["worker-transfer"]?.[0] || 0)
|
||||||
);
|
);
|
||||||
});
|
});
|
||||||
}
|
});
|
||||||
|
|
||||||
function constructPoints(key: string) {
|
function constructPoints(key: string) {
|
||||||
if (key === "total") {
|
if (key === "total") {
|
||||||
return getTotalPoints();
|
return totalPoints;
|
||||||
}
|
}
|
||||||
return data.map((run) => {
|
return data.map((run) => {
|
||||||
if (key in run) {
|
if (key in run) {
|
||||||
@@ -148,47 +165,33 @@
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
function getSplitValues(): number[] {
|
const computedTotalDisplay = $derived.by(() =>
|
||||||
if (showAverage) {
|
round(showAverage ? totalPerformance.average : totalPerformance.onlyLast),
|
||||||
return [
|
);
|
||||||
getAverage("worker-transfer"),
|
|
||||||
getAverage("runtime"),
|
|
||||||
getAverage("update-geometries"),
|
|
||||||
];
|
|
||||||
}
|
|
||||||
|
|
||||||
return [
|
const computedFps = $derived.by(() =>
|
||||||
getLast("worker-transfer"),
|
Math.floor(
|
||||||
getLast("runtime"),
|
1000 /
|
||||||
getLast("update-geometries"),
|
(showAverage
|
||||||
];
|
? totalPerformance.average || 1
|
||||||
}
|
: totalPerformance.onlyLast || 1),
|
||||||
|
),
|
||||||
function getTitle(t: string) {
|
);
|
||||||
if (t.includes("/")) {
|
|
||||||
return `Node ${t.split("/").slice(-1).join("/")}`;
|
|
||||||
}
|
|
||||||
|
|
||||||
return t
|
|
||||||
.split("-")
|
|
||||||
.map((v) => v[0].toUpperCase() + v.slice(1))
|
|
||||||
.join(" ");
|
|
||||||
}
|
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
{#key $activeType && data}
|
{#if data.length !== 0}
|
||||||
{#if $activeType === "cache-hit"}
|
{#if activeType === "cache-hit"}
|
||||||
<Monitor
|
<Monitor
|
||||||
title="Cache Hits"
|
title="Cache Hits"
|
||||||
points={constructPoints($activeType)}
|
points={constructPoints(activeType)}
|
||||||
min={0}
|
min={0}
|
||||||
max={1}
|
max={1}
|
||||||
type="%"
|
type="%"
|
||||||
/>
|
/>
|
||||||
{:else}
|
{:else}
|
||||||
<Monitor
|
<Monitor
|
||||||
title={getTitle($activeType)}
|
title={getTitle(activeType)}
|
||||||
points={constructPoints($activeType)}
|
points={constructPoints(activeType)}
|
||||||
/>
|
/>
|
||||||
{/if}
|
{/if}
|
||||||
|
|
||||||
@@ -198,116 +201,108 @@
|
|||||||
<label for="show-total">Show Average</label>
|
<label for="show-total">Show Average</label>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
{#if data.length !== 0}
|
<BarSplit
|
||||||
<BarSplit
|
labels={["worker-transfer", "runtime", "update-geometries"]}
|
||||||
labels={["worker-transfer", "runtime", "update-geometries"]}
|
values={splitValues}
|
||||||
values={getSplitValues()}
|
/>
|
||||||
/>
|
|
||||||
|
|
||||||
<h3>General</h3>
|
<h3>General</h3>
|
||||||
|
|
||||||
<table>
|
<table>
|
||||||
<tbody>
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td>
|
||||||
|
{computedTotalDisplay}<span>ms</span>
|
||||||
|
</td>
|
||||||
|
<td
|
||||||
|
class:active={activeType === "total"}
|
||||||
|
onclick={() => (activeType = "total")}
|
||||||
|
>
|
||||||
|
total<span>({computedFps}fps)</span>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
|
||||||
|
{#each performanceData as [key, value]}
|
||||||
<tr>
|
<tr>
|
||||||
<td>
|
<td>{round(value)}<span>ms</span></td>
|
||||||
{round(getTotalPerformance(!showAverage))}<span>ms</span>
|
|
||||||
</td>
|
|
||||||
<td
|
<td
|
||||||
class:active={$activeType === "total"}
|
class:active={activeType === key}
|
||||||
on:click={() => ($activeType = "total")}
|
onclick={() => (activeType = key)}
|
||||||
>
|
>
|
||||||
total<span
|
{key}
|
||||||
>({Math.floor(
|
|
||||||
1000 / getTotalPerformance(showAverage),
|
|
||||||
)}fps)</span
|
|
||||||
>
|
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
{#each getPerformanceData(!showAverage) as [key, value]}
|
{/each}
|
||||||
<tr>
|
|
||||||
<td>
|
|
||||||
{round(value)}<span>ms</span>
|
|
||||||
</td>
|
|
||||||
<td
|
|
||||||
class:active={$activeType === key}
|
|
||||||
on:click={() => ($activeType = key)}
|
|
||||||
>
|
|
||||||
{key}
|
|
||||||
</td>
|
|
||||||
</tr>
|
|
||||||
{/each}
|
|
||||||
|
|
||||||
|
<tr>
|
||||||
|
<td>{data.length}</td>
|
||||||
|
<td>Samples</td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
|
||||||
|
<tbody>
|
||||||
|
<tr><td><h3>Nodes</h3></td></tr>
|
||||||
|
</tbody>
|
||||||
|
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td
|
||||||
|
>{showAverage ? cacheRatio.average : cacheRatio.onlyLast}<span
|
||||||
|
>%</span
|
||||||
|
></td
|
||||||
|
>
|
||||||
|
<td
|
||||||
|
class:active={activeType === "cache-hit"}
|
||||||
|
onclick={() => (activeType = "cache-hit")}
|
||||||
|
>
|
||||||
|
cache hits
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
|
||||||
|
{#each nodePerformanceData as [key, value]}
|
||||||
<tr>
|
<tr>
|
||||||
<td>{data.length}</td>
|
<td>{round(value)}<span>ms</span></td>
|
||||||
<td>Samples</td>
|
|
||||||
</tr>
|
|
||||||
</tbody>
|
|
||||||
<tbody>
|
|
||||||
<tr>
|
|
||||||
<td>
|
|
||||||
<h3>Nodes</h3>
|
|
||||||
</td>
|
|
||||||
</tr>
|
|
||||||
</tbody>
|
|
||||||
<tbody>
|
|
||||||
<tr>
|
|
||||||
<td> {getCacheRatio(!showAverage)}<span>%</span> </td>
|
|
||||||
<td
|
<td
|
||||||
class:active={$activeType === "cache-hit"}
|
class:active={activeType === key}
|
||||||
on:click={() => ($activeType = "cache-hit")}>cache hits</td
|
onclick={() => (activeType = key)}
|
||||||
>
|
>
|
||||||
</tr>
|
{key.split("/").slice(-1).join("/")}
|
||||||
{#each getNodePerformanceData(!showAverage) as [key, value]}
|
|
||||||
<tr>
|
|
||||||
<td>
|
|
||||||
{round(value)}<span>ms</span>
|
|
||||||
</td>
|
|
||||||
|
|
||||||
<td
|
|
||||||
class:active={$activeType === key}
|
|
||||||
on:click={() => ($activeType = key)}
|
|
||||||
>
|
|
||||||
{key.split("/").slice(-1).join("/")}
|
|
||||||
</td>
|
|
||||||
</tr>
|
|
||||||
{/each}
|
|
||||||
</tbody>
|
|
||||||
<tbody>
|
|
||||||
<tr>
|
|
||||||
<td>
|
|
||||||
<h3>Viewer</h3>
|
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
</tbody>
|
{/each}
|
||||||
<tbody>
|
</tbody>
|
||||||
|
|
||||||
|
<tbody>
|
||||||
|
<tr><td><h3>Viewer</h3></td></tr>
|
||||||
|
</tbody>
|
||||||
|
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td>{humanizeNumber(getLast("total-vertices"))}</td>
|
||||||
|
<td>Vertices</td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td>{humanizeNumber(getLast("total-faces"))}</td>
|
||||||
|
<td>Faces</td>
|
||||||
|
</tr>
|
||||||
|
|
||||||
|
{#each viewerPerformanceData as [key, value]}
|
||||||
<tr>
|
<tr>
|
||||||
<td>{humanizeNumber(getLast("total-vertices"))}</td>
|
<td>{round(value)}<span>ms</span></td>
|
||||||
<td>Vertices</td>
|
<td
|
||||||
|
class:active={activeType === key}
|
||||||
|
onclick={() => (activeType = key)}
|
||||||
|
>
|
||||||
|
{key.split("/").slice(-1).join("/")}
|
||||||
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
{/each}
|
||||||
<td>{humanizeNumber(getLast("total-faces"))}</td>
|
</tbody>
|
||||||
<td>Faces</td>
|
</table>
|
||||||
</tr>
|
|
||||||
{#each getViewerPerformanceData(!showAverage) as [key, value]}
|
|
||||||
<tr>
|
|
||||||
<td>
|
|
||||||
{round(value)}<span>ms</span>
|
|
||||||
</td>
|
|
||||||
<td
|
|
||||||
class:active={$activeType === key}
|
|
||||||
on:click={() => ($activeType = key)}
|
|
||||||
>
|
|
||||||
{key.split("/").slice(-1).join("/")}
|
|
||||||
</td>
|
|
||||||
</tr>
|
|
||||||
{/each}
|
|
||||||
</tbody>
|
|
||||||
</table>
|
|
||||||
{:else}
|
|
||||||
<p>No runs available</p>
|
|
||||||
{/if}
|
|
||||||
</div>
|
</div>
|
||||||
{/key}
|
{:else}
|
||||||
|
<p>No runs available</p>
|
||||||
|
{/if}
|
||||||
|
|
||||||
<style>
|
<style>
|
||||||
h3 {
|
h3 {
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
<script lang="ts">
|
<script lang="ts">
|
||||||
export let points: number[];
|
const { points }: { points: number[] } = $props();
|
||||||
|
|
||||||
function constructPath() {
|
const path = $derived.by(() => {
|
||||||
const max = Math.max(...points);
|
const max = Math.max(...points);
|
||||||
const min = Math.min(...points);
|
const min = Math.min(...points);
|
||||||
return points
|
return points
|
||||||
@@ -11,13 +11,11 @@
|
|||||||
return `${x},${y}`;
|
return `${x},${y}`;
|
||||||
})
|
})
|
||||||
.join(" ");
|
.join(" ");
|
||||||
}
|
});
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<svg preserveAspectRatio="none" viewBox="0 0 100 100">
|
<svg preserveAspectRatio="none" viewBox="0 0 100 100">
|
||||||
{#key points}
|
<polyline vector-effect="non-scaling-stroke" points={path} />
|
||||||
<polyline vector-effect="non-scaling-stroke" points={constructPath()} />
|
|
||||||
{/key}
|
|
||||||
</svg>
|
</svg>
|
||||||
|
|
||||||
<style>
|
<style>
|
||||||
|
|||||||
@@ -1,25 +1,23 @@
|
|||||||
<script lang="ts">
|
<script lang="ts">
|
||||||
import { humanizeDuration, humanizeNumber } from "$lib/helpers";
|
import { humanizeDuration, humanizeNumber } from "$lib/helpers";
|
||||||
import localStore from "$lib/helpers/localStore";
|
import { localState } from "$lib/helpers/localState.svelte";
|
||||||
import SmallGraph from "./SmallGraph.svelte";
|
import SmallGraph from "./SmallGraph.svelte";
|
||||||
import type { PerformanceData, PerformanceStore } from "@nodarium/utils";
|
import type { PerformanceData, PerformanceStore } from "@nodarium/utils";
|
||||||
|
|
||||||
export let store: PerformanceStore;
|
const { store, fps }: { store: PerformanceStore; fps: number[] } = $props();
|
||||||
|
|
||||||
const open = localStore("node.performance.small.open", {
|
const open = localState("node.performance.small.open", {
|
||||||
runtime: false,
|
runtime: false,
|
||||||
fps: false,
|
fps: false,
|
||||||
});
|
});
|
||||||
|
|
||||||
$: vertices = $store?.at(-1)?.["total-vertices"]?.[0] || 0;
|
const vertices = $derived($store?.at(-1)?.["total-vertices"]?.[0] || 0);
|
||||||
$: faces = $store?.at(-1)?.["total-faces"]?.[0] || 0;
|
const faces = $derived($store?.at(-1)?.["total-faces"]?.[0] || 0);
|
||||||
$: runtime = $store?.at(-1)?.["runtime"]?.[0] || 0;
|
const runtime = $derived($store?.at(-1)?.["runtime"]?.[0] || 0);
|
||||||
|
|
||||||
function getPoints(data: PerformanceData, key: string) {
|
function getPoints(data: PerformanceData, key: string) {
|
||||||
return data?.map((run) => run[key]?.[0] || 0) || [];
|
return data?.map((run) => run[key]?.[0] || 0) || [];
|
||||||
}
|
}
|
||||||
|
|
||||||
export let fps: number[] = [];
|
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<div class="wrapper">
|
<div class="wrapper">
|
||||||
@@ -27,12 +25,12 @@
|
|||||||
<tbody>
|
<tbody>
|
||||||
<tr
|
<tr
|
||||||
style="cursor:pointer;"
|
style="cursor:pointer;"
|
||||||
on:click={() => ($open.runtime = !$open.runtime)}
|
onclick={() => (open.value.runtime = !open.value.runtime)}
|
||||||
>
|
>
|
||||||
<td>{$open.runtime ? "-" : "+"} runtime </td>
|
<td>{open.value.runtime ? "-" : "+"} runtime </td>
|
||||||
<td>{humanizeDuration(runtime || 1000)}</td>
|
<td>{humanizeDuration(runtime || 1000)}</td>
|
||||||
</tr>
|
</tr>
|
||||||
{#if $open.runtime}
|
{#if open.value.runtime}
|
||||||
<tr>
|
<tr>
|
||||||
<td colspan="2">
|
<td colspan="2">
|
||||||
<SmallGraph points={getPoints($store, "runtime")} />
|
<SmallGraph points={getPoints($store, "runtime")} />
|
||||||
@@ -40,13 +38,16 @@
|
|||||||
</tr>
|
</tr>
|
||||||
{/if}
|
{/if}
|
||||||
|
|
||||||
<tr style="cursor:pointer;" on:click={() => ($open.fps = !$open.fps)}>
|
<tr
|
||||||
<td>{$open.fps ? "-" : "+"} fps </td>
|
style="cursor:pointer;"
|
||||||
|
onclick={() => (open.value.fps = !open.value.fps)}
|
||||||
|
>
|
||||||
|
<td>{open.value.fps ? "-" : "+"} fps </td>
|
||||||
<td>
|
<td>
|
||||||
{Math.floor(fps[fps.length - 1])}fps
|
{Math.floor(fps[fps.length - 1])}fps
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
{#if $open.fps}
|
{#if open.value.fps}
|
||||||
<tr>
|
<tr>
|
||||||
<td colspan="2">
|
<td colspan="2">
|
||||||
<SmallGraph points={fps} />
|
<SmallGraph points={fps} />
|
||||||
|
|||||||
108
app/src/lib/project-manager/ProjectManager.svelte
Normal file
108
app/src/lib/project-manager/ProjectManager.svelte
Normal file
@@ -0,0 +1,108 @@
|
|||||||
|
<script lang="ts">
|
||||||
|
import type { Graph } from "$lib/types";
|
||||||
|
import { defaultPlant, plant, lottaFaces } from "$lib/graph-templates";
|
||||||
|
import type { ProjectManager } from "./project-manager.svelte";
|
||||||
|
|
||||||
|
const { projectManager } = $props<{ projectManager: ProjectManager }>();
|
||||||
|
|
||||||
|
let showNewProject = $state(false);
|
||||||
|
let newProjectName = $state("");
|
||||||
|
let selectedTemplate = $state("defaultPlant");
|
||||||
|
|
||||||
|
const templates = [
|
||||||
|
{
|
||||||
|
name: "Default Plant",
|
||||||
|
value: "defaultPlant",
|
||||||
|
graph: defaultPlant as unknown as Graph,
|
||||||
|
},
|
||||||
|
{ name: "Plant", value: "plant", graph: plant as unknown as Graph },
|
||||||
|
{
|
||||||
|
name: "Lotta Faces",
|
||||||
|
value: "lottaFaces",
|
||||||
|
graph: lottaFaces as unknown as Graph,
|
||||||
|
},
|
||||||
|
];
|
||||||
|
|
||||||
|
function handleCreate() {
|
||||||
|
const template =
|
||||||
|
templates.find((t) => t.value === selectedTemplate) || templates[0];
|
||||||
|
projectManager.handleCreateProject(template.graph, newProjectName);
|
||||||
|
newProjectName = "";
|
||||||
|
showNewProject = false;
|
||||||
|
}
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<header
|
||||||
|
class="flex justify-between px-4 h-[70px] border-b-1 border-[var(--outline)] items-center"
|
||||||
|
>
|
||||||
|
<h3>Project</h3>
|
||||||
|
<button
|
||||||
|
class="px-3 py-1 bg-[var(--layer-0)] rounded"
|
||||||
|
onclick={() => (showNewProject = !showNewProject)}
|
||||||
|
>
|
||||||
|
New
|
||||||
|
</button>
|
||||||
|
</header>
|
||||||
|
|
||||||
|
{#if showNewProject}
|
||||||
|
<div class="flex flex-col px-4 py-3 border-b-1 border-[var(--outline)] gap-2">
|
||||||
|
<input
|
||||||
|
type="text"
|
||||||
|
bind:value={newProjectName}
|
||||||
|
placeholder="Project name"
|
||||||
|
class="w-full px-2 py-2 bg-gray-800 border border-gray-700 rounded"
|
||||||
|
onkeydown={(e) => e.key === "Enter" && handleCreate()}
|
||||||
|
/>
|
||||||
|
<select
|
||||||
|
bind:value={selectedTemplate}
|
||||||
|
class="w-full px-2 py-2 bg-gray-800 border border-gray-700 rounded"
|
||||||
|
>
|
||||||
|
{#each templates as template}
|
||||||
|
<option value={template.value}>{template.name}</option>
|
||||||
|
{/each}
|
||||||
|
</select>
|
||||||
|
<button
|
||||||
|
class="cursor-pointer self-end px-3 py-1 bg-blue-600 rounded"
|
||||||
|
onclick={() => handleCreate()}
|
||||||
|
>
|
||||||
|
Create
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
{/if}
|
||||||
|
|
||||||
|
<div class="p-4 text-white min-h-screen">
|
||||||
|
{#if projectManager.loading}
|
||||||
|
<p>Loading...</p>
|
||||||
|
{/if}
|
||||||
|
|
||||||
|
<ul class="space-y-2">
|
||||||
|
{#each projectManager.projects as project (project.id)}
|
||||||
|
<li>
|
||||||
|
<div
|
||||||
|
class="w-full text-left px-3 py-2 rounded cursor-pointer {projectManager
|
||||||
|
.activeProjectId.value === project.id
|
||||||
|
? 'bg-blue-600'
|
||||||
|
: 'bg-gray-800 hover:bg-gray-700'}"
|
||||||
|
onclick={() => projectManager.handleSelectProject(project.id!)}
|
||||||
|
role="button"
|
||||||
|
tabindex="0"
|
||||||
|
onkeydown={(e) =>
|
||||||
|
e.key === "Enter" &&
|
||||||
|
projectManager.handleSelectProject(project.id!)}
|
||||||
|
>
|
||||||
|
<div class="flex justify-between items-center">
|
||||||
|
<span>{project.meta?.title || "Untitled"}</span>
|
||||||
|
<button
|
||||||
|
class="text-red-400 hover:text-red-300"
|
||||||
|
onclick={() => {
|
||||||
|
projectManager.handleDeleteProject(project.id!);
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
×
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</li>
|
||||||
|
{/each}
|
||||||
|
</ul>
|
||||||
|
</div>
|
||||||
52
app/src/lib/project-manager/project-database.svelte.ts
Normal file
52
app/src/lib/project-manager/project-database.svelte.ts
Normal file
@@ -0,0 +1,52 @@
|
|||||||
|
import type { Graph } from '@nodarium/types';
|
||||||
|
import { type IDBPDatabase, openDB } from 'idb';
|
||||||
|
|
||||||
|
export interface GraphDatabase {
|
||||||
|
projects: Graph;
|
||||||
|
}
|
||||||
|
|
||||||
|
const DB_NAME = 'nodarium-graphs';
|
||||||
|
const DB_VERSION = 1;
|
||||||
|
const STORE_NAME = 'graphs';
|
||||||
|
|
||||||
|
let dbPromise: Promise<IDBPDatabase<GraphDatabase>> | null = null;
|
||||||
|
|
||||||
|
export function getDB() {
|
||||||
|
if (!dbPromise) {
|
||||||
|
dbPromise = openDB<GraphDatabase>(DB_NAME, DB_VERSION, {
|
||||||
|
upgrade(db) {
|
||||||
|
if (!db.objectStoreNames.contains(STORE_NAME)) {
|
||||||
|
db.createObjectStore(STORE_NAME, { keyPath: 'id' });
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
return dbPromise;
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function getGraph(id: number): Promise<Graph | undefined> {
|
||||||
|
const db = await getDB();
|
||||||
|
return db.get(STORE_NAME, id);
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function saveGraph(graph: Graph): Promise<Graph> {
|
||||||
|
const db = await getDB();
|
||||||
|
graph.meta = { ...graph.meta, lastModified: new Date().toISOString() };
|
||||||
|
await db.put(STORE_NAME, graph);
|
||||||
|
return graph;
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function deleteGraph(id: number): Promise<void> {
|
||||||
|
const db = await getDB();
|
||||||
|
await db.delete(STORE_NAME, id);
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function getGraphs(): Promise<Graph[]> {
|
||||||
|
const db = await getDB();
|
||||||
|
return db.getAll(STORE_NAME);
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function clear(): Promise<void> {
|
||||||
|
const db = await getDB();
|
||||||
|
return db.clear(STORE_NAME);
|
||||||
|
}
|
||||||
85
app/src/lib/project-manager/project-manager.svelte.ts
Normal file
85
app/src/lib/project-manager/project-manager.svelte.ts
Normal file
@@ -0,0 +1,85 @@
|
|||||||
|
import * as templates from '$lib/graph-templates';
|
||||||
|
import { localState } from '$lib/helpers/localState.svelte';
|
||||||
|
import type { Graph } from '@nodarium/types';
|
||||||
|
import * as db from './project-database.svelte';
|
||||||
|
|
||||||
|
export class ProjectManager {
|
||||||
|
public graph = $state<Graph>();
|
||||||
|
private projects = $state<Graph[]>([]);
|
||||||
|
private activeProjectId = localState<number | undefined>(
|
||||||
|
'node.activeProjectId',
|
||||||
|
undefined
|
||||||
|
);
|
||||||
|
public readonly loading = $derived(this.graph?.id !== this.activeProjectId.value);
|
||||||
|
|
||||||
|
constructor() {
|
||||||
|
this.init();
|
||||||
|
}
|
||||||
|
|
||||||
|
async saveGraph(g: Graph) {
|
||||||
|
db.saveGraph(g);
|
||||||
|
}
|
||||||
|
|
||||||
|
private async init() {
|
||||||
|
await db.getDB();
|
||||||
|
this.projects = await db.getGraphs();
|
||||||
|
|
||||||
|
if (this.activeProjectId.value !== undefined) {
|
||||||
|
let loadedGraph = await db.getGraph(this.activeProjectId.value);
|
||||||
|
if (loadedGraph) {
|
||||||
|
this.graph = loadedGraph;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!this.graph) {
|
||||||
|
if (this.projects?.length && this.projects[0]?.id !== undefined) {
|
||||||
|
this.graph = this.projects[0];
|
||||||
|
this.activeProjectId.value = this.graph.id;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!this.graph) {
|
||||||
|
this.handleCreateProject();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public handleCreateProject(
|
||||||
|
g: Graph = templates.defaultPlant as unknown as Graph,
|
||||||
|
title: string = 'New Project'
|
||||||
|
) {
|
||||||
|
let id = g?.id || 0;
|
||||||
|
while (this.projects.find((p) => p.id === id)) {
|
||||||
|
id++;
|
||||||
|
}
|
||||||
|
|
||||||
|
g.id = id;
|
||||||
|
if (!g.meta) g.meta = {};
|
||||||
|
if (!g.meta.title) g.meta.title = title;
|
||||||
|
|
||||||
|
db.saveGraph(g);
|
||||||
|
this.projects = [...this.projects, g];
|
||||||
|
this.handleSelectProject(id);
|
||||||
|
}
|
||||||
|
|
||||||
|
public async handleDeleteProject(projectId: number) {
|
||||||
|
await db.deleteGraph(projectId);
|
||||||
|
if (this.projects.length === 1) {
|
||||||
|
this.graph = undefined;
|
||||||
|
this.projects = [];
|
||||||
|
} else {
|
||||||
|
this.projects = this.projects.filter((p) => p.id !== projectId);
|
||||||
|
const id = this.projects[0].id;
|
||||||
|
if (id !== undefined) {
|
||||||
|
this.handleSelectProject(id);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public async handleSelectProject(id: number) {
|
||||||
|
if (this.activeProjectId.value !== id) {
|
||||||
|
const project = await db.getGraph(id);
|
||||||
|
this.graph = project;
|
||||||
|
this.activeProjectId.value = id;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -35,6 +35,9 @@
|
|||||||
scene = $bindable(),
|
scene = $bindable(),
|
||||||
}: Props = $props();
|
}: Props = $props();
|
||||||
|
|
||||||
|
let geometries = $state.raw<BufferGeometry[]>([]);
|
||||||
|
let center = $state(new Vector3(0, 4, 0));
|
||||||
|
|
||||||
useTask(
|
useTask(
|
||||||
(delta) => {
|
(delta) => {
|
||||||
fps.push(1 / delta);
|
fps.push(1 / delta);
|
||||||
@@ -45,11 +48,13 @@
|
|||||||
|
|
||||||
export const invalidate = function () {
|
export const invalidate = function () {
|
||||||
if (scene) {
|
if (scene) {
|
||||||
geometries = scene.children
|
const geos: BufferGeometry[] = [];
|
||||||
.filter((child) => "geometry" in child && child.isObject3D)
|
scene.traverse(function (child) {
|
||||||
.map((child) => {
|
if (isMesh(child)) {
|
||||||
return (child as Mesh).geometry;
|
geos.push(child.geometry);
|
||||||
});
|
}
|
||||||
|
});
|
||||||
|
geometries = geos;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (geometries && scene && centerCamera) {
|
if (geometries && scene && centerCamera) {
|
||||||
@@ -62,9 +67,6 @@
|
|||||||
_invalidate();
|
_invalidate();
|
||||||
};
|
};
|
||||||
|
|
||||||
let geometries = $state<BufferGeometry[]>();
|
|
||||||
let center = $state(new Vector3(0, 4, 0));
|
|
||||||
|
|
||||||
function isMesh(child: Mesh | any): child is Mesh {
|
function isMesh(child: Mesh | any): child is Mesh {
|
||||||
return child.isObject3D && "material" in child;
|
return child.isObject3D && "material" in child;
|
||||||
}
|
}
|
||||||
@@ -76,7 +78,7 @@
|
|||||||
$effect(() => {
|
$effect(() => {
|
||||||
const wireframe = appSettings.value.debug.wireframe;
|
const wireframe = appSettings.value.debug.wireframe;
|
||||||
scene.traverse(function (child) {
|
scene.traverse(function (child) {
|
||||||
if (isMesh(child) && isMatCapMaterial(child.material)) {
|
if (isMesh(child) && isMatCapMaterial(child.material) && child.visible) {
|
||||||
child.material.wireframe = wireframe;
|
child.material.wireframe = wireframe;
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -95,12 +95,14 @@
|
|||||||
<SmallPerformanceViewer {fps} store={perf} />
|
<SmallPerformanceViewer {fps} store={perf} />
|
||||||
{/if}
|
{/if}
|
||||||
|
|
||||||
<Canvas>
|
<div style="height: 100%">
|
||||||
<Scene
|
<Canvas>
|
||||||
bind:this={sceneComponent}
|
<Scene
|
||||||
{lines}
|
bind:this={sceneComponent}
|
||||||
{centerCamera}
|
{lines}
|
||||||
bind:scene
|
{centerCamera}
|
||||||
bind:fps
|
bind:scene
|
||||||
/>
|
bind:fps
|
||||||
</Canvas>
|
/>
|
||||||
|
</Canvas>
|
||||||
|
</div>
|
||||||
|
|||||||
@@ -11,7 +11,7 @@ import {
|
|||||||
} from "three";
|
} from "three";
|
||||||
|
|
||||||
function fastArrayHash(arr: Int32Array) {
|
function fastArrayHash(arr: Int32Array) {
|
||||||
const sampleDistance = Math.max(Math.floor(arr.length / 100), 1);
|
const sampleDistance = Math.max(Math.floor(arr.length / 1000), 1);
|
||||||
const sampleCount = Math.floor(arr.length / sampleDistance);
|
const sampleCount = Math.floor(arr.length / sampleDistance);
|
||||||
|
|
||||||
let hash = new Int32Array(sampleCount);
|
let hash = new Int32Array(sampleCount);
|
||||||
@@ -40,6 +40,9 @@ export function createGeometryPool(parentScene: Group, material: Material) {
|
|||||||
let hash = fastArrayHash(data);
|
let hash = fastArrayHash(data);
|
||||||
|
|
||||||
let geometry = existingMesh ? existingMesh.geometry : new BufferGeometry();
|
let geometry = existingMesh ? existingMesh.geometry : new BufferGeometry();
|
||||||
|
if (existingMesh) {
|
||||||
|
existingMesh.visible = true;
|
||||||
|
}
|
||||||
|
|
||||||
// Extract data from the encoded array
|
// Extract data from the encoded array
|
||||||
// const geometryType = encodedData[index++];
|
// const geometryType = encodedData[index++];
|
||||||
@@ -121,7 +124,6 @@ export function createGeometryPool(parentScene: Group, material: Material) {
|
|||||||
updateSingleGeometry(input, existingMesh || null);
|
updateSingleGeometry(input, existingMesh || null);
|
||||||
} else if (existingMesh) {
|
} else if (existingMesh) {
|
||||||
existingMesh.visible = false;
|
existingMesh.visible = false;
|
||||||
scene.remove(existingMesh);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return { totalVertices, totalFaces };
|
return { totalVertices, totalFaces };
|
||||||
@@ -258,7 +260,6 @@ export function createInstancedGeometryPool(
|
|||||||
updateSingleInstance(input, existingMesh || null);
|
updateSingleInstance(input, existingMesh || null);
|
||||||
} else if (existingMesh) {
|
} else if (existingMesh) {
|
||||||
existingMesh.visible = false;
|
existingMesh.visible = false;
|
||||||
scene.remove(existingMesh);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return { totalVertices, totalFaces };
|
return { totalVertices, totalFaces };
|
||||||
|
|||||||
@@ -1,19 +1,33 @@
|
|||||||
import { type SyncCache } from "@nodarium/types";
|
import { type SyncCache } from "@nodarium/types";
|
||||||
|
|
||||||
export class MemoryRuntimeCache implements SyncCache {
|
export class MemoryRuntimeCache implements SyncCache {
|
||||||
|
private map = new Map<string, unknown>();
|
||||||
|
size: number;
|
||||||
|
|
||||||
private cache: [string, unknown][] = [];
|
constructor(size = 50) {
|
||||||
size = 50;
|
this.size = size;
|
||||||
|
}
|
||||||
|
|
||||||
get<T>(key: string): T | undefined {
|
get<T>(key: string): T | undefined {
|
||||||
return this.cache.find(([k]) => k === key)?.[1] as T;
|
if (!this.map.has(key)) return undefined;
|
||||||
}
|
const value = this.map.get(key) as T;
|
||||||
set<T>(key: string, value: T): void {
|
this.map.delete(key);
|
||||||
this.cache.push([key, value]);
|
this.map.set(key, value);
|
||||||
this.cache = this.cache.slice(-this.size);
|
return value;
|
||||||
}
|
|
||||||
clear(): void {
|
|
||||||
this.cache = [];
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
set<T>(key: string, value: T): void {
|
||||||
|
if (this.map.has(key)) {
|
||||||
|
this.map.delete(key);
|
||||||
|
}
|
||||||
|
this.map.set(key, value);
|
||||||
|
while (this.map.size > this.size) {
|
||||||
|
const oldestKey = this.map.keys().next().value as string;
|
||||||
|
this.map.delete(oldestKey);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
clear(): void {
|
||||||
|
this.map.clear();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -64,7 +64,7 @@ export class MemoryRuntimeExecutor implements RuntimeExecutor {
|
|||||||
|
|
||||||
constructor(
|
constructor(
|
||||||
private registry: NodeRegistry,
|
private registry: NodeRegistry,
|
||||||
private cache?: SyncCache<Int32Array>,
|
public cache?: SyncCache<Int32Array>,
|
||||||
) {
|
) {
|
||||||
this.cache = undefined;
|
this.cache = undefined;
|
||||||
}
|
}
|
||||||
@@ -244,13 +244,14 @@ export class MemoryRuntimeExecutor implements RuntimeExecutor {
|
|||||||
}
|
}
|
||||||
this.perf?.addPoint("cache-hit", 0);
|
this.perf?.addPoint("cache-hit", 0);
|
||||||
|
|
||||||
log.group(`executing ${node_type.id || node.id}`);
|
log.group(`executing ${node_type.id}-${node.id}`);
|
||||||
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);
|
||||||
|
log.log("Executed", node.type, node.id)
|
||||||
b = performance.now();
|
b = performance.now();
|
||||||
|
|
||||||
if (this.cache) {
|
if (this.cache && node.id !== outputNode.id) {
|
||||||
this.cache.set(inputHash, results[node.id]);
|
this.cache.set(inputHash, results[node.id]);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -2,15 +2,33 @@ import { MemoryRuntimeExecutor } from "./runtime-executor";
|
|||||||
import { RemoteNodeRegistry, IndexDBCache } from "@nodarium/registry";
|
import { RemoteNodeRegistry, IndexDBCache } from "@nodarium/registry";
|
||||||
import type { Graph } from "@nodarium/types";
|
import type { Graph } from "@nodarium/types";
|
||||||
import { createPerformanceStore } from "@nodarium/utils";
|
import { createPerformanceStore } from "@nodarium/utils";
|
||||||
|
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);
|
||||||
|
|
||||||
const executor = new MemoryRuntimeExecutor(nodeRegistry);
|
const cache = new MemoryRuntimeCache()
|
||||||
|
const executor = new MemoryRuntimeExecutor(nodeRegistry, cache);
|
||||||
|
|
||||||
const performanceStore = createPerformanceStore();
|
const performanceStore = createPerformanceStore();
|
||||||
executor.perf = performanceStore;
|
executor.perf = performanceStore;
|
||||||
|
|
||||||
|
export async function setUseRegistryCache(useCache: boolean) {
|
||||||
|
if (useCache) {
|
||||||
|
nodeRegistry.cache = indexDbCache;
|
||||||
|
} else {
|
||||||
|
nodeRegistry.cache = undefined;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function setUseRuntimeCache(useCache: boolean) {
|
||||||
|
if (useCache) {
|
||||||
|
executor.cache = cache;
|
||||||
|
} else {
|
||||||
|
executor.cache = undefined;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
export async function executeGraph(
|
export async function executeGraph(
|
||||||
graph: Graph,
|
graph: Graph,
|
||||||
settings: Record<string, unknown>,
|
settings: Record<string, unknown>,
|
||||||
|
|||||||
@@ -11,5 +11,11 @@ export class WorkerRuntimeExecutor implements RuntimeExecutor {
|
|||||||
async getPerformanceData() {
|
async getPerformanceData() {
|
||||||
return this.worker.getPerformanceData();
|
return this.worker.getPerformanceData();
|
||||||
}
|
}
|
||||||
|
set useRuntimeCache(useCache: boolean) {
|
||||||
|
this.worker.setUseRuntimeCache(useCache);
|
||||||
|
}
|
||||||
|
set useRegistryCache(useCache: boolean) {
|
||||||
|
this.worker.setUseRegistryCache(useCache);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -54,7 +54,7 @@ export const AppSettingTypes = {
|
|||||||
},
|
},
|
||||||
useWorker: {
|
useWorker: {
|
||||||
type: "boolean",
|
type: "boolean",
|
||||||
label: "Execute runtime in worker",
|
label: "Execute in WebWorker",
|
||||||
value: true,
|
value: true,
|
||||||
},
|
},
|
||||||
showIndices: {
|
showIndices: {
|
||||||
@@ -87,6 +87,19 @@ export const AppSettingTypes = {
|
|||||||
label: "Show Graph Source",
|
label: "Show Graph Source",
|
||||||
value: false,
|
value: false,
|
||||||
},
|
},
|
||||||
|
cache: {
|
||||||
|
title: "Cache",
|
||||||
|
useRuntimeCache: {
|
||||||
|
type: "boolean",
|
||||||
|
label: "Node Results",
|
||||||
|
value: true,
|
||||||
|
},
|
||||||
|
useRegistryCache: {
|
||||||
|
type: "boolean",
|
||||||
|
label: "Node Source",
|
||||||
|
value: true,
|
||||||
|
},
|
||||||
|
},
|
||||||
stressTest: {
|
stressTest: {
|
||||||
title: "Stress Test",
|
title: "Stress Test",
|
||||||
amount: {
|
amount: {
|
||||||
|
|||||||
@@ -1,48 +1,46 @@
|
|||||||
<script lang="ts">
|
<script lang="ts">
|
||||||
import { getContext } from "svelte";
|
import { type Snippet } from "svelte";
|
||||||
import type { Readable } from "svelte/store";
|
import { panelState } from "./PanelState.svelte";
|
||||||
|
|
||||||
export let id: string;
|
const {
|
||||||
export let icon: string = "";
|
id,
|
||||||
export let title = "";
|
icon = "",
|
||||||
export let classes = "";
|
title = "",
|
||||||
export let hidden: boolean | undefined = undefined;
|
classes = "",
|
||||||
|
hidden,
|
||||||
|
children,
|
||||||
|
} = $props<{
|
||||||
|
id: string;
|
||||||
|
icon?: string;
|
||||||
|
title?: string;
|
||||||
|
classes?: string;
|
||||||
|
hidden?: boolean;
|
||||||
|
children?: Snippet;
|
||||||
|
}>();
|
||||||
|
|
||||||
const setVisibility =
|
const panel = panelState.registerPanel(id, icon, classes, hidden);
|
||||||
getContext<(id: string, visible: boolean) => void>("setVisibility");
|
$effect(() => {
|
||||||
|
panel.hidden = hidden;
|
||||||
$: if (typeof hidden === "boolean") {
|
});
|
||||||
setVisibility(id, !hidden);
|
|
||||||
}
|
|
||||||
|
|
||||||
const registerPanel =
|
|
||||||
getContext<
|
|
||||||
(id: string, icon: string, classes: string) => Readable<boolean>
|
|
||||||
>("registerPanel");
|
|
||||||
|
|
||||||
let visible = registerPanel(id, icon, classes);
|
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
{#if $visible}
|
{#if panelState.activePanel.value === id}
|
||||||
<div class="wrapper" class:hidden>
|
<div class="wrapper" class:hidden>
|
||||||
{#if title}
|
{#if title}
|
||||||
<header>
|
<header>
|
||||||
<h3>{title}</h3>
|
<h3>{title}</h3>
|
||||||
</header>
|
</header>
|
||||||
{/if}
|
{/if}
|
||||||
<slot />
|
{@render children?.()}
|
||||||
</div>
|
</div>
|
||||||
{/if}
|
{/if}
|
||||||
|
|
||||||
<style>
|
<style>
|
||||||
header {
|
header {
|
||||||
border-bottom: solid thin var(--outline);
|
border-bottom: solid thin var(--outline);
|
||||||
height: 69px;
|
height: 70px;
|
||||||
display: flex;
|
display: flex;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
padding-left: 1em;
|
padding-left: 1em;
|
||||||
}
|
}
|
||||||
h3 {
|
|
||||||
margin: 0px;
|
|
||||||
}
|
|
||||||
</style>
|
</style>
|
||||||
|
|||||||
40
app/src/lib/sidebar/PanelState.svelte.ts
Normal file
40
app/src/lib/sidebar/PanelState.svelte.ts
Normal file
@@ -0,0 +1,40 @@
|
|||||||
|
import { localState } from '$lib/helpers/localState.svelte';
|
||||||
|
|
||||||
|
type Panel = {
|
||||||
|
icon: string;
|
||||||
|
classes: string;
|
||||||
|
hidden?: boolean;
|
||||||
|
};
|
||||||
|
|
||||||
|
class PanelState {
|
||||||
|
panels = $state<Record<string, Panel>>({});
|
||||||
|
activePanel = localState<string | boolean>('node.activePanel', '');
|
||||||
|
|
||||||
|
get keys() {
|
||||||
|
return Object.keys(this.panels);
|
||||||
|
}
|
||||||
|
|
||||||
|
public registerPanel(id: string, icon: string, classes: string, hidden: boolean): Panel {
|
||||||
|
const state = $state({
|
||||||
|
icon: icon,
|
||||||
|
classes: classes,
|
||||||
|
hidden: hidden
|
||||||
|
});
|
||||||
|
this.panels[id] = state;
|
||||||
|
return state;
|
||||||
|
}
|
||||||
|
|
||||||
|
public toggleOpen() {
|
||||||
|
if (this.activePanel.value) {
|
||||||
|
this.activePanel.value = false;
|
||||||
|
} else {
|
||||||
|
this.activePanel.value = this.keys[0];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public setActivePanel(panelId: string) {
|
||||||
|
this.activePanel.value = panelId;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
export const panelState = new PanelState();
|
||||||
@@ -1,77 +1,32 @@
|
|||||||
<script lang="ts">
|
<script lang="ts">
|
||||||
import localStore from "$lib/helpers/localStore";
|
import { type Snippet } from "svelte";
|
||||||
import { setContext } from "svelte";
|
import { panelState as state } from "./PanelState.svelte";
|
||||||
import { derived } from "svelte/store";
|
|
||||||
|
|
||||||
let panels: Record<
|
const { children } = $props<{ children?: Snippet }>();
|
||||||
string,
|
|
||||||
{
|
|
||||||
icon: string;
|
|
||||||
id: string;
|
|
||||||
classes: string;
|
|
||||||
visible?: boolean;
|
|
||||||
}
|
|
||||||
> = {};
|
|
||||||
|
|
||||||
const activePanel = localStore<keyof typeof panels | false>(
|
|
||||||
"nodes.settings.activePanel",
|
|
||||||
false,
|
|
||||||
);
|
|
||||||
|
|
||||||
$: keys = panels
|
|
||||||
? (Object.keys(panels) as unknown as (keyof typeof panels)[]).filter(
|
|
||||||
(key) => !!panels[key]?.id,
|
|
||||||
)
|
|
||||||
: [];
|
|
||||||
|
|
||||||
setContext("setVisibility", (id: string, visible: boolean) => {
|
|
||||||
panels[id].visible = visible;
|
|
||||||
panels = { ...panels };
|
|
||||||
});
|
|
||||||
|
|
||||||
setContext("registerPanel", (id: string, icon: string, classes: string) => {
|
|
||||||
panels[id] = { id, icon, classes };
|
|
||||||
return derived(activePanel, ($activePanel) => {
|
|
||||||
return $activePanel === id;
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
function setActivePanel(panel: keyof typeof panels | false) {
|
|
||||||
if (panel === $activePanel) {
|
|
||||||
$activePanel = false;
|
|
||||||
} else if (panel) {
|
|
||||||
$activePanel = panel;
|
|
||||||
} else {
|
|
||||||
$activePanel = false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<div class="wrapper" class:visible={$activePanel}>
|
<div class="wrapper" class:visible={state.activePanel.value}>
|
||||||
<div class="tabs">
|
<div class="tabs">
|
||||||
<button
|
<button aria-label="Close" onclick={() => state.toggleOpen()}>
|
||||||
aria-label="Close"
|
<span class="icon-[tabler--settings]"></span>
|
||||||
on:click={() => {
|
<span class="absolute i-[tabler--chevron-left] w-6 h-6 block"></span>
|
||||||
setActivePanel($activePanel ? false : keys[0]);
|
|
||||||
}}
|
|
||||||
>
|
|
||||||
<span class="absolute i-tabler-chevron-left w-6 h-6 block"></span>
|
|
||||||
</button>
|
</button>
|
||||||
{#each keys as panel (panels[panel].id)}
|
{#each state.keys as panelId (panelId)}
|
||||||
{#if panels[panel].visible !== false}
|
{#if !state.panels[panelId].hidden}
|
||||||
<button
|
<button
|
||||||
aria-label={panel}
|
aria-label={panelId}
|
||||||
class="tab {panels[panel].classes}"
|
class="tab {state.panels[panelId].classes}"
|
||||||
class:active={panel === $activePanel}
|
class:active={panelId === state.activePanel.value}
|
||||||
on:click={() => setActivePanel(panel)}
|
onclick={() => (state.activePanel.value = panelId)}
|
||||||
>
|
>
|
||||||
<span class={`block w-6 h-6 ${panels[panel].icon}`}></span>
|
<span class={`block w-6 h-6 iconify ${state.panels[panelId].icon}`}
|
||||||
|
></span>
|
||||||
</button>
|
</button>
|
||||||
{/if}
|
{/if}
|
||||||
{/each}
|
{/each}
|
||||||
</div>
|
</div>
|
||||||
<div class="content">
|
<div class="content">
|
||||||
<slot />
|
{@render children?.()}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|||||||
@@ -64,6 +64,7 @@
|
|||||||
lastPropsHash = propsHash;
|
lastPropsHash = propsHash;
|
||||||
|
|
||||||
if (needsUpdate) {
|
if (needsUpdate) {
|
||||||
|
manager.save();
|
||||||
manager.execute();
|
manager.execute();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -8,17 +8,17 @@
|
|||||||
node: NodeInstance | undefined;
|
node: NodeInstance | undefined;
|
||||||
};
|
};
|
||||||
|
|
||||||
const { manager, node }: Props = $props();
|
let { manager, node = $bindable() }: Props = $props();
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
{#if node}
|
{#if node}
|
||||||
{#key node.id}
|
{#key node.id}
|
||||||
{#if node}
|
{#if node}
|
||||||
<ActiveNodeSelected {manager} {node} />
|
<ActiveNodeSelected {manager} bind:node />
|
||||||
{:else}
|
{:else}
|
||||||
<p class="mx-4">Active Node has no Settings</p>
|
<p class="mx-4">Active Node has no Settings</p>
|
||||||
{/if}
|
{/if}
|
||||||
{/key}
|
{/key}
|
||||||
{:else}
|
{:else}
|
||||||
<p class="mx-4">No active node</p>
|
<p class="mx-4">No node selected</p>
|
||||||
{/if}
|
{/if}
|
||||||
|
|||||||
@@ -1,143 +1,148 @@
|
|||||||
<script lang="ts">
|
<script lang="ts" module>
|
||||||
import localStore from "$lib/helpers/localStore";
|
let result:
|
||||||
import { Integer } from "@nodarium/ui";
|
| { stdev: number; avg: number; duration: number; samples: number[] }
|
||||||
import { writable } from "svelte/store";
|
| undefined = $state();
|
||||||
import { humanizeDuration } from "$lib/helpers";
|
|
||||||
import Monitor from "$lib/performance/Monitor.svelte";
|
|
||||||
|
|
||||||
function calculateStandardDeviation(array: number[]) {
|
|
||||||
const n = array.length;
|
|
||||||
const mean = array.reduce((a, b) => a + b) / n;
|
|
||||||
return Math.sqrt(
|
|
||||||
array.map((x) => Math.pow(x - mean, 2)).reduce((a, b) => a + b) / n,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
export let run: () => Promise<any>;
|
|
||||||
|
|
||||||
let isRunning = false;
|
|
||||||
let amount = localStore<number>("nodes.benchmark.samples", 500);
|
|
||||||
let samples = 0;
|
|
||||||
let warmUp = writable(0);
|
|
||||||
let warmUpAmount = 10;
|
|
||||||
let state = "";
|
|
||||||
let result:
|
|
||||||
| { stdev: number; avg: number; duration: number; samples: number[] }
|
|
||||||
| undefined;
|
|
||||||
|
|
||||||
const copyContent = async (text?: string | number) => {
|
|
||||||
if (!text) return;
|
|
||||||
if (typeof text !== "string") {
|
|
||||||
text = (Math.floor(text * 100) / 100).toString();
|
|
||||||
}
|
|
||||||
try {
|
|
||||||
await navigator.clipboard.writeText(text);
|
|
||||||
} catch (err) {
|
|
||||||
console.error("Failed to copy: ", err);
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
async function benchmark() {
|
|
||||||
if (isRunning) return;
|
|
||||||
isRunning = true;
|
|
||||||
result = undefined;
|
|
||||||
samples = 0;
|
|
||||||
$warmUp = 0;
|
|
||||||
|
|
||||||
await new Promise((r) => setTimeout(r, 50));
|
|
||||||
|
|
||||||
// warm up
|
|
||||||
for (let i = 0; i < warmUpAmount; i++) {
|
|
||||||
await run();
|
|
||||||
$warmUp = i + 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
let a = performance.now();
|
|
||||||
let results = [];
|
|
||||||
|
|
||||||
// perform run
|
|
||||||
for (let i = 0; i < $amount; i++) {
|
|
||||||
const a = performance.now();
|
|
||||||
await run();
|
|
||||||
samples = i;
|
|
||||||
const b = performance.now();
|
|
||||||
await new Promise((r) => setTimeout(r, 20));
|
|
||||||
results.push(b - a);
|
|
||||||
}
|
|
||||||
result = {
|
|
||||||
stdev: calculateStandardDeviation(results),
|
|
||||||
samples: results,
|
|
||||||
duration: performance.now() - a,
|
|
||||||
avg: results.reduce((a, b) => a + b) / results.length,
|
|
||||||
};
|
|
||||||
}
|
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
{state}
|
<script lang="ts">
|
||||||
|
import { humanizeDuration } from '$lib/helpers';
|
||||||
|
import { localState } from '$lib/helpers/localState.svelte';
|
||||||
|
import Monitor from '$lib/performance/Monitor.svelte';
|
||||||
|
import { Number } from '@nodarium/ui';
|
||||||
|
import { writable } from 'svelte/store';
|
||||||
|
|
||||||
|
function calculateStandardDeviation(array: number[]) {
|
||||||
|
const n = array.length;
|
||||||
|
const mean = array.reduce((a, b) => a + b) / n;
|
||||||
|
return Math.sqrt(
|
||||||
|
array.map((x) => Math.pow(x - mean, 2)).reduce((a, b) => a + b) / n
|
||||||
|
);
|
||||||
|
}
|
||||||
|
type Props = {
|
||||||
|
run: () => Promise<any>;
|
||||||
|
};
|
||||||
|
|
||||||
|
const { run }: Props = $props();
|
||||||
|
|
||||||
|
let isRunning = $state(false);
|
||||||
|
let amount = localState<number>('nodes.benchmark.samples', 500);
|
||||||
|
let samples = $state(0);
|
||||||
|
let warmUp = writable(0);
|
||||||
|
let warmUpAmount = 10;
|
||||||
|
let status = '';
|
||||||
|
|
||||||
|
const copyContent = async (text?: string | number) => {
|
||||||
|
if (!text) return;
|
||||||
|
if (typeof text !== 'string') {
|
||||||
|
text = (Math.floor(text * 100) / 100).toString();
|
||||||
|
}
|
||||||
|
try {
|
||||||
|
await navigator.clipboard.writeText(text);
|
||||||
|
} catch (err) {
|
||||||
|
console.error('Failed to copy: ', err);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
async function benchmark() {
|
||||||
|
if (isRunning) return;
|
||||||
|
isRunning = true;
|
||||||
|
result = undefined;
|
||||||
|
samples = 0;
|
||||||
|
$warmUp = 0;
|
||||||
|
|
||||||
|
await new Promise((r) => setTimeout(r, 50));
|
||||||
|
|
||||||
|
// warm up
|
||||||
|
for (let i = 0; i < warmUpAmount; i++) {
|
||||||
|
await run();
|
||||||
|
$warmUp = i + 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
let a = performance.now();
|
||||||
|
let results = [];
|
||||||
|
|
||||||
|
// perform run
|
||||||
|
for (let i = 0; i < amount.value; i++) {
|
||||||
|
const a = performance.now();
|
||||||
|
await run();
|
||||||
|
samples = i;
|
||||||
|
const b = performance.now();
|
||||||
|
await new Promise((r) => setTimeout(r, 20));
|
||||||
|
results.push(b - a);
|
||||||
|
}
|
||||||
|
result = {
|
||||||
|
stdev: calculateStandardDeviation(results),
|
||||||
|
samples: results,
|
||||||
|
duration: performance.now() - a,
|
||||||
|
avg: results.reduce((a, b) => a + b) / results.length
|
||||||
|
};
|
||||||
|
}
|
||||||
|
</script>
|
||||||
|
|
||||||
|
{status}
|
||||||
|
|
||||||
<div class="wrapper" class:running={isRunning}>
|
<div class="wrapper" class:running={isRunning}>
|
||||||
{#if isRunning}
|
{#if result}
|
||||||
{#if result}
|
<h3>Finished ({humanizeDuration(result.duration)})</h3>
|
||||||
<h3>Finished ({humanizeDuration(result.duration)})</h3>
|
<div class="monitor-wrapper">
|
||||||
<div class="monitor-wrapper">
|
<Monitor points={result.samples} />
|
||||||
<Monitor points={result.samples} />
|
</div>
|
||||||
</div>
|
<label for="bench-avg">Average </label>
|
||||||
<label for="bench-avg">Average </label>
|
<button
|
||||||
<button
|
id="bench-avg"
|
||||||
id="bench-avg"
|
onkeydown={(ev) => ev.key === 'Enter' && copyContent(result?.avg)}
|
||||||
on:keydown={(ev) => ev.key === "Enter" && copyContent(result?.avg)}
|
onclick={() => copyContent(result?.avg)}
|
||||||
on:click={() => copyContent(result?.avg)}
|
>
|
||||||
>{Math.floor(result.avg * 100) / 100}</button
|
{Math.floor(result.avg * 100) / 100}
|
||||||
>
|
</button>
|
||||||
<i
|
<i
|
||||||
role="button"
|
role="button"
|
||||||
tabindex="0"
|
tabindex="0"
|
||||||
on:keydown={(ev) => ev.key === "Enter" && copyContent(result?.avg)}
|
onkeydown={(ev) => ev.key === 'Enter' && copyContent(result?.avg)}
|
||||||
on:click={() => copyContent(result?.avg)}>(click to copy)</i
|
onclick={() => copyContent(result?.avg)}
|
||||||
>
|
>(click to copy)</i>
|
||||||
<label for="bench-stdev">Standard Deviation σ</label>
|
<label for="bench-stdev">Standard Deviation σ</label>
|
||||||
<button id="bench-stdev" on:click={() => copyContent(result?.stdev)}
|
<button id="bench-stdev" onclick={() => copyContent(result?.stdev)}>
|
||||||
>{Math.floor(result.stdev * 100) / 100}</button
|
{Math.floor(result.stdev * 100) / 100}
|
||||||
>
|
</button>
|
||||||
<i
|
<i
|
||||||
role="button"
|
role="button"
|
||||||
tabindex="0"
|
tabindex="0"
|
||||||
on:keydown={(ev) => ev.key === "Enter" && copyContent(result?.avg)}
|
onkeydown={(ev) => ev.key === 'Enter' && copyContent(result?.avg)}
|
||||||
on:click={() => copyContent(result?.stdev + "")}>(click to copy)</i
|
onclick={() => copyContent(result?.stdev + '')}
|
||||||
>
|
>(click to copy)</i>
|
||||||
<div>
|
<div>
|
||||||
<button on:click={() => (isRunning = false)}>reset</button>
|
<button onclick={() => (isRunning = false)}>reset</button>
|
||||||
</div>
|
</div>
|
||||||
{:else}
|
{:else if isRunning}
|
||||||
<p>WarmUp ({$warmUp}/{warmUpAmount})</p>
|
<p>WarmUp ({$warmUp}/{warmUpAmount})</p>
|
||||||
<progress value={$warmUp} max={warmUpAmount}
|
<progress value={$warmUp} max={warmUpAmount}>
|
||||||
>{Math.floor(($warmUp / warmUpAmount) * 100)}%</progress
|
{Math.floor(($warmUp / warmUpAmount) * 100)}%
|
||||||
>
|
</progress>
|
||||||
<p>Progress ({samples}/{$amount})</p>
|
<p>Progress ({samples}/{amount.value})</p>
|
||||||
<progress value={samples} max={$amount}
|
<progress value={samples} max={amount.value}>
|
||||||
>{Math.floor((samples / $amount) * 100)}%</progress
|
{Math.floor((samples / amount.value) * 100)}%
|
||||||
>
|
</progress>
|
||||||
{/if}
|
{:else}
|
||||||
{:else}
|
<label for="bench-samples">Samples</label>
|
||||||
<label for="bench-samples">Samples</label>
|
<Number id="bench-sample" bind:value={amount.value} max={1000} />
|
||||||
<Integer id="bench-sample" bind:value={$amount} max={1000} />
|
<button onclick={benchmark} disabled={isRunning}>start</button>
|
||||||
<button on:click={benchmark} disabled={isRunning}> start </button>
|
{/if}
|
||||||
{/if}
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<style>
|
<style>
|
||||||
.wrapper {
|
.wrapper {
|
||||||
padding: 1em;
|
padding: 1em;
|
||||||
display: flex;
|
display: flex;
|
||||||
flex-direction: column;
|
flex-direction: column;
|
||||||
gap: 1em;
|
gap: 1em;
|
||||||
}
|
}
|
||||||
.monitor-wrapper {
|
.monitor-wrapper {
|
||||||
border: solid thin var(--outline);
|
border: solid thin var(--outline);
|
||||||
border-bottom: none;
|
border-bottom: none;
|
||||||
}
|
}
|
||||||
i {
|
i {
|
||||||
opacity: 0.5;
|
opacity: 0.5;
|
||||||
font-size: 0.8em;
|
font-size: 0.8em;
|
||||||
}
|
}
|
||||||
</style>
|
</style>
|
||||||
|
|||||||
@@ -15,7 +15,7 @@
|
|||||||
FileSaver.saveAs(blob, name + "." + extension);
|
FileSaver.saveAs(blob, name + "." + extension);
|
||||||
};
|
};
|
||||||
|
|
||||||
export let scene: Group;
|
const { scene } = $props<{ scene: Group }>();
|
||||||
|
|
||||||
let gltfExporter: GLTFExporter;
|
let gltfExporter: GLTFExporter;
|
||||||
async function exportGltf() {
|
async function exportGltf() {
|
||||||
@@ -53,7 +53,7 @@
|
|||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<div class="p-2">
|
<div class="p-4">
|
||||||
<button on:click={exportObj}> export obj </button>
|
<button onclick={exportObj}> export obj </button>
|
||||||
<button on:click={exportGltf}> export gltf </button>
|
<button onclick={exportGltf}> export gltf </button>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
<script lang="ts">
|
<script lang="ts">
|
||||||
import type { Graph } from "$lib/types";
|
import type { Graph } from "$lib/types";
|
||||||
|
|
||||||
const { graph }: { graph: Graph } = $props();
|
const { graph }: { graph?: Graph } = $props();
|
||||||
|
|
||||||
function convert(g: Graph): string {
|
function convert(g: Graph): string {
|
||||||
return JSON.stringify(
|
return JSON.stringify(
|
||||||
@@ -16,5 +16,5 @@
|
|||||||
</script>
|
</script>
|
||||||
|
|
||||||
<pre>
|
<pre>
|
||||||
{convert(graph)}
|
{graph ? convert(graph) : 'No graph loaded'}
|
||||||
</pre>
|
</pre>
|
||||||
|
|||||||
@@ -13,32 +13,34 @@
|
|||||||
let { keymaps }: Props = $props();
|
let { keymaps }: Props = $props();
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<table class="wrapper">
|
<div class="p-4">
|
||||||
<tbody>
|
<table class="wrapper">
|
||||||
{#each keymaps as keymap}
|
<tbody>
|
||||||
<tr>
|
{#each keymaps as keymap}
|
||||||
<td colspan="2">
|
|
||||||
<h3>{keymap.title}</h3>
|
|
||||||
</td>
|
|
||||||
</tr>
|
|
||||||
{#each get(keymap.keymap?.keys) as key}
|
|
||||||
<tr>
|
<tr>
|
||||||
{#if key.description}
|
<td colspan="2">
|
||||||
<td class="command-wrapper">
|
<h3>{keymap.title}</h3>
|
||||||
<ShortCut
|
</td>
|
||||||
alt={key.alt}
|
|
||||||
ctrl={key.ctrl}
|
|
||||||
shift={key.shift}
|
|
||||||
key={key.key}
|
|
||||||
/>
|
|
||||||
</td>
|
|
||||||
<td>{key.description}</td>
|
|
||||||
{/if}
|
|
||||||
</tr>
|
</tr>
|
||||||
|
{#each get(keymap.keymap?.keys) as key}
|
||||||
|
<tr>
|
||||||
|
{#if key.description}
|
||||||
|
<td class="command-wrapper">
|
||||||
|
<ShortCut
|
||||||
|
alt={key.alt}
|
||||||
|
ctrl={key.ctrl}
|
||||||
|
shift={key.shift}
|
||||||
|
key={key.key}
|
||||||
|
/>
|
||||||
|
</td>
|
||||||
|
<td>{key.description}</td>
|
||||||
|
{/if}
|
||||||
|
</tr>
|
||||||
|
{/each}
|
||||||
{/each}
|
{/each}
|
||||||
{/each}
|
</tbody>
|
||||||
</tbody>
|
</table>
|
||||||
</table>
|
</div>
|
||||||
|
|
||||||
<style>
|
<style>
|
||||||
.wrapper {
|
.wrapper {
|
||||||
|
|||||||
@@ -1,7 +1,15 @@
|
|||||||
<script lang="ts">
|
<script lang="ts">
|
||||||
import "@nodarium/ui/app.css";
|
import "@nodarium/ui/app.css";
|
||||||
import "virtual:uno.css";
|
import "../app.css";
|
||||||
import "@unocss/reset/normalize.css";
|
import type { Snippet } from "svelte";
|
||||||
|
import * as config from "$lib/config";
|
||||||
|
const { children } = $props<{ children?: Snippet }>();
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<slot />
|
{@render children?.()}
|
||||||
|
|
||||||
|
<svelte:head>
|
||||||
|
{#if config.ANALYTIC_SCRIPT}
|
||||||
|
{@html config.ANALYTIC_SCRIPT}
|
||||||
|
{/if}
|
||||||
|
</svelte:head>
|
||||||
|
|||||||
@@ -28,6 +28,8 @@
|
|||||||
import BenchmarkPanel from "$lib/sidebar/panels/BenchmarkPanel.svelte";
|
import BenchmarkPanel from "$lib/sidebar/panels/BenchmarkPanel.svelte";
|
||||||
import { debounceAsyncFunction } from "$lib/helpers";
|
import { debounceAsyncFunction } from "$lib/helpers";
|
||||||
import GraphSource from "$lib/sidebar/panels/GraphSource.svelte";
|
import GraphSource from "$lib/sidebar/panels/GraphSource.svelte";
|
||||||
|
import { ProjectManager } from "$lib/project-manager/project-manager.svelte";
|
||||||
|
import ProjectManagerEl from "$lib/project-manager/ProjectManager.svelte";
|
||||||
|
|
||||||
let performanceStore = createPerformanceStore();
|
let performanceStore = createPerformanceStore();
|
||||||
|
|
||||||
@@ -37,23 +39,34 @@
|
|||||||
const runtimeCache = new MemoryRuntimeCache();
|
const runtimeCache = new MemoryRuntimeCache();
|
||||||
const memoryRuntime = new MemoryRuntimeExecutor(nodeRegistry, runtimeCache);
|
const memoryRuntime = new MemoryRuntimeExecutor(nodeRegistry, runtimeCache);
|
||||||
memoryRuntime.perf = performanceStore;
|
memoryRuntime.perf = performanceStore;
|
||||||
|
const pm = new ProjectManager();
|
||||||
|
|
||||||
const runtime = $derived(
|
const runtime = $derived(
|
||||||
appSettings.value.debug.useWorker ? workerRuntime : memoryRuntime,
|
appSettings.value.debug.useWorker ? workerRuntime : memoryRuntime,
|
||||||
);
|
);
|
||||||
|
|
||||||
|
$effect(() => {
|
||||||
|
workerRuntime.useRegistryCache =
|
||||||
|
appSettings.value.debug.cache.useRuntimeCache;
|
||||||
|
workerRuntime.useRuntimeCache =
|
||||||
|
appSettings.value.debug.cache.useRegistryCache;
|
||||||
|
|
||||||
|
if (appSettings.value.debug.cache.useRegistryCache) {
|
||||||
|
nodeRegistry.cache = registryCache;
|
||||||
|
} else {
|
||||||
|
nodeRegistry.cache = undefined;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (appSettings.value.debug.cache.useRuntimeCache) {
|
||||||
|
memoryRuntime.cache = runtimeCache;
|
||||||
|
} else {
|
||||||
|
memoryRuntime.cache = undefined;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
let activeNode = $state<NodeInstance | undefined>(undefined);
|
let activeNode = $state<NodeInstance | undefined>(undefined);
|
||||||
let scene = $state<Group>(null!);
|
let scene = $state<Group>(null!);
|
||||||
|
|
||||||
let graph = $state(
|
|
||||||
localStorage.getItem("graph")
|
|
||||||
? JSON.parse(localStorage.getItem("graph")!)
|
|
||||||
: templates.defaultPlant,
|
|
||||||
);
|
|
||||||
function handleSave(graph: Graph) {
|
|
||||||
localStorage.setItem("graph", JSON.stringify(graph));
|
|
||||||
}
|
|
||||||
|
|
||||||
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>>();
|
||||||
const manager = $derived(graphInterface?.manager);
|
const manager = $derived(graphInterface?.manager);
|
||||||
@@ -72,29 +85,21 @@
|
|||||||
callback: () => randomGenerate(),
|
callback: () => randomGenerate(),
|
||||||
},
|
},
|
||||||
]);
|
]);
|
||||||
|
|
||||||
let graphSettings = $state<Record<string, any>>({});
|
let graphSettings = $state<Record<string, any>>({});
|
||||||
|
let graphSettingTypes = $state({
|
||||||
|
randomSeed: { type: "boolean", value: false },
|
||||||
|
});
|
||||||
$effect(() => {
|
$effect(() => {
|
||||||
if (graphSettings) {
|
if (graphSettings && graphSettingTypes) {
|
||||||
manager?.setSettings($state.snapshot(graphSettings));
|
manager?.setSettings($state.snapshot(graphSettings));
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
type BooleanSchema = {
|
|
||||||
[key: string]: {
|
|
||||||
type: "boolean";
|
|
||||||
value: false;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
let graphSettingTypes = $state<BooleanSchema>({
|
|
||||||
randomSeed: { type: "boolean", value: false },
|
|
||||||
});
|
|
||||||
|
|
||||||
let runIndex = 0;
|
|
||||||
|
|
||||||
async function update(
|
async function update(
|
||||||
g: Graph,
|
g: Graph,
|
||||||
s: Record<string, any> = $state.snapshot(graphSettings),
|
s: Record<string, any> = $state.snapshot(graphSettings),
|
||||||
) {
|
) {
|
||||||
runIndex++;
|
|
||||||
performanceStore.startRun();
|
performanceStore.startRun();
|
||||||
try {
|
try {
|
||||||
let a = performance.now();
|
let a = performance.now();
|
||||||
@@ -167,21 +172,23 @@
|
|||||||
/>
|
/>
|
||||||
</Grid.Cell>
|
</Grid.Cell>
|
||||||
<Grid.Cell>
|
<Grid.Cell>
|
||||||
<GraphInterface
|
{#if pm.graph}
|
||||||
{graph}
|
<GraphInterface
|
||||||
bind:this={graphInterface}
|
graph={pm.graph}
|
||||||
registry={nodeRegistry}
|
bind:this={graphInterface}
|
||||||
showGrid={appSettings.value.nodeInterface.showNodeGrid}
|
registry={nodeRegistry}
|
||||||
snapToGrid={appSettings.value.nodeInterface.snapToGrid}
|
showGrid={appSettings.value.nodeInterface.showNodeGrid}
|
||||||
bind:activeNode
|
snapToGrid={appSettings.value.nodeInterface.snapToGrid}
|
||||||
bind:showHelp={appSettings.value.nodeInterface.showHelp}
|
bind:activeNode
|
||||||
bind:settings={graphSettings}
|
bind:showHelp={appSettings.value.nodeInterface.showHelp}
|
||||||
bind:settingTypes={graphSettingTypes}
|
bind:settings={graphSettings}
|
||||||
onresult={(result) => handleUpdate(result)}
|
bind:settingTypes={graphSettingTypes}
|
||||||
onsave={(graph) => handleSave(graph)}
|
onsave={(g) => pm.saveGraph(g)}
|
||||||
/>
|
onresult={(result) => handleUpdate(result)}
|
||||||
|
/>
|
||||||
|
{/if}
|
||||||
<Sidebar>
|
<Sidebar>
|
||||||
<Panel id="general" title="General" icon="i-tabler-settings">
|
<Panel id="general" title="General" icon="i-[tabler--settings]">
|
||||||
<NestedSettings
|
<NestedSettings
|
||||||
id="general"
|
id="general"
|
||||||
bind:value={appSettings.value}
|
bind:value={appSettings.value}
|
||||||
@@ -191,7 +198,7 @@
|
|||||||
<Panel
|
<Panel
|
||||||
id="shortcuts"
|
id="shortcuts"
|
||||||
title="Keyboard Shortcuts"
|
title="Keyboard Shortcuts"
|
||||||
icon="i-tabler-keyboard"
|
icon="i-[tabler--keyboard]"
|
||||||
>
|
>
|
||||||
<Keymap
|
<Keymap
|
||||||
keymaps={[
|
keymaps={[
|
||||||
@@ -200,50 +207,49 @@
|
|||||||
]}
|
]}
|
||||||
/>
|
/>
|
||||||
</Panel>
|
</Panel>
|
||||||
<Panel id="exports" title="Exporter" icon="i-tabler-package-export">
|
<Panel id="exports" title="Exporter" icon="i-[tabler--package-export]">
|
||||||
<ExportSettings {scene} />
|
<ExportSettings {scene} />
|
||||||
</Panel>
|
</Panel>
|
||||||
<Panel
|
<Panel
|
||||||
id="node-store"
|
id="node-store"
|
||||||
classes="text-green-400"
|
|
||||||
title="Node Store"
|
title="Node Store"
|
||||||
icon="i-tabler-database"
|
icon="i-[tabler--database] bg-green-400"
|
||||||
>
|
>
|
||||||
<NodeStore registry={nodeRegistry} />
|
<NodeStore registry={nodeRegistry} />
|
||||||
</Panel>
|
</Panel>
|
||||||
<Panel
|
<Panel
|
||||||
id="performance"
|
id="performance"
|
||||||
title="Performance"
|
title="Performance"
|
||||||
classes="text-red-400"
|
|
||||||
hidden={!appSettings.value.debug.showPerformancePanel}
|
hidden={!appSettings.value.debug.showPerformancePanel}
|
||||||
icon="i-tabler-brand-speedtest"
|
icon="i-[tabler--brand-speedtest] bg-red-400"
|
||||||
>
|
>
|
||||||
{#if $performanceStore}
|
{#if $performanceStore}
|
||||||
<PerformanceViewer data={$performanceStore} />
|
<PerformanceViewer data={$performanceStore} />
|
||||||
{/if}
|
{/if}
|
||||||
</Panel>
|
</Panel>
|
||||||
|
<Panel id="projects" icon="i-[tabler--folder-open]">
|
||||||
|
<ProjectManagerEl projectManager={pm} />
|
||||||
|
</Panel>
|
||||||
<Panel
|
<Panel
|
||||||
id="graph-source"
|
id="graph-source"
|
||||||
title="Graph Source"
|
title="Graph Source"
|
||||||
hidden={!appSettings.value.debug.showGraphJson}
|
hidden={!appSettings.value.debug.showGraphJson}
|
||||||
icon="i-tabler-code"
|
icon="i-[tabler--code]"
|
||||||
>
|
>
|
||||||
<GraphSource {graph} />
|
<GraphSource graph={pm.graph ?? manager?.serialize()} />
|
||||||
</Panel>
|
</Panel>
|
||||||
<Panel
|
<Panel
|
||||||
id="benchmark"
|
id="benchmark"
|
||||||
title="Benchmark"
|
title="Benchmark"
|
||||||
classes="text-red-400"
|
|
||||||
hidden={!appSettings.value.debug.showBenchmarkPanel}
|
hidden={!appSettings.value.debug.showBenchmarkPanel}
|
||||||
icon="i-tabler-graph"
|
icon="i-[tabler--graph] bg-red-400"
|
||||||
>
|
>
|
||||||
<BenchmarkPanel run={randomGenerate} />
|
<BenchmarkPanel run={randomGenerate} />
|
||||||
</Panel>
|
</Panel>
|
||||||
<Panel
|
<Panel
|
||||||
id="graph-settings"
|
id="graph-settings"
|
||||||
title="Graph Settings"
|
title="Graph Settings"
|
||||||
classes="text-blue-400"
|
icon="i-[custom--graph] bg-blue-400"
|
||||||
icon="i-custom-graph"
|
|
||||||
>
|
>
|
||||||
<NestedSettings
|
<NestedSettings
|
||||||
id="graph-settings"
|
id="graph-settings"
|
||||||
@@ -254,10 +260,9 @@
|
|||||||
<Panel
|
<Panel
|
||||||
id="active-node"
|
id="active-node"
|
||||||
title="Node Settings"
|
title="Node Settings"
|
||||||
classes="text-blue-400"
|
icon="i-[tabler--adjustments] bg-blue-400"
|
||||||
icon="i-tabler-adjustments"
|
|
||||||
>
|
>
|
||||||
<ActiveNodeSettings {manager} node={activeNode} />
|
<ActiveNodeSettings {manager} bind:node={activeNode} />
|
||||||
</Panel>
|
</Panel>
|
||||||
</Sidebar>
|
</Sidebar>
|
||||||
</Grid.Cell>
|
</Grid.Cell>
|
||||||
|
|||||||
8
app/src/routes/dev/+layout.svelte
Normal file
8
app/src/routes/dev/+layout.svelte
Normal file
@@ -0,0 +1,8 @@
|
|||||||
|
<script lang="ts">
|
||||||
|
import type { Snippet } from "svelte";
|
||||||
|
const { children } = $props<{ children?: Snippet }>();
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<main class="w-screen overflow-x-hidden">
|
||||||
|
{@render children()}
|
||||||
|
</main>
|
||||||
119
app/src/routes/dev/+page.svelte
Normal file
119
app/src/routes/dev/+page.svelte
Normal file
@@ -0,0 +1,119 @@
|
|||||||
|
<script lang="ts">
|
||||||
|
import NodeHTML from "$lib/graph-interface/node/NodeHTML.svelte";
|
||||||
|
import { localState } from "$lib/helpers/localState.svelte";
|
||||||
|
import Panel from "$lib/sidebar/Panel.svelte";
|
||||||
|
import Sidebar from "$lib/sidebar/Sidebar.svelte";
|
||||||
|
import { IndexDBCache, RemoteNodeRegistry } from "@nodarium/registry";
|
||||||
|
import { type NodeId, type NodeInstance } from "@nodarium/types";
|
||||||
|
import Code from "./Code.svelte";
|
||||||
|
import Grid from "$lib/grid";
|
||||||
|
import {
|
||||||
|
concatEncodedArrays,
|
||||||
|
createWasmWrapper,
|
||||||
|
encodeNestedArray,
|
||||||
|
} from "@nodarium/utils";
|
||||||
|
|
||||||
|
const registryCache = new IndexDBCache("node-registry");
|
||||||
|
const nodeRegistry = new RemoteNodeRegistry("", registryCache);
|
||||||
|
|
||||||
|
let activeNode = localState<NodeId | undefined>(
|
||||||
|
"node.dev.activeNode",
|
||||||
|
undefined,
|
||||||
|
);
|
||||||
|
|
||||||
|
let nodeWasm = $state<ArrayBuffer>();
|
||||||
|
let nodeInstance = $state<NodeInstance>();
|
||||||
|
let nodeWasmWrapper = $state<ReturnType<typeof createWasmWrapper>>();
|
||||||
|
|
||||||
|
async function fetchNodeData(nodeId?: NodeId) {
|
||||||
|
nodeWasm = undefined;
|
||||||
|
nodeInstance = undefined;
|
||||||
|
|
||||||
|
if (!nodeId) return;
|
||||||
|
|
||||||
|
const data = await nodeRegistry.fetchNodeDefinition(nodeId);
|
||||||
|
nodeWasm = await nodeRegistry.fetchArrayBuffer("nodes/" + nodeId + ".wasm");
|
||||||
|
nodeInstance = {
|
||||||
|
id: 0,
|
||||||
|
type: nodeId,
|
||||||
|
position: [0, 0] as [number, number],
|
||||||
|
props: {},
|
||||||
|
state: {
|
||||||
|
type: data,
|
||||||
|
},
|
||||||
|
};
|
||||||
|
nodeWasmWrapper = createWasmWrapper(nodeWasm);
|
||||||
|
}
|
||||||
|
|
||||||
|
$effect(() => {
|
||||||
|
fetchNodeData(activeNode.value);
|
||||||
|
});
|
||||||
|
|
||||||
|
$effect(() => {
|
||||||
|
if (nodeInstance?.props && nodeWasmWrapper) {
|
||||||
|
const keys = Object.keys(nodeInstance.state.type?.inputs || {});
|
||||||
|
let ins = Object.values(nodeInstance.props) as number[];
|
||||||
|
if (keys[0] === "plant") {
|
||||||
|
ins = [[0, 0, 0, 0, 0, 0, 0, 0], ...ins];
|
||||||
|
}
|
||||||
|
const inputs = concatEncodedArrays(encodeNestedArray(ins));
|
||||||
|
nodeWasmWrapper?.execute(inputs);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<div class="node-wrapper absolute bottom-8 left-8">
|
||||||
|
{#if nodeInstance}
|
||||||
|
<NodeHTML inView position="relative" z={5} bind:node={nodeInstance} />
|
||||||
|
{/if}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<Grid.Row>
|
||||||
|
<Grid.Cell>
|
||||||
|
<pre>
|
||||||
|
<code>
|
||||||
|
{JSON.stringify(nodeInstance?.props)}
|
||||||
|
</code>
|
||||||
|
</pre>
|
||||||
|
</Grid.Cell>
|
||||||
|
|
||||||
|
<Grid.Cell>
|
||||||
|
<div class="h-screen w-[80vw] overflow-y-auto">
|
||||||
|
{#if nodeWasm}
|
||||||
|
<Code wasm={nodeWasm} />
|
||||||
|
{/if}
|
||||||
|
</div>
|
||||||
|
</Grid.Cell>
|
||||||
|
</Grid.Row>
|
||||||
|
|
||||||
|
<Sidebar>
|
||||||
|
<Panel
|
||||||
|
id="node-store"
|
||||||
|
classes="text-green-400"
|
||||||
|
title="Node Store"
|
||||||
|
icon="i-[tabler--database]"
|
||||||
|
>
|
||||||
|
<div class="p-4 flex flex-col gap-2">
|
||||||
|
{#await nodeRegistry.fetchCollection("max/plantarium")}
|
||||||
|
<p>Loading Nodes...</p>
|
||||||
|
{:then result}
|
||||||
|
{#each result.nodes as n}
|
||||||
|
<button
|
||||||
|
class="cursor-pointer p-2 bg-layer-1 {activeNode.value === n.id
|
||||||
|
? 'outline outline-offset-1'
|
||||||
|
: ''}"
|
||||||
|
onclick={() => (activeNode.value = n.id)}>{n.id}</button
|
||||||
|
>
|
||||||
|
{/each}
|
||||||
|
{/await}
|
||||||
|
</div>
|
||||||
|
</Panel>
|
||||||
|
</Sidebar>
|
||||||
|
|
||||||
|
<style>
|
||||||
|
:global body {
|
||||||
|
height: 100vh;
|
||||||
|
width: 100vw;
|
||||||
|
overflow: hidden;
|
||||||
|
}
|
||||||
|
</style>
|
||||||
26
app/src/routes/dev/Code.svelte
Normal file
26
app/src/routes/dev/Code.svelte
Normal file
@@ -0,0 +1,26 @@
|
|||||||
|
<script lang="ts">
|
||||||
|
import wabtInit from "wabt";
|
||||||
|
|
||||||
|
const { wasm } = $props<{ wasm: ArrayBuffer }>();
|
||||||
|
|
||||||
|
async function toWat(arrayBuffer: ArrayBuffer) {
|
||||||
|
const wabt = await wabtInit();
|
||||||
|
|
||||||
|
const module = wabt.readWasm(new Uint8Array(arrayBuffer), {
|
||||||
|
readDebugNames: true,
|
||||||
|
});
|
||||||
|
|
||||||
|
module.generateNames();
|
||||||
|
module.applyNames();
|
||||||
|
|
||||||
|
return module.toText({ foldExprs: false, inlineExport: false });
|
||||||
|
}
|
||||||
|
</script>
|
||||||
|
|
||||||
|
{#await toWat(wasm)}
|
||||||
|
<p>Converting to WAT</p>
|
||||||
|
{:then c}
|
||||||
|
<pre>
|
||||||
|
<code class="text-gray-50">{c}</code>
|
||||||
|
</pre>
|
||||||
|
{/await}
|
||||||
1
app/static/.gitignore
vendored
Normal file
1
app/static/.gitignore
vendored
Normal file
@@ -0,0 +1 @@
|
|||||||
|
nodes/
|
||||||
@@ -1,20 +0,0 @@
|
|||||||
// uno.config.ts
|
|
||||||
import { defineConfig } from 'unocss'
|
|
||||||
import presetIcons from '@unocss/preset-icons'
|
|
||||||
import { presetUno } from 'unocss'
|
|
||||||
import fs from 'fs'
|
|
||||||
|
|
||||||
const icons = Object.fromEntries(fs.readdirSync('./src/lib/icons')
|
|
||||||
.map(name => [name.replace(".svg", ""), fs.readFileSync(`./src/lib/icons/${name}`, 'utf-8')]))
|
|
||||||
|
|
||||||
|
|
||||||
export default defineConfig({
|
|
||||||
presets: [
|
|
||||||
presetUno(),
|
|
||||||
presetIcons({
|
|
||||||
collections: {
|
|
||||||
custom: icons
|
|
||||||
}
|
|
||||||
}),
|
|
||||||
]
|
|
||||||
})
|
|
||||||
@@ -1,14 +1,14 @@
|
|||||||
import { sveltekit } from '@sveltejs/kit/vite';
|
import { sveltekit } from '@sveltejs/kit/vite';
|
||||||
import UnoCSS from 'unocss/vite';
|
|
||||||
import { defineConfig } from 'vite';
|
import { defineConfig } from 'vite';
|
||||||
|
import tailwindcss from '@tailwindcss/vite'
|
||||||
import comlink from 'vite-plugin-comlink';
|
import comlink from 'vite-plugin-comlink';
|
||||||
import glsl from "vite-plugin-glsl";
|
import glsl from "vite-plugin-glsl";
|
||||||
import wasm from "vite-plugin-wasm";
|
import wasm from "vite-plugin-wasm";
|
||||||
|
|
||||||
export default defineConfig({
|
export default defineConfig({
|
||||||
plugins: [
|
plugins: [
|
||||||
|
tailwindcss(),
|
||||||
comlink(),
|
comlink(),
|
||||||
UnoCSS(),
|
|
||||||
sveltekit(),
|
sveltekit(),
|
||||||
glsl(),
|
glsl(),
|
||||||
wasm()
|
wasm()
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ This guide will help you developing your first Nodarium Node written in Rust. As
|
|||||||
|
|
||||||
## Prerequesites
|
## Prerequesites
|
||||||
|
|
||||||
You need to have [Rust](https://www.rust-lang.org/tools/install) and [wasm-pack](https://rustwasm.github.io/wasm-pack/book/) installed. Rust is the language we are going to develop our node in and wasm-pack helps us compile our rust code into a webassembly file.
|
You need to have [Rust](https://www.rust-lang.org/tools/install) and [wasm-pack](https://rustwasm.github.io/docs/wasm-pack/) installed. Rust is the language we are going to develop our node in and wasm-pack helps us compile our rust code into a webassembly file.
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
# install rust
|
# install rust
|
||||||
@@ -22,11 +22,12 @@ cd my-new-node
|
|||||||
|
|
||||||
## Setup Definition
|
## Setup Definition
|
||||||
|
|
||||||
Now we create the definition file of the node.
|
Now we create the definition file of the node.
|
||||||
Here we define what kind of inputs our node will expect and what kind of output it produces. If you want to dive deeper into this topic, have a look at [NODE_DEFINITION.md](./NODE_DEFINITION.md).
|
Here we define what kind of inputs our node will expect and what kind of output it produces. If you want to dive deeper into this topic, have a look at [NODE_DEFINITION.md](./NODE_DEFINITION.md).
|
||||||
|
|
||||||
`src/definition.json`
|
`src/definition.json`
|
||||||
```json
|
|
||||||
|
```json
|
||||||
{
|
{
|
||||||
"id": "my-name/my-namespace/zylinder-node",
|
"id": "my-name/my-namespace/zylinder-node",
|
||||||
"outputs": [
|
"outputs": [
|
||||||
@@ -35,7 +36,7 @@ Here we define what kind of inputs our node will expect and what kind of output
|
|||||||
"inputs": {
|
"inputs": {
|
||||||
"height": {
|
"height": {
|
||||||
"type": "float",
|
"type": "float",
|
||||||
"value": 2,
|
"value": 2
|
||||||
},
|
},
|
||||||
"radius": {
|
"radius": {
|
||||||
"type": "float",
|
"type": "float",
|
||||||
@@ -44,6 +45,7 @@ Here we define what kind of inputs our node will expect and what kind of output
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
```
|
```
|
||||||
|
|
||||||
If we take a look at the `src/lib.rs` file we see that `src/definition.json` is included with the following line:
|
If we take a look at the `src/lib.rs` file we see that `src/definition.json` is included with the following line:
|
||||||
|
|
||||||
```rust
|
```rust
|
||||||
|
|||||||
27
flake.lock
generated
Normal file
27
flake.lock
generated
Normal file
@@ -0,0 +1,27 @@
|
|||||||
|
{
|
||||||
|
"nodes": {
|
||||||
|
"nixpkgs": {
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1768564909,
|
||||||
|
"narHash": "sha256-Kell/SpJYVkHWMvnhqJz/8DqQg2b6PguxVWOuadbHCc=",
|
||||||
|
"owner": "nixos",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"rev": "e4bae1bd10c9c57b2cf517953ab70060a828ee6f",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "nixos",
|
||||||
|
"ref": "nixos-unstable",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"root": {
|
||||||
|
"inputs": {
|
||||||
|
"nixpkgs": "nixpkgs"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"root": "root",
|
||||||
|
"version": 7
|
||||||
|
}
|
||||||
46
flake.nix
Normal file
46
flake.nix
Normal file
@@ -0,0 +1,46 @@
|
|||||||
|
{
|
||||||
|
inputs = {
|
||||||
|
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
|
||||||
|
};
|
||||||
|
|
||||||
|
outputs = {nixpkgs, ...}: let
|
||||||
|
systems = ["aarch64-darwin" "x86_64-darwin" "aarch64-linux" "x86_64-linux"];
|
||||||
|
eachSystem = function:
|
||||||
|
nixpkgs.lib.genAttrs systems (system:
|
||||||
|
function {
|
||||||
|
inherit system;
|
||||||
|
pkgs = nixpkgs.legacyPackages.${system};
|
||||||
|
});
|
||||||
|
in {
|
||||||
|
devShells = eachSystem ({pkgs, ...}: {
|
||||||
|
default = pkgs.mkShellNoCC {
|
||||||
|
packages = [
|
||||||
|
# general deps
|
||||||
|
pkgs.nodejs_24
|
||||||
|
pkgs.pnpm_10
|
||||||
|
|
||||||
|
# wasm stuff
|
||||||
|
pkgs.rustc
|
||||||
|
pkgs.cargo
|
||||||
|
pkgs.rust-analyzer
|
||||||
|
pkgs.rustfmt
|
||||||
|
pkgs.binaryen
|
||||||
|
pkgs.lld
|
||||||
|
pkgs.zig
|
||||||
|
pkgs.zls
|
||||||
|
|
||||||
|
# frontend
|
||||||
|
pkgs.vscode-langservers-extracted
|
||||||
|
pkgs.typescript-language-server
|
||||||
|
pkgs.prettier
|
||||||
|
pkgs.tailwindcss-language-server
|
||||||
|
pkgs.svelte-language-server
|
||||||
|
];
|
||||||
|
|
||||||
|
shellHook = ''
|
||||||
|
unset ZIG_GLOBAL_CACHE_DIR
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
});
|
||||||
|
};
|
||||||
|
}
|
||||||
@@ -11,18 +11,8 @@ crate-type = ["cdylib", "rlib"]
|
|||||||
default = ["console_error_panic_hook"]
|
default = ["console_error_panic_hook"]
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
wasm-bindgen = "0.2.84"
|
|
||||||
|
|
||||||
# The `console_error_panic_hook` crate provides better debugging of panics by
|
|
||||||
# logging them with `console.error`. This is great for development, but requires
|
|
||||||
# all the `std::fmt` and `std::panicking` infrastructure, so isn't great for
|
|
||||||
# code size when deploying.
|
|
||||||
utils = { version = "0.1.0", path = "../../../../packages/utils" }
|
utils = { version = "0.1.0", path = "../../../../packages/utils" }
|
||||||
macros = { version = "0.1.0", path = "../../../../packages/macros" }
|
macros = { version = "0.1.0", path = "../../../../packages/macros" }
|
||||||
serde = { version = "1.0", features = ["derive"] }
|
serde = { version = "1.0", features = ["derive"] }
|
||||||
serde-wasm-bindgen = "0.4"
|
|
||||||
console_error_panic_hook = { version = "0.1.7", optional = true }
|
console_error_panic_hook = { version = "0.1.7", optional = true }
|
||||||
web-sys = { version = "0.3.69", features = ["console"] }
|
web-sys = { version = "0.3.69", features = ["console"] }
|
||||||
|
|
||||||
[dev-dependencies]
|
|
||||||
wasm-bindgen-test = "0.3.34"
|
|
||||||
|
|||||||
@@ -1,6 +0,0 @@
|
|||||||
{
|
|
||||||
"scripts": {
|
|
||||||
"build": "wasm-pack build --release --out-name index --no-default-features",
|
|
||||||
"dev": "cargo watch -s 'wasm-pack build --dev --out-name index --no-default-features'"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,13 +0,0 @@
|
|||||||
//! Test suite for the Web and headless browsers.
|
|
||||||
|
|
||||||
#![cfg(target_arch = "wasm32")]
|
|
||||||
|
|
||||||
extern crate wasm_bindgen_test;
|
|
||||||
use wasm_bindgen_test::*;
|
|
||||||
|
|
||||||
wasm_bindgen_test_configure!(run_in_browser);
|
|
||||||
|
|
||||||
#[wasm_bindgen_test]
|
|
||||||
fn pass() {
|
|
||||||
assert_eq!(1 + 1, 2);
|
|
||||||
}
|
|
||||||
@@ -7,22 +7,6 @@ edition = "2018"
|
|||||||
[lib]
|
[lib]
|
||||||
crate-type = ["cdylib", "rlib"]
|
crate-type = ["cdylib", "rlib"]
|
||||||
|
|
||||||
[features]
|
|
||||||
default = ["console_error_panic_hook"]
|
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
wasm-bindgen = "0.2.84"
|
|
||||||
|
|
||||||
# The `console_error_panic_hook` crate provides better debugging of panics by
|
|
||||||
# logging them with `console.error`. This is great for development, but requires
|
|
||||||
# all the `std::fmt` and `std::panicking` infrastructure, so isn't great for
|
|
||||||
# code size when deploying.
|
|
||||||
nodarium_utils = { version = "0.1.0", path = "../../../../packages/utils" }
|
|
||||||
nodarium_macros = { version = "0.1.0", path = "../../../../packages/macros" }
|
nodarium_macros = { version = "0.1.0", path = "../../../../packages/macros" }
|
||||||
serde = { version = "1.0", features = ["derive"] }
|
nodarium_utils = { version = "0.1.0", path = "../../../../packages/utils" }
|
||||||
serde-wasm-bindgen = "0.4"
|
|
||||||
console_error_panic_hook = { version = "0.1.7", optional = true }
|
|
||||||
web-sys = { version = "0.3.69", features = ["console"] }
|
|
||||||
|
|
||||||
[dev-dependencies]
|
|
||||||
wasm-bindgen-test = "0.3.34"
|
|
||||||
|
|||||||
@@ -1,6 +0,0 @@
|
|||||||
{
|
|
||||||
"scripts": {
|
|
||||||
"build": "wasm-pack build --release --out-name index --no-default-features",
|
|
||||||
"dev": "cargo watch -s 'wasm-pack build --dev --out-name index --no-default-features'"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,18 +1,15 @@
|
|||||||
use nodarium_macros::include_definition_file;
|
use nodarium_macros::nodarium_definition_file;
|
||||||
|
use nodarium_macros::nodarium_execute;
|
||||||
use nodarium_utils::{
|
use nodarium_utils::{
|
||||||
concat_args, encode_float, evaluate_float, geometry::calculate_normals, log, set_panic_hook,
|
encode_float, evaluate_float, geometry::calculate_normals,log,
|
||||||
split_args, wrap_arg,
|
split_args, wrap_arg,
|
||||||
};
|
};
|
||||||
use wasm_bindgen::prelude::*;
|
|
||||||
|
|
||||||
include_definition_file!("src/input.json");
|
nodarium_definition_file!("src/input.json");
|
||||||
|
|
||||||
#[rustfmt::skip]
|
#[nodarium_execute]
|
||||||
#[wasm_bindgen]
|
|
||||||
pub fn execute(input: &[i32]) -> Vec<i32> {
|
pub fn execute(input: &[i32]) -> Vec<i32> {
|
||||||
|
|
||||||
set_panic_hook();
|
|
||||||
|
|
||||||
let args = split_args(input);
|
let args = split_args(input);
|
||||||
|
|
||||||
log!("WASM(cube): input: {:?} -> {:?}", input, args);
|
log!("WASM(cube): input: {:?} -> {:?}", input, args);
|
||||||
@@ -22,7 +19,6 @@ pub fn execute(input: &[i32]) -> Vec<i32> {
|
|||||||
let p = encode_float(size);
|
let p = encode_float(size);
|
||||||
let n = encode_float(-size);
|
let n = encode_float(-size);
|
||||||
|
|
||||||
|
|
||||||
// [[1,3, x, y, z, x, y,z,x,y,z]];
|
// [[1,3, x, y, z, x, y,z,x,y,z]];
|
||||||
let mut cube_geometry = [
|
let mut cube_geometry = [
|
||||||
|
|
||||||
|
|||||||
@@ -1,13 +0,0 @@
|
|||||||
//! Test suite for the Web and headless browsers.
|
|
||||||
|
|
||||||
#![cfg(target_arch = "wasm32")]
|
|
||||||
|
|
||||||
extern crate wasm_bindgen_test;
|
|
||||||
use wasm_bindgen_test::*;
|
|
||||||
|
|
||||||
wasm_bindgen_test_configure!(run_in_browser);
|
|
||||||
|
|
||||||
#[wasm_bindgen_test]
|
|
||||||
fn pass() {
|
|
||||||
assert_eq!(1 + 1, 2);
|
|
||||||
}
|
|
||||||
@@ -7,23 +7,6 @@ edition = "2018"
|
|||||||
[lib]
|
[lib]
|
||||||
crate-type = ["cdylib", "rlib"]
|
crate-type = ["cdylib", "rlib"]
|
||||||
|
|
||||||
[features]
|
|
||||||
default = ["console_error_panic_hook"]
|
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
wasm-bindgen = "0.2.84"
|
|
||||||
|
|
||||||
# The `console_error_panic_hook` crate provides better debugging of panics by
|
|
||||||
# logging them with `console.error`. This is great for development, but requires
|
|
||||||
# all the `std::fmt` and `std::panicking` infrastructure, so isn't great for
|
|
||||||
# code size when deploying.
|
|
||||||
nodarium_utils = { version = "0.1.0", path = "../../../../packages/utils" }
|
nodarium_utils = { version = "0.1.0", path = "../../../../packages/utils" }
|
||||||
nodarium_macros = { version = "0.1.0", path = "../../../../packages/macros" }
|
nodarium_macros = { version = "0.1.0", path = "../../../../packages/macros" }
|
||||||
serde = { version = "1.0", features = ["derive"] }
|
|
||||||
serde-wasm-bindgen = "0.4"
|
|
||||||
console_error_panic_hook = { version = "0.1.7", optional = true }
|
|
||||||
web-sys = { version = "0.3.69", features = ["console"] }
|
|
||||||
glam = "0.27.0"
|
|
||||||
|
|
||||||
[dev-dependencies]
|
|
||||||
wasm-bindgen-test = "0.3.34"
|
|
||||||
|
|||||||
@@ -1,6 +0,0 @@
|
|||||||
{
|
|
||||||
"scripts": {
|
|
||||||
"build": "wasm-pack build --release --out-name index --no-default-features",
|
|
||||||
"dev": "cargo watch -s 'wasm-pack build --dev --out-name index --no-default-features'"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,20 +1,19 @@
|
|||||||
use nodarium_macros::include_definition_file;
|
use nodarium_macros::nodarium_definition_file;
|
||||||
|
use nodarium_macros::nodarium_execute;
|
||||||
use nodarium_utils::{
|
use nodarium_utils::{
|
||||||
concat_arg_vecs, evaluate_float, evaluate_int,
|
concat_arg_vecs, evaluate_float, evaluate_int,
|
||||||
geometry::{
|
geometry::{
|
||||||
create_path, interpolate_along_path, rotate_vector_by_angle, wrap_path, wrap_path_mut,
|
create_path, interpolate_along_path, rotate_vector_by_angle, wrap_path, wrap_path_mut,
|
||||||
},
|
},
|
||||||
log, set_panic_hook, split_args,
|
log, split_args,
|
||||||
};
|
};
|
||||||
|
|
||||||
use std::f32::consts::PI;
|
use std::f32::consts::PI;
|
||||||
use wasm_bindgen::prelude::*;
|
|
||||||
|
|
||||||
include_definition_file!("src/input.json");
|
nodarium_definition_file!("src/input.json");
|
||||||
|
|
||||||
#[wasm_bindgen]
|
#[nodarium_execute]
|
||||||
pub fn execute(input: &[i32]) -> Vec<i32> {
|
pub fn execute(input: &[i32]) -> Vec<i32> {
|
||||||
set_panic_hook();
|
|
||||||
|
|
||||||
let args = split_args(input);
|
let args = split_args(input);
|
||||||
|
|
||||||
let paths = split_args(args[0]);
|
let paths = split_args(args[0]);
|
||||||
|
|||||||
@@ -1,13 +0,0 @@
|
|||||||
//! Test suite for the Web and headless browsers.
|
|
||||||
|
|
||||||
#![cfg(target_arch = "wasm32")]
|
|
||||||
|
|
||||||
extern crate wasm_bindgen_test;
|
|
||||||
use wasm_bindgen_test::*;
|
|
||||||
|
|
||||||
wasm_bindgen_test_configure!(run_in_browser);
|
|
||||||
|
|
||||||
#[wasm_bindgen_test]
|
|
||||||
fn pass() {
|
|
||||||
assert_eq!(1 + 1, 2);
|
|
||||||
}
|
|
||||||
@@ -7,21 +7,6 @@ edition = "2018"
|
|||||||
[lib]
|
[lib]
|
||||||
crate-type = ["cdylib", "rlib"]
|
crate-type = ["cdylib", "rlib"]
|
||||||
|
|
||||||
[features]
|
|
||||||
default = ["console_error_panic_hook"]
|
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
wasm-bindgen = "0.2.84"
|
|
||||||
|
|
||||||
# The `console_error_panic_hook` crate provides better debugging of panics by
|
|
||||||
# logging them with `console.error`. This is great for development, but requires
|
|
||||||
# all the `std::fmt` and `std::panicking` infrastructure, so isn't great for
|
|
||||||
# code size when deploying.
|
|
||||||
nodarium_utils = { version = "0.1.0", path = "../../../../packages/utils" }
|
nodarium_utils = { version = "0.1.0", path = "../../../../packages/utils" }
|
||||||
nodarium_macros = { version = "0.1.0", path = "../../../../packages/macros" }
|
nodarium_macros = { version = "0.1.0", path = "../../../../packages/macros" }
|
||||||
serde = { version = "1.0", features = ["derive"] }
|
|
||||||
serde-wasm-bindgen = "0.4"
|
|
||||||
console_error_panic_hook = { version = "0.1.7", optional = true }
|
|
||||||
|
|
||||||
[dev-dependencies]
|
|
||||||
wasm-bindgen-test = "0.3.34"
|
|
||||||
|
|||||||
@@ -1,6 +0,0 @@
|
|||||||
{
|
|
||||||
"scripts": {
|
|
||||||
"build": "wasm-pack build --release --out-name index --no-default-features",
|
|
||||||
"dev": "cargo watch -s 'wasm-pack build --dev --out-name index --no-default-features'"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,9 +1,9 @@
|
|||||||
use nodarium_macros::include_definition_file;
|
use nodarium_macros::nodarium_definition_file;
|
||||||
use wasm_bindgen::prelude::*;
|
use nodarium_macros::nodarium_execute;
|
||||||
|
|
||||||
include_definition_file!("src/input.json");
|
nodarium_definition_file!("src/input.json");
|
||||||
|
|
||||||
#[wasm_bindgen]
|
#[nodarium_execute]
|
||||||
pub fn execute(args: &[i32]) -> Vec<i32> {
|
pub fn execute(args: &[i32]) -> Vec<i32> {
|
||||||
args.into()
|
args.into()
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,13 +0,0 @@
|
|||||||
//! Test suite for the Web and headless browsers.
|
|
||||||
|
|
||||||
#![cfg(target_arch = "wasm32")]
|
|
||||||
|
|
||||||
extern crate wasm_bindgen_test;
|
|
||||||
use wasm_bindgen_test::*;
|
|
||||||
|
|
||||||
wasm_bindgen_test_configure!(run_in_browser);
|
|
||||||
|
|
||||||
#[wasm_bindgen_test]
|
|
||||||
fn pass() {
|
|
||||||
assert_eq!(1 + 1, 2);
|
|
||||||
}
|
|
||||||
@@ -7,24 +7,7 @@ edition = "2018"
|
|||||||
[lib]
|
[lib]
|
||||||
crate-type = ["cdylib", "rlib"]
|
crate-type = ["cdylib", "rlib"]
|
||||||
|
|
||||||
[features]
|
|
||||||
default = ["console_error_panic_hook"]
|
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
wasm-bindgen = "0.2.84"
|
|
||||||
|
|
||||||
# The `console_error_panic_hook` crate provides better debugging of panics by
|
|
||||||
# logging them with `console.error`. This is great for development, but requires
|
|
||||||
# all the `std::fmt` and `std::panicking` infrastructure, so isn't great for
|
|
||||||
# code size when deploying.
|
|
||||||
nodarium_utils = { version = "0.1.0", path = "../../../../packages/utils" }
|
nodarium_utils = { version = "0.1.0", path = "../../../../packages/utils" }
|
||||||
nodarium_macros = { version = "0.1.0", path = "../../../../packages/macros" }
|
nodarium_macros = { version = "0.1.0", path = "../../../../packages/macros" }
|
||||||
serde = { version = "1.0", features = ["derive"] }
|
glam = "0.30.10"
|
||||||
serde-wasm-bindgen = "0.4"
|
|
||||||
console_error_panic_hook = { version = "0.1.7", optional = true }
|
|
||||||
web-sys = { version = "0.3.69", features = ["console"] }
|
|
||||||
noise = "0.9.0"
|
|
||||||
glam = "0.27.0"
|
|
||||||
|
|
||||||
[dev-dependencies]
|
|
||||||
wasm-bindgen-test = "0.3.34"
|
|
||||||
|
|||||||
@@ -1,6 +0,0 @@
|
|||||||
{
|
|
||||||
"scripts": {
|
|
||||||
"build": "wasm-pack build --release --out-name index --no-default-features",
|
|
||||||
"dev": "cargo watch -s 'wasm-pack build --dev --out-name index --no-default-features'"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,22 +1,20 @@
|
|||||||
use glam::Vec3;
|
use glam::Vec3;
|
||||||
use nodarium_macros::include_definition_file;
|
use nodarium_macros::nodarium_definition_file;
|
||||||
|
use nodarium_macros::nodarium_execute;
|
||||||
use nodarium_utils::{
|
use nodarium_utils::{
|
||||||
concat_args, evaluate_float, evaluate_int,
|
concat_args, evaluate_float, evaluate_int,
|
||||||
geometry::{wrap_path, wrap_path_mut},
|
geometry::{wrap_path, wrap_path_mut},
|
||||||
log, reset_call_count, set_panic_hook, split_args,
|
log, reset_call_count, split_args,
|
||||||
};
|
};
|
||||||
use wasm_bindgen::prelude::*;
|
|
||||||
|
|
||||||
include_definition_file!("src/input.json");
|
nodarium_definition_file!("src/input.json");
|
||||||
|
|
||||||
fn lerp_vec3(a: Vec3, b: Vec3, t: f32) -> Vec3 {
|
fn lerp_vec3(a: Vec3, b: Vec3, t: f32) -> Vec3 {
|
||||||
a + (b - a) * t
|
a + (b - a) * t
|
||||||
}
|
}
|
||||||
|
|
||||||
#[wasm_bindgen]
|
#[nodarium_execute]
|
||||||
pub fn execute(input: &[i32]) -> Vec<i32> {
|
pub fn execute(input: &[i32]) -> Vec<i32> {
|
||||||
set_panic_hook();
|
|
||||||
|
|
||||||
reset_call_count();
|
reset_call_count();
|
||||||
|
|
||||||
let args = split_args(input);
|
let args = split_args(input);
|
||||||
|
|||||||
@@ -1,13 +0,0 @@
|
|||||||
//! Test suite for the Web and headless browsers.
|
|
||||||
|
|
||||||
#![cfg(target_arch = "wasm32")]
|
|
||||||
|
|
||||||
extern crate wasm_bindgen_test;
|
|
||||||
use wasm_bindgen_test::*;
|
|
||||||
|
|
||||||
wasm_bindgen_test_configure!(run_in_browser);
|
|
||||||
|
|
||||||
#[wasm_bindgen_test]
|
|
||||||
fn pass() {
|
|
||||||
assert_eq!(1 + 1, 2);
|
|
||||||
}
|
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "nodarium_instance"
|
name = "instance"
|
||||||
version = "0.1.0"
|
version = "0.1.0"
|
||||||
authors = ["Max Richter <jim-x@web.de>"]
|
authors = ["Max Richter <jim-x@web.de>"]
|
||||||
edition = "2018"
|
edition = "2018"
|
||||||
@@ -7,23 +7,7 @@ edition = "2018"
|
|||||||
[lib]
|
[lib]
|
||||||
crate-type = ["cdylib", "rlib"]
|
crate-type = ["cdylib", "rlib"]
|
||||||
|
|
||||||
[features]
|
|
||||||
default = ["console_error_panic_hook"]
|
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
wasm-bindgen = "0.2.84"
|
|
||||||
|
|
||||||
# The `console_error_panic_hook` crate provides better debugging of panics by
|
|
||||||
# logging them with `console.error`. This is great for development, but requires
|
|
||||||
# all the `std::fmt` and `std::panicking` infrastructure, so isn't great for
|
|
||||||
# code size when deploying.
|
|
||||||
nodarium_utils = { version = "0.1.0", path = "../../../../packages/utils" }
|
nodarium_utils = { version = "0.1.0", path = "../../../../packages/utils" }
|
||||||
nodarium_macros = { version = "0.1.0", path = "../../../../packages/macros" }
|
nodarium_macros = { version = "0.1.0", path = "../../../../packages/macros" }
|
||||||
serde = { version = "1.0", features = ["derive"] }
|
glam = "0.30.10"
|
||||||
serde-wasm-bindgen = "0.4"
|
|
||||||
console_error_panic_hook = { version = "0.1.7", optional = true }
|
|
||||||
web-sys = { version = "0.3.69", features = ["console"] }
|
|
||||||
glam = "0.27.0"
|
|
||||||
|
|
||||||
[dev-dependencies]
|
|
||||||
wasm-bindgen-test = "0.3.34"
|
|
||||||
|
|||||||
@@ -1,6 +0,0 @@
|
|||||||
{
|
|
||||||
"scripts": {
|
|
||||||
"build": "wasm-pack build --release --out-name index --no-default-features",
|
|
||||||
"dev": "cargo watch -s 'wasm-pack build --dev --out-name index --no-default-features'"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,20 +1,18 @@
|
|||||||
use glam::{Mat4, Quat, Vec3};
|
use glam::{Mat4, Quat, Vec3};
|
||||||
use nodarium_macros::include_definition_file;
|
use nodarium_macros::nodarium_execute;
|
||||||
|
use nodarium_macros::nodarium_definition_file;
|
||||||
use nodarium_utils::{
|
use nodarium_utils::{
|
||||||
concat_args, encode_float, evaluate_float, evaluate_int,
|
concat_args, evaluate_float, evaluate_int,
|
||||||
geometry::{
|
geometry::{
|
||||||
calculate_normals, create_instance_data, wrap_geometry_data, wrap_instance_data, wrap_path,
|
create_instance_data, wrap_geometry_data, wrap_instance_data, wrap_path,
|
||||||
},
|
},
|
||||||
log, set_panic_hook, split_args, wrap_arg,
|
log, split_args,
|
||||||
};
|
};
|
||||||
use wasm_bindgen::prelude::*;
|
|
||||||
|
|
||||||
include_definition_file!("src/input.json");
|
nodarium_definition_file!("src/input.json");
|
||||||
|
|
||||||
#[wasm_bindgen]
|
#[nodarium_execute]
|
||||||
pub fn execute(input: &[i32]) -> Vec<i32> {
|
pub fn execute(input: &[i32]) -> Vec<i32> {
|
||||||
set_panic_hook();
|
|
||||||
|
|
||||||
let args = split_args(input);
|
let args = split_args(input);
|
||||||
let mut inputs = split_args(args[0]);
|
let mut inputs = split_args(args[0]);
|
||||||
log!("WASM(instance): inputs: {:?}", inputs);
|
log!("WASM(instance): inputs: {:?}", inputs);
|
||||||
|
|||||||
@@ -1,13 +0,0 @@
|
|||||||
//! Test suite for the Web and headless browsers.
|
|
||||||
|
|
||||||
#![cfg(target_arch = "wasm32")]
|
|
||||||
|
|
||||||
extern crate wasm_bindgen_test;
|
|
||||||
use wasm_bindgen_test::*;
|
|
||||||
|
|
||||||
wasm_bindgen_test_configure!(run_in_browser);
|
|
||||||
|
|
||||||
#[wasm_bindgen_test]
|
|
||||||
fn pass() {
|
|
||||||
assert_eq!(1 + 1, 2);
|
|
||||||
}
|
|
||||||
@@ -7,17 +7,6 @@ edition = "2018"
|
|||||||
[lib]
|
[lib]
|
||||||
crate-type = ["cdylib", "rlib"]
|
crate-type = ["cdylib", "rlib"]
|
||||||
|
|
||||||
[features]
|
|
||||||
default = ["console_error_panic_hook"]
|
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
wasm-bindgen = "0.2.84"
|
|
||||||
serde = { version = "1.0", features = ["derive"] }
|
|
||||||
serde-wasm-bindgen = "0.4"
|
|
||||||
console_error_panic_hook = { version = "0.1.7", optional = true }
|
|
||||||
nodarium_utils = { version = "0.1.0", path = "../../../../packages/utils" }
|
nodarium_utils = { version = "0.1.0", path = "../../../../packages/utils" }
|
||||||
nodarium_macros = { version = "0.1.0", path = "../../../../packages/macros" }
|
nodarium_macros = { version = "0.1.0", path = "../../../../packages/macros" }
|
||||||
web-sys = { version = "0.3.69", features = ["console"] }
|
|
||||||
|
|
||||||
[dev-dependencies]
|
|
||||||
wasm-bindgen-test = "0.3.34"
|
|
||||||
|
|||||||
@@ -1,6 +0,0 @@
|
|||||||
{
|
|
||||||
"scripts": {
|
|
||||||
"build": "wasm-pack build --release --out-name index --no-default-features",
|
|
||||||
"dev": "cargo watch -s 'wasm-pack build --dev --out-name index --no-default-features'"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user