@woosh/meep-engine 3.57.0 → 3.58.0

package/src/generation/foliage/presets/make_tree_species_preset.js

@@ -14,7 +14,6 @@ import { LeafBaseShape } from "../config/LeafBaseShape.js";
 import { LeafLobation } from "../config/LeafLobation.js";
 import { ShootBudZone } from "../config/ShootBudZone.js";
 import { ShootSystemRule } from "../config/ShootSystemRule.js";
-import { shoot_expected_yield } from "../skeleton/shoot_demography.js";
 
 /**
  * Structural surface roots: thick, fast-tapering, they leave the trunk on its basal flare crests and creep along
@@ -26,8 +25,6 @@ function make_surface_roots(length) {
 	return BranchGeneratorConfig.from({
 		root: true,
 		segments: 3,
-		radial_segments_max: 9,
-		radial_segments_min: 4,
 		length: length,
 		length_variance: 0.3,
 		radius_ratio: 0.11,
@@ -82,8 +79,6 @@ function make_surface_roots_rule(target, flare_lobes) {
 function make_twig_generator(overrides) {
 	return BranchGeneratorConfig.from({
 		segments: 1,
-		radial_segments_max: 4,
-		radial_segments_min: 3,
 		length: 0.1,
 		radius_ratio: 0.03,
 		taper: 0.6,
@@ -102,8 +97,6 @@ function make_twig_generator(overrides) {
 function make_short_shoot_generator() {
 	return BranchGeneratorConfig.from({
 		segments: 1,
-		radial_segments_max: 3,
-		radial_segments_min: 3,
 		length: 0.01,
 		radius_ratio: 0.03,
 		taper: 0.8,
@@ -126,7 +119,7 @@ function make_short_shoot_generator() {
 function make_conifer_shoot_rule(source, target, overrides) {
 	return ShootSystemRule.from({
 		source,
-		target,
+		target: [target],
 		max_order: 6,
 		// a terminal follows the unit before it: 0.995, 0.913, 0.938, 0.999 of it by order [KK1991 Table 4]
 		terminal_length: [0],
@@ -159,8 +152,8 @@ function make_conifer_shoot_rule(source, target, overrides) {
 function make_conifer_leader_rule(target) {
 	return ShootSystemRule.from({
 		source: 0,
-		target,
-		mean_unit_length: 0.475,
+		target: [target],
+		mean_unit_length: [0.475],
 		max_unit_length: [0.475],
 		length_negative_binomial_p: [],
 		zones: []
@@ -184,7 +177,8 @@ export function make_tree_species_preset(preset = TreePreset.Oak, overrides = {}
 		case TreePreset.Pine: {
 			// Pinus follows Rauh's model (Pfisterer 2000): its branches are orthotropic, built like the trunk, so they carry no
 			// plagiotropism.
-			// The tiers come from one whorl of branches a year.
+			// Grown from the seed leader: one whorl of branches a year at the leader's tip, and every order below from the
+			// same shoot demography [KK1991]; the generator graph lays only the seed and the roots.
 			config.name = "pine";
 			config.preset = TreePreset.Pine;
 			config.crown.applyOverrides({
@@ -199,26 +193,17 @@ export function make_tree_species_preset(preset = TreePreset.Oak, overrides = {}
 				sky_phototropism_mix: 0.35
 			});
 			config.branches = [
+				// the stem: the generator graph lays its seed, one segment the first year's shoot long (below); the shoot
+				// simulation grows it on
 				BranchGeneratorConfig.from({
 					excurrent: true,
-					segments: 12,
-					radial_segments_max: 14,
-					radial_segments_min: 8,
-					length: 11.2,
-					length_variance: 0.05,
+					segments: 1,
+					length_variance: 0,
 					radius_ratio: 0.038,
-					taper: 0.88,
-					curvature: 0.16,
-					curve_back: -0.10,
-					spiral_twist: 0.22,
 					gravitropism: -0.06,
 					phototropism: 0.10,
-					gnarl_strength: 0.09,
-					gnarl_frequency: 0.32,
 					basal_lean: 0.015,
-					nodal_kink_strength: 0.18,
 					internode_zigzag: 0.04,
-					kink_sharpness: 0.48,
 					bark_displacement: 0.08,
 					parent_collar_bulge: 0.26,
 					split_probability: 0.0,
@@ -230,146 +215,76 @@ export function make_tree_species_preset(preset = TreePreset.Oak, overrides = {}
 					flute_frequency: 3,
 					collar_weld_rings: 0
 				}),
+				// the boughs: the stem's laterals, grown by the shoot simulation
 				BranchGeneratorConfig.from({
-					self_pruning: 0.55, // open-grown Scots pine holds dead lower branches for a while
-					segments: 7,
-					radial_segments_max: 7,
-					radial_segments_min: 4,
-					length: 3.8,
-					length_variance: 0.10,
-					radius_ratio: 0.035,
-					taper: 0.85,
-					curvature: 0.16,
-					curve_back: -0.12,
 					gravitropism: 0.22,
 					phototropism: 0.16,
-					gnarl_strength: 0.12,
-					nodal_kink_strength: 0.42,
 					internode_zigzag: 0.09,
-					kink_sharpness: 0.55,
-					tip_upcurl: 0.34,
 					oval_eccentricity: 0.16,
 					bark_displacement: 0.06,
 					collar_weld_rings: 2
-				}),
-				// Inter-whorl branches: short laterals spiralling along the internodes between whorls
-				BranchGeneratorConfig.from({
-					self_pruning: 0.55, // open-grown Scots pine holds dead lower branches for a while
-					segments: 5,
-					radial_segments_max: 5,
-					radial_segments_min: 3,
-					length: 1.9,
-					length_variance: 0.18,
-					radius_ratio: 0.034,
-					taper: 0.86,
-					curvature: 0.14,
-					curve_back: -0.10,
-					gravitropism: 0.26,
-					phototropism: 0.14,
-					gnarl_strength: 0.12,
-					nodal_kink_strength: 0.30,
-					internode_zigzag: 0.10,
-					kink_sharpness: 0.55,
-					tip_upcurl: 0.30,
-					oval_eccentricity: 0.12,
-					bark_displacement: 0.05,
-					collar_weld_rings: 1
-				}),
-				BranchGeneratorConfig.from({
-					segments: 5,
-					radial_segments_max: 5,
-					radial_segments_min: 3,
-					length: 1.4,
-					length_variance: 0.14,
-					radius_ratio: 0.032,
-					taper: 0.85,
-					curvature: 0.14,
-					gravitropism: 0.08,
-					phototropism: 0.24,
-					gnarl_strength: 0.12,
-					internode_zigzag: 0.12,
-					tip_upcurl: 0.32,
-					collar_weld_rings: 1
 				})
 			];
-			config.branch_rules = [
-				BranchSpawnRule.from({
-					source: 0,
-					target: 1,
-					count: 32,
-					attach_min: 0.24,
-					phyllotaxis_mode: PhyllotaxisMode.Whorled,
-					whorl_count: 4,
-					azimuth_jitter: 0.16,
-					insertion_angle: 1.34,
-					insertion_angle_variation: 0.08,
-					insertion_angle_profile: AnimationCurve.linear(0, 1.05, 1, 0.52),
-					length_profile: AnimationCurve.linear(0, 1.0, 1, 0.72),
-					parent_kink: 0.0
-				}),
-				BranchSpawnRule.from({
-					source: 0,
-					target: 2,
-					count: 14,
-					attach_min: 0.30,
-					phyllotaxis_mode: PhyllotaxisMode.SpiralGolden,
-					azimuth_jitter: 0.30,
-					insertion_angle: 1.22,
-					insertion_angle_variation: 0.12,
-					insertion_angle_profile: AnimationCurve.linear(0, 1.05, 1, 0.55),
-					length_profile: AnimationCurve.linear(0, 1.0, 1, 0.6),
-					parent_kink: 0.0
-				}),
-				// Whorl boughs and inter-whorl branches both carry the same twigs
-				BranchSpawnRule.from({
-					source: 1,
-					target: 3,
-					count: 7,
-					attach_min: 0.12,
-					phyllotaxis_mode: PhyllotaxisMode.AlternateDistichous,
-					azimuth_jitter: 0.14,
-					insertion_angle: 0.88,
-					insertion_angle_variation: 0.10,
-					length_profile: AnimationCurve.linear(0, 0.95, 1, 0.48)
-				}),
-				BranchSpawnRule.from({
-					source: 2,
-					target: 3,
-					count: 4,
-					attach_min: 0.15,
-					phyllotaxis_mode: PhyllotaxisMode.AlternateDistichous,
-					azimuth_jitter: 0.14,
-					insertion_angle: 0.88,
-					insertion_angle_variation: 0.10,
-					length_profile: AnimationCurve.linear(0, 0.8, 1, 0.45)
-				})
-			];
-			// 4: surface roots on the flare crests
+			// 2: surface roots on the flare crests
 			config.branches.push(make_surface_roots(1.8));
-			config.branch_rules.push(make_surface_roots_rule(4, config.branches[0].flare_lobes));
-			// 5: the twig system, grown year by year on the boughs, inter-whorl branches and twigs
+			config.branch_rules = [make_surface_roots_rule(2, config.branches[0].flare_lobes)];
+			// 3: the twigs
 			config.branches.push(make_twig_generator({ gravitropism: 0.08, phototropism: 0.24, tip_upcurl: 0.3 }));
-			// Shoots average 11.02 cm on the whorl branches, at most 47.5 cm [KK1991 Table 4, Eq. 6]; branching angles 61,
-			// 59, 65 degrees by the lateral's order 2-4 [KK1991 Fig. 2]
-			config.shoot_rules = [1, 2, 3].map(source => make_conifer_shoot_rule(source, 5, {
-				carrier_order: source === 3 ? 2 : 1,
-				mean_unit_length: 0.1102,
-				max_unit_length: [0.475],
-				insertion_angle: [1.065, 1.030, 1.134]
-			}));
-			config.shoot_rules.push(make_conifer_leader_rule(5));
+			// Every order from the stem out [KK1991], in the rule's numbering stem = 1 (KK1991's order 0). Pine is uninodal:
+			// a shoot's laterals grow from the whorl of buds under its terminal bud, k + c L of them with the terminal on a
+			// shoot L cm long: 3.990 + 0.022 L on the stem, then 0.992 + 0.161 L, 0.544 + 0.149 L, 0.861 + 0.041 L [KK1991
+			// Table 3, Fig. 1]. A lateral is 0.570, 0.458, 0.355, 0.475 of its parent shoot, a terminal 1.196, 0.995, 0.913,
+			// 0.938, 0.999 of the shoot before it, and shoots average 23.42, 11.02, 5.24, 2.68, 1.73 cm, by order 0-4 [KK1991
+			// Table 4]. Laterals leave the stem at 83 degrees and the higher orders at 61, 59, 65 [KK1991 Fig. 2]. A stem
+			// shoot 1.196 of the one before grows without bound, so KK1991 grow the stem by height instead (Eq. 6,
+			// ShootGrowthConfig.leader_unit), as the simulation does; a branch's shoots are at most the leader's 47.5 cm.
+			config.shoot_rules = [ShootSystemRule.from({
+				source: 0,
+				target: [1, 3],
+				carrier_order: 1,
+				max_order: 6,
+				terminal_length: [0],
+				terminal_length_slope: [1.196, 0.995, 0.913, 0.938, 0.999],
+				max_unit_length: [Infinity, 0.475],
+				length_negative_binomial_p: [],
+				mean_unit_length: [0.2342, 0.1102, 0.0524, 0.0268, 0.0173],
+				insertion_angle: [1.449, 1.065, 1.030, 1.134],
+				zones: [
+					ShootBudZone.from({
+						u_min: 0.92,
+						u_max: 0.99,
+						buds: [3.990 - 1, 0.992 - 1, 0.544 - 1, 0.861 - 1],
+						buds_per_metre: [2.2, 16.1, 14.9, 4.1],
+						long: [1],
+						length: [0],
+						length_slope: [0.570, 0.458, 0.355, 0.475]
+					})
+				]
+			})];
 			// Scots pine stops branching below a relative light of 0.20-0.25 [Ilonen et al. 1979, Silva Fennica 13: 319-321];
-			// Rb in full light is the example branch's 1.867 [Niinemets & Lukjanova 2003, New Phytol. 158: 75-89, Fig. 2];
-			// where it saturates is spruce's (below). A shoot's needles are bunched: its silhouette is 0.146 of its needle
-			// area against a random 0.25 [Smolander, Stenberg & Linder 1994, Tree Physiol. 14: 971-980]
-			// a Scots pine leader grows 47.5 cm a year once the tree is past 3.5-4.5 m [KK1991 Eq. 6, p. 111]
+			// KK1991's counts are of living shoots, so in full light none is shed (an example branch in a stand nets 1.867,
+			// Niinemets & Lukjanova 2003, New Phytol. 158: 75-89, Fig. 2); where light saturates is spruce's (below). A shoot's needles are bunched: its silhouette is 0.146 of its needle
+			// area against a random 0.25 [Smolander, Stenberg & Linder 1994, Tree Physiol. 14: 971-980].
+			// The leader grows 47.5 / (1 + a * 0.98434^H) cm a year at height H cm [KK1991 Eq. 6, after Flower-Ellis et al.
+			// 1976]: 0.98434^H is exp(-H / 63.36 cm). KK1991's a = 11.1569 is fitted to stand-grown trees of 1.1-7.4 m and
+			// takes 15 years to the first metre; a = 4.34 is fitted by least squares to the heights at age of eleven
+			// open-grown trees: 2.73 m at 8 years [Kuuluvainen et al. 1988, Silva Fennica 22: 89-104, Table 3] and ten of
+			// 3.7-11.4 m at 14-30 years [Sievänen, Nikinmaa & Perttunen 1997, Silva Fennica 31: 329-340, Table 2], RMS 1.3 m.
+			// The tree is 30 years old, 11.1 m tall by that curve: Sievänen's tree 13 was 11.4 m at 30.
 			config.shoot_growth.applyOverrides({
+				age: 30,
 				leader_growth: 0.475,
-				vigour: 1.867,
+				leader_onset: 4.34,
+				leader_height_scale: -0.01 / Math.log(0.98434),
+				// fitted so the crown of a 2.4-3.4 m tree is 0.62 of its height, as the open-grown trees of Kuuluvainen et al.
+				// (1988, Table 3) were: 0.60-0.63 over three seeds at 12 years
+				apical_control: 0.51,
 				compensation_light: 0.22,
 				saturation_light: 0.30,
 				leaf_clumping: 0.146 / 0.25
 			});
+			// the seed leader: the first year's shoot
+			config.branches[0].length = config.shoot_growth.leader_unit(0);
 			// Needles 52 mm long [Niinemets & Lukjanova 2003, Ann. For. Sci. 60: 195-208, Table I], in fascicles of two,
 			// 7.8 fascicles a cm [Salminen & Jalkanen 2006, Silva Fennica 40: 183-194, Table 3]; of a year's needles 1,
 			// 0.90, 0.69, 0.22 are alive at ages 1-4, none after [KK1991 p. 113]. A card is a stretch of shoot as long as a
@@ -382,7 +297,7 @@ export function make_tree_species_preset(preset = TreePreset.Oak, overrides = {}
 				phototropism: 0.45,
 				gravitropism: 0.12
 			});
-			config.foliage_rules = [0, 1, 2, 3, 5].map(source => FoliageSpawnRule.from({
+			config.foliage_rules = [0, 1, 3].map(source => FoliageSpawnRule.from({
 				source,
 				phyllotaxis_mode: PhyllotaxisMode.SpiralGolden
 			}));
@@ -440,8 +355,6 @@ export function make_tree_species_preset(preset = TreePreset.Oak, overrides = {}
 			config.branches = [
 				BranchGeneratorConfig.from({
 					segments: 12,
-					radial_segments_max: 14,
-					radial_segments_min: 8,
 					length: 11.5,
 					length_variance: 0.08,
 					radius_ratio: 0.032,
@@ -472,8 +385,6 @@ export function make_tree_species_preset(preset = TreePreset.Oak, overrides = {}
 				BranchGeneratorConfig.from({
 					self_pruning: 0.85, // birch sheds its shaded branches cleanly
 					segments: 8,
-					radial_segments_max: 7,
-					radial_segments_min: 4,
 					length: 3.6,
 					length_variance: 0.15,
 					radius_ratio: 0.034,
@@ -493,8 +404,6 @@ export function make_tree_species_preset(preset = TreePreset.Oak, overrides = {}
 				}),
 				BranchGeneratorConfig.from({
 					segments: 6,
-					radial_segments_max: 5,
-					radial_segments_min: 3,
 					length: 1.7,
 					length_variance: 0.18,
 					radius_ratio: 0.028,
@@ -546,22 +455,21 @@ export function make_tree_species_preset(preset = TreePreset.Oak, overrides = {}
 			//   for higher orders;
 			// - a short shoot grows under 3 mm a year and carries 2 leaves [M1982 I p. 205-209, L2011]; buds survive a year at
 			//   about 60% [JH1987 p. 26];
-			// - the bud population grows 1.52 a year in the top of the crown, 0.999 at its bottom [M1982 II Table 1]: the
-			//   vigour in full light, and a shoot that just replaces itself in the shade. Where in the light those are was
+			// - the bud population grows 1.52 a year in the top of the crown, 0.999 at its bottom [M1982 II Table 1]: a
+			//   check on the yield in full light, and a shoot that just replaces itself in the shade. Where in the light those are was
 			//   not measured: the compensation light is Scots pine's, another pioneer's, the saturation spruce's.
 			// a long shoot of the stem is 26.3 cm [L2011 Table A2, B20]: the leader's growth
 			config.shoot_growth.applyOverrides({
 				leader_growth: 0.263,
-				vigour: 1.52,
 				compensation_light: 0.22,
 				saturation_light: 0.30
 			});
 			config.shoot_rules = [1, 2].map(source => ShootSystemRule.from({
 				source,
-				target: 4,
+				target: [4],
 				short_target: 5,
 				max_order: 6,
-				mean_unit_length: 0.146,
+				mean_unit_length: [0.146],
 				terminal_length: [0.146, 0.075],
 				max_unit_length: [1.2],
 				length_negative_binomial_p: [],
@@ -666,8 +574,6 @@ export function make_tree_species_preset(preset = TreePreset.Oak, overrides = {}
 			config.branches = [
 				BranchGeneratorConfig.from({
 					segments: 11,
-					radial_segments_max: 13,
-					radial_segments_min: 7,
 					length: 7.5,
 					radius_ratio: 0.065,
 					taper: 0.75,
@@ -695,8 +601,6 @@ export function make_tree_species_preset(preset = TreePreset.Oak, overrides = {}
 				BranchGeneratorConfig.from({
 					self_pruning: 0.75, // willow wood is brittle: dead branches snap off early
 					segments: 8,
-					radial_segments_max: 8,
-					radial_segments_min: 4,
 					length: 4.8,
 					radius_ratio: 0.042,
 					taper: 0.84,
@@ -715,8 +619,6 @@ export function make_tree_species_preset(preset = TreePreset.Oak, overrides = {}
 				}),
 				BranchGeneratorConfig.from({
 					segments: 8,
-					radial_segments_max: 4,
-					radial_segments_min: 3,
 					length: 3.4,
 					radius_ratio: 0.02,
 					taper: 0.92,
@@ -758,7 +660,7 @@ export function make_tree_species_preset(preset = TreePreset.Oak, overrides = {}
 			// the higher orders keep their proleptic shares with 2% syllepsis. Annual shoots of mature Salix alba are 5-25
 			// cm, at 30-60 degrees [Héja 2007, Tilia 13: 77-94, p. 82]. Of a year's laterals 46% are still there in their
 			// fourth year [Remphrey & Pearn 2006 p. 1535]: with 69% of buds growing out, on the 5.7 nodes of a 15 cm unit, a
-			// shoot leaves 1 + 0.69 x 0.46 x 5.7 = 2.8 shoots, the vigour (young trees). No light response was found: the
+			// shoot leaves 1 + 0.69 x 0.46 x 5.7 = 2.8 shoots (young trees), a check on its yield in full light. No light response was found: the
 			// compensation light is Scots pine's (willows are as light-demanding), the saturation spruce's.
 			const willow_quarter = (u_min, u_max, sylleptic, long) => ShootBudZone.from({
 				u_min,
@@ -773,16 +675,15 @@ export function make_tree_species_preset(preset = TreePreset.Oak, overrides = {}
 			// tree's leader slower, 0.5 m chosen
 			config.shoot_growth.applyOverrides({
 				leader_growth: 0.5,
-				vigour: 1 + 0.69 * 0.46 * (0.15 * 42 / 1.104),
 				compensation_light: 0.22,
 				saturation_light: 0.30
 			});
 			// the boughs and the hanging branchlets both carry twigs
 			config.shoot_rules = [1, 2].map(source => ShootSystemRule.from({
 					source,
-					target: 4,
+					target: [4],
 					max_order: 6,
-					mean_unit_length: 0.15,
+					mean_unit_length: [0.15],
 					terminal_length: [0.15],
 					max_unit_length: [0.25],
 					length_negative_binomial_p: [],
@@ -883,7 +784,7 @@ export function make_tree_species_preset(preset = TreePreset.Oak, overrides = {}
 			// orders (the stem is 1): a bough is his 2nd order, a branch his 3rd:
 			// - a long shoot's top pairs grow long shoots, its middle pairs short ones [W1966 p. 3, Fig. 1]: net, 1.8, 1.5,
 			//   0.1, 0.03 long and 4 short laterals a year from orders 1-4 [W1966 p. 10, Table 2]. These are net counts, so
-			//   nothing is shed past them in light: the vigour, 2.8, is above every order's yield. Red maple bears shade, so
+			//   nothing is shed past them in full light. Red maple bears shade, so
 			//   its compensation light is spruce's, as is its saturation; neither was measured for maple;
 			// - long shoots grow 8.8, 4.5, 3.6, 3.4, 2.7 cm a year at orders 2-6 [W1966 p. 6], the leader about 30 cm
 			//   [W1966 p. 6], at most 54 cm [C1971 p. 242];
@@ -893,18 +794,17 @@ export function make_tree_species_preset(preset = TreePreset.Oak, overrides = {}
 			// the leader grows about 30 cm a year for 40 years [W1966 p. 6]
 			config.shoot_growth.applyOverrides({
 				leader_growth: 0.30,
-				vigour: 2.8,
 				compensation_light: 0.16,
 				saturation_light: 0.30
 			});
 			config.shoot_rules = [1, 2].map(source => ShootSystemRule.from({
 				source,
-				target: 4,
+				target: [4],
 				short_target: 5,
 				max_order: 7,
 				carrier_order: source + 1,
 				terminal_length: MAPLE_TERMINAL_LENGTH,
-				mean_unit_length: MAPLE_TERMINAL_LENGTH[source],
+				mean_unit_length: [MAPLE_TERMINAL_LENGTH[source]],
 				max_unit_length: [0.54],
 				length_negative_binomial_p: [],
 				zones: [
@@ -1005,8 +905,6 @@ export function make_tree_species_preset(preset = TreePreset.Oak, overrides = {}
 				BranchGeneratorConfig.from({
 					excurrent: true,
 					segments: 10,
-					radial_segments_max: 10,
-					radial_segments_min: 4,
 					length: 11.8,
 					radius_ratio: 0.036,
 					taper: 0.92,
@@ -1021,8 +919,6 @@ export function make_tree_species_preset(preset = TreePreset.Oak, overrides = {}
 				BranchGeneratorConfig.from({
 					self_pruning: 0.2, // Norway spruce keeps a skirt of dead branches for decades
 					segments: 5,
-					radial_segments_max: 6,
-					radial_segments_min: 3,
 					length: 3.6,
 					radius_ratio: 0.032,
 					taper: 0.86,
@@ -1037,8 +933,6 @@ export function make_tree_species_preset(preset = TreePreset.Oak, overrides = {}
 				BranchGeneratorConfig.from({
 					self_pruning: 0.2, // Norway spruce keeps a skirt of dead branches for decades
 					segments: 4,
-					radial_segments_max: 5,
-					radial_segments_min: 3,
 					length: 1.7,
 					length_variance: 0.18,
 					radius_ratio: 0.031,
@@ -1052,8 +946,6 @@ export function make_tree_species_preset(preset = TreePreset.Oak, overrides = {}
 				}),
 				BranchGeneratorConfig.from({
 					segments: 3,
-					radial_segments_max: 4,
-					radial_segments_min: 3,
 					length: 1.1,
 					radius_ratio: 0.03,
 					taper: 0.85,
@@ -1123,14 +1015,13 @@ export function make_tree_species_preset(preset = TreePreset.Oak, overrides = {}
 			// no spruce leader growth was found: Scots pine's [KK1991 Eq. 6]
 			config.shoot_growth.applyOverrides({
 				leader_growth: 0.475,
-				vigour: 2.19,
 				compensation_light: 0.16,
 				saturation_light: 0.30,
 				leaf_clumping: 0.164 / 0.25
 			});
 			config.shoot_rules = [1, 2, 3].map(source => make_conifer_shoot_rule(source, 5, {
 				carrier_order: source === 3 ? 2 : 1,
-				mean_unit_length: 0.048,
+				mean_unit_length: [0.048],
 				max_unit_length: [0.113],
 				insertion_angle: [0.96],
 				zones: [
@@ -1205,8 +1096,6 @@ export function make_tree_species_preset(preset = TreePreset.Oak, overrides = {}
 			config.branches = [
 				BranchGeneratorConfig.from({
 					segments: 10,
-					radial_segments_max: 10,
-					radial_segments_min: 7,
 					length: 9.5,
 					radius_ratio: 0.038,
 					taper: 0.35,
@@ -1222,8 +1111,6 @@ export function make_tree_species_preset(preset = TreePreset.Oak, overrides = {}
 				}),
 				BranchGeneratorConfig.from({
 					segments: 5,
-					radial_segments_max: 5,
-					radial_segments_min: 3,
 					length: 2.8,
 					radius_ratio: 0.025,
 					taper: 0.9,
@@ -1307,8 +1194,6 @@ export function make_tree_species_preset(preset = TreePreset.Oak, overrides = {}
 			config.branches = [
 				BranchGeneratorConfig.from({
 					segments: 5,
-					radial_segments_max: 7,
-					radial_segments_min: 4,
 					length: 1.8,
 					radius_ratio: 0.055,
 					taper: 0.8,
@@ -1323,8 +1208,6 @@ export function make_tree_species_preset(preset = TreePreset.Oak, overrides = {}
 				}),
 				BranchGeneratorConfig.from({
 					segments: 4,
-					radial_segments_max: 5,
-					radial_segments_min: 3,
 					length: 1.2,
 					radius_ratio: 0.04,
 					taper: 0.85,
@@ -1352,8 +1235,7 @@ export function make_tree_species_preset(preset = TreePreset.Oak, overrides = {}
 			// vegetative, 46% mixed); its shoot is 6.84 cm distally to 0.58 cm proximally; 8 nodes on a 10-25 cm shoot. The
 			// apical bud dies: growth is sympodial. Shoot length is chosen; hazel grows in woodland shade, so its
 			// compensation light is spruce's, as is its saturation. No net shoot yield was found for hazel: in full light a
-			// shoot keeps every shoot its buds grow, the gross yield Grisafi et al. measured on orchard trees in full sun,
-			// so only shade sheds them (Alex's pick, 2026-10-26).
+			// shoot keeps every shoot its buds grow, the gross yield Grisafi et al. measured on orchard trees in full sun.
 			const hazel_third = (u_min, u_max, burst, length) => ShootBudZone.from({
 				u_min,
 				u_max,
@@ -1365,9 +1247,9 @@ export function make_tree_species_preset(preset = TreePreset.Oak, overrides = {}
 			// the stems and their branches both carry twigs
 			config.shoot_rules = [0, 1].map(source => ShootSystemRule.from({
 					source,
-					target: 2,
+					target: [2],
 					max_order: 5,
-					mean_unit_length: 0.175,
+					mean_unit_length: [0.175],
 					terminal_length: [0.175],
 					max_unit_length: [0.7],
 					length_negative_binomial_p: [],
@@ -1381,7 +1263,6 @@ export function make_tree_species_preset(preset = TreePreset.Oak, overrides = {}
 			// a hazel stem soon stops gaining height; 0.1 m a year is chosen, so the stool's stems are about 18 years old
 			config.shoot_growth.applyOverrides({
 				leader_growth: 0.1,
-				vigour: shoot_expected_yield(config.shoot_rules[0]),
 				compensation_light: 0.16,
 				saturation_light: 0.30
 			});
@@ -1436,8 +1317,6 @@ export function make_tree_species_preset(preset = TreePreset.Oak, overrides = {}
 			config.branches = [
 				BranchGeneratorConfig.from({
 					segments: 3,
-					radial_segments_max: 6,
-					radial_segments_min: 4,
 					length: 0.35,
 					radius_ratio: 0.18,
 					taper: 0.6,
@@ -1446,8 +1325,6 @@ export function make_tree_species_preset(preset = TreePreset.Oak, overrides = {}
 				}),
 				BranchGeneratorConfig.from({
 					segments: 5,
-					radial_segments_max: 4,
-					radial_segments_min: 3,
 					length: 1.15,
 					radius_ratio: 0.025,
 					taper: 0.92,
@@ -1520,8 +1397,6 @@ export function make_tree_species_preset(preset = TreePreset.Oak, overrides = {}
 				// 4: epicormic water sprouts on the bole and boughs
 				BranchGeneratorConfig.from({
 					segments: 4,
-					radial_segments_max: 4,
-					radial_segments_min: 3,
 					length: 1.6,
 					length_variance: 0.3,
 					radius_ratio: 0.03,
@@ -1537,8 +1412,6 @@ export function make_tree_species_preset(preset = TreePreset.Oak, overrides = {}
 				// 5: the peripheral twig system, grown year by year on the boughs, branches and sprouts (shoot_rules)
 				BranchGeneratorConfig.from({
 					segments: 1,
-					radial_segments_max: 4,
-					radial_segments_min: 3,
 					length: 0.1,
 					radius_ratio: 0.03,
 					taper: 0.6,
@@ -1550,19 +1423,18 @@ export function make_tree_species_preset(preset = TreePreset.Oak, overrides = {}
 			);
 			// Oak's twigs and leaves from the shoot demography of mature oak crowns (Buck-Sorlin & Bell 2000, Forestry
 			// 73(1): 1-19; 1998, Bot. J. Linn. Soc. 127: 371-391): ShootSystemRule's defaults, on every peripheral axis.
-			// No light response was found for oak: the vigour is chosen, the compensation light is Scots pine's (oak is as
+			// No light response was found for oak: the compensation light is Scots pine's (oak is as
 			// light-demanding), the saturation spruce's.
 			// no oak leader growth was found: 0.3 m a year is chosen
 			config.shoot_growth.applyOverrides({
 				leader_growth: 0.3,
-				vigour: 1.3,
 				compensation_light: 0.22,
 				saturation_light: 0.30
 			});
 			config.shoot_rules = [
-				ShootSystemRule.from({ source: 1, target: 5 }),
-				ShootSystemRule.from({ source: 2, target: 5 }),
-				ShootSystemRule.from({ source: 4, target: 5 })
+				ShootSystemRule.from({ source: 1, target: [5] }),
+				ShootSystemRule.from({ source: 2, target: [5] }),
+				ShootSystemRule.from({ source: 4, target: [5] })
 			];
 			config.branch_rules.push(
 				make_surface_roots_rule(3, config.branches[0].flare_lobes),

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

@@ -20,16 +20,19 @@ export class ShootFrameworkHash {
     query: number;
     /**
      * Whether the capsule from `a` to `b` of radius `radius` runs into a framework segment, other than those of
-     * `exempt_branch` within one segment of `exempt_edge` (the junction it grows from). Radii are the skeleton's now.
+     * `exempt_branch` within one segment of `exempt_edge` (the junction it grows from), and those of `exempt_family`
+     * and the framework branches it carries: a branch's own extension grows on from its tip and joins what grows on
+     * it. Radii are the skeleton's now.
      *
      * @param {ArrayLike<number>} a
      * @param {ArrayLike<number>} b
      * @param {number} radius
      * @param {number} exempt_branch
      * @param {number} exempt_edge
+     * @param {number} [exempt_family] -1 for none
      * @returns {boolean}
      */
-    hits(a: ArrayLike<number>, b: ArrayLike<number>, radius: number, exempt_branch: number, exempt_edge: number): boolean;
+    hits(a: ArrayLike<number>, b: ArrayLike<number>, radius: number, exempt_branch: number, exempt_edge: number, exempt_family?: number): boolean;
     #private;
 }
 //# sourceMappingURL=ShootFrameworkHash.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"ShootFrameworkHash.d.ts","sourceRoot":"","sources":["../../../../../src/generation/foliage/skeleton/ShootFrameworkHash.js"],"names":[],"mappings":"AAwBA;;;GAGG;AACH;IAII;;;OAGG;IACH,sBAHW,OAAO,mBAAmB,EAAE,YAAY,kBACxC,MAAM,EAmBhB;IAxBD,oCAAoC;IACpC,OADW,IAAI,MAAM,EAAE,MAAM,EAAE,CAAC,CACd;IAOd,mDAAwB;IACxB,sBAAkC;IAClC;;;OAGG;IACH,MAFU,UAAU,CAEqB;IACzC,cAAc;IAkElB;;;;;;;;;;OAUG;IACH,QAPW,UAAU,MAAM,CAAC,KACjB,UAAU,MAAM,CAAC,UACjB,MAAM,iBACN,MAAM,eACN,MAAM,GACJ,OAAO,CAQnB;;CACJ"}
+{"version":3,"file":"ShootFrameworkHash.d.ts","sourceRoot":"","sources":["../../../../../src/generation/foliage/skeleton/ShootFrameworkHash.js"],"names":[],"mappings":"AAwBA;;;GAGG;AACH;IAII;;;OAGG;IACH,sBAHW,OAAO,mBAAmB,EAAE,YAAY,kBACxC,MAAM,EAmBhB;IAxBD,oCAAoC;IACpC,OADW,IAAI,MAAM,EAAE,MAAM,EAAE,CAAC,CACd;IAOd,mDAAwB;IACxB,sBAAkC;IAClC;;;OAGG;IACH,MAFU,UAAU,CAEqB;IACzC,cAAc;IAoElB;;;;;;;;;;;;;OAaG;IACH,QARW,UAAU,MAAM,CAAC,KACjB,UAAU,MAAM,CAAC,UACjB,MAAM,iBACN,MAAM,eACN,MAAM,kBACN,MAAM,GACJ,OAAO,CAQnB;;CACJ"}