- {#key id && graphId}
- {#if node?.tmp?.type?.inputs?.[id]?.external !== true}
-
-
-
- {/if}
+
+ {#key id && graphId}
+
+
+ {#if node?.tmp?.type?.inputs?.[id]?.external !== true}
+
+ {/if}
+
- {#if node?.tmp?.type?.inputs?.[id]?.internal !== true}
-
-
- {/if}
- {/key}
+ {#if node?.tmp?.type?.inputs?.[id]?.internal !== true}
+
+
+ {/if}
+ {/key}
-
+ >
+
+
diff --git a/app/src/lib/node-registry.ts b/app/src/lib/node-registry.ts
index 9d259a5..45d14cb 100644
--- a/app/src/lib/node-registry.ts
+++ b/app/src/lib/node-registry.ts
@@ -73,6 +73,7 @@ export class RemoteNodeRegistry implements NodeRegistry {
nodeIds.push("max/plantarium/random");
nodeIds.push("max/plantarium/float");
nodeIds.push("max/plantarium/triangle");
+ nodeIds.push("max/plantarium/vec3");
nodeIds.push("max/plantarium/output");
nodeIds.push("max/plantarium/array");
nodeIds.push("max/plantarium/sum");
diff --git a/app/src/lib/runtime-executor.ts b/app/src/lib/runtime-executor.ts
index 8d2dbc1..d05a945 100644
--- a/app/src/lib/runtime-executor.ts
+++ b/app/src/lib/runtime-executor.ts
@@ -1,5 +1,5 @@
import type { Graph, NodeRegistry, NodeType, RuntimeExecutor } from "@nodes/types";
-import { fastHash, concat_encoded, encodeFloat } from "@nodes/utils"
+import { fastHash, concat_encoded, encodeFloat, encode } from "@nodes/utils"
export class MemoryRuntimeExecutor implements RuntimeExecutor {
@@ -176,15 +176,22 @@ export class MemoryRuntimeExecutor implements RuntimeExecutor {
return encodeFloat(value as number);
}
+ if (Array.isArray(value)) {
+ return encode(value);
+ }
+
return value;
});
+ console.log(transformed_inputs);
+
const a2 = performance.now();
// console.log(`${a2 - a1}ms TRANSFORMED_INPUTS`);
const _inputs = concat_encoded(transformed_inputs);
const a3 = performance.now();
+ console.log(`executing ${node_type.id || node.id}`, _inputs);
results[node.id] = node_type.execute(_inputs) as number;
const duration = performance.now() - a3;
if (duration > 5) {
diff --git a/nodes/max/plantarium/.template/.gitignore b/nodes/max/plantarium/.template/.gitignore
new file mode 100644
index 0000000..4e30131
--- /dev/null
+++ b/nodes/max/plantarium/.template/.gitignore
@@ -0,0 +1,6 @@
+/target
+**/*.rs.bk
+Cargo.lock
+bin/
+pkg/
+wasm-pack.log
diff --git a/nodes/max/plantarium/.template/Cargo.toml b/nodes/max/plantarium/.template/Cargo.toml
new file mode 100644
index 0000000..2b724c9
--- /dev/null
+++ b/nodes/max/plantarium/.template/Cargo.toml
@@ -0,0 +1,28 @@
+[package]
+name = "triangle"
+version = "0.1.0"
+authors = ["Max Richter
"]
+edition = "2018"
+
+[lib]
+crate-type = ["cdylib", "rlib"]
+
+[features]
+default = ["console_error_panic_hook"]
+
+[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" }
+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"] }
+
+[dev-dependencies]
+wasm-bindgen-test = "0.3.34"
diff --git a/nodes/max/plantarium/.template/package.json b/nodes/max/plantarium/.template/package.json
new file mode 100644
index 0000000..a601fc9
--- /dev/null
+++ b/nodes/max/plantarium/.template/package.json
@@ -0,0 +1,6 @@
+{
+ "scripts": {
+ "build": "wasm-pack build --release --out-name index --no-default-features",
+ "dev": "cargo watch -s 'pnpm build'"
+ }
+}
diff --git a/nodes/max/plantarium/.template/src/input.json b/nodes/max/plantarium/.template/src/input.json
new file mode 100644
index 0000000..0384747
--- /dev/null
+++ b/nodes/max/plantarium/.template/src/input.json
@@ -0,0 +1,4 @@
+{
+ "outputs": [],
+ "inputs": {}
+}
diff --git a/nodes/max/plantarium/.template/src/lib.rs b/nodes/max/plantarium/.template/src/lib.rs
new file mode 100644
index 0000000..3dbc453
--- /dev/null
+++ b/nodes/max/plantarium/.template/src/lib.rs
@@ -0,0 +1,12 @@
+use macros::include_definition_file;
+use utils::{decode_float, encode_float, wrap_arg};
+use wasm_bindgen::prelude::*;
+use web_sys::console;
+
+include_definition_file!("src/input.json");
+
+#[rustfmt::skip]
+#[wasm_bindgen]
+pub fn execute(input: &[i32]) -> Vec {
+ vec![]
+}
diff --git a/nodes/max/plantarium/.template/tests/web.rs b/nodes/max/plantarium/.template/tests/web.rs
new file mode 100644
index 0000000..de5c1da
--- /dev/null
+++ b/nodes/max/plantarium/.template/tests/web.rs
@@ -0,0 +1,13 @@
+//! 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);
+}
diff --git a/nodes/max/plantarium/array/src/lib.rs b/nodes/max/plantarium/array/src/lib.rs
index 0179024..78be6f1 100644
--- a/nodes/max/plantarium/array/src/lib.rs
+++ b/nodes/max/plantarium/array/src/lib.rs
@@ -1,5 +1,5 @@
use macros::include_definition_file;
-use utils::{evaluate_args, get_args};
+use utils::{evaluate_arg, get_args};
use wasm_bindgen::prelude::*;
use web_sys::console;
@@ -11,9 +11,8 @@ pub fn execute(input: &[i32]) -> Vec {
let args = get_args(input);
- let value_encoded = evaluate_args(args[0]);
- // let value = decode_float(value_encoded[0], value_encoded[1]);
- let length = (args[1][0]) as usize;
+ let value_encoded = evaluate_arg(args[0]);
+ let length = evaluate_arg(args[1]) as usize;
console::log_1(&format!("WASM(array): input: {:?} -> {:?}", args, value_encoded).into());
@@ -22,7 +21,7 @@ pub fn execute(input: &[i32]) -> Vec {
res.push(0);
res.push(length as i32 + 4);
for _ in 0..length {
- res.push(value_encoded[0]);
+ res.push(value_encoded);
}
res.push(1);
res.push(1);
diff --git a/nodes/max/plantarium/box/src/lib.rs b/nodes/max/plantarium/box/src/lib.rs
index 443d37c..5183167 100644
--- a/nodes/max/plantarium/box/src/lib.rs
+++ b/nodes/max/plantarium/box/src/lib.rs
@@ -1,7 +1,6 @@
-use crate::geometry::calculate_normals;
use macros::include_definition_file;
use utils::{
- decode_float, encode_float, evaluate_args, geometry, get_args, set_panic_hook, wrap_arg,
+ encode_float, evaluate_float, geometry::calculate_normals, get_args, set_panic_hook, wrap_arg,
};
use wasm_bindgen::prelude::*;
use web_sys::console;
@@ -18,12 +17,10 @@ pub fn execute(input: &[i32]) -> Vec {
console::log_1(&format!("WASM(cube): input: {:?} -> {:?}", input, args ).into());
- let arg1 = evaluate_args(args[0]);
+ let size = evaluate_float(args[0]);
- let decoded = decode_float(arg1[0]);
-
- let p = encode_float(decoded);
- let n = encode_float(-decoded);
+ let p = encode_float(size);
+ let n = encode_float(-size);
// [[1,3, x, y, z, x, y,z,x,y,z]];
diff --git a/nodes/max/plantarium/output/Cargo.toml b/nodes/max/plantarium/output/Cargo.toml
index ace99c4..9c553e7 100644
--- a/nodes/max/plantarium/output/Cargo.toml
+++ b/nodes/max/plantarium/output/Cargo.toml
@@ -25,6 +25,7 @@ macros = { version = "0.1.0", path = "../../../../packages/macros" }
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"
diff --git a/nodes/max/plantarium/output/src/lib.rs b/nodes/max/plantarium/output/src/lib.rs
index 7278977..43f96e4 100644
--- a/nodes/max/plantarium/output/src/lib.rs
+++ b/nodes/max/plantarium/output/src/lib.rs
@@ -1,31 +1,36 @@
+use glam::{Mat4, Vec3};
use macros::include_definition_file;
-use utils::{concat_args, geometry::extrude_path, get_args};
+use utils::{
+ concat_args,
+ geometry::{extrude_path, transform_geometry},
+ get_args,
+};
use wasm_bindgen::prelude::*;
include_definition_file!("src/inputs.json");
-#[rustfmt::skip]
#[wasm_bindgen]
pub fn execute(input: Vec) -> Vec {
utils::set_panic_hook();
let args = get_args(input.as_slice());
- let mut output:Vec> = Vec::new();
+ let mut output: Vec> = Vec::new();
for arg in args {
-
- if arg.len() < 3 { continue; }
+ if arg.len() < 3 {
+ continue;
+ }
if arg[2] == 0 {
let _arg = &arg[3..];
- let geometry = extrude_path(_arg, 16);
+ let mut geometry = extrude_path(_arg, 4);
+ let matrix = Mat4::from_translation(Vec3::new(0.0, 0.0, 0.0));
+ geometry = transform_geometry(geometry, matrix);
output.push(geometry);
- }else if arg[2] == 1 {
+ } else if arg[2] == 1 {
output.push(arg.to_vec());
}
-
}
concat_args(output)
-
}
diff --git a/nodes/max/plantarium/stem/src/input.json b/nodes/max/plantarium/stem/src/input.json
index 5d6a7d1..a94039d 100644
--- a/nodes/max/plantarium/stem/src/input.json
+++ b/nodes/max/plantarium/stem/src/input.json
@@ -3,6 +3,15 @@
"plant"
],
"inputs": {
+ "origin": {
+ "type": "vec3",
+ "value": [
+ 0,
+ 0,
+ 0
+ ],
+ "external": true
+ },
"length": {
"type": "float",
"value": 2
diff --git a/nodes/max/plantarium/stem/src/lib.rs b/nodes/max/plantarium/stem/src/lib.rs
index ff37ad0..0b5e367 100644
--- a/nodes/max/plantarium/stem/src/lib.rs
+++ b/nodes/max/plantarium/stem/src/lib.rs
@@ -1,5 +1,5 @@
use macros::include_definition_file;
-use utils::{decode_float, evaluate_args, get_args, set_panic_hook, wrap_arg};
+use utils::{evaluate_float, evaluate_vec3, get_args, log, set_panic_hook, wrap_arg};
use wasm_bindgen::prelude::*;
include_definition_file!("src/input.json");
@@ -10,9 +10,13 @@ pub fn execute(input: &[i32]) -> Vec {
let args = get_args(input);
- let length = decode_float(evaluate_args(args[0])[0]);
- let thickness = decode_float(evaluate_args(args[1])[0]);
- let resolution = 512; //evaluate_args(args[2]);
+ log!("Args: {:?}", args);
+
+ let origin = evaluate_vec3(args[0]);
+ log!("Origin: {:?}", origin);
+ let length = evaluate_float(args[1]);
+ let thickness = evaluate_float(args[2]);
+ let resolution = 16;
let mut path: Vec = vec![0; resolution * 4 + 1];
path.resize(resolution * 4 + 1, 0);
@@ -32,9 +36,9 @@ pub fn execute(input: &[i32]) -> Vec {
for i in 0..resolution {
let a = i as f32 / resolution as f32;
- path_p[i * 4] = (a * 8.0).sin() * 0.2;
- path_p[i * 4 + 1] = a * length;
- path_p[i * 4 + 2] = 0.0;
+ path_p[i * 4] = origin[0] + (a * 8.0).sin() * 0.2;
+ path_p[i * 4 + 1] = origin[1] + a * length;
+ path_p[i * 4 + 2] = origin[2] + 0.0;
path_p[i * 4 + 3] = thickness * (1.0 - a);
}
diff --git a/nodes/max/plantarium/sum/Cargo.toml b/nodes/max/plantarium/sum/Cargo.toml
index c72548b..d344d8f 100644
--- a/nodes/max/plantarium/sum/Cargo.toml
+++ b/nodes/max/plantarium/sum/Cargo.toml
@@ -1,5 +1,5 @@
[package]
-name = "sum"
+name = "max-plantarium-sum"
version = "0.1.0"
authors = ["Max Richter "]
edition = "2018"
diff --git a/nodes/max/plantarium/triangle/Cargo.toml b/nodes/max/plantarium/triangle/Cargo.toml
index 2b724c9..2f6518a 100644
--- a/nodes/max/plantarium/triangle/Cargo.toml
+++ b/nodes/max/plantarium/triangle/Cargo.toml
@@ -1,5 +1,5 @@
[package]
-name = "triangle"
+name = "max-plantarium-triangle"
version = "0.1.0"
authors = ["Max Richter "]
edition = "2018"
diff --git a/nodes/max/plantarium/vec3/.gitignore b/nodes/max/plantarium/vec3/.gitignore
new file mode 100644
index 0000000..4e30131
--- /dev/null
+++ b/nodes/max/plantarium/vec3/.gitignore
@@ -0,0 +1,6 @@
+/target
+**/*.rs.bk
+Cargo.lock
+bin/
+pkg/
+wasm-pack.log
diff --git a/nodes/max/plantarium/vec3/Cargo.toml b/nodes/max/plantarium/vec3/Cargo.toml
new file mode 100644
index 0000000..fed1e0d
--- /dev/null
+++ b/nodes/max/plantarium/vec3/Cargo.toml
@@ -0,0 +1,28 @@
+[package]
+name = "max-plantarium-vec3"
+version = "0.1.0"
+authors = ["Max Richter "]
+edition = "2018"
+
+[lib]
+crate-type = ["cdylib", "rlib"]
+
+[features]
+default = ["console_error_panic_hook"]
+
+[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" }
+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"] }
+
+[dev-dependencies]
+wasm-bindgen-test = "0.3.34"
diff --git a/nodes/max/plantarium/vec3/package.json b/nodes/max/plantarium/vec3/package.json
new file mode 100644
index 0000000..a601fc9
--- /dev/null
+++ b/nodes/max/plantarium/vec3/package.json
@@ -0,0 +1,6 @@
+{
+ "scripts": {
+ "build": "wasm-pack build --release --out-name index --no-default-features",
+ "dev": "cargo watch -s 'pnpm build'"
+ }
+}
diff --git a/nodes/max/plantarium/vec3/src/input.json b/nodes/max/plantarium/vec3/src/input.json
new file mode 100644
index 0000000..ec5bba4
--- /dev/null
+++ b/nodes/max/plantarium/vec3/src/input.json
@@ -0,0 +1,16 @@
+{
+ "outputs": [
+ "vec3"
+ ],
+ "inputs": {
+ "0": {
+ "type": "float"
+ },
+ "1": {
+ "type": "float"
+ },
+ "2": {
+ "type": "float"
+ }
+ }
+}
diff --git a/nodes/max/plantarium/vec3/src/lib.rs b/nodes/max/plantarium/vec3/src/lib.rs
new file mode 100644
index 0000000..f97c101
--- /dev/null
+++ b/nodes/max/plantarium/vec3/src/lib.rs
@@ -0,0 +1,20 @@
+use macros::include_definition_file;
+use utils::log;
+use wasm_bindgen::prelude::*;
+
+include_definition_file!("src/input.json");
+
+#[wasm_bindgen]
+pub fn execute(args: &[i32]) -> Vec {
+ let mut result = Vec::with_capacity(args.len() + 2);
+ result.push(0); // encoding the [ bracket
+ result.push(args[1]);
+
+ result.extend_from_slice(&args[2..]);
+
+ result.push(1);
+ result.push(1); // closing bracket
+
+ log!("WASM(vec3): res {:?}", result);
+ result
+}
diff --git a/nodes/max/plantarium/vec3/tests/web.rs b/nodes/max/plantarium/vec3/tests/web.rs
new file mode 100644
index 0000000..de5c1da
--- /dev/null
+++ b/nodes/max/plantarium/vec3/tests/web.rs
@@ -0,0 +1,13 @@
+//! 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);
+}
diff --git a/packages/utils/Cargo.toml b/packages/utils/Cargo.toml
index d51cef1..96eb7e4 100644
--- a/packages/utils/Cargo.toml
+++ b/packages/utils/Cargo.toml
@@ -12,5 +12,4 @@ web-sys = { version = "0.3.69", features = ["console"] }
serde = { version = "1.0", features = ["derive"] }
serde_json = { version = "1.0", default-features = false, features = ["alloc"] }
console_error_panic_hook = { version = "0.1.7", optional = true }
-gl_matrix = "0.0.2"
glam = "0.27.0"
diff --git a/packages/utils/src/geometry/extrude_path.rs b/packages/utils/src/geometry/extrude_path.rs
index 27e3301..19830dc 100644
--- a/packages/utils/src/geometry/extrude_path.rs
+++ b/packages/utils/src/geometry/extrude_path.rs
@@ -1,4 +1,4 @@
-use super::create_empty_geometry;
+use super::{create_geometry_data, wrap_geometry_data};
use glam::{Mat4, Quat, Vec3};
fn create_circle(res: usize) -> Vec {
@@ -19,22 +19,19 @@ pub fn extrude_path(input_path: &[i32], res_x: usize) -> Vec {
let circle = create_circle(res_x);
- let mut geometry = create_empty_geometry(vertices_amount, face_amount);
+ let mut geometry_data = create_geometry_data(vertices_amount, face_amount);
+
+ let geometry = wrap_geometry_data(&mut geometry_data);
+
+ let normals = geometry.normals;
+ let positions = geometry.positions;
+ let indices = geometry.faces;
- let (_header,rest) = geometry.split_at_mut(5);
- let (indices, rest) = rest.split_at_mut(face_amount*3);
- let (_positions, _normals) = rest.split_at_mut(vertices_amount*3);
- let positions: &mut [f32];
- let normals: &mut [f32];
let path: &[f32];
unsafe {
path = std::slice::from_raw_parts(input_path.as_ptr() as *const f32, input_path.len());
- positions = std::slice::from_raw_parts_mut(_positions.as_mut_ptr() as *mut f32, _positions.len());
- normals = std::slice::from_raw_parts_mut(_normals.as_mut_ptr() as *mut f32, _normals.len());
}
- normals[0] = 0.0;
-
for i in 0..point_amount {
let index_offset = i * res_x * 6;
@@ -109,5 +106,5 @@ pub fn extrude_path(input_path: &[i32], res_x: usize) -> Vec {
}
}
- geometry
+ geometry_data
}
diff --git a/packages/utils/src/geometry/geometry.rs b/packages/utils/src/geometry/geometry.rs
new file mode 100644
index 0000000..f10d1cc
--- /dev/null
+++ b/packages/utils/src/geometry/geometry.rs
@@ -0,0 +1,74 @@
+use crate::log;
+
+pub struct GeometryData<'a> {
+ pub positions: &'a mut [f32], // View into `data`
+ pub normals: &'a mut [f32], // View into `data`
+ pub faces: &'a mut [i32], // View into `data`
+}
+
+pub fn create_geometry_data(vertex_amount: usize, face_amount: usize) -> Vec {
+ let amount = 3 // definition (type, vertex_amount, face_amount)
+ + 4 // opening and closing brackets
+ + vertex_amount * 3 // positions
+ + vertex_amount * 3 // normals
+ + face_amount * 3; // faces
+
+ let mut geo = vec![0; amount];
+
+ geo[0] = 0; // opening bracket
+ geo[1] = amount as i32 - 2; // opening bracket
+ geo[2] = 1; // type: geometry
+ geo[3] = vertex_amount as i32;
+ geo[4] = face_amount as i32;
+ geo[amount - 2] = 1; // closing bracket
+ geo[amount - 1] = 1; // closing bracket
+
+ geo
+}
+
+pub fn wrap_geometry_data(geometry: &mut [i32]) -> GeometryData {
+ // Basic validity checks
+ assert!(
+ geometry.len() > 5,
+ "Geometry vector does not contain enough data for a header."
+ );
+
+ // Split at after header
+ let (header, rest) = geometry.split_at_mut(5);
+
+ let vertices_amount = header[3] as usize;
+ let face_amount = header[4] as usize;
+ let total_floats = vertices_amount * 3 * 2;
+
+ let (faces, rest) = rest.split_at_mut(face_amount * 3);
+ let (positions_slice, rest) = rest.split_at_mut(vertices_amount * 3);
+ let (normals_slice, _) = rest.split_at_mut(vertices_amount * 3);
+
+ log!(
+ "Vertices: {}, normals: {}, Total floats: {}",
+ positions_slice.len(),
+ normals_slice.len(),
+ total_floats
+ );
+
+ assert!(
+ positions_slice.len() + normals_slice.len() == total_floats,
+ "Slices do not match the expected sizes."
+ );
+
+ let positions: &mut [f32] = unsafe {
+ std::slice::from_raw_parts_mut(
+ positions_slice.as_mut_ptr() as *mut f32,
+ positions_slice.len(),
+ )
+ };
+ let normals: &mut [f32] = unsafe {
+ std::slice::from_raw_parts_mut(normals_slice.as_mut_ptr() as *mut f32, normals_slice.len())
+ };
+
+ GeometryData {
+ positions,
+ normals,
+ faces,
+ }
+}
diff --git a/packages/utils/src/geometry/mod.rs b/packages/utils/src/geometry/mod.rs
index c499d2f..9efe85a 100644
--- a/packages/utils/src/geometry/mod.rs
+++ b/packages/utils/src/geometry/mod.rs
@@ -1,33 +1,9 @@
mod calculate_normals;
mod extrude_path;
+mod geometry;
+mod transform;
pub use calculate_normals::*;
pub use extrude_path::*;
-
-use crate::log;
-
-#[rustfmt::skip]
-pub fn create_empty_geometry(vertex_amount: usize, face_amount: usize) -> Vec {
- log!(
- "create_empty_geometry: vertex_amount: {}, face_amount: {}",
- vertex_amount,
- face_amount
- );
-
- let amount =
- 3 // definition (type, vertex_amount, face_amount)
- + 4 // opening and closing brackets
- + vertex_amount * 3 // positions
- + vertex_amount * 3 // normals
- + face_amount * 3; // faces
-
- let mut vec: Vec = vec![0; amount];
- vec[0] = 0; // opening bracket
- vec[1] = amount as i32 - 2; // opening bracket
- vec[2] = 1; // type: geometry
- vec[3] = vertex_amount as i32;
- vec[4] = face_amount as i32;
- vec[amount - 2] = 1; // closing bracket
- vec[amount - 1] = 1; // closing bracket
- vec
-}
+pub use geometry::*;
+pub use transform::*;
diff --git a/packages/utils/src/geometry/transform.rs b/packages/utils/src/geometry/transform.rs
new file mode 100644
index 0000000..607e3cc
--- /dev/null
+++ b/packages/utils/src/geometry/transform.rs
@@ -0,0 +1,25 @@
+use glam::{Mat4, Vec3};
+
+pub fn transform_geometry(mut geometry: Vec, matrix: Mat4) -> Vec {
+ let (_header, rest) = geometry.split_at_mut(5);
+
+ let vertices_amount = _header[3] as usize;
+ let face_amount = _header[4] as usize;
+
+ let (_indices, rest) = rest.split_at_mut(face_amount * 3);
+ let (_positions, _normals) = rest.split_at_mut(vertices_amount * 3);
+ let positions: &mut [f32];
+ unsafe {
+ positions =
+ std::slice::from_raw_parts_mut(_positions.as_mut_ptr() as *mut f32, _positions.len());
+ }
+
+ for i in 0..vertices_amount {
+ let pos = Mat4::transform_point3(&matrix, Vec3::from_slice(&positions[i * 3..i * 3 + 3]));
+ positions[i * 3] = pos.x;
+ positions[i * 3 + 1] = pos.y;
+ positions[i * 3 + 2] = pos.z;
+ }
+
+ geometry
+}
diff --git a/packages/utils/src/tree.rs b/packages/utils/src/tree.rs
index c564cba..15184ed 100644
--- a/packages/utils/src/tree.rs
+++ b/packages/utils/src/tree.rs
@@ -1,3 +1,5 @@
+use crate::decode_float;
+
pub fn get_args(args: &[i32]) -> Vec<&[i32]> {
let mut idx: usize = 0;
let mut depth = -1;
@@ -105,13 +107,29 @@ pub fn evaluate_node(input_args: &[i32]) -> i32 {
}
}
-pub fn evaluate_args(input_args: &[i32]) -> Vec {
- if input_args.len() == 1 {
- return input_args.to_vec();
- }
+pub fn evaluate_vec3(input_args: &[i32]) -> Vec {
+ let args = get_args(input_args);
- if input_args.len() == 4 && input_args[0] == 0 && input_args[1] == 3 {
- return vec![input_args[2], input_args[3]];
+ assert!(
+ args.len() == 3,
+ "Failed to evaluate Vec3 - Expected 3 arguments, got {}",
+ args.len()
+ );
+
+ let x = evaluate_float(args[0]);
+ let y = evaluate_float(args[1]);
+ let z = evaluate_float(args[2]);
+
+ vec![x, y, z]
+}
+
+pub fn evaluate_float(arg: &[i32]) -> f32 {
+ decode_float(evaluate_arg(arg))
+}
+
+pub fn evaluate_arg(input_args: &[i32]) -> i32 {
+ if input_args.len() == 1 {
+ return input_args.to_vec()[0];
}
let args = get_args(input_args);
@@ -125,22 +143,20 @@ pub fn evaluate_args(input_args: &[i32]) -> Vec {
resolved.push(arg[2]);
resolved.push(arg[3]);
} else {
- resolved.push(evaluate_args(arg)[0]);
+ resolved.push(evaluate_arg(arg));
}
}
if resolved.len() > 1 {
- let res = evaluate_node(&resolved);
- vec![res]
+ evaluate_node(&resolved)
} else {
- resolved
+ resolved[0]
}
}
+
#[cfg(test)]
mod tests {
- use crate::encoding::decode_float;
-
use super::*;
#[test]
@@ -152,10 +168,9 @@ mod tests {
// and another math node that adds 2 to that result
// the numbers are f32 floats encoded as two i32's
- let result = evaluate_args(&input);
- let decoded = decode_float(result[0]);
+ let result = evaluate_float(&input);
- assert_eq!(decoded, 6.0);
+ assert_eq!(result, 6.0);
}
#[test]