core: fix dome roof is not created correctly if there is more than on…

…e outer polygon Apply the same logic for cylinder facade builder as well
reinterpretcat · Jun 3, 2016 · cd55afd · cd55afd
1 parent 7105fa6
commit cd55afd
Show file tree

Hide file tree

Showing 4 changed files with 49 additions and 31 deletions.
diff --git a/core/src/builders/buildings/facades/CylinderFacadeBuilder.hpp b/core/src/builders/buildings/facades/CylinderFacadeBuilder.hpp
@@ -20,18 +20,20 @@ class CylinderFacadeBuilder : public FacadeBuilder
 
     void build(utymap::meshing::Polygon& polygon)
     {
-        utymap::meshing::Vector2 center2d;
-        double radius;
-        utymap::utils::getCircle(polygon.rectangle, center2d, radius);
+        utymap::utils::outerRectangles(polygon, [&](const utymap::meshing::Rectangle& rectangle) {
+            utymap::meshing::Vector2 center2d;
+            double radius;
+            utymap::utils::getCircle(rectangle, center2d, radius);
 
-        CylinderGenerator cylinderGenerator(builderContext_, meshContext_, FacadeColorKey);
-        cylinderGenerator
-            .setCenter(utymap::meshing::Vector3(center2d.x, minHeight_, center2d.y))
-            .setHeight(height_)
-            .setMaxSegmentHeight(5)
-            .setRadialSegments(7)
-            .setRadius(radius)
-            .generate();
+            CylinderGenerator cylinderGenerator(builderContext_, meshContext_, FacadeColorKey);
+            cylinderGenerator
+                .setCenter(utymap::meshing::Vector3(center2d.x, minHeight_, center2d.y))
+                .setHeight(height_)
+                .setMaxSegmentHeight(5)
+                .setRadialSegments(7)
+                .setRadius(radius)
+                .generate();
+        });
     }
 };
 

diff --git a/core/src/builders/buildings/facades/FlatFacadeBuilder.hpp b/core/src/builders/buildings/facades/FlatFacadeBuilder.hpp
@@ -44,7 +44,7 @@ class FlatFacadeBuilder : public FacadeBuilder
         std::int64_t last = range.second - 2;
         for (std::int64_t i = last; i >= first; i -= 2) {
             utymap::meshing::Vector2 p1(polygon.points[i], polygon.points[i + 1]);
-            int j = i == first ? last : i - 2;
+            auto j = i == first ? last : i - 2;
             utymap::meshing::Vector2 p2(polygon.points[j], polygon.points[j + 1]);
 
             builderContext_.meshBuilder.addPlane(meshContext_.mesh,

diff --git a/core/src/builders/buildings/roofs/DomeRoofBuilder.hpp b/core/src/builders/buildings/roofs/DomeRoofBuilder.hpp
@@ -23,26 +23,25 @@ class DomeRoofBuilder : public RoofBuilder
 
     void build(utymap::meshing::Polygon& polygon)
     {
-        utymap::meshing::Vector2 center2d;
-        double radius;
-        utymap::utils::getCircle(polygon.rectangle, center2d, radius);
-
-        double heightInMeters = utymap::utils::GeoUtils::distance(
-            utymap::GeoCoordinate(center2d.y, center2d.x),
-            utymap::GeoCoordinate(center2d.y + radius, center2d.x));
-
-        utymap::builders::IcoSphereGenerator generator(builderContext_, meshContext_, RoofColorKey);
-        generator
-            .setCenter(utymap::meshing::Vector3(center2d.x, minHeight_, center2d.y))
-            .setRadius(radius, heightInMeters)
-            .setRecursionLevel(2)
-            .isSemiSphere(true)
-            .setVertexNoiseFreq(0.0)
-            .generate();
+        utymap::utils::outerRectangles(polygon, [&](const utymap::meshing::Rectangle& rectangle) {
+            utymap::meshing::Vector2 center2d;
+            double radius;
+            utymap::utils::getCircle(rectangle, center2d, radius);
+
+            double heightInMeters = utymap::utils::GeoUtils::distance(
+                utymap::GeoCoordinate(center2d.y, center2d.x),
+                utymap::GeoCoordinate(center2d.y + radius, center2d.x));
+
+            utymap::builders::IcoSphereGenerator generator(builderContext_, meshContext_, RoofColorKey);
+            generator
+                .setCenter(utymap::meshing::Vector3(center2d.x, minHeight_, center2d.y))
+                .setRadius(radius, heightInMeters)
+                .setRecursionLevel(2)
+                .isSemiSphere(true)
+                .setVertexNoiseFreq(0.0)
+                .generate();
+        });
     }
-
-private:
-
 };
 
 }}

diff --git a/core/src/utils/GeometryUtils.hpp b/core/src/utils/GeometryUtils.hpp
@@ -72,6 +72,23 @@ namespace utymap { namespace utils {
         return utymap::meshing::Vector2(centroidX, centroidY);
     }
 
+    // Iterates through polygon outers and call visitor with rectangle of this outer
+    template <typename Visitor>
+    inline void outerRectangles(const utymap::meshing::Polygon& polygon, Visitor& visitor)
+    {
+        if (polygon.outers.size() == 1) {
+            visitor(polygon.rectangle);
+            return;
+        }
+
+        for (const auto& outer : polygon.outers) {
+            auto rectangle = utymap::meshing::Rectangle();
+            for (auto i = outer.first; i < outer.second; i += 2) {
+                rectangle.expand(utymap::meshing::Vector2(polygon.points[i], polygon.points[i + 1]));
+            }
+            visitor(rectangle);
+        }
+    }
 }}
 
 #endif // UTILS_GEOMETRYUTILS_HPP_DEFINED