Skip to content

fix flower and foliage generation#4723

Merged
tigerw merged 34 commits intocuberite:masterfrom
mBornand:flower
Nov 14, 2020
Merged

fix flower and foliage generation#4723
tigerw merged 34 commits intocuberite:masterfrom
mBornand:flower

Conversation

@mBornand
Copy link
Contributor

@mBornand mBornand commented May 7, 2020

Activate flower generation.
Fixes #238
Fixes #241

The main base of the code was already present, but it contained some mistakes.

  • Flower generation works with default settings.
  • Add tulip generation
  • stop incorrect mushroom generation

@mBornand mBornand marked this pull request as ready for review May 7, 2020 12:08
@mBornand mBornand changed the title fix flower generation fix flower and foliage generation May 13, 2020
mBornand added 2 commits May 13, 2020 19:35
Remove duplication of grass generation
Remove fern in inapropriate biomes
@mBornand mBornand requested a review from tigerw May 15, 2020 20:11
@tigerw
Copy link
Member

tigerw commented May 15, 2020

Looking

@tigerw
Copy link
Member

tigerw commented May 15, 2020

It seems cFinishGenSprinkleFoliage has been somewhat gutted, was all of its functionality preserved in the migration to FinishGenClumpTopBlock? E.g. there is a // Nothing grows above Y=250 on line 863 of FinishGen.cpp, does the new code have/need this check, etc.

@bearbin
Copy link
Member

bearbin commented Aug 5, 2020

@mBornand Any chance that you are going to get back to this, I would like to get this merged in.

@12xx12
Copy link
Member

12xx12 commented Oct 25, 2020

It seems cFinishGenSprinkleFoliage has been somewhat gutted, was all of its functionality preserved in the migration to FinishGenClumpTopBlock? E.g. there is a // Nothing grows above Y=250 on line 863 of FinishGen.cpp, does the new code have/need this check, etc.

There weren't any checksat all. If the terrain would have caused an invalid height for the placed block the server would have crashed

@12xx12 12xx12 requested a review from tigerw October 25, 2020 16:08
@12xx12 12xx12 mentioned this pull request Oct 25, 2020
9 tasks
{
// Initialize the vector for all biomes.
for (int i = static_cast<int>(a_Output.size()); i < static_cast<int>(biMaxVariantBiome); i++)
for (int i = static_cast<int>(a_Output.size()); i <= static_cast<int>(biMaxVariantBiome); i++)
Copy link
Member

Choose a reason for hiding this comment

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

what this by the way?

Copy link
Member

@12xx12 12xx12 Nov 3, 2020

Choose a reason for hiding this comment

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

when using biMesaPlateauM = biMaxVariantBiome the server crashed

@tigerw
Copy link
Member

tigerw commented Nov 3, 2020

yeah seems good, not sure if anyone has any screenshots for the record?

@12xx12
Copy link
Member

12xx12 commented Nov 3, 2020

i'm gonna make some

@12xx12
Copy link
Member

12xx12 commented Nov 3, 2020

This PR:
2020-11-03_22 06 54
Current Master:
2020-11-03_22 10 04

Bright grass: Sunflower Plains
Dark Grass: Flower forest

The Screenschots are in WQHD - feel free to zoom in

12xx12 and others added 5 commits November 6, 2020 16:23
+ Style
+ Use empty()
+ Emplace directly
+ Avoid a string copy in BiomeName
+ Alias BiomeIndex to avoid multiple casts
@tigerw tigerw merged commit 58def8f into cuberite:master Nov 14, 2020
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.

Add the Flower Forest Biome Add the Sunflower Plains Biome

4 participants