Bake the orchard and the Vallaskogen reserve #137

Merged

sermuns merged 2 commits from bake-gardens into main

2026-10-23 15:09:45 +00:00

sermuns commented

2026-10-23 14:28:11 +00:00

Owner

area_kind read neither landuse=orchard nor leisure=nature_reserve, so Fruktträdgård and the Vallaskogen reserve drew as bare ground.

Both are now their own AREA_* kinds, drawn with the grass texture: the orchard a warm garden green, the reserve the deep green of the woodland hill it names. Both sit under the mapped patches and paths, so a clearing and a trail still read inside them.
The woodland is mostly unmapped tree by tree, so the reserve and the forest patches get a scatter of trees of their own, on a world-aligned jittered grid that stays clear of buildings and paths.
The scatter is tuned for the frame budget: the grid is coarse enough that the alpha-tested foliage does not drown a reserve, and the canopy stops drawing at TREE_DRAW_DISTANCE, short of the fog, so far trees do not pay for pixels the fog has already swallowed. Worst-case triangles in the reserve drop by about 5x.
Baking Vallaskogen grows the world east to cover the reserve; the terrain and assets/baked/valla.bin were rebuilt.
The allotments, farmland and construction site stay out: private, incidental or temporary.

Closes #46.

Also fixes the Forgejo command examples in AGENTS.md: they passed -h for the host, but -h is --help in fj, so every one printed usage.

Merged

Merged into main as part of the batch (order: #136, #142, #137, #138, #141, #139, #140, #143). The batch carries a single major bump, 1.1.2 → 2.0.0, so this branch's own bump commit was dropped when it was rebased; PROTOCOL_VERSION stays 2. assets/baked/valla.bin was rebaked once at the end of the batch.

The bake was regenerated once more at the end of the batch, after this branch was rebased onto the crossing and path-surface work.

`area_kind` read neither `landuse=orchard` nor `leisure=nature_reserve`, so Fruktträdgård and the Vallaskogen reserve drew as bare ground. - Both are now their own `AREA_*` kinds, drawn with the grass texture: the orchard a warm garden green, the reserve the deep green of the woodland hill it names. Both sit under the mapped patches and paths, so a clearing and a trail still read inside them. - The woodland is mostly unmapped tree by tree, so the reserve and the forest patches get a scatter of trees of their own, on a world-aligned jittered grid that stays clear of buildings and paths. - The scatter is tuned for the frame budget: the grid is coarse enough that the alpha-tested foliage does not drown a reserve, and the canopy stops drawing at `TREE_DRAW_DISTANCE`, short of the fog, so far trees do not pay for pixels the fog has already swallowed. Worst-case triangles in the reserve drop by about 5x. - Baking Vallaskogen grows the world east to cover the reserve; the terrain and `assets/baked/valla.bin` were rebuilt. - The allotments, farmland and construction site stay out: private, incidental or temporary. Closes #46. Also fixes the Forgejo command examples in `AGENTS.md`: they passed `-h` for the host, but `-h` is `--help` in `fj`, so every one printed usage. ## Merged Merged into `main` as part of the batch (order: #136, #142, #137, #138, #141, #139, #140, #143). The batch carries a single major bump, `1.1.2` → `2.0.0`, so this branch's own bump commit was dropped when it was rebased; `PROTOCOL_VERSION` stays 2. `assets/baked/valla.bin` was rebaked once at the end of the batch. The bake was regenerated once more at the end of the batch, after this branch was rebased onto the crossing and path-surface work.

sermuns added 3 commits

2026-10-23 14:28:11 +00:00

(slop) bake the orchard and the Vallaskogen reserve closes #46 e54ab5676d

`area_kind` read neither `landuse=orchard` nor `leisure=nature_reserve`, so
Fruktträdgård and the Vallaskogen reserve drew as bare ground. Each is now
its own area kind, drawn with the grass texture: the orchard a warm garden
green, the reserve the deep green of the woodland hill it names. Both sit
under the mapped patches and paths, so a clearing and a trail still read
inside them.

The allotments, farmland and construction site stay out: private, incidental
or temporary, and no part of the campus edge worth drawing.

(slop) correct the forgejo api commands in AGENTS.md 6c275ee38f

The examples passed `-h` for the host, but `-h` is `--help` in `fj`, so
every one of them printed usage. Use `-H` for the host, or `-R origin`
after `fj issue` / `fj pr` to take both host and repo from the remote.
Also note that neither has a `list` subcommand.

(slop) bump version to 1.2.0 eba6a69220

sermuns force-pushed bake-gardens from eba6a69220 to e66e1c20fb

2026-10-23 14:28:39 +00:00

Compare

sermuns force-pushed bake-gardens from e66e1c20fb to 60f67087f7

2026-10-23 14:46:42 +00:00

Compare

sermuns changed title from ~~Bake the orchard and the Vallaskogen reserve~~ to [DRAFT]: Bake the orchard and the Vallaskogen reserve

2026-10-23 14:54:52 +00:00

sermuns force-pushed bake-gardens from 60f67087f7 to 0d14a83585

2026-10-23 15:01:39 +00:00

Compare