Skip to content

Implement wetlands#430

Merged
louis-e merged 5 commits intolouis-e:mainfrom
Oleg4260:main
May 2, 2025
Merged

Implement wetlands#430
louis-e merged 5 commits intolouis-e:mainfrom
Oleg4260:main

Conversation

@Oleg4260
Copy link
Contributor

@Oleg4260 Oleg4260 commented Apr 30, 2025 •
edited
Loading

Another bunch of improvements to generation of natural objects, now adding some nice wetlands

@Oleg4260
Implement wetlands
32ae077 
Implement wetlands

cargo fmt; implement bog

Better bog
@Oleg4260
Copy link
Contributor Author

Oleg4260 commented Apr 30, 2025

wetland=reefbed bordering a natural=scrub and natural=wood
2025-04-29_15 47 56
2025-04-29_15 49 24
2025-04-29_15 47 41
wetland=swamp
2025-04-29_16 23 20

@Oleg4260
Copy link
Contributor Author

Oleg4260 commented Apr 30, 2025

wetland=bog
2025-04-30_15 57 59

@Oleg4260
Copy link
Contributor Author

Oleg4260 commented Apr 30, 2025 •
edited
Loading

generic natural=wetland, this also includes marsh and saltmarsh. because they look practically the same
image

@Oleg4260
Copy link
Contributor Author

Oleg4260 commented Apr 30, 2025

wetland=wet_meadow | wetland=fen
2025-04-30_16 45 20

@louis-e
Copy link
Owner

louis-e commented May 1, 2025

retrigger-benchmark

@github-actions
Copy link

github-actions bot commented May 1, 2025 •
edited
Loading

⏱️ Benchmark run finished in 2m 5s
🧠 Peak memory usage: 1964 MB

📈 Compared against baseline: 130s
🧮 Delta: -5s
🔢 Commit: e8bbbec

🟢 Generation time is unchanged.

You can retrigger the benchmark by commenting retrigger-benchmark.

@louis-e
Copy link
Owner

louis-e commented May 1, 2025

retrigger-benchmark

@Oleg4260 Oleg4260 marked this pull request as ready for review May 1, 2025 15:34
@Oleg4260
Copy link
Contributor Author

Oleg4260 commented May 1, 2025

Guess that's all for now, so allowing this to be merged

@Oleg4260
Copy link
Contributor Author

Oleg4260 commented May 2, 2025 •
edited
Loading

@louis-e please consider merging this, also seems like you didn't notice my message in your closed PR #423 , please read, it's important.

I'm finishing work on this PR because I am currently busy with studying so I don't have time to work on other features, and I want to merge this to prevent it from outdating and getting merge conflicts

@louis-e
Copy link
Owner

louis-e commented May 2, 2025

LGTM - thanks a lot!

@louis-e louis-e merged commit 7ae6dc8 into louis-e:main May 2, 2025
3 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@Oleg4260 @louis-e