From 20796f5e6d87d1a85271de9df22206839a15726e Mon Sep 17 00:00:00 2001
From: Linoal <1321932+linoal@users.noreply.github.com>
Date: Mon, 2 Dec 2024 03:29:01 +0900
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E5=89=B2=E7=B5=90=E5=90=88=E3=81=A7?=
 =?UTF-8?q?=E3=83=A1=E3=83=83=E3=82=B7=E3=83=A5=E3=81=AEindices=E3=81=8C3?=
 =?UTF-8?q?=E3=81=AE=E5=80=8D=E6=95=B0=E3=81=A7=E3=81=AA=E3=81=8F=E3=81=AA?=
 =?UTF-8?q?=E3=82=8B=E3=81=93=E3=81=A8=E3=81=8C=E3=81=82=E3=82=8B=E3=83=90?=
 =?UTF-8?q?=E3=82=B0=E3=82=92=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../filter_by_city_obj_index.cpp              | 22 ++++++++++++++-----
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/src/granularity_convert/filter_by_city_obj_index.cpp b/src/granularity_convert/filter_by_city_obj_index.cpp
index d32add1e..62674ccd 100644
--- a/src/granularity_convert/filter_by_city_obj_index.cpp
+++ b/src/granularity_convert/filter_by_city_obj_index.cpp
@@ -47,16 +47,26 @@ namespace plateau::granularityConvert {
         auto indices_id_transform = std::vector<long>();
         dst_indices.reserve(src_indices.size());
         indices_id_transform.reserve(src_indices.size());
-        for (auto src_index: src_indices) {
-            const auto next_id = vert_id_transform.at(src_index); // 削除頂点を詰めたあとの新たな頂点番号
-            if (next_id < 0) {
-                indices_id_transform.push_back(-1);
+
+        auto src_triangle_count = src_indices.size() / 3;
+        for(int tri=0; tri<src_triangle_count; tri++) {
+            unsigned int src_index[3] = {src_indices.at(tri*3), src_indices.at(tri*3+1), src_indices.at(tri*3+2)};
+            long next_id[3];
+            for(int i=0; i<3; i++){
+                next_id[i] = vert_id_transform.at(src_index[i]);
+            }
+            if(next_id[0] < 0 || next_id[1] < 0 || next_id[2] < 0) {
+                for(int i=0; i<3; i++) indices_id_transform.push_back(-1);
                 continue;
             }
-            dst_indices.push_back(next_id);
-            indices_id_transform.push_back((long) dst_indices.size() - 1);
+            for(int i=0; i<3; i++) {
+                dst_indices.push_back((unsigned) next_id[i]);
+                indices_id_transform.push_back((long) dst_indices.size() - 1);
+            }
         }
 
+
+
         // SubMeshについて、元から削除部分を除いたvector<SubMesh>を生成します。
         auto dst_sub_meshes = std::vector<SubMesh>();
         for (const auto& src_sub_mesh: src_sub_meshes) {