AIコメント対応

Author: sevendev

include/plateau/polygon_mesh/polygon_mesh_types.h

@@ -3,7 +3,8 @@
 #include <memory>
 #include <vector>
 
+namespace citygml { class CityModel; }
+
 namespace plateau::polygonMesh {
-    class citygml::CityModel;
     using CityModelVector = std::shared_ptr<std::vector<std::weak_ptr<const citygml::CityModel>>>;
 }

src/c_wrapper/tile_extractor_c.cpp

@@ -1,31 +1,29 @@
-#include "libplateau_c.h"
+#include "libplateau_c.h"
 #include "city_model_c.h"
 #include <plateau/polygon_mesh/tile_extractor.h>
-
-using namespace libplateau;
-using namespace plateau::polygonMesh;
+#include <vector>
 
 extern "C"{
 
-    LIBPLATEAU_C_EXPORT APIResult LIBPLATEAU_C_API plateau_tile_extractor_extract_with_combine(
+    LIBPLATEAU_C_EXPORT libplateau::APIResult LIBPLATEAU_C_API plateau_tile_extractor_extract_with_combine(
         const CityModelHandle* const* city_model_handles,
         const int city_model_size,
-        const MeshExtractOptions options,
+        const plateau::polygonMesh::MeshExtractOptions options,
         const std::vector<plateau::geometry::Extent>* extents,
-        Model* const out_model) {
+        plateau::polygonMesh::Model* const out_model) {
         API_TRY{
 
             if (out_model == nullptr || extents == nullptr) {
-                return APIResult::ErrorInvalidArgument;
+                return libplateau::APIResult::ErrorInvalidArgument;
             }
             if (city_model_size < 0) {
-                return APIResult::ErrorInvalidArgument;
+                return libplateau::APIResult::ErrorInvalidArgument;
             }
                 if (city_model_size > 0 && city_model_handles == nullptr) {
-                return APIResult::ErrorInvalidArgument;
+                return libplateau::APIResult::ErrorInvalidArgument;
             }
 
-            CityModelVector city_models = std::make_shared<std::vector<std::weak_ptr<const citygml::CityModel>>>();
+            plateau::polygonMesh::CityModelVector city_models = std::make_shared<std::vector<std::weak_ptr<const citygml::CityModel>>>();
             city_models->reserve(static_cast<size_t>(city_model_size));
             for (int i = 0; i < city_model_size; ++i) {
                 if (!city_model_handles[i]) {
@@ -41,34 +39,34 @@ extern "C"{
 
             if (city_models->empty()) {
                 // 入力に有効な CityModel が含まれていない
-                return APIResult::ErrorInvalidArgument;   
+                return libplateau::APIResult::ErrorInvalidArgument;
             }
 
-            TileExtractor::extractWithCombine(*out_model, city_models, options, *extents);
-            return APIResult::Success;
+            plateau::polygonMesh::TileExtractor::extractWithCombine(*out_model, city_models, options, *extents);
+            return libplateau::APIResult::Success;
 
         }
         API_CATCH;
-        return APIResult::ErrorUnknown;
+        return libplateau::APIResult::ErrorUnknown;
     }
 
-    LIBPLATEAU_C_EXPORT APIResult LIBPLATEAU_C_API plateau_tile_extractor_extract_with_grid(
+    LIBPLATEAU_C_EXPORT libplateau::APIResult LIBPLATEAU_C_API plateau_tile_extractor_extract_with_grid(
         const CityModelHandle* const city_model_handle,
-        const MeshExtractOptions options,
+        const plateau::polygonMesh::MeshExtractOptions options,
         const std::vector<plateau::geometry::Extent>* extents,
-        Model* const out_model) {
+        plateau::polygonMesh::Model* const out_model) {
         API_TRY{
             if (out_model == nullptr || extents == nullptr || city_model_handle == nullptr) {
-                return APIResult::ErrorInvalidArgument;
+                return libplateau::APIResult::ErrorInvalidArgument;
             }
             auto cityModelPtr = city_model_handle->getCityModelPtr();
             if (!cityModelPtr) {
-                return APIResult::ErrorInvalidArgument;
+                return libplateau::APIResult::ErrorInvalidArgument;
             }
-            TileExtractor::extractWithGrid(*out_model, *cityModelPtr, options, *extents);
-            return APIResult::Success;
+            plateau::polygonMesh::TileExtractor::extractWithGrid(*out_model, *cityModelPtr, options, *extents);
+            return libplateau::APIResult::Success;
         }
         API_CATCH;
-        return APIResult::ErrorUnknown;
+        return libplateau::APIResult::ErrorUnknown;
     }
 }

src/polygon_mesh/area_mesh_factory.h

@@ -8,6 +8,7 @@
 #include <map>
 #include <memory>
 #include <utility>
+#include <vector>
 
 namespace plateau::polygonMesh {
     // グループIDとグリッドIDのペアをキーとし、その結合後Meshのmapです。