Merge pull request #1717 from akortunov/default_terrain

Render default land texture for Wilderness cells with distant terrain

components/terrain/quadtreeworld.cpp

@@ -189,36 +189,23 @@ public:
         node->setViewDataMap(mViewDataMap);
         parent->addChild(node);
 
-        if (center.x() - size > mMaxX
+        if (node->getSize() > mMinSize)
-                || center.x() + size < mMinX
+        {
-                || center.y() - size > mMaxY
+            addChildren(node);
-                || center.y() + size < mMinY )
-            // Out of bounds of the actual terrain - this will happen because
-            // we rounded the size up to the next power of two
-        {
-            // Still create and return an empty node so as to not break the assumption that each QuadTreeNode has either 4 or 0 children.
             return node;
         }
 
-        if (node->getSize() <= mMinSize)
-        {
         // We arrived at a leaf
         float minZ, maxZ;
-            if (mStorage->getMinMaxHeights(size, center, minZ, maxZ))
+        mStorage->getMinMaxHeights(size, center, minZ, maxZ);
-            {
+
         float cellWorldSize = mStorage->getCellWorldSize();
         osg::BoundingBox boundingBox(osg::Vec3f((center.x()-size)*cellWorldSize, (center.y()-size)*cellWorldSize, minZ),
                                 osg::Vec3f((center.x()+size)*cellWorldSize, (center.y()+size)*cellWorldSize, maxZ));
         node->setBoundingBox(boundingBox);
-            }
+
-            return node;
-        }
-        else
-        {
-            addChildren(node);
         return node;
     }
-    }
 
     osg::ref_ptr<RootNode> getRootNode()
     {