Skip to content

Feat/climate and trees#1130

Merged
louis-e merged 5 commits into
mainfrom
feat/climate-and-trees
Jun 28, 2026
Merged

Feat/climate and trees#1130
louis-e merged 5 commits into
mainfrom
feat/climate-and-trees

Conversation

@louis-e

@louis-e louis-e commented Jun 28, 2026

Copy link
Copy Markdown
Owner

No description provided.

louis-e and others added 3 commits June 27, 2026 14:12
Port the schematic tree system from the Teddy563 fork, adapted to the
arnis pipeline and bundled into the binary.

- Embed a region tree pack (include_dir) selected by realm from the bbox
  center; trees on by default, --legacy-trees / GUI "Legacy Trees" opts out.
- Pack state lives on WorldEditor (per-generation, multi-run safe), not a
  global; water-awareness reuses the existing Arc<Ground> (no extra mask).
- Size tiers (small/medium/big/tall/giant) via --tree-sizes and GUI toggles.
- map vine/moss as canopy leaves so models like red alder keep their crown.
- Gate palm species outside the subtropics so e.g. New York gets no palms.
- Credit the model artist (paleozoey) in the in-app license dialog.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Add a climate axis on top of the schematic tree pack so deserts, ice caps,
tropics and arid canyons render correctly while temperate areas are unchanged.

- Bundle a global Koppen-Geiger 0.1 deg grid (CC BY 4.0), sampled once per
  generation at the bbox center and stored on Ground; rodata, no heap growth.
- Climate-aware surface palettes (sand/sandstone deserts, snow/packed-ice
  caps, gravel cold deserts, podzol boreal, mossy tundra) and biomes.
- Arid climates get tan sandstone/terracotta canyon walls on steep slopes.
- DryContinental (e.g. the Grand Canyon) keeps the baseline ground blocks and
  only adapts its biome to savanna.
- Temperate/humid output is byte-identical (verified via block hash); per-cell
  cost is a couple of Copy-enum checks, fine for 300 sq km areas.
- Trim comments to single lines across the tree and climate modules.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Land cover is required for the climate-driven surfaces/biomes, so it is now
unconditionally on for CLI runs; drops the --land-cover/--city-boundaries flag.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Copilot AI review requested due to automatic review settings June 28, 2026 15:16
@github-actions

github-actions Bot commented Jun 28, 2026

Copy link
Copy Markdown

⏱️ Benchmark run finished in 1m 24s
🏗️ Generation time: 19s (excl. data fetching)
🧠 Peak memory usage: 1016 MB

📈 Compared against baseline: 18s time, 1005 MB memory
🧮 Delta: 66s time, 11 MB memory
🔢 Commit: b024e4d

🟢 Generation time is unchanged.
🟢 Peak memory is unchanged.

📅 Last benchmark: 2026-06-28 16:24:49 UTC

You can retrigger the benchmark by commenting retrigger-benchmark.

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copilot wasn't able to review this pull request because it exceeds the maximum number of files (300). Try reducing the number of changed files and requesting a review from Copilot again.

louis-e and others added 2 commits June 28, 2026 18:06
…cleanup

- Move the tree files under src/trees/ and the land_cover_* files under
  src/land_cover/ (land_cover.rs -> land_cover/mod.rs keeps the hot path).
- Add climate-aware ocean biomes (warm/lukewarm/cold/frozen, deep variants),
  frozen rivers, and tropical sparse jungle.
- Remove the tree-size GUI tickboxes and the --tree-sizes flag; all sizes are
  on by default. Land cover is always on. One shared accent rule styles every
  checkbox/slider so new toggles need no per-id CSS.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Add the legacy_trees label to every locale file so the toggle is no longer
English-only.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
@louis-e louis-e merged commit 877e07f into main Jun 28, 2026
3 checks passed
@louis-e louis-e deleted the feat/climate-and-trees branch June 28, 2026 16:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants