@woosh/meep-engine 3.53.0 → 3.54.0

package/src/generation/foliage/skeleton/crown_envelope_evaluate.js

@@ -1,121 +1,121 @@
-import { clamp } from "../../../core/math/clamp.js";
-import { CrownEnvelopeType } from "../config/CrownEnvelopeType.js";
-
-/**
- * Evaluates the normalized radial crown envelope profile $S_{\text{env}}(h_{\text{norm}}) \in [0.05, 1.0]$
- * at normalized crown height $h_{\text{norm}} \in [0, 1]$ (0 = base of crown, 1 = apex of crown).
- *
- * Implements Weber & Penn (1995) / SpeedTree botanical crown envelope shapes.
- *
- * @param {CrownEnvelopeType|number} envelope_type
- * @param {number} h_norm normalized height in [0, 1]
- * @param {number} [prune_width_peak=0.6] normalized height of maximum crown width for asymmetric envelopes
- * @param {number} [power_low=1.5] lower envelope exponent
- * @param {number} [power_high=1.5] upper envelope exponent
- * @returns {number} radial envelope factor in [0.05, 1.0]
- */
-export function crown_envelope_evaluate(
-    envelope_type,
-    h_norm,
-    prune_width_peak = 0.6,
-    power_low = 1.5,
-    power_high = 1.5
-) {
-    const h = clamp(h_norm, 0.0, 1.0);
-    let val = 1.0;
-
-    switch (envelope_type) {
-        case CrownEnvelopeType.Conical:
-            val = 0.2 + 0.8 * (1.0 - h);
-            break;
-
-        case CrownEnvelopeType.Spherical:
-            val = 0.2 + 0.8 * Math.sin(Math.PI * h);
-            break;
-
-        case CrownEnvelopeType.Hemispherical:
-            val = 0.2 + 0.8 * Math.sin(0.5 * Math.PI * (1.0 - h));
-            break;
-
-        case CrownEnvelopeType.Cylindrical:
-            val = 1.0;
-            break;
-
-        case CrownEnvelopeType.TaperedCylindrical:
-            val = 0.5 + 0.5 * (1.0 - h);
-            break;
-
-        case CrownEnvelopeType.Flame:
-            if (h <= 0.7) {
-                val = h / 0.7;
-            } else {
-                val = (1.0 - h) / 0.3;
-            }
-            val = 0.15 + 0.85 * val;
-            break;
-
-        case CrownEnvelopeType.InverseConical:
-            val = 0.2 + 0.8 * h;
-            break;
-
-        case CrownEnvelopeType.TendFlame:
-            if (h <= 0.7) {
-                val = 0.5 + 0.5 * (h / 0.7);
-            } else {
-                val = 0.5 + 0.5 * ((1.0 - h) / 0.3);
-            }
-            break;
-
-        case CrownEnvelopeType.Weeping: {
-            const peak = clamp(prune_width_peak, 0.1, 0.9);
-            if (h < peak) {
-                const u = (peak - h) / peak;
-                val = 1.0 - Math.pow(u, power_low);
-            } else {
-                const u = (h - peak) / (1.0 - peak);
-                val = 1.0 - Math.pow(u, power_high);
-            }
-            val = 0.18 + 0.82 * Math.max(0.0, val);
-            break;
-        }
-
-        default:
-            val = 0.2 + 0.8 * Math.sin(Math.PI * h);
-            break;
-    }
-
-    return clamp(val, 0.05, 1.0);
-}
-
-/**
- * Evaluates a signed distance approximation to the 3D crown envelope around the `+Y` trunk axis.
- * Negative inside the crown envelope, positive outside.
- *
- * @param {number} px
- * @param {number} py
- * @param {number} pz
- * @param {import("../config/CrownConfig.js").CrownConfig} crown_config
- * @returns {number}
- */
-export function crown_envelope_sdf(px, py, pz, crown_config) {
-    const base_y = crown_config.base_height;
-    const height = Math.max(0.1, crown_config.height);
-    const max_r = Math.max(0.1, crown_config.radius);
-
-    const h_norm = (py - base_y) / height;
-    const r_horiz = Math.sqrt(px * px + pz * pz);
-    const r_env = max_r * crown_envelope_evaluate(crown_config.envelope_type, clamp(h_norm, 0.0, 1.0));
-
-    const d_radial = r_horiz - r_env;
-    let d_vert = 0.0;
-    if (py < base_y) {
-        d_vert = base_y - py;
-    } else if (py > base_y + height) {
-        d_vert = py - (base_y + height);
-    }
-
-    if (d_vert > 0.0 && d_radial > 0.0) {
-        return Math.sqrt(d_radial * d_radial + d_vert * d_vert);
-    }
-    return Math.max(d_radial, d_vert > 0.0 ? d_vert : (Math.abs(h_norm - 0.5) - 0.5) * height);
-}
+import { clamp } from "../../../core/math/clamp.js";
+import { CrownEnvelopeType } from "../config/CrownEnvelopeType.js";
+
+/**
+ * Evaluates the normalized radial crown envelope profile $S_{\text{env}}(h_{\text{norm}}) \in [0.05, 1.0]$
+ * at normalized crown height $h_{\text{norm}} \in [0, 1]$ (0 = base of crown, 1 = apex of crown).
+ *
+ * Implements Weber & Penn (1995) / SpeedTree botanical crown envelope shapes.
+ *
+ * @param {CrownEnvelopeType|number} envelope_type
+ * @param {number} h_norm normalized height in [0, 1]
+ * @param {number} [prune_width_peak=0.6] normalized height of maximum crown width for asymmetric envelopes
+ * @param {number} [power_low=1.5] lower envelope exponent
+ * @param {number} [power_high=1.5] upper envelope exponent
+ * @returns {number} radial envelope factor in [0.05, 1.0]
+ */
+export function crown_envelope_evaluate(
+	envelope_type,
+	h_norm,
+	prune_width_peak = 0.6,
+	power_low = 1.5,
+	power_high = 1.5
+) {
+	const h = clamp(h_norm, 0.0, 1.0);
+	let val = 1.0;
+
+	switch (envelope_type) {
+		case CrownEnvelopeType.Conical:
+			val = 0.06 + 0.94 * (1.0 - h);
+			break;
+
+		case CrownEnvelopeType.Spherical:
+			val = 0.2 + 0.8 * Math.sin(Math.PI * h);
+			break;
+
+		case CrownEnvelopeType.Hemispherical:
+			val = 0.2 + 0.8 * Math.sin(0.5 * Math.PI * (1.0 - h));
+			break;
+
+		case CrownEnvelopeType.Cylindrical:
+			val = 1.0;
+			break;
+
+		case CrownEnvelopeType.TaperedCylindrical:
+			val = 0.5 + 0.5 * (1.0 - h);
+			break;
+
+		case CrownEnvelopeType.Flame:
+			if (h <= 0.7) {
+				val = h / 0.7;
+			} else {
+				val = (1.0 - h) / 0.3;
+			}
+			val = 0.15 + 0.85 * val;
+			break;
+
+		case CrownEnvelopeType.InverseConical:
+			val = 0.2 + 0.8 * h;
+			break;
+
+		case CrownEnvelopeType.TendFlame:
+			if (h <= 0.7) {
+				val = 0.5 + 0.5 * (h / 0.7);
+			} else {
+				val = 0.5 + 0.5 * ((1.0 - h) / 0.3);
+			}
+			break;
+
+		case CrownEnvelopeType.Weeping: {
+			const peak = clamp(prune_width_peak, 0.1, 0.9);
+			if (h < peak) {
+				const u = (peak - h) / peak;
+				val = 1.0 - Math.pow(u, power_low);
+			} else {
+				const u = (h - peak) / (1.0 - peak);
+				val = 1.0 - Math.pow(u, power_high);
+			}
+			val = 0.18 + 0.82 * Math.max(0.0, val);
+			break;
+		}
+
+		default:
+			val = 0.2 + 0.8 * Math.sin(Math.PI * h);
+			break;
+	}
+
+	return clamp(val, 0.05, 1.0);
+}
+
+/**
+ * Evaluates a signed distance approximation to the 3D crown envelope around the `+Y` trunk axis.
+ * Negative inside the crown envelope, positive outside.
+ *
+ * @param {number} px
+ * @param {number} py
+ * @param {number} pz
+ * @param {import("../config/CrownConfig.js").CrownConfig} crown_config
+ * @returns {number}
+ */
+export function crown_envelope_sdf(px, py, pz, crown_config) {
+	const base_y = crown_config.base_height;
+	const height = Math.max(0.1, crown_config.height);
+	const max_r = Math.max(0.1, crown_config.radius);
+
+	const h_norm = (py - base_y) / height;
+	const r_horiz = Math.sqrt(px * px + pz * pz);
+	const r_env = max_r * crown_envelope_evaluate(crown_config.envelope_type, clamp(h_norm, 0.0, 1.0));
+
+	const d_radial = r_horiz - r_env;
+	let d_vert = 0.0;
+	if (py < base_y) {
+		d_vert = base_y - py;
+	} else if (py > base_y + height) {
+		d_vert = py - (base_y + height);
+	}
+
+	if (d_vert > 0.0 && d_radial > 0.0) {
+		return Math.sqrt(d_radial * d_radial + d_vert * d_vert);
+	}
+	return Math.max(d_radial, d_vert > 0.0 ? d_vert : (Math.abs(h_norm - 0.5) - 0.5) * height);
+}

package/src/generation/foliage/skeleton/tree_skeleton_compute_pipe_radii.d.ts

@@ -1,14 +1,17 @@
 /**
- * Computes and blends botanical Pipe Model Theory (Shinozaki et al. 1964; Leonardo da Vinci / Murray's law)
- * cross-sectional radii $R_p^\alpha = \sum R_i^\alpha$ bottom-up across `skeleton.graph`,
- * blending with the parametric `radius_profile` curves according to `config.crown.pipe_model_weight`.
+ * Enforces Da Vinci's pipe-model cross-sectional area conservation across a `TreeSkeleton`
+ * in a bottom-up post-order pass:
  *
- * Also guarantees monotonic non-increasing radii along each branch from base to tip and updates
- * each node's {@link Transform64} scale and `skeleton.branch_base_radius`.
+ * $$r_{\text{parent}}^\alpha = \sum_{k} r_{\text{child}, k}^\alpha$$
+ *
+ * Blended with each node's initial parametric taper radius via `pipe_model_weight`, while
+ * preserving boundary conditions at both the branch base ($t = 0$) and terminal shoot apex ($t = 1$)
+ * so neither trunk nor branch tips inflate into blunt stubs.
  *
  * @param {import("./TreeSkeleton.js").TreeSkeleton} skeleton
- * @param {TreeSpeciesConfig|Object} [config]
+ * @param {TreeSpeciesConfig} [config]
+ * @returns {import("./TreeSkeleton.js").TreeSkeleton}
  */
-export function tree_skeleton_compute_pipe_radii(skeleton: import("./TreeSkeleton.js").TreeSkeleton, config?: TreeSpeciesConfig | any): void;
+export function tree_skeleton_compute_pipe_radii(skeleton: import("./TreeSkeleton.js").TreeSkeleton, config?: TreeSpeciesConfig): import("./TreeSkeleton.js").TreeSkeleton;
 import { TreeSpeciesConfig } from "../config/TreeSpeciesConfig.js";
 //# sourceMappingURL=tree_skeleton_compute_pipe_radii.d.ts.map

package/src/generation/foliage/skeleton/tree_skeleton_compute_pipe_radii.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tree_skeleton_compute_pipe_radii.d.ts","sourceRoot":"","sources":["../../../../../src/generation/foliage/skeleton/tree_skeleton_compute_pipe_radii.js"],"names":[],"mappings":"AAIA;;;;;;;;;;GAUG;AACH,2DAHW,OAAO,mBAAmB,EAAE,YAAY,WACxC,iBAAiB,MAAO,QAqKlC;kCAhLiC,gCAAgC"}
+{"version":3,"file":"tree_skeleton_compute_pipe_radii.d.ts","sourceRoot":"","sources":["../../../../../src/generation/foliage/skeleton/tree_skeleton_compute_pipe_radii.js"],"names":[],"mappings":"AAIA;;;;;;;;;;;;;GAaG;AACH,2DAJW,OAAO,mBAAmB,EAAE,YAAY,WACxC,iBAAiB,GACf,OAAO,mBAAmB,EAAE,YAAY,CA6LpD;kCA3MiC,gCAAgC"}