Allow full circle rotation with 2degs step for plantlike drawtype.

[oweals/minetest.git] / src / treegen.cpp

diff --git a/src/treegen.cpp b/src/treegen.cpp
index 9df528a21fd01191017f8a09a93b4536d76d355c..542bdf21c10305855dddde769d17b40ed5a2a010 100644 (file)
--- a/src/treegen.cpp
+++ b/src/treegen.cpp
@@ -19,6 +19,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 #include "irr_v3d.h"
 #include <stack>
+#include "util/pointer.h"
 #include "util/numeric.h"
 #include "util/mathconstants.h"
 #include "map.h"
@@ -32,6 +33,11 @@ namespace treegen
 void make_tree(ManualMapVoxelManipulator &vmanip, v3s16 p0,
                bool is_apple_tree, INodeDefManager *ndef, int seed)
 {
+       /*
+               NOTE: Tree-placing code is currently duplicated in the engine
+               and in games that have saplings; both are deprecated but not
+               replaced yet
+       */
        MapNode treenode(ndef->getId("mapgen_tree"));
        MapNode leavesnode(ndef->getId("mapgen_leaves"));
        MapNode applenode(ndef->getId("mapgen_apple"));
@@ -225,7 +231,7 @@ void make_ltree(ManualMapVoxelManipulator &vmanip, v3s16 p0, INodeDefManager *nd
                tree_node_placement(vmanip,v3f(position.X,position.Y-1,position.Z+1),dirtnode);
                tree_node_placement(vmanip,v3f(position.X+1,position.Y-1,position.Z+1),dirtnode);
        }
-       if (tree_definition.trunk_type == "crossed")
+       else if (tree_definition.trunk_type == "crossed")
        {
                tree_node_placement(vmanip,v3f(position.X+1,position.Y-1,position.Z),dirtnode);
                tree_node_placement(vmanip,v3f(position.X-1,position.Y-1,position.Z),dirtnode);
@@ -283,7 +289,7 @@ void make_ltree(ManualMapVoxelManipulator &vmanip, v3s16 p0, INodeDefManager *nd
                                tree_trunk_placement(vmanip,v3f(position.X,position.Y,position.Z+1),tree_definition);
                                tree_trunk_placement(vmanip,v3f(position.X+1,position.Y,position.Z+1),tree_definition);
                        }
-                       if (tree_definition.trunk_type == "crossed" && !tree_definition.thin_branches)
+                       else if (tree_definition.trunk_type == "crossed" && !tree_definition.thin_branches)
                        {
                                tree_trunk_placement(vmanip,v3f(position.X+1,position.Y,position.Z),tree_definition);
                                tree_trunk_placement(vmanip,v3f(position.X-1,position.Y,position.Z),tree_definition);
@@ -303,7 +309,7 @@ void make_ltree(ManualMapVoxelManipulator &vmanip, v3s16 p0, INodeDefManager *nd
                                tree_trunk_placement(vmanip,v3f(position.X,position.Y,position.Z+1),tree_definition);
                                tree_trunk_placement(vmanip,v3f(position.X+1,position.Y,position.Z+1),tree_definition);
                        }
-                       if ((stack_orientation.empty() && tree_definition.trunk_type == "crossed") ||
+                       else if ((stack_orientation.empty() && tree_definition.trunk_type == "crossed") ||
                                (!stack_orientation.empty() && tree_definition.trunk_type == "crossed" && !tree_definition.thin_branches))
                        {
                                tree_trunk_placement(vmanip,v3f(position.X+1,position.Y,position.Z),tree_definition);
@@ -510,6 +516,11 @@ v3f transposeMatrix(irr::core::matrix4 M, v3f v)
 void make_jungletree(VoxelManipulator &vmanip, v3s16 p0,
                INodeDefManager *ndef, int seed)
 {
+       /*
+               NOTE: Tree-placing code is currently duplicated in the engine
+               and in games that have saplings; both are deprecated but not
+               replaced yet
+       */
        content_t c_tree   = ndef->getId("mapgen_jungletree");
        content_t c_leaves = ndef->getId("mapgen_jungleleaves");
        if (c_tree == CONTENT_IGNORE)
@@ -528,19 +539,27 @@ void make_jungletree(VoxelManipulator &vmanip, v3s16 p0,
                        continue;
                v3s16 p1 = p0 + v3s16(x,0,z);
                v3s16 p2 = p0 + v3s16(x,-1,z);
-               if(vmanip.m_area.contains(p2)
-                               && vmanip.m_data[vmanip.m_area.index(p2)] == CONTENT_AIR)
-                       vmanip.m_data[vmanip.m_area.index(p2)] = treenode;
-               else if(vmanip.m_area.contains(p1))
-                       vmanip.m_data[vmanip.m_area.index(p1)] = treenode;
+               u32 vi1 = vmanip.m_area.index(p1);
+               u32 vi2 = vmanip.m_area.index(p2);
+               
+               if (vmanip.m_area.contains(p2) &&
+                       vmanip.m_data[vi2].getContent() == CONTENT_AIR)
+                       vmanip.m_data[vi2] = treenode;
+               else if (vmanip.m_area.contains(p1) &&
+                               vmanip.m_data[vi1].getContent() == CONTENT_AIR)
+                       vmanip.m_data[vi1] = treenode;
        }
+       vmanip.m_data[vmanip.m_area.index(p0)] = treenode;
 
        s16 trunk_h = pr.range(8, 12);
        v3s16 p1 = p0;
-       for(s16 ii=0; ii<trunk_h; ii++)
+       for (s16 ii=0; ii<trunk_h; ii++)
        {
-               if(vmanip.m_area.contains(p1))
-                       vmanip.m_data[vmanip.m_area.index(p1)] = treenode;
+               if (vmanip.m_area.contains(p1)) {
+                       u32 vi = vmanip.m_area.index(p1);
+                       if (vmanip.m_data[vi].getContent() == CONTENT_AIR)
+                               vmanip.m_data[vi] = treenode;
+               }
                p1.Y++;
        }
 
@@ -593,8 +612,8 @@ void make_jungletree(VoxelManipulator &vmanip, v3s16 p0,
                if(vmanip.m_area.contains(p) == false)
                        continue;
                u32 vi = vmanip.m_area.index(p);
-               if(vmanip.m_data[vi].getContent() != CONTENT_AIR
-                               && vmanip.m_data[vi].getContent() != CONTENT_IGNORE)
+               if (vmanip.m_data[vi].getContent() != CONTENT_AIR &&
+                       vmanip.m_data[vi].getContent() != CONTENT_IGNORE)
                        continue;
                u32 i = leaves_a.index(x,y,z);
                if(leaves_d[i] == 1)