主要地物と最小地物で主要地物IDがずれる問題を修正 (Synesthesias#181)

Author: linoal

include/plateau/polygon_mesh/mesh_factory.h

@@ -60,6 +60,8 @@ namespace plateau::polygonMesh {
             const std::list<const citygml::CityObject*>& city_objects,
             unsigned lod, const std::string& gml_path);
 
+        void incrementPrimaryIndex();
+
         /**
          * city_obj に含まれるポリゴンをすべて検索し、リストで返します。
          * 子の CityObject は検索しません。

src/polygon_mesh/area_mesh_factory.cpp

@@ -132,6 +132,7 @@ namespace plateau::polygonMesh {
                     auto atomic_objects = PolygonMeshUtils::getChildCityObjectsRecursive(*primary_object);
                     mesh_factory.addPolygonsInAtomicCityObjects(*primary_object, atomic_objects, lod, city_model.getGmlPath());
                 }
+                mesh_factory.incrementPrimaryIndex();
             }
             merged_meshes.emplace(group_id, mesh_factory.releaseMesh());
         }

src/polygon_mesh/mesh_extractor.cpp

@@ -71,6 +71,7 @@ namespace {
 
                     // 主要地物ごとのノードを追加します。
                     lod_node.addChildNode(Node(primary_object->getId(), mesh_factory.releaseMesh()));
+                    mesh_factory.incrementPrimaryIndex();
                 }
             }
             break;
@@ -87,8 +88,8 @@ namespace {
 
                     // 主要地物のノードを作成します。
                     std::unique_ptr<Mesh> primary_mesh;
+                    MeshFactory primary_mesh_factory(nullptr, options, geo_reference);
                     if (MeshExtractor::shouldContainPrimaryMesh(lod, *primary_city_object)) {
-                        MeshFactory primary_mesh_factory(nullptr, options, geo_reference);
                         primary_mesh_factory.addPolygonsInPrimaryCityObject(*primary_city_object, lod, city_model.getGmlPath());
                         primary_mesh = primary_mesh_factory.releaseMesh();
                     }
@@ -105,6 +106,7 @@ namespace {
                         primary_node.addChildNode(std::move(atomic_node));
                     }
                     lod_node.addChildNode(std::move(primary_node));
+                    primary_mesh_factory.incrementPrimaryIndex();
                 }
 
             }

src/polygon_mesh/mesh_factory.cpp

@@ -227,7 +227,6 @@ namespace plateau::polygonMesh {
         const auto primary_index = available_primary_index_.getPrimary();
         mesh_->addUV4WithSameVal(primary_index.toUV(), vertex_count);
         mesh_->city_object_list_.add(primary_index, gml_id);
-        ++available_primary_index_.primary_index;
     }
 
     long long MeshFactory::countVertices(
@@ -314,6 +313,9 @@ namespace plateau::polygonMesh {
         }
     }
 
+    void MeshFactory::incrementPrimaryIndex() {
+        ++available_primary_index_.primary_index;
+    }
 
     void MeshFactory::findAllPolygons(
         const CityObject& city_obj, const unsigned lod,
@@ -339,7 +341,6 @@ namespace plateau::polygonMesh {
             // 登録されて無ければ新規にインデックスを追加
             available_city_object_index = available_primary_index_;
             available_city_object_index.atomic_index = 0;
-            ++available_primary_index_.primary_index;
         }
         return available_city_object_index;
     }