@woosh/meep-engine 3.56.0 → 3.57.0

package/src/generation/foliage/config/{BranchLevelConfig.d.ts → BranchGeneratorConfig.d.ts}

@@ -1,18 +1,14 @@
 /**
- * Configuration for one recursion level of branch generation (0 = Trunk, 1 = Primary Boughs,
- * 2 = Secondary Branches, 3 = Twigs).
+ * One branch generator of a tree: how a branch it grows is shaped (spine, taper, tropisms, bark relief,
+ * collar, splitting). Where and how many of its branches attach to a parent is described by the
+ * `BranchSpawnRule`s that target it, see `TreeSpeciesConfig.branch_rules`.
  */
-export class BranchLevelConfig {
+export class BranchGeneratorConfig {
     /**
-     * @param {Partial<BranchLevelConfig>} [options]
-     * @returns {BranchLevelConfig}
+     * @param {Partial<BranchGeneratorConfig>} [options]
+     * @returns {BranchGeneratorConfig}
      */
-    static from(options?: Partial<BranchLevelConfig>): BranchLevelConfig;
-    /**
-     * Recursion level index (0 = trunk).
-     * @type {number}
-     */
-    level: number;
+    static from(options?: Partial<BranchGeneratorConfig>): BranchGeneratorConfig;
     /**
      * Number of longitudinal Cubic Hermite segments along the spine.
      * @type {number}
@@ -29,7 +25,7 @@ export class BranchLevelConfig {
      */
     radial_segments_min: number;
     /**
-     * Nominal length (for level 0 in meters; for level > 0 as ratio of parent length or meters).
+     * Nominal length in meters (scaled per child by the spawning rule's `length_profile`).
      * @type {number}
      */
     length: number;
@@ -38,11 +34,6 @@ export class BranchLevelConfig {
      * @type {number}
      */
     length_variance: number;
-    /**
-     * 1D Hermite curve scaling child length along parent normalized position t in [0, 1].
-     * @type {AnimationCurve}
-     */
-    length_profile: AnimationCurve;
     /**
      * Base radius as a fraction of branch length.
      * @type {number}
@@ -58,47 +49,6 @@ export class BranchLevelConfig {
      * @type {AnimationCurve}
      */
     radius_profile: AnimationCurve;
-    /**
-     * Fraction [0, 0.95] at the base of this branch where no child branches spawn.
-     * @type {number}
-     */
-    bare_length_ratio: number;
-    /**
-     * Number of lateral child branch nodes spawned by a branch at this level into (level + 1).
-     * @type {number}
-     */
-    child_count: number;
-    /**
-     * Phyllotactic arrangement for children spawned along this branch.
-     * @type {PhyllotaxisMode|number}
-     */
-    phyllotaxis_mode: PhyllotaxisMode | number;
-    /**
-     * Number of branches per whorl when `phyllotaxis_mode === PhyllotaxisMode.Whorled`.
-     * @type {number}
-     */
-    whorl_count: number;
-    /**
-     * Random azimuthal jitter in radians.
-     * @type {number}
-     */
-    azimuth_jitter: number;
-    /**
-     * Axillary insertion (polar divergence) angle in radians from parent tangent.
-     * @type {number}
-     */
-    insertion_angle: number;
-    /**
-     * Random variation in insertion angle (radians).
-     * @type {number}
-     */
-    insertion_angle_variation: number;
-    /**
-     * 1D Hermite curve scaling insertion angle along parent normalized position t in [0, 1].
-     * Typically wider at bottom of crown (1.0) and steeper near apex (0.6).
-     * @type {AnimationCurve}
-     */
-    insertion_angle_profile: AnimationCurve;
     /**
      * Cumulative intrinsic pitch curvature (radians) along the spine.
      * @type {number}
@@ -229,6 +179,29 @@ export class BranchLevelConfig {
      * @type {number}
      */
     tip_upcurl: number;
+    /**
+     * Plagiotropism [0, 1]: how dorsiventral this generator's shoots are. A plagiotropic shoot grows in the horizontal
+     * plane and bears its buds in it: its spine is pulled towards horizontal, its children's buds are fanned into the
+     * plane spanned by its tangent and the horizontal across it, and no bud is emitted into the downward cone of
+     * half-angle `plagiotropism * pi / 2`: a bud on its underside does not break, nor one that fanning or a turn for
+     * clearance would carry into the cone (contact with a neighbour can still deflect a child afterwards).
+     * Set it by the species' architectural model: the branches of Massart's model (fir, spruce) and Troll's (beech, lime,
+     * elm) are plagiotropic; those of Rauh's model (pine, maple, oak, birch) are orthotropic, built like the trunk, and
+     * take 0. Only lateral (non-trunk) shoots are plagiotropic; a vertical parent has no horizontal plane to fan its buds
+     * into.
+     *
+     * Models: Hallé, Oldeman & Tomlinson (1978), *Tropical Trees and Forests*. Species per model: Pfisterer (2000),
+     * *Mitt. Biol. Bundesanst. Land- Forstwirtsch.* 370; Millet, Bouchard & Édelin (1999), *Écoscience* 6: 187–203.
+     * @type {number}
+     */
+    plagiotropism: number;
+    /**
+     * Straightness [0, 1]: pull of the growing tip back towards the heading its bud left the parent with (for the fork
+     * that continues a split, the heading the split gave it), so a strongly gnarled branch still arrives near where it
+     * was aimed. It resists every deviation from that heading, droop and curl included.
+     * @type {number}
+     */
+    straightness: number;
     /**
      * Biomechanical reaction-wood cross-sectional ovalization on inclined boughs [0, 0.5].
      * @type {number}
@@ -240,39 +213,53 @@ export class BranchLevelConfig {
      */
     bark_displacement: number;
     /**
-     * Swelling collar boss amplitude on this parent stem around attached child branches.
+     * Swelling collar boss amplitude on this parent stem around attached child branches. The collar outlives a shed
+     * branch: it is the healed callus rim around the scar left where the branch grew (see `self_pruning`).
      * @type {number}
      */
     parent_collar_bulge: number;
     /**
-     * Number of healed pruned-branch callus knots, burls, or eye scars along this stem.
-     * @type {number}
+     * Excurrent (monopodial) stem habit: a single dominant plumb leader with tight lateral drift and no apical
+     * relaxation, as in conifers. Only meaningful on the trunk generator.
+     * @type {boolean}
+     */
+    excurrent: boolean;
+    /**
+     * Structural surface root: the branch creeps along the ground plane `y = 0`, sinking from fully exposed at
+     * the stem until it is buried about halfway out,
+     * adds no pipe-model area to its parent and is never given a wind joint. Its spawning rule should
+     * set `crown_envelope: false`.
+     * @type {boolean}
      */
-    knot_count: number;
+    root: boolean;
     /**
-     * Radial amplitude of callus knots and burls (fraction of local branch radius).
+     * Self-pruning [0, 1]: how readily this generator's branches are shed once the crown rises above them and they
+     * die in its shade. `1` = dead branches drop at the collar and are grown over, leaving no stub. Below that, a
+     * dead branch keeps `(1 - self_pruning) - age` of its length, `age` running from 0 just below the living
+     * branches to 1 at the stem's base; what no longer clears the bark has been grown over. Good self-pruners
+     * (birch, beech) sit near 1, poor ones that keep a skirt of dead branches (spruce) near 0.
      * @type {number}
      */
-    knot_strength: number;
+    self_pruning: number;
     /**
-     * @param {Partial<BranchLevelConfig>} [overrides]
+     * @param {Partial<BranchGeneratorConfig>} [overrides]
      * @returns {this}
      */
-    applyOverrides(overrides?: Partial<BranchLevelConfig>): this;
+    applyOverrides(overrides?: Partial<BranchGeneratorConfig>): this;
     /**
-     * @param {BranchLevelConfig} other
+     * @param {BranchGeneratorConfig} other
      * @returns {this}
      */
-    copy(other: BranchLevelConfig): this;
+    copy(other: BranchGeneratorConfig): this;
     /**
-     * @returns {BranchLevelConfig}
+     * @returns {BranchGeneratorConfig}
      */
-    clone(): BranchLevelConfig;
+    clone(): BranchGeneratorConfig;
     /**
-     * @param {BranchLevelConfig} other
+     * @param {BranchGeneratorConfig} other
      * @returns {boolean}
      */
-    equals(other: BranchLevelConfig): boolean;
+    equals(other: BranchGeneratorConfig): boolean;
     /**
      * @returns {number}
      */
@@ -281,8 +268,7 @@ export class BranchLevelConfig {
      * @readonly
      * @type {boolean}
      */
-    readonly isBranchLevelConfig: boolean;
+    readonly isBranchGeneratorConfig: boolean;
 }
 import { AnimationCurve } from "../../../engine/animation/curve/AnimationCurve.js";
-import { PhyllotaxisMode } from "./PhyllotaxisMode.js";
-//# sourceMappingURL=BranchLevelConfig.d.ts.map
+//# sourceMappingURL=BranchGeneratorConfig.d.ts.map

package/src/generation/foliage/config/BranchGeneratorConfig.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"BranchGeneratorConfig.d.ts","sourceRoot":"","sources":["../../../../../src/generation/foliage/config/BranchGeneratorConfig.js"],"names":[],"mappings":"AAMA;;;;GAIG;AACH;IAmRI;;;OAGG;IACH,sBAHW,QAAQ,qBAAqB,CAAC,GAC5B,qBAAqB,CAMjC;IA1RD;;;OAGG;IACH,UAFU,MAAM,CAEH;IAEb;;;OAGG;IACH,qBAFU,MAAM,CAES;IAEzB;;;OAGG;IACH,qBAFU,MAAM,CAEQ;IAExB;;;OAGG;IACH,QAFU,MAAM,CAEH;IAEb;;;OAGG;IACH,iBAFU,MAAM,CAEM;IAEtB;;;OAGG;IACH,cAFU,MAAM,CAEI;IAEpB;;;OAGG;IACH,OAFU,MAAM,CAEH;IAEb;;;OAGG;IACH,gBAFU,cAAc,CAE8B;IAEtD;;;OAGG;IACH,WAFU,MAAM,CAEC;IAEjB;;;OAGG;IACH,YAFU,MAAM,CAEC;IAEjB;;;OAGG;IACH,cAFU,MAAM,CAEG;IAEnB;;;OAGG;IACH,cAFU,MAAM,CAEI;IAEpB;;;OAGG;IACH,cAFU,MAAM,CAEI;IAEpB;;;OAGG;IACH,gBAFU,MAAM,CAEM;IAEtB;;;OAGG;IACH,iBAFU,MAAM,CAEO;IAEvB;;;OAGG;IACH,mBAFU,MAAM,CAEQ;IAExB;;;OAGG;IACH,aAFU,MAAM,CAEA;IAEhB;;;OAGG;IACH,aAFU,MAAM,CAEG;IAEnB;;;OAGG;IACH,iBAFU,MAAM,CAEM;IAEtB;;;OAGG;IACH,oBAFU,MAAM,CAEU;IAE1B;;;OAGG;IACH,aAFU,MAAM,CAEA;IAEhB;;;OAGG;IACH,iBAFU,MAAM,CAEM;IAEtB;;;OAGG;IACH,iBAFU,MAAM,CAEM;IAEtB;;;OAGG;IACH,iBAFU,MAAM,CAEI;IAEpB;;;OAGG;IACH,mBAFU,MAAM,CAEM;IAEtB;;;OAGG;IACH,qBAFU,MAAM,CAEW;IAE3B;;;OAGG;IACH,qBAFU,MAAM,CAEW;IAE3B;;;OAGG;IACH,qBAFU,MAAM,CAEW;IAE3B;;;OAGG;IACH,qBAFU,MAAM,CAEW;IAE3B;;;OAGG;IACH,YAFU,MAAM,CAEE;IAElB;;;OAGG;IACH,qBAFU,MAAM,CAEW;IAE3B;;;OAGG;IACH,kBAFU,MAAM,CAEQ;IAExB;;;OAGG;IACH,gBAFU,MAAM,CAEM;IAEtB;;;OAGG;IACH,YAFU,MAAM,CAEE;IAElB;;;;;;;;;;;;;;OAcG;IACH,eAFU,MAAM,CAEI;IAEpB;;;;;OAKG;IACH,cAFU,MAAM,CAEG;IAEnB;;;OAGG;IACH,mBAFU,MAAM,CAES;IAEzB;;;OAGG;IACH,mBAFU,MAAM,CAES;IAEzB;;;;OAIG;IACH,qBAFU,MAAM,CAEW;IAE3B;;;;OAIG;IACH,WAFU,OAAO,CAEC;IAElB;;;;;;OAMG;IACH,MAFU,OAAO,CAEJ;IAEb;;;;;;;OAOG;IACH,cAFU,MAAM,CAEG;IAYnB;;;OAGG;IACH,2BAHW,QAAQ,qBAAqB,CAAC,GAC5B,IAAI,CAoDhB;IAED;;;OAGG;IACH,YAHW,qBAAqB,GACnB,IAAI,CA+ChB;IAED;;OAEG;IACH,SAFa,qBAAqB,CAMjC;IAED;;;OAGG;IACH,cAHW,qBAAqB,GACnB,OAAO,CA+CnB;IAED;;OAEG;IACH,QAFa,MAAM,CAqBlB;IAGL;;;OAGG;IACH,kCAFU,OAAO,CAEsC;CANtD;+BAle8B,mDAAmD"}

package/src/generation/foliage/config/{BranchLevelConfig.js → BranchGeneratorConfig.js}

@@ -1,20 +1,15 @@
 import { assert } from "../../../core/assert.js";
+import { clamp } from "../../../core/math/clamp.js";
 import { hash_mix2 } from "../../../core/math/hash/hash_mix2.js";
 import { computeHashFloat } from "../../../core/primitives/numbers/computeHashFloat.js";
 import { AnimationCurve } from "../../../engine/animation/curve/AnimationCurve.js";
-import { PhyllotaxisMode } from "./PhyllotaxisMode.js";
 
 /**
- * Configuration for one recursion level of branch generation (0 = Trunk, 1 = Primary Boughs,
- * 2 = Secondary Branches, 3 = Twigs).
+ * One branch generator of a tree: how a branch it grows is shaped (spine, taper, tropisms, bark relief,
+ * collar, splitting). Where and how many of its branches attach to a parent is described by the
+ * `BranchSpawnRule`s that target it, see `TreeSpeciesConfig.branch_rules`.
  */
-export class BranchLevelConfig {
-    /**
-     * Recursion level index (0 = trunk).
-     * @type {number}
-     */
-    level = 0;
-
+export class BranchGeneratorConfig {
     /**
      * Number of longitudinal Cubic Hermite segments along the spine.
      * @type {number}
@@ -34,7 +29,7 @@ export class BranchLevelConfig {
     radial_segments_min = 4;
 
     /**
-     * Nominal length (for level 0 in meters; for level > 0 as ratio of parent length or meters).
+     * Nominal length in meters (scaled per child by the spawning rule's `length_profile`).
      * @type {number}
      */
     length = 8.0;
@@ -45,12 +40,6 @@ export class BranchLevelConfig {
      */
     length_variance = 0.1;
 
-    /**
-     * 1D Hermite curve scaling child length along parent normalized position t in [0, 1].
-     * @type {AnimationCurve}
-     */
-    length_profile = AnimationCurve.constant(0, 1, 1);
-
     /**
      * Base radius as a fraction of branch length.
      * @type {number}
@@ -69,55 +58,6 @@ export class BranchLevelConfig {
      */
     radius_profile = AnimationCurve.linear(0, 1, 1, 0.15);
 
-    /**
-     * Fraction [0, 0.95] at the base of this branch where no child branches spawn.
-     * @type {number}
-     */
-    bare_length_ratio = 0.25;
-
-    /**
-     * Number of lateral child branch nodes spawned by a branch at this level into (level + 1).
-     * @type {number}
-     */
-    child_count = 10;
-
-    /**
-     * Phyllotactic arrangement for children spawned along this branch.
-     * @type {PhyllotaxisMode|number}
-     */
-    phyllotaxis_mode = PhyllotaxisMode.SpiralGolden;
-
-    /**
-     * Number of branches per whorl when `phyllotaxis_mode === PhyllotaxisMode.Whorled`.
-     * @type {number}
-     */
-    whorl_count = 3;
-
-    /**
-     * Random azimuthal jitter in radians.
-     * @type {number}
-     */
-    azimuth_jitter = 0.15;
-
-    /**
-     * Axillary insertion (polar divergence) angle in radians from parent tangent.
-     * @type {number}
-     */
-    insertion_angle = 0.72;
-
-    /**
-     * Random variation in insertion angle (radians).
-     * @type {number}
-     */
-    insertion_angle_variation = 0.12;
-
-    /**
-     * 1D Hermite curve scaling insertion angle along parent normalized position t in [0, 1].
-     * Typically wider at bottom of crown (1.0) and steeper near apex (0.6).
-     * @type {AnimationCurve}
-     */
-    insertion_angle_profile = AnimationCurve.linear(0, 1.0, 1, 0.65);
-
     /**
      * Cumulative intrinsic pitch curvature (radians) along the spine.
      * @type {number}
@@ -274,6 +214,31 @@ export class BranchLevelConfig {
      */
     tip_upcurl = 0.18;
 
+    /**
+     * Plagiotropism [0, 1]: how dorsiventral this generator's shoots are. A plagiotropic shoot grows in the horizontal
+     * plane and bears its buds in it: its spine is pulled towards horizontal, its children's buds are fanned into the
+     * plane spanned by its tangent and the horizontal across it, and no bud is emitted into the downward cone of
+     * half-angle `plagiotropism * pi / 2`: a bud on its underside does not break, nor one that fanning or a turn for
+     * clearance would carry into the cone (contact with a neighbour can still deflect a child afterwards).
+     * Set it by the species' architectural model: the branches of Massart's model (fir, spruce) and Troll's (beech, lime,
+     * elm) are plagiotropic; those of Rauh's model (pine, maple, oak, birch) are orthotropic, built like the trunk, and
+     * take 0. Only lateral (non-trunk) shoots are plagiotropic; a vertical parent has no horizontal plane to fan its buds
+     * into.
+     *
+     * Models: Hallé, Oldeman & Tomlinson (1978), *Tropical Trees and Forests*. Species per model: Pfisterer (2000),
+     * *Mitt. Biol. Bundesanst. Land- Forstwirtsch.* 370; Millet, Bouchard & Édelin (1999), *Écoscience* 6: 187–203.
+     * @type {number}
+     */
+    plagiotropism = 0.0;
+
+    /**
+     * Straightness [0, 1]: pull of the growing tip back towards the heading its bud left the parent with (for the fork
+     * that continues a split, the heading the split gave it), so a strongly gnarled branch still arrives near where it
+     * was aimed. It resists every deviation from that heading, droop and curl included.
+     * @type {number}
+     */
+    straightness = 0.0;
+
     /**
      * Biomechanical reaction-wood cross-sectional ovalization on inclined boughs [0, 0.5].
      * @type {number}
@@ -287,42 +252,56 @@ export class BranchLevelConfig {
     bark_displacement = 0.08;
 
     /**
-     * Swelling collar boss amplitude on this parent stem around attached child branches.
+     * Swelling collar boss amplitude on this parent stem around attached child branches. The collar outlives a shed
+     * branch: it is the healed callus rim around the scar left where the branch grew (see `self_pruning`).
      * @type {number}
      */
     parent_collar_bulge = 0.28;
 
     /**
-     * Number of healed pruned-branch callus knots, burls, or eye scars along this stem.
-     * @type {number}
+     * Excurrent (monopodial) stem habit: a single dominant plumb leader with tight lateral drift and no apical
+     * relaxation, as in conifers. Only meaningful on the trunk generator.
+     * @type {boolean}
+     */
+    excurrent = false;
+
+    /**
+     * Structural surface root: the branch creeps along the ground plane `y = 0`, sinking from fully exposed at
+     * the stem until it is buried about halfway out,
+     * adds no pipe-model area to its parent and is never given a wind joint. Its spawning rule should
+     * set `crown_envelope: false`.
+     * @type {boolean}
      */
-    knot_count = 4;
+    root = false;
 
     /**
-     * Radial amplitude of callus knots and burls (fraction of local branch radius).
+     * Self-pruning [0, 1]: how readily this generator's branches are shed once the crown rises above them and they
+     * die in its shade. `1` = dead branches drop at the collar and are grown over, leaving no stub. Below that, a
+     * dead branch keeps `(1 - self_pruning) - age` of its length, `age` running from 0 just below the living
+     * branches to 1 at the stem's base; what no longer clears the bark has been grown over. Good self-pruners
+     * (birch, beech) sit near 1, poor ones that keep a skirt of dead branches (spruce) near 0.
      * @type {number}
      */
-    knot_strength = 0.16;
+    self_pruning = 1.0;
 
     /**
-     * @param {Partial<BranchLevelConfig>} [options]
-     * @returns {BranchLevelConfig}
+     * @param {Partial<BranchGeneratorConfig>} [options]
+     * @returns {BranchGeneratorConfig}
      */
     static from(options = {}) {
-        const r = new BranchLevelConfig();
+        const r = new BranchGeneratorConfig();
         r.applyOverrides(options);
         return r;
     }
 
     /**
-     * @param {Partial<BranchLevelConfig>} [overrides]
+     * @param {Partial<BranchGeneratorConfig>} [overrides]
      * @returns {this}
      */
     applyOverrides(overrides = {}) {
         if (overrides === null || overrides === undefined) {
             return this;
         }
-        if (overrides.level !== undefined) this.level = overrides.level;
         if (overrides.segments !== undefined) this.segments = Math.max(1, overrides.segments | 0);
         if (overrides.radial_segments_max !== undefined) this.radial_segments_max = Math.max(3, overrides.radial_segments_max | 0);
         if (overrides.radial_segments_min !== undefined) this.radial_segments_min = Math.max(3, overrides.radial_segments_min | 0);
@@ -331,18 +310,9 @@ export class BranchLevelConfig {
         }
         if (overrides.length !== undefined) this.length = overrides.length;
         if (overrides.length_variance !== undefined) this.length_variance = overrides.length_variance;
-        if (overrides.length_profile !== undefined) this.length_profile.copy(overrides.length_profile);
         if (overrides.radius_ratio !== undefined) this.radius_ratio = overrides.radius_ratio;
         if (overrides.taper !== undefined) this.taper = overrides.taper;
         if (overrides.radius_profile !== undefined) this.radius_profile.copy(overrides.radius_profile);
-        if (overrides.bare_length_ratio !== undefined) this.bare_length_ratio = overrides.bare_length_ratio;
-        if (overrides.child_count !== undefined) this.child_count = Math.max(0, overrides.child_count | 0);
-        if (overrides.phyllotaxis_mode !== undefined) this.phyllotaxis_mode = overrides.phyllotaxis_mode;
-        if (overrides.whorl_count !== undefined) this.whorl_count = Math.max(1, overrides.whorl_count | 0);
-        if (overrides.azimuth_jitter !== undefined) this.azimuth_jitter = overrides.azimuth_jitter;
-        if (overrides.insertion_angle !== undefined) this.insertion_angle = overrides.insertion_angle;
-        if (overrides.insertion_angle_variation !== undefined) this.insertion_angle_variation = overrides.insertion_angle_variation;
-        if (overrides.insertion_angle_profile !== undefined) this.insertion_angle_profile.copy(overrides.insertion_angle_profile);
         if (overrides.curvature !== undefined) this.curvature = overrides.curvature;
         if (overrides.curve_back !== undefined) this.curve_back = overrides.curve_back;
         if (overrides.spiral_twist !== undefined) this.spiral_twist = overrides.spiral_twist;
@@ -369,38 +339,31 @@ export class BranchLevelConfig {
         if (overrides.internode_zigzag !== undefined) this.internode_zigzag = overrides.internode_zigzag;
         if (overrides.kink_sharpness !== undefined) this.kink_sharpness = overrides.kink_sharpness;
         if (overrides.tip_upcurl !== undefined) this.tip_upcurl = overrides.tip_upcurl;
+        if (overrides.plagiotropism !== undefined) this.plagiotropism = clamp(overrides.plagiotropism, 0.0, 1.0);
+        if (overrides.straightness !== undefined) this.straightness = clamp(overrides.straightness, 0.0, 1.0);
         if (overrides.oval_eccentricity !== undefined) this.oval_eccentricity = overrides.oval_eccentricity;
         if (overrides.bark_displacement !== undefined) this.bark_displacement = overrides.bark_displacement;
         if (overrides.parent_collar_bulge !== undefined) this.parent_collar_bulge = overrides.parent_collar_bulge;
-        if (overrides.knot_count !== undefined) this.knot_count = Math.max(0, overrides.knot_count | 0);
-        if (overrides.knot_strength !== undefined) this.knot_strength = overrides.knot_strength;
+        if (overrides.excurrent !== undefined) this.excurrent = Boolean(overrides.excurrent);
+        if (overrides.root !== undefined) this.root = Boolean(overrides.root);
+        if (overrides.self_pruning !== undefined) this.self_pruning = clamp(overrides.self_pruning, 0.0, 1.0);
         return this;
     }
 
     /**
-     * @param {BranchLevelConfig} other
+     * @param {BranchGeneratorConfig} other
      * @returns {this}
      */
     copy(other) {
         assert.defined(other, 'other');
-        this.level = other.level;
         this.segments = other.segments;
         this.radial_segments_max = other.radial_segments_max;
         this.radial_segments_min = other.radial_segments_min;
         this.length = other.length;
         this.length_variance = other.length_variance;
-        this.length_profile.copy(other.length_profile);
         this.radius_ratio = other.radius_ratio;
         this.taper = other.taper;
         this.radius_profile.copy(other.radius_profile);
-        this.bare_length_ratio = other.bare_length_ratio;
-        this.child_count = other.child_count;
-        this.phyllotaxis_mode = other.phyllotaxis_mode;
-        this.whorl_count = other.whorl_count;
-        this.azimuth_jitter = other.azimuth_jitter;
-        this.insertion_angle = other.insertion_angle;
-        this.insertion_angle_variation = other.insertion_angle_variation;
-        this.insertion_angle_profile.copy(other.insertion_angle_profile);
         this.curvature = other.curvature;
         this.curve_back = other.curve_back;
         this.spiral_twist = other.spiral_twist;
@@ -427,48 +390,41 @@ export class BranchLevelConfig {
         this.internode_zigzag = other.internode_zigzag;
         this.kink_sharpness = other.kink_sharpness;
         this.tip_upcurl = other.tip_upcurl;
+        this.plagiotropism = other.plagiotropism;
+        this.straightness = other.straightness;
         this.oval_eccentricity = other.oval_eccentricity;
         this.bark_displacement = other.bark_displacement;
         this.parent_collar_bulge = other.parent_collar_bulge;
-        this.knot_count = other.knot_count;
-        this.knot_strength = other.knot_strength;
+        this.excurrent = other.excurrent;
+        this.root = other.root;
+        this.self_pruning = other.self_pruning;
         return this;
     }
 
     /**
-     * @returns {BranchLevelConfig}
+     * @returns {BranchGeneratorConfig}
      */
     clone() {
-        const r = new BranchLevelConfig();
+        const r = new BranchGeneratorConfig();
         r.copy(this);
         return r;
     }
 
     /**
-     * @param {BranchLevelConfig} other
+     * @param {BranchGeneratorConfig} other
      * @returns {boolean}
      */
     equals(other) {
         if (this === other) return true;
-        if (!other || !other.isBranchLevelConfig) return false;
-        return this.level === other.level
-            && this.segments === other.segments
+        if (!other || !other.isBranchGeneratorConfig) return false;
+        return this.segments === other.segments
             && this.radial_segments_max === other.radial_segments_max
             && this.radial_segments_min === other.radial_segments_min
             && this.length === other.length
             && this.length_variance === other.length_variance
-            && this.length_profile.equals(other.length_profile)
             && this.radius_ratio === other.radius_ratio
             && this.taper === other.taper
             && this.radius_profile.equals(other.radius_profile)
-            && this.bare_length_ratio === other.bare_length_ratio
-            && this.child_count === other.child_count
-            && this.phyllotaxis_mode === other.phyllotaxis_mode
-            && this.whorl_count === other.whorl_count
-            && this.azimuth_jitter === other.azimuth_jitter
-            && this.insertion_angle === other.insertion_angle
-            && this.insertion_angle_variation === other.insertion_angle_variation
-            && this.insertion_angle_profile.equals(other.insertion_angle_profile)
             && this.curvature === other.curvature
             && this.curve_back === other.curve_back
             && this.spiral_twist === other.spiral_twist
@@ -495,26 +451,25 @@ export class BranchLevelConfig {
             && this.internode_zigzag === other.internode_zigzag
             && this.kink_sharpness === other.kink_sharpness
             && this.tip_upcurl === other.tip_upcurl
+            && this.plagiotropism === other.plagiotropism
+            && this.straightness === other.straightness
             && this.oval_eccentricity === other.oval_eccentricity
             && this.bark_displacement === other.bark_displacement
             && this.parent_collar_bulge === other.parent_collar_bulge
-            && this.knot_count === other.knot_count
-            && this.knot_strength === other.knot_strength;
+            && this.excurrent === other.excurrent
+            && this.root === other.root
+            && this.self_pruning === other.self_pruning;
     }
 
     /**
      * @returns {number}
      */
     hash() {
-        let h = hash_mix2(this.level, this.segments);
-        h = hash_mix2(h, this.radial_segments_max);
+        let h = hash_mix2(this.segments, this.radial_segments_max);
         h = hash_mix2(h, this.radial_segments_min);
         h = hash_mix2(h, computeHashFloat(this.length));
         h = hash_mix2(h, computeHashFloat(this.radius_ratio));
         h = hash_mix2(h, computeHashFloat(this.taper));
-        h = hash_mix2(h, this.child_count);
-        h = hash_mix2(h, this.phyllotaxis_mode);
-        h = hash_mix2(h, computeHashFloat(this.insertion_angle));
         h = hash_mix2(h, computeHashFloat(this.curvature));
         h = hash_mix2(h, computeHashFloat(this.gravitropism));
         h = hash_mix2(h, computeHashFloat(this.phototropism));
@@ -522,9 +477,11 @@ export class BranchLevelConfig {
         h = hash_mix2(h, computeHashFloat(this.nodal_kink_strength));
         h = hash_mix2(h, computeHashFloat(this.internode_zigzag));
         h = hash_mix2(h, computeHashFloat(this.bark_displacement));
-        h = hash_mix2(h, computeHashFloat(this.knot_strength));
-        h = hash_mix2(h, this.length_profile.hash());
         h = hash_mix2(h, this.radius_profile.hash());
+        h = hash_mix2(h, (this.excurrent ? 1 : 0) | (this.root ? 2 : 0));
+        h = hash_mix2(h, computeHashFloat(this.self_pruning));
+        h = hash_mix2(h, computeHashFloat(this.plagiotropism));
+        h = hash_mix2(h, computeHashFloat(this.straightness));
         return h;
     }
 }
@@ -533,4 +490,4 @@ export class BranchLevelConfig {
  * @readonly
  * @type {boolean}
  */
-BranchLevelConfig.prototype.isBranchLevelConfig = true;
+BranchGeneratorConfig.prototype.isBranchGeneratorConfig = true;