feat: add juvenile tree variants (35% small trees), taller trunks

Author: lanmower

client/VegetationSystem.js

@@ -6,11 +6,11 @@ import { createTerrainField } from '/src/terrain/TerrainField.js'
 import { generateContinent, CONTINENT_PRESETS } from '/src/terrain/ContinentGen.js'
 
 const TREE_CONFIG = {
-  oak:    { type: TreeType.Deciduous, bark: BarkType.Oak,    leaf: LeafType.Oak,   trunkLen: 16, levels: 3, leafCount: 28, leafSize: 2.2, scale: 0.8 },
-  pine:   { type: TreeType.Evergreen, bark: BarkType.Pine,   leaf: LeafType.Pine,  trunkLen: 20, levels: 3, leafCount: 42, leafSize: 1.6, scale: 0.9 },
-  fir:    { type: TreeType.Evergreen, bark: BarkType.Pine,   leaf: LeafType.Pine,  trunkLen: 22, levels: 3, leafCount: 48, leafSize: 1.4, scale: 1.0 },
-  willow: { type: TreeType.Deciduous, bark: BarkType.Willow, leaf: LeafType.Aspen, trunkLen: 12, levels: 4, leafCount: 34, leafSize: 1.8, scale: 0.7 },
-  palm:   { type: TreeType.Deciduous, bark: BarkType.Birch,  leaf: LeafType.Ash,   trunkLen: 18, levels: 2, leafCount: 26, leafSize: 2.4, scale: 0.8 }
+  oak:    { type: TreeType.Deciduous, bark: BarkType.Oak,    leaf: LeafType.Oak,   trunkLen: 24, levels: 3, leafCount: 28, leafSize: 2.2, scale: 0.8 },
+  pine:   { type: TreeType.Evergreen, bark: BarkType.Pine,   leaf: LeafType.Pine,  trunkLen: 28, levels: 3, leafCount: 42, leafSize: 1.6, scale: 0.9 },
+  fir:    { type: TreeType.Evergreen, bark: BarkType.Pine,   leaf: LeafType.Pine,  trunkLen: 32, levels: 3, leafCount: 48, leafSize: 1.4, scale: 1.0 },
+  willow: { type: TreeType.Deciduous, bark: BarkType.Willow, leaf: LeafType.Aspen, trunkLen: 18, levels: 4, leafCount: 34, leafSize: 1.8, scale: 0.7 },
+  palm:   { type: TreeType.Deciduous, bark: BarkType.Birch,  leaf: LeafType.Ash,   trunkLen: 24, levels: 2, leafCount: 26, leafSize: 2.4, scale: 0.8 }
 }
 
 const CARD_CONFIG = {
@@ -45,22 +45,22 @@ function makeCardTexture(color) {
   const t = new THREE.CanvasTexture(c); t.colorSpace = THREE.SRGBColorSpace; return t
 }
 
-function bakeTreeVariant(name, variantSeed) {
+function bakeTreeVariant(name, variantSeed, juvenile = false) {
   const cfg = TREE_CONFIG[name]; if (!cfg) return null
   const t = new Tree()
   t.options.seed = variantSeed
   if (cfg.type) t.options.type = cfg.type
   if (cfg.bark && t.options.bark) t.options.bark.type = cfg.bark
   if (cfg.leaf && t.options.leaves) {
     t.options.leaves.type = cfg.leaf
-    if (cfg.leafCount != null) t.options.leaves.count = cfg.leafCount
-    if (cfg.leafSize != null) t.options.leaves.size = cfg.leafSize
+    if (cfg.leafCount != null) t.options.leaves.count = juvenile ? Math.max(4, Math.floor(cfg.leafCount * 0.5) : cfg.leafCount
+    if (cfg.leafSize != null) t.options.leaves.size = juvenile ? cfg.leafSize * 0.7 : cfg.leafSize
     t.options.leaves.alphaTest = 0.5
   }
   if (t.options.branch) {
-    t.options.branch.levels = cfg.levels
+    t.options.branch.levels = juvenile ? Math.max(1, cfg.levels - 1) : cfg.levels
     if (t.options.branch.length && typeof t.options.branch.length === 'object') {
-      t.options.branch.length[0] = cfg.trunkLen
+      t.options.branch.length[0] = juvenile ? Math.max(3, cfg.trunkLen * 0.5) : cfg.trunkLen
     }
   }
   try { t.generate() } catch (e) { console.error(`[Vegetation] bake ${name}#${variantSeed}:`, e.message); return null }
@@ -148,8 +148,14 @@ export function createVegetationSystem(scene, args = {}) {
   for (const name of SPECIES_LIST) {
     if (TREE_SPECIES.has(name)) {
       const variants = []
+      // Mature variants
       for (let vi = 0; vi < VARIANTS_PER_SPECIES; vi++) {
-        const baked = bakeTreeVariant(name, (name.charCodeAt(0) * 101 + vi * 4099) | 0)
+        const baked = bakeTreeVariant(name, (name.charCodeAt(0) * 101 + vi * 4099) | 0, false)
+        if (baked) variants.push(baked)
+      }
+      // Juvenile variants
+      for (let vi = 0; vi < VARIANTS_PER_SPECIES; vi++) {
+        const baked = bakeTreeVariant(name, (name.charCodeAt(0) * 101 + vi * 4099 + 10000) | 0, true)
         if (baked) variants.push(baked)
       }
       if (variants.length) {
@@ -196,7 +202,9 @@ export function createVegetationSystem(scene, args = {}) {
       const sp = species.get(p.species); if (!sp) continue
       const cap = sp.kind === 'card' ? MAX_GROUND_COVER_PER_CHUNK : MAX_INSTANCES_PER_CHUNK
       const variantCount = sp.kind === 'tree' ? sp.variants.length : 1
-      const variantIdx = variantCount > 1 ? ((p.seed >>> 16) % variantCount) : 0
+      // Use scale to choose variant: < 0.5 = juvenile, >= 0.5 = mature
+      const baseIdx = (p.scale ?? 1) < 0.5 ? VARIANTS_PER_SPECIES : 0
+      const variantIdx = baseIdx + (variantCount > 1 ? ((p.seed >>> 16) % VARIANTS_PER_SPECIES) : 0)
       const key = p.species + '#' + variantIdx
       let arr = byBucket.get(key)
       if (!arr) { arr = { sp, variantIdx, list: [] }; byBucket.set(key, arr) }

src/terrain/VegetationPlacement.js

@@ -81,6 +81,7 @@ export function createVegetationPlacement(args = {}) {
   const WATER_BAND = waterlineBand
   const INV_WATER_BAND = WATER_BAND > 0 ? 1 / WATER_BAND : 0
   const CLUMPING = clumping
+  const JUVENILE_RATIO = 0.35
   const _clumps = new Map()
 
   const heightFn = sampleHeight || (field ? field.sampleHeight : null)
@@ -194,8 +195,12 @@ export function createVegetationPlacement(args = {}) {
         const scaleRange = TREE_SPECIES.has(sp) ? 0.4 : 0.3
         const scaleMin = TREE_SPECIES.has(sp) ? 0.65 : 0.8
         const rawScale = scaleMin + rand01(cellHash ^ 0x27d4eb2f) * scaleRange
+        // Determine if juvenile based on random - 35% chance for small trees
+        const isJuvenile = TREE_SPECIES.has(sp) && rand01(cellHash ^ 0xdeadbabe) < JUVENILE_RATIO
+        // Juvenile trees get smaller final scale
+        const juvenileScale = isJuvenile ? rawScale * 0.4 : rawScale
         const stressFactor = 0.55 + 0.45 * terrainFactor
-        const scale = TREE_SPECIES.has(sp) ? rawScale * ageScaleFactor * stressFactor : rawScale
+        const scale = TREE_SPECIES.has(sp) ? (isJuvenile ? juvenileScale : rawScale * ageScaleFactor * stressFactor) : rawScale
         const tiltAngle = rand01(cellHash ^ 0x165667b1) * 2 * Math.PI
         const tiltAmt = TREE_SPECIES.has(sp) ? rand01(cellHash ^ 0xd1b2ae35) * 0.08 : 0
         const health = 0.7 + rand01(cellHash ^ 0x7f4a7c15) * 0.3