max/nodarium
1
0
Fork 0
Code Issues 4 Pull Requests Actions Packages Projects Releases Wiki Activity

fix: random node now works as expected

Browse Source
This commit is contained in:
max_richter
2024-04-23 20:35:56 +02:00
parent 198a868fc6
commit 070a5b52d0
16 changed files with 141 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
nodes/max/plantarium/math/src/input.json
View File

@@ -13,8 +13,7 @@
"multiply",
"divide"
],
"internal": true,
"value": 0
"internal": true
},
"a": {
"type": "float",

1
nodes/max/plantarium/noise/Cargo.toml
View File

@@ -24,6 +24,7 @@ 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
nodes/max/plantarium/noise/src/input.json
View File

@@ -19,6 +19,7 @@
},
"fixBottom": {
"type": "float",
"label": "Fixate bottom of plant",
"hidden": true,
"min": 0,
"max": 1

33
nodes/max/plantarium/noise/src/lib.rs
View File

@@ -1,3 +1,4 @@
use glam::Vec3;
use macros::include_definition_file;
use noise::{core::open_simplex::open_simplex_2d, permutationtable::PermutationTable, Vector2};
use utils::{
@@ -18,7 +19,7 @@ pub fn execute(input: &[i32]) -> Vec<i32> {
let args = get_args(input);
let plants = get_args(args[0]);
let scale = evaluate_float(args[1]);
let scale = (evaluate_float(args[1]) * 0.1) as f64;
let strength = evaluate_float(args[2]);
let _fix_bottom = evaluate_float(args[3]);
let fix_bottom = if _fix_bottom.is_finite() {
@@ -40,24 +41,48 @@ pub fn execute(input: &[i32]) -> Vec<i32> {
let output: Vec<Vec<i32>> = plants
.iter()
.map(|p| {
.enumerate()
.map(|(j, p)| {
let mut plant = p.to_vec();
log!("plant: {:?}", plant);
let points = (plant.len() - 5) / 4;
let p0 = Vec3::new(
decode_float(plant[3]),
decode_float(plant[4]),
decode_float(plant[5]),
);
let p2 = Vec3::new(
decode_float(plant[plant.len() - 6]),
decode_float(plant[plant.len() - 5]),
decode_float(plant[plant.len() - 4]),
);
// .... x, y, z, w, 1, 1
// -4 -3 -2 -1
let length = (p2 - p0).length() as f64;
log!("p0: {:?} p1: {:?} length: {}", p0, p2, length);
for i in 0..points {
let a = i as f64 / (points - 1) as f64;
let px = Vector2::new(0.0, a * scale as f64);
let pz = Vector2::new(a * scale as f64, 0.0);
let px = Vector2::new(j as f64 + a * length * scale, a * scale as f64);
let pz = Vector2::new(a * scale as f64, j as f64 + a * length * scale);
let nx = open_simplex_2d(px, &hasher) as f32
* strength
* 0.1
* lerp(1.0, a as f32, fix_bottom);
let nz = open_simplex_2d(pz, &hasher) as f32
* strength
* 0.1
* lerp(1.0, a as f32, fix_bottom);
plant[3 + i * 4] = encode_float(decode_float(plant[3 + i * 4]) + nx);
plant[5 + i * 4] = encode_float(decode_float(plant[5 + i * 4]) + nz);
}

18
nodes/max/plantarium/random/src/lib.rs
View File

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

7
nodes/max/plantarium/stem/src/input.json
View File

@@ -13,13 +13,18 @@
],
"external": true
},
"amount": {
"type": "integer",
"min": 1,
"max": 64,
"value": 1
},
"length": {
"type": "float",
"value": 2
},
"thickness": {
"type": "float",
"element": "slider",
"value": 2
},
"resolution_curve": {

81
nodes/max/plantarium/stem/src/lib.rs
View File

@@ -1,5 +1,7 @@
use macros::include_definition_file;
use utils::{evaluate_float, evaluate_int, evaluate_vec3, get_args, log, set_panic_hook, wrap_arg};
use utils::{
evaluate_float, evaluate_int, evaluate_vec3, get_args, log, reset_call_count, set_panic_hook,
};
use wasm_bindgen::prelude::*;
include_definition_file!("src/input.json");
@@ -8,57 +10,64 @@ include_definition_file!("src/input.json");
pub fn execute(input: &[i32]) -> Vec<i32> {
set_panic_hook();
reset_call_count();
let args = get_args(input);
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;
let amount = evaluate_int(args[1]) as usize;
let res_curve = evaluate_int(args[4]) as usize;
log!(
"origin: {:?} length: {} thickness: {} res_curve: {}",
origin,
length,
thickness,
res_curve
);
log!("STEM: amount: {} res_curve: {}", amount, res_curve);
let amount_points = res_curve * 4;
// +4 for opening and closing brackets and +1 node-type
let output_size = amount_points + 9;
// 4 extra for opening and closing brackets
// and each stem has 5 extra for opening and closing brackets and node-type
let output_size = 4 + amount * (res_curve * 4 + 5);
// 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] = 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[5..5 + amount_points];
for i in 0..amount {
let start_index = 2 + i * (res_curve * 4 + 5);
let end_index = 2 + (i + 1) * (res_curve * 4 + 5);
let path_p: &mut [f32] = unsafe {
assert_eq!(slice.len() % 4, 0);
std::slice::from_raw_parts_mut(slice.as_ptr() as *mut f32, slice.len())
};
let origin = evaluate_vec3(args[0]);
let length = evaluate_float(args[2]);
let thickness = evaluate_float(args[3]);
for i in 0..res_curve {
let a = i as f32 / (res_curve - 1) as f32;
path_p[i * 4] = origin[0];
path_p[i * 4 + 1] = origin[1] + a * length;
path_p[i * 4 + 2] = origin[2];
path_p[i * 4 + 3] = thickness * (1.0 - a);
log!(
"STEM {i}: origin: {:?} length: {} thickness: {}",
origin,
length,
thickness
);
path[start_index] = 0; // encode opening bracket
path[start_index + 1] = res_curve as i32 * 4 + 2; // encode opening bracket
path[start_index + 2] = 0; // encode node-type, stem: 0
path[end_index - 2] = 1; // encode closing bracket
path[end_index - 1] = 1; // encode closing bracket
let path_slice = &mut path[3 + start_index..end_index - 2];
let path_p: &mut [f32] = unsafe {
assert_eq!(path_slice.len() % 4, 0);
std::slice::from_raw_parts_mut(path_slice.as_ptr() as *mut f32, path_slice.len())
};
for i in 0..res_curve {
let a = i as f32 / (res_curve - 1) as f32;
path_p[i * 4] = origin[0];
path_p[i * 4 + 1] = origin[1] + a * length;
path_p[i * 4 + 2] = origin[2];
path_p[i * 4 + 3] = thickness * (1.0 - a);
}
}
log!("res: {:?}", path);
path
}

6
nodes/max/plantarium/vec3/src/input.json
View File

@@ -6,15 +6,15 @@
"inputs": {
"0": {
"type": "float",
"label": false
"label": ""
},
"1": {
"type": "float",
"label": false
"label": ""
},
"2": {
"type": "float",
"label": false
"label": ""
}
}
}