diff --git a/Editor/RoadNetwork/RoadNetworkEditorWindow.cs b/Editor/RoadNetwork/RoadNetworkEditorWindow.cs index dfde93e94..434339348 100644 --- a/Editor/RoadNetwork/RoadNetworkEditorWindow.cs +++ b/Editor/RoadNetwork/RoadNetworkEditorWindow.cs @@ -31,9 +31,9 @@ public static IRoadNetworkEditingSystemInterface GetEditorInterface() return GetWindow(false).EditorInterface; } - // 2024年7月のリリース準備のため、開発中の機能を一時的にメニューから非表示にしています。 + // リリース準備のため、開発中の機能を一時的にメニューから非表示にしています。 // リリースが終わったら下のコメント行を復活させてください。 - [MenuItem("PLATEAU_Dev/PLATEAU RoadNetwork Editor")] + // [MenuItem("PLATEAU_Dev/PLATEAU RoadNetwork Editor")] public static void ShowWindow() { GetWindow(true); diff --git a/Plugins/Android/libplateau.so b/Plugins/Android/libplateau.so index 69ffa7172..5d9761aa1 100644 --- a/Plugins/Android/libplateau.so +++ b/Plugins/Android/libplateau.so @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4de2f7fb19fd1ae6889c95bbb69ef85448a5fb12bd2955e6dd9cda1fe0657743 -size 12340592 +oid sha256:5d1febfdfa705f1e31961040db43b8e4703761cb6c0fdd662a1737f083c49e69 +size 12340992 diff --git a/Plugins/Linux/x86_64/libplateau.so b/Plugins/Linux/x86_64/libplateau.so index 34ee111ad..db504b043 100644 --- a/Plugins/Linux/x86_64/libplateau.so +++ b/Plugins/Linux/x86_64/libplateau.so @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:49797fb92fefbbb75dd452ea254a6ca85fa119079edd2a794e226b235b7d34ad -size 165136440 +oid sha256:b8acae2313e23e0fe7775330bade4afdcc72cdb1c05c3fff1fec10bc9d6a0e06 +size 165132016 diff --git a/Plugins/MacOS/arm64/libOpenMeshCore.8.0.dylib b/Plugins/MacOS/arm64/libOpenMeshCore.8.0.dylib index ae1ce5019..daf8dda49 100644 --- a/Plugins/MacOS/arm64/libOpenMeshCore.8.0.dylib +++ b/Plugins/MacOS/arm64/libOpenMeshCore.8.0.dylib @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c1d46db26d836adacfaf083c118899b3c37b5f8073ae19949eb980f8e6643fb2 +oid sha256:f2bb36f2b364baa3566ae210c6c41bef00615674d0b070d369b21e343bb413b5 size 599624 diff --git a/Plugins/MacOS/arm64/libOpenMeshCore.dylib b/Plugins/MacOS/arm64/libOpenMeshCore.dylib index ae1ce5019..daf8dda49 100644 --- a/Plugins/MacOS/arm64/libOpenMeshCore.dylib +++ b/Plugins/MacOS/arm64/libOpenMeshCore.dylib @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c1d46db26d836adacfaf083c118899b3c37b5f8073ae19949eb980f8e6643fb2 +oid sha256:f2bb36f2b364baa3566ae210c6c41bef00615674d0b070d369b21e343bb413b5 size 599624 diff --git a/Plugins/MacOS/arm64/libOpenMeshTools.8.0.dylib b/Plugins/MacOS/arm64/libOpenMeshTools.8.0.dylib index 4be575762..ce6208ff4 100644 --- a/Plugins/MacOS/arm64/libOpenMeshTools.8.0.dylib +++ b/Plugins/MacOS/arm64/libOpenMeshTools.8.0.dylib @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:05426d4421108522cb0491e5331ae54db0ae50b45aef32ff2a4a2839fd9a7b2e +oid sha256:eb9508ae38bd0632354d2bae3bdb0c2a0497a862a3515d59c8ac736159703bb8 size 126536 diff --git a/Plugins/MacOS/arm64/libOpenMeshTools.dylib b/Plugins/MacOS/arm64/libOpenMeshTools.dylib index 4be575762..ce6208ff4 100644 --- a/Plugins/MacOS/arm64/libOpenMeshTools.dylib +++ b/Plugins/MacOS/arm64/libOpenMeshTools.dylib @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:05426d4421108522cb0491e5331ae54db0ae50b45aef32ff2a4a2839fd9a7b2e +oid sha256:eb9508ae38bd0632354d2bae3bdb0c2a0497a862a3515d59c8ac736159703bb8 size 126536 diff --git a/Plugins/MacOS/arm64/libplateau.dylib b/Plugins/MacOS/arm64/libplateau.dylib index 0105bb55f..404e13bf5 100755 --- a/Plugins/MacOS/arm64/libplateau.dylib +++ b/Plugins/MacOS/arm64/libplateau.dylib @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0e3be0cd29462b33f14572a80ca17f164ad94d9ff057a917e055fafe15c05b8d -size 20748832 +oid sha256:3156acc08c3bdf8c7b3888a428c0874e2a2b828471b5cbf4a9f0ff134a5d9be1 +size 20748976 diff --git a/Plugins/MacOS/arm64/libz.1.2.13.dylib b/Plugins/MacOS/arm64/libz.1.2.13.dylib index eeedbdf6e..84fe73995 100644 --- a/Plugins/MacOS/arm64/libz.1.2.13.dylib +++ b/Plugins/MacOS/arm64/libz.1.2.13.dylib @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:53b6a1d64808e0142aae7944eced2f9436f891249024d6b59ea29afe5ca2912f +oid sha256:3a1727251abff271f6471d392454d2ac6861c5ff4bf9ccdc9838367908e48424 size 135168 diff --git a/Plugins/MacOS/arm64/libz.1.dylib b/Plugins/MacOS/arm64/libz.1.dylib index eeedbdf6e..84fe73995 100644 --- a/Plugins/MacOS/arm64/libz.1.dylib +++ b/Plugins/MacOS/arm64/libz.1.dylib @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:53b6a1d64808e0142aae7944eced2f9436f891249024d6b59ea29afe5ca2912f +oid sha256:3a1727251abff271f6471d392454d2ac6861c5ff4bf9ccdc9838367908e48424 size 135168 diff --git a/Plugins/MacOS/arm64/libz.dylib b/Plugins/MacOS/arm64/libz.dylib index eeedbdf6e..84fe73995 100644 --- a/Plugins/MacOS/arm64/libz.dylib +++ b/Plugins/MacOS/arm64/libz.dylib @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:53b6a1d64808e0142aae7944eced2f9436f891249024d6b59ea29afe5ca2912f +oid sha256:3a1727251abff271f6471d392454d2ac6861c5ff4bf9ccdc9838367908e48424 size 135168 diff --git a/Plugins/MacOS/x86_64/libOpenMeshCore.8.0.dylib b/Plugins/MacOS/x86_64/libOpenMeshCore.8.0.dylib index 806a841c6..425494892 100644 --- a/Plugins/MacOS/x86_64/libOpenMeshCore.8.0.dylib +++ b/Plugins/MacOS/x86_64/libOpenMeshCore.8.0.dylib @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e0c0756e30b66395fc1a9474d5e75d8c2a1b97205ac5834eaa5b4349ff9bb672 +oid sha256:edfa83f4110644783bc0cd3b2154b39d17ac139a4c6be2f71629723a2b9f36df size 601936 diff --git a/Plugins/MacOS/x86_64/libOpenMeshCore.dylib b/Plugins/MacOS/x86_64/libOpenMeshCore.dylib index 806a841c6..425494892 100644 --- a/Plugins/MacOS/x86_64/libOpenMeshCore.dylib +++ b/Plugins/MacOS/x86_64/libOpenMeshCore.dylib @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e0c0756e30b66395fc1a9474d5e75d8c2a1b97205ac5834eaa5b4349ff9bb672 +oid sha256:edfa83f4110644783bc0cd3b2154b39d17ac139a4c6be2f71629723a2b9f36df size 601936 diff --git a/Plugins/MacOS/x86_64/libOpenMeshTools.8.0.dylib b/Plugins/MacOS/x86_64/libOpenMeshTools.8.0.dylib index 2577c3c8f..b5aebae02 100644 --- a/Plugins/MacOS/x86_64/libOpenMeshTools.8.0.dylib +++ b/Plugins/MacOS/x86_64/libOpenMeshTools.8.0.dylib @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:98d768088bce1e9e714e54345eeda233698c0c3ebc7986f38a96fb0482290f21 +oid sha256:8b0dfd0b40d800c2cef477f08101b4be6581e6e5eb3a0f5324ecdeb8638522d1 size 102632 diff --git a/Plugins/MacOS/x86_64/libOpenMeshTools.dylib b/Plugins/MacOS/x86_64/libOpenMeshTools.dylib index 2577c3c8f..b5aebae02 100644 --- a/Plugins/MacOS/x86_64/libOpenMeshTools.dylib +++ b/Plugins/MacOS/x86_64/libOpenMeshTools.dylib @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:98d768088bce1e9e714e54345eeda233698c0c3ebc7986f38a96fb0482290f21 +oid sha256:8b0dfd0b40d800c2cef477f08101b4be6581e6e5eb3a0f5324ecdeb8638522d1 size 102632 diff --git a/Plugins/MacOS/x86_64/libplateau.dylib b/Plugins/MacOS/x86_64/libplateau.dylib index 5efd06f1d..2393ca80f 100755 --- a/Plugins/MacOS/x86_64/libplateau.dylib +++ b/Plugins/MacOS/x86_64/libplateau.dylib @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d0c699c902bc0170f58b55c1f35073f4b8a7a50ec13243251523faedb0145384 -size 21999816 +oid sha256:7f3ff07f40a71f6cfb910553e26ba467dcf53187630762bfca6ea41b96c071bf +size 21999968 diff --git a/Plugins/MacOS/x86_64/libz.1.2.13.dylib b/Plugins/MacOS/x86_64/libz.1.2.13.dylib index 59e2b5295..a0bd336e4 100755 --- a/Plugins/MacOS/x86_64/libz.1.2.13.dylib +++ b/Plugins/MacOS/x86_64/libz.1.2.13.dylib @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8d7f24307eb0308d112733b270ae986ba952ffa9023fb5dbb4d6423ad6b01091 +oid sha256:c2cefef3ce5e405fa8401cf1a3f3b27a5a5f0097cc5c24d228a321d67aebc6b6 size 117632 diff --git a/Plugins/MacOS/x86_64/libz.1.dylib b/Plugins/MacOS/x86_64/libz.1.dylib index 59e2b5295..a0bd336e4 100644 --- a/Plugins/MacOS/x86_64/libz.1.dylib +++ b/Plugins/MacOS/x86_64/libz.1.dylib @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8d7f24307eb0308d112733b270ae986ba952ffa9023fb5dbb4d6423ad6b01091 +oid sha256:c2cefef3ce5e405fa8401cf1a3f3b27a5a5f0097cc5c24d228a321d67aebc6b6 size 117632 diff --git a/Plugins/MacOS/x86_64/libz.dylib b/Plugins/MacOS/x86_64/libz.dylib index 59e2b5295..a0bd336e4 100644 --- a/Plugins/MacOS/x86_64/libz.dylib +++ b/Plugins/MacOS/x86_64/libz.dylib @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8d7f24307eb0308d112733b270ae986ba952ffa9023fb5dbb4d6423ad6b01091 +oid sha256:c2cefef3ce5e405fa8401cf1a3f3b27a5a5f0097cc5c24d228a321d67aebc6b6 size 117632 diff --git a/Plugins/Windows/x86_64/plateau.dll b/Plugins/Windows/x86_64/plateau.dll index 57c94d4e8..0aa10fae6 100644 --- a/Plugins/Windows/x86_64/plateau.dll +++ b/Plugins/Windows/x86_64/plateau.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6cef4cac3bedec7f397275815489186d828ca01824f1123529f40f8f990e603c +oid sha256:1d6d9cf9a715585db5dd4410f018db149b35ad2cbe3af9055b5a1ecbdf39e38b size 22872064 diff --git a/Plugins/iOS/plateau.framework/plateau b/Plugins/iOS/plateau.framework/plateau index 64091dd8b..dc03c17c4 100755 Binary files a/Plugins/iOS/plateau.framework/plateau and b/Plugins/iOS/plateau.framework/plateau differ diff --git a/Runtime/CityImport/Import/Convert/AttributeDataHelper.cs b/Runtime/CityImport/Import/Convert/AttributeDataHelper.cs index 41456106b..fa41594cd 100644 --- a/Runtime/CityImport/Import/Convert/AttributeDataHelper.cs +++ b/Runtime/CityImport/Import/Convert/AttributeDataHelper.cs @@ -181,17 +181,18 @@ private CityObjectList GetSerializableCityObjectForNonArea() CityObjectList cityObjList = new CityObjectList(); foreach (var cityObjSer in cityObjSerArr) { - cityObjSer.CityObjectIndex = GetCurrentCityObjectIndex(index, currentNode, cityObjSer.GmlID).ToArray(); // 分割結合時に必要 + cityObjSer.CityObjectIndex = index.ToArray(); // 分割結合時に必要 if (!string.IsNullOrEmpty(this.parentGmlID)) cityObjList.outsideParent = this.parentGmlID; - - foreach (var id in indexList) + + for (int i = 0; i < indexList.Count; i++) { + var id = indexList[i]; if (id.PrimaryID == id.AtomicID) continue; var childCityObj = serializedCityObjectGetter.GetDstCityObjectByGmlID(id.AtomicID, id.Index); if (childCityObj == null) continue; - childCityObj.CityObjectIndex = GetCurrentCityObjectIndex(id.Index, currentNode, id.AtomicID).ToArray(); // 分割結合時に必要 + childCityObj.CityObjectIndex = id.Index.ToArray(); // 分割結合時に必要 cityObjSer.Children.Add(childCityObj); } cityObjList.rootCityObjects.Add(cityObjSer); @@ -201,27 +202,6 @@ private CityObjectList GetSerializableCityObjectForNonArea() return cityObjList; } - private CityObjectIndex GetCurrentCityObjectIndex(CityObjectIndex id, Node node, string gmlID) - { - // Nodeから、idに対応するCityObjectIndexを取得します。 - // 見つからなかった場合、このクラスに記録されたCityObjectIndexを返します。 - // FIXME: Node優先なら全部Nodeで良いのでは。このクラスにCityObjectIndexを記録するなど、無駄な処理があるのでは。 - var currentID = new CityObjectIndex(id.PrimaryIndex, id.AtomicIndex); - if (node.Mesh != null) - { - var col = node.Mesh.CityObjectList; - var indices = col.GetAllKeys(); - Func searchPredicate = idx => col.GetAtomicID(idx) == gmlID; - if (indices.Any(searchPredicate)) - { - var nodeIdx = indices.First(searchPredicate); - return nodeIdx; - } - - } - return currentID; - } - /// /// 地域単位結合モデルの場合のシリアライズ可能なデータへの変換です /// rootCityObjectsが空の場合はnullを返します @@ -250,7 +230,7 @@ private CityObjectList GetSerializableCityObjectForArea() if (id.PrimaryID != id.AtomicID) continue; // まずは主要地物から見る // TODO 下の処理は GetByIDメソッド内にまとめられそう? - cityObj.CityObjectIndex = GetCurrentCityObjectIndex(id.Index, currentNode, id.PrimaryID).ToArray(); // 分割結合時に必要 + cityObj.CityObjectIndex = id.Index.ToArray(); // 分割結合時に必要 // var ser = CityObjectSerializableConvert.FromCityGMLCityObject(cityObj, id.Index); if (!chidrenMap.ContainsKey(id.PrimaryID)) continue;