Merge pull request #276 from longhuan2018/fix-empty-geometry

修复空地物导致bbox计算错误
fanvanzh · Nov 17, 2023 · dd39111 · dd39111
2 parents a7c3000 + a844287
commit dd39111
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/src/osgb23dtile.cpp b/src/osgb23dtile.cpp
@@ -88,6 +88,9 @@ class InfoVisitor : public osg::NodeVisitor
     }
 
     void apply(osg::Geometry& geometry){
+        if (geometry.getVertexArray() == nullptr || geometry.getVertexArray()->getDataSize() == 0U || geometry.getNumPrimitiveSets() == 0U)
+            return;
+
         geometry_array.push_back(&geometry);        
         if (GeoTransform::pOgrCT)
         {
@@ -199,7 +202,7 @@ class InfoVisitor : public osg::NodeVisitor
 double get_geometric_error(TileBox& bbox){
     if (bbox.max.empty() || bbox.min.empty())
     {
-        LOG_E("bbox is empty!");
+        //LOG_E("bbox is empty!");
         return 0;
     }
 
@@ -706,8 +709,11 @@ write_element_array_primitive(osg::Geometry* g, osg::PrimitiveSet* ps, OsgBuildS
         }
         write_vec3_array(vertexArr, osgState, point_max, point_min);
         // merge mesh bbox
-        expand_bbox3d(osgState->point_max, osgState->point_min, point_max);
-        expand_bbox3d(osgState->point_max, osgState->point_min, point_min);
+        if (point_min.x() <= point_max.x() && point_min.y() <= point_max.y() && point_min.z() <= point_max.z())
+        {
+            expand_bbox3d(osgState->point_max, osgState->point_min, point_max);
+            expand_bbox3d(osgState->point_max, osgState->point_min, point_min);
+        }
     }
     // normal
     osg::Vec3Array* normalArr = (osg::Vec3Array*)g->getNormalArray();