BRNSystems/minetest
1
0
Fork 0
forked from Mirrorlandia_minetest/minetest
Code Pull Requests 1 Activity

L-System trees: Remove hardcoded use of 'mapgen_dirt' alias (#9931)

Browse Source 
Games often and increasingly do not use this mapgen alias, as it
is only required for Mapgen V6. Such games were triggering the
recently added error message.

Even if this mapgen alias was defined, dirt nodes placed under a
wide trunk were inconsistent with biomes that do not use dirt
surface nodes.

Place trunk nodes below a wide trunk instead of 'mapgen_dirt'.
On sloping ground, the trunk then extends down to the surface,
instead of the surface rising up to meet the trunk. This looks
more natural and does not alter the terrain.
This commit is contained in:
Paramat 2020-05-25 21:11:57 +01:00 committed by GitHub
parent 5311a27523
commit b546e8938d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/mapgen/treegen.cpp
View File

@ -148,10 +148,6 @@ treegen::error spawn_ltree(ServerMap *map, v3s16 p0,
treegen::error make_ltree(MMVManip &vmanip, v3s16 p0, treegen::error make_ltree(MMVManip &vmanip, v3s16 p0,
const NodeDefManager *ndef, TreeDef tree_definition) const NodeDefManager *ndef, TreeDef tree_definition)
{ {
MapNode dirtnode(ndef->getId("mapgen_dirt"));
if (dirtnode == CONTENT_IGNORE)
errorstream << "Treegen (make_ltree): Mapgen alias 'mapgen_dirt' is invalid!" << std::endl;
s32 seed; s32 seed;
if (tree_definition.explicit_seed) if (tree_definition.explicit_seed)
seed = tree_definition.seed + 14002; seed = tree_definition.seed + 14002;
@ -229,43 +225,43 @@ treegen::error make_ltree(MMVManip &vmanip, v3s16 p0,
axiom = temp; axiom = temp;
} }
//make sure tree is not floating in the air // Add trunk nodes below a wide trunk to avoid gaps when tree is on sloping ground
if (tree_definition.trunk_type == "double") { if (tree_definition.trunk_type == "double") {
tree_node_placement( tree_trunk_placement(
vmanip, vmanip,
v3f(position.X + 1, position.Y - 1, position.Z), v3f(position.X + 1, position.Y - 1, position.Z),
dirtnode tree_definition
); );
tree_node_placement( tree_trunk_placement(
vmanip, vmanip,
v3f(position.X, position.Y - 1, position.Z + 1), v3f(position.X, position.Y - 1, position.Z + 1),
dirtnode tree_definition
); );
tree_node_placement( tree_trunk_placement(
vmanip, vmanip,
v3f(position.X + 1, position.Y - 1, position.Z + 1), v3f(position.X + 1, position.Y - 1, position.Z + 1),
dirtnode tree_definition
); );
} else if (tree_definition.trunk_type == "crossed") { } else if (tree_definition.trunk_type == "crossed") {
tree_node_placement( tree_trunk_placement(
vmanip, vmanip,
v3f(position.X + 1, position.Y - 1, position.Z), v3f(position.X + 1, position.Y - 1, position.Z),
dirtnode tree_definition
); );
tree_node_placement( tree_trunk_placement(
vmanip, vmanip,
v3f(position.X - 1, position.Y - 1, position.Z), v3f(position.X - 1, position.Y - 1, position.Z),
dirtnode tree_definition
); );
tree_node_placement( tree_trunk_placement(
vmanip, vmanip,
v3f(position.X, position.Y - 1, position.Z + 1), v3f(position.X, position.Y - 1, position.Z + 1),
dirtnode tree_definition
); );
tree_node_placement( tree_trunk_placement(
vmanip, vmanip,
v3f(position.X, position.Y - 1, position.Z - 1), v3f(position.X, position.Y - 1, position.Z - 1),
dirtnode tree_definition
); );
} }
@ -372,7 +368,7 @@ treegen::error make_ltree(MMVManip &vmanip, v3s16 p0,
!tree_definition.thin_branches)) { !tree_definition.thin_branches)) {
tree_trunk_placement( tree_trunk_placement(
vmanip, vmanip,
v3f(position.X +1 , position.Y, position.Z), v3f(position.X + 1, position.Y, position.Z),
tree_definition tree_definition
); );
tree_trunk_placement( tree_trunk_placement(