feat: improve get_args functions

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

@@ -1,18 +1,12 @@
 use macros::include_definition_file;
+use utils::{concat_args, get_args, set_panic_hook};
 use wasm_bindgen::prelude::*;
 
 include_definition_file!("src/input.json");
 
 #[wasm_bindgen]
 pub fn execute(args: &[i32]) -> Vec<i32> {
-    let mut result = Vec::with_capacity(args.len() + 3);
-    result.push(0); // encoding the [ bracket
-    result.push(args[1] + 1);
-
-    result.push(0); // adding the node-type, math: 0
-    result.extend_from_slice(&args[2..]);
-
-    result.push(1);
-    result.push(1); // closing bracket
-    result
+    set_panic_hook();
+    let args = get_args(args);
+    concat_args(vec![&[0], args[0], args[1], args[2]])
 }

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

@@ -13,13 +13,14 @@ include_definition_file!("src/inputs.json");
 pub fn execute(input: &[i32]) -> Vec<i32> {
     utils::set_panic_hook();
 
-    log!("output input: {:?}", input);
-
     let args = get_args(input);
 
     log!("output args: {:?}", args);
 
     let inputs = get_args(args[0]);
+
+    log!("output inputs: {:?}", inputs);
+
     let resolution = evaluate_int(args[1]) as usize;
 
     log!("inputs: {}, resolution: {}", inputs.len(), resolution);
@@ -30,16 +31,14 @@ pub fn execute(input: &[i32]) -> Vec<i32> {
             continue;
         }
 
-        let arg_type = arg[0];
-
-        log!("arg: {:?}", arg);
+        let arg_type = arg[2];
 
         if arg_type == 0 {
             // this is stem
-            let _arg = &arg[3..];
-            let mut geometry = extrude_path(_arg, resolution);
-            let matrix = Mat4::from_translation(Vec3::new(0.0, 0.0, 0.0));
-            geometry = transform_geometry(geometry, matrix);
+            let stem = &arg[2..arg.len() - 2];
+            output.push(arg.to_vec());
+            let geometry = extrude_path(stem, resolution);
+            log!("geometry: {:?}", geometry);
             output.push(geometry);
         } else if arg_type == 1 {
             // this is geometry
@@ -47,5 +46,5 @@ pub fn execute(input: &[i32]) -> Vec<i32> {
         }
     }
 
-    concat_args(output)
+    concat_args(output.iter().map(|v| v.as_slice()).collect())
 }

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

@@ -10,27 +10,40 @@ pub fn execute(input: &[i32]) -> Vec<i32> {
 
     let args = get_args(input);
 
-    log!("node-stem: {:?}", args);
+    log!("stem args: {:?}", args);
 
     let origin = evaluate_vec3(args[0]);
     let length = evaluate_float(args[1]);
     let thickness = evaluate_float(args[2]);
     let res_curve = evaluate_int(args[3]) as usize;
 
-    log!("origin: {:?}", origin);
+    log!(
+        "origin: {:?} length: {} thickness: {} res_curve: {}",
+        origin,
+        length,
+        thickness,
+        res_curve
+    );
 
     let amount_points = res_curve * 4;
     // +4 for opening and closing brackets and +1 node-type
-    let output_size = amount_points + 5;
+    let output_size = amount_points + 9;
 
+    // because we could potentially return multiple stems
+    // we need to encode two pairs of brackets
+    //
     let mut path: Vec<i32> = vec![0; output_size];
     path[0] = 0; // encode opening bracket
-    path[1] = res_curve as i32 * 4 + 4; // encode opening bracket
-    path[2] = 0; // encode node-type, stem: 0
+    path[1] = 1; // encode opening bracket
+    path[2] = 0; // encode opening bracket
+    path[3] = res_curve as i32 * 4 + 2; // encode opening bracket
+    path[4] = 0; // encode node-type, stem: 0
+    path[output_size - 4] = 1; // encode closing bracket
+    path[output_size - 3] = 1; // encode closing bracket
     path[output_size - 2] = 1; // encode closing bracket
     path[output_size - 1] = 1; // encode closing bracket
 
-    let slice = &mut path[3..output_size - 2];
+    let slice = &mut path[5..5 + amount_points];
 
     let path_p: &mut [f32] = unsafe {
         assert_eq!(slice.len() % 4, 0);

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

@@ -1,9 +1,13 @@
 use macros::include_definition_file;
+use utils::{concat_args, get_args, log};
 use wasm_bindgen::prelude::*;
 
 include_definition_file!("src/input.json");
 
 #[wasm_bindgen]
 pub fn execute(input: &[i32]) -> Vec<i32> {
-    input.to_vec()
+    let args = get_args(input);
+    log!("vec3 input: {:?}", input);
+    log!("vec3 args: {:?}", args);
+    concat_args(args)
 }