Compare commits
1 Commits
feat/zig-b
...
137425b31b
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
137425b31b
|
|
Before Width: | Height: | Size: 36 KiB After Width: | Height: | Size: 36 KiB |
@@ -6,10 +6,7 @@ members = [
|
|||||||
"packages/types",
|
"packages/types",
|
||||||
"packages/utils",
|
"packages/utils",
|
||||||
]
|
]
|
||||||
exclude = [
|
exclude = ["nodes/max/plantarium/.template"]
|
||||||
"nodes/max/plantarium/.template",
|
|
||||||
"nodes/max/plantarium/zig"
|
|
||||||
]
|
|
||||||
|
|
||||||
[profile.release]
|
[profile.release]
|
||||||
lto = true
|
lto = true
|
||||||
|
|||||||
@@ -2,17 +2,17 @@ Nodarium
|
|||||||
|
|
||||||
<div align="center">
|
<div align="center">
|
||||||
|
|
||||||
<a href="https://nodes.max-richter.dev/"><h2 align="center">Nodarium</h2></a>
|
<a href="https://nodes.max-richter.dev/"><h2 align="center">Nodarium</h2></a>
|
||||||
|
|
||||||
<p align="center">
|
<p align="center">
|
||||||
Nodarium is a WebAssembly based visual programming language.
|
Nodarium is a WebAssembly based visual programming language.
|
||||||
</p>
|
</p>
|
||||||
|
|
||||||
<img src=".github/graphics/nodes.svg" width="80%"/>
|
<img src=".gitea/graphics/nodes.svg" width="80%"/>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
Currently this visual programming language is used to develop https://nodes.max-richter.dev, a procedural modelling tool for 3d-plants.
|
Currently this visual programming language is used to develop <https://nodes.max-richter.dev>, a procedural modelling tool for 3d-plants.
|
||||||
|
|
||||||
# Table of contents
|
# Table of contents
|
||||||
|
|
||||||
@@ -22,7 +22,7 @@ Currently this visual programming language is used to develop https://nodes.max-
|
|||||||
|
|
||||||
# Developing
|
# Developing
|
||||||
|
|
||||||
### Install prerequisites:
|
### Install prerequisites
|
||||||
|
|
||||||
- [Node.js](https://nodejs.org/en/download)
|
- [Node.js](https://nodejs.org/en/download)
|
||||||
- [pnpm](https://pnpm.io/installation)
|
- [pnpm](https://pnpm.io/installation)
|
||||||
|
|||||||
13
flake.nix
13
flake.nix
@@ -4,7 +4,7 @@
|
|||||||
};
|
};
|
||||||
|
|
||||||
outputs = {nixpkgs, ...}: let
|
outputs = {nixpkgs, ...}: let
|
||||||
systems = ["aarch64-darwin" "x86_64-darwin" "aarch64-linux" "x86_64-linux"];
|
systems = ["aarch64-darwin" "x86_64-linux"];
|
||||||
eachSystem = function:
|
eachSystem = function:
|
||||||
nixpkgs.lib.genAttrs systems (system:
|
nixpkgs.lib.genAttrs systems (system:
|
||||||
function {
|
function {
|
||||||
@@ -19,15 +19,14 @@
|
|||||||
pkgs.nodejs_24
|
pkgs.nodejs_24
|
||||||
pkgs.pnpm_10
|
pkgs.pnpm_10
|
||||||
|
|
||||||
# wasm stuff
|
# wasm/rust stuff
|
||||||
pkgs.rustc
|
pkgs.rustc
|
||||||
pkgs.cargo
|
pkgs.cargo
|
||||||
pkgs.rust-analyzer
|
pkgs.rust-analyzer
|
||||||
pkgs.rustfmt
|
pkgs.rustfmt
|
||||||
pkgs.binaryen
|
pkgs.wasm-bindgen-cli
|
||||||
|
pkgs.wasm-pack
|
||||||
pkgs.lld
|
pkgs.lld
|
||||||
pkgs.zig
|
|
||||||
pkgs.zls
|
|
||||||
|
|
||||||
# frontend
|
# frontend
|
||||||
pkgs.vscode-langservers-extracted
|
pkgs.vscode-langservers-extracted
|
||||||
@@ -36,10 +35,6 @@
|
|||||||
pkgs.tailwindcss-language-server
|
pkgs.tailwindcss-language-server
|
||||||
pkgs.svelte-language-server
|
pkgs.svelte-language-server
|
||||||
];
|
];
|
||||||
|
|
||||||
shellHook = ''
|
|
||||||
unset ZIG_GLOBAL_CACHE_DIR
|
|
||||||
'';
|
|
||||||
};
|
};
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|||||||
2
nodes/max/plantarium/zig/.gitignore
vendored
2
nodes/max/plantarium/zig/.gitignore
vendored
@@ -1,2 +0,0 @@
|
|||||||
.zig-cache/
|
|
||||||
zig-out/
|
|
||||||
@@ -1,19 +0,0 @@
|
|||||||
const std = @import("std");
|
|
||||||
|
|
||||||
pub fn build(b: *std.Build) void {
|
|
||||||
const target = b.resolveTargetQuery(.{ .os_tag = .freestanding, .abi = .none, .cpu_arch = .wasm32 });
|
|
||||||
const release = b.option(bool, "release", "To build a wasm release") orelse false;
|
|
||||||
|
|
||||||
const exe = b.addExecutable(.{
|
|
||||||
.name = "zig",
|
|
||||||
.root_module = b.createModule(.{
|
|
||||||
.root_source_file = b.path("src/main.zig"),
|
|
||||||
.target = target,
|
|
||||||
.optimize = if (release) .ReleaseSmall else .Debug,
|
|
||||||
}),
|
|
||||||
});
|
|
||||||
exe.rdynamic = true;
|
|
||||||
exe.entry = .disabled;
|
|
||||||
|
|
||||||
b.installArtifact(exe);
|
|
||||||
}
|
|
||||||
@@ -1,81 +0,0 @@
|
|||||||
.{
|
|
||||||
// This is the default name used by packages depending on this one. For
|
|
||||||
// example, when a user runs `zig fetch --save <url>`, this field is used
|
|
||||||
// as the key in the `dependencies` table. Although the user can choose a
|
|
||||||
// different name, most users will stick with this provided value.
|
|
||||||
//
|
|
||||||
// It is redundant to include "zig" in this name because it is already
|
|
||||||
// within the Zig package namespace.
|
|
||||||
.name = .math,
|
|
||||||
// This is a [Semantic Version](https://semver.org/).
|
|
||||||
// In a future version of Zig it will be used for package deduplication.
|
|
||||||
.version = "0.0.0",
|
|
||||||
// Together with name, this represents a globally unique package
|
|
||||||
// identifier. This field is generated by the Zig toolchain when the
|
|
||||||
// package is first created, and then *never changes*. This allows
|
|
||||||
// unambiguous detection of one package being an updated version of
|
|
||||||
// another.
|
|
||||||
//
|
|
||||||
// When forking a Zig project, this id should be regenerated (delete the
|
|
||||||
// field and run `zig build`) if the upstream project is still maintained.
|
|
||||||
// Otherwise, the fork is *hostile*, attempting to take control over the
|
|
||||||
// original project's identity. Thus it is recommended to leave the comment
|
|
||||||
// on the following line intact, so that it shows up in code reviews that
|
|
||||||
// modify the field.
|
|
||||||
.fingerprint = 0xa927044d8d610b01, // Changing this has security and trust implications.
|
|
||||||
// Tracks the earliest Zig version that the package considers to be a
|
|
||||||
// supported use case.
|
|
||||||
.minimum_zig_version = "0.15.2",
|
|
||||||
// This field is optional.
|
|
||||||
// Each dependency must either provide a `url` and `hash`, or a `path`.
|
|
||||||
// `zig build --fetch` can be used to fetch all dependencies of a package, recursively.
|
|
||||||
// Once all dependencies are fetched, `zig build` no longer requires
|
|
||||||
// internet connectivity.
|
|
||||||
.dependencies = .{
|
|
||||||
// See `zig fetch --save <url>` for a command-line interface for adding dependencies.
|
|
||||||
//.example = .{
|
|
||||||
// // When updating this field to a new URL, be sure to delete the corresponding
|
|
||||||
// // `hash`, otherwise you are communicating that you expect to find the old hash at
|
|
||||||
// // the new URL. If the contents of a URL change this will result in a hash mismatch
|
|
||||||
// // which will prevent zig from using it.
|
|
||||||
// .url = "https://example.com/foo.tar.gz",
|
|
||||||
//
|
|
||||||
// // This is computed from the file contents of the directory of files that is
|
|
||||||
// // obtained after fetching `url` and applying the inclusion rules given by
|
|
||||||
// // `paths`.
|
|
||||||
// //
|
|
||||||
// // This field is the source of truth; packages do not come from a `url`; they
|
|
||||||
// // come from a `hash`. `url` is just one of many possible mirrors for how to
|
|
||||||
// // obtain a package matching this `hash`.
|
|
||||||
// //
|
|
||||||
// // Uses the [multihash](https://multiformats.io/multihash/) format.
|
|
||||||
// .hash = "...",
|
|
||||||
//
|
|
||||||
// // When this is provided, the package is found in a directory relative to the
|
|
||||||
// // build root. In this case the package's hash is irrelevant and therefore not
|
|
||||||
// // computed. This field and `url` are mutually exclusive.
|
|
||||||
// .path = "foo",
|
|
||||||
//
|
|
||||||
// // When this is set to `true`, a package is declared to be lazily
|
|
||||||
// // fetched. This makes the dependency only get fetched if it is
|
|
||||||
// // actually used.
|
|
||||||
// .lazy = false,
|
|
||||||
//},
|
|
||||||
},
|
|
||||||
// Specifies the set of files and directories that are included in this package.
|
|
||||||
// Only files and directories listed here are included in the `hash` that
|
|
||||||
// is computed for this package. Only files listed here will remain on disk
|
|
||||||
// when using the zig package manager. As a rule of thumb, one should list
|
|
||||||
// files required for compilation plus any license(s).
|
|
||||||
// Paths are relative to the build root. Use the empty string (`""`) to refer to
|
|
||||||
// the build root itself.
|
|
||||||
// A directory listed here means that all files within, recursively, are included.
|
|
||||||
.paths = .{
|
|
||||||
"build.zig",
|
|
||||||
"build.zig.zon",
|
|
||||||
"src",
|
|
||||||
// For example...
|
|
||||||
//"LICENSE",
|
|
||||||
//"README.md",
|
|
||||||
},
|
|
||||||
}
|
|
||||||
@@ -1,27 +0,0 @@
|
|||||||
{
|
|
||||||
"id": "max/nodarium/zig",
|
|
||||||
"outputs": [
|
|
||||||
"float"
|
|
||||||
],
|
|
||||||
"inputs": {
|
|
||||||
"op_type": {
|
|
||||||
"label": "type",
|
|
||||||
"type": "select",
|
|
||||||
"options": [
|
|
||||||
"add",
|
|
||||||
"subtract",
|
|
||||||
"multiply",
|
|
||||||
"divide"
|
|
||||||
],
|
|
||||||
"internal": true
|
|
||||||
},
|
|
||||||
"a": {
|
|
||||||
"type": "float",
|
|
||||||
"value": 2
|
|
||||||
},
|
|
||||||
"b": {
|
|
||||||
"type": "float",
|
|
||||||
"value": 2
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,29 +0,0 @@
|
|||||||
const std = @import("std");
|
|
||||||
|
|
||||||
const def = @embedFile("input.json");
|
|
||||||
|
|
||||||
export fn execute(ptr: *anyopaque, len: c_int) c_int {
|
|
||||||
_ = ptr; // autofix
|
|
||||||
_ = len; // autofix
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
export fn __alloc(len: c_int) ?*anyopaque {
|
|
||||||
if (len < 0) return null;
|
|
||||||
const mem = std.heap.wasm_allocator.alloc(u8, @intCast(len)) catch return null;
|
|
||||||
return mem.ptr;
|
|
||||||
}
|
|
||||||
|
|
||||||
export fn __free(ptr: *anyopaque, len: c_int) void {
|
|
||||||
if (len < 1) return;
|
|
||||||
const mem: [*]u8 = @ptrCast(@alignCast(ptr));
|
|
||||||
std.heap.wasm_allocator.free(mem[0..@intCast(len)]);
|
|
||||||
}
|
|
||||||
|
|
||||||
export fn getDefinitionPtr() *const anyopaque {
|
|
||||||
return def.ptr;
|
|
||||||
}
|
|
||||||
|
|
||||||
export fn getDefinitionLen() usize {
|
|
||||||
return def.len;
|
|
||||||
}
|
|
||||||
@@ -3,8 +3,6 @@ interface NodariumExports extends WebAssembly.Exports {
|
|||||||
execute: (ptr: number, len: number) => number;
|
execute: (ptr: number, len: number) => number;
|
||||||
__free: (ptr: number, len: number) => void;
|
__free: (ptr: number, len: number) => void;
|
||||||
__alloc: (len: number) => number;
|
__alloc: (len: number) => number;
|
||||||
getDefinitionPtr: () => number;
|
|
||||||
getDefinitionLen: () => number;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
export function createWasmWrapper(buffer: ArrayBuffer) {
|
export function createWasmWrapper(buffer: ArrayBuffer) {
|
||||||
@@ -21,8 +19,8 @@ export function createWasmWrapper(buffer: ArrayBuffer) {
|
|||||||
if (!exports) return;
|
if (!exports) return;
|
||||||
const view = new Uint8Array(exports.memory.buffer, ptr, len);
|
const view = new Uint8Array(exports.memory.buffer, ptr, len);
|
||||||
console.log("RUST:", new TextDecoder().decode(view));
|
console.log("RUST:", new TextDecoder().decode(view));
|
||||||
},
|
}
|
||||||
},
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
const module = new WebAssembly.Module(buffer);
|
const module = new WebAssembly.Module(buffer);
|
||||||
@@ -45,22 +43,12 @@ export function createWasmWrapper(buffer: ArrayBuffer) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function get_definition() {
|
function get_definition() {
|
||||||
const decoder = new TextDecoder();
|
const sections = WebAssembly.Module.customSections(module, "nodarium_definition");
|
||||||
const sections = WebAssembly.Module.customSections(
|
|
||||||
module,
|
|
||||||
"nodarium_definition",
|
|
||||||
);
|
|
||||||
if (sections.length > 0) {
|
if (sections.length > 0) {
|
||||||
|
const decoder = new TextDecoder();
|
||||||
const jsonString = decoder.decode(sections[0]);
|
const jsonString = decoder.decode(sections[0]);
|
||||||
return JSON.parse(jsonString);
|
return JSON.parse(jsonString);
|
||||||
}
|
}
|
||||||
|
|
||||||
const ptr = exports.getDefinitionPtr();
|
|
||||||
const len = exports.getDefinitionLen();
|
|
||||||
|
|
||||||
const view = new Uint8Array(exports.memory.buffer, ptr, len);
|
|
||||||
const jsonString = decoder.decode(view);
|
|
||||||
return JSON.parse(jsonString);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return { execute, get_definition };
|
return { execute, get_definition };
|
||||||
|
|||||||
Reference in New Issue
Block a user