From ac4f3480752112ae3e78bd6cacecdbb9df5db686 Mon Sep 17 00:00:00 2001 From: linoal <1321932+linoal@users.noreply.github.com> Date: Thu, 11 Jan 2024 17:05:10 +0900 Subject: [PATCH 01/13] =?UTF-8?q?=E3=83=9E=E3=83=BC=E3=82=B1=E3=83=83?= =?UTF-8?q?=E3=83=88=E3=83=97=E3=83=AC=E3=82=A4=E3=82=B9=E6=8F=90=E5=87=BA?= =?UTF-8?q?=E3=81=AE=E3=81=9F=E3=82=81=E3=81=ABstrpy=E3=81=AEwarning?= =?UTF-8?q?=E3=82=92=E6=8A=91=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Source/PLATEAURuntime/Private/PLATEAUCityModelLoader.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Source/PLATEAURuntime/Private/PLATEAUCityModelLoader.cpp b/Source/PLATEAURuntime/Private/PLATEAUCityModelLoader.cpp index 47986384..53e99826 100644 --- a/Source/PLATEAURuntime/Private/PLATEAUCityModelLoader.cpp +++ b/Source/PLATEAURuntime/Private/PLATEAUCityModelLoader.cpp @@ -65,7 +65,13 @@ class FCityModelLoaderImpl { ExtractOptions.export_appearance = Settings.bImportTexture; ExtractOptions.enable_texture_packing = Settings.bEnableTexturePacking; ExtractOptions.attach_map_tile = Settings.bAttachMapTile; + + // strcpyは非推奨という警告が出ますが、共通ライブラリを利用するために必要と思われるので警告を抑制します。 + // なお抑制しないとマーケットプレイスの審査で弾かれる可能性が高いです。 +#pragma warning(push) +#pragma warning(disable:4996) std::strcpy(ExtractOptions.map_tile_url, TCHAR_TO_UTF8(*Settings.MapTileUrl)); +#pragma warning(pop) ExtractOptions.map_tile_zoom_level = Settings.ZoomLevel; switch (Settings.TexturePackingResolution) { From bfba778a7d25d920c502687aa09ed0dbd3236cae Mon Sep 17 00:00:00 2001 From: linoal <1321932+linoal@users.noreply.github.com> Date: Thu, 11 Jan 2024 17:20:54 +0900 Subject: [PATCH 02/13] =?UTF-8?q?=E3=83=9E=E3=83=BC=E3=82=B1=E3=83=83?= =?UTF-8?q?=E3=83=88=E3=83=97=E3=83=AC=E3=82=A4=E3=82=B9=E3=81=AB=E9=80=9A?= =?UTF-8?q?=E3=81=99=E3=81=9F=E3=82=81=E3=81=ABFilterPlugin.ini=E3=82=92?= =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Config/FilterPlugin.ini | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Config/FilterPlugin.ini b/Config/FilterPlugin.ini index a0bb8bb7..4077eae5 100644 --- a/Config/FilterPlugin.ini +++ b/Config/FilterPlugin.ini @@ -2,4 +2,5 @@ /Documentation/... /README_Images/... /Resources/... -/README.md \ No newline at end of file +/README.md +/ThirdPartyNotices.md From d0d7d6c59ec5c98aabe0de3b9f23f4d2c1358648 Mon Sep 17 00:00:00 2001 From: SYN-miyamoto <145427271+SYN-miyamoto@users.noreply.github.com> Date: Tue, 23 Jan 2024 13:28:05 +0900 Subject: [PATCH 03/13] Update README.md --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index 7629fec6..fe1b5a0c 100644 --- a/README.md +++ b/README.md @@ -18,6 +18,9 @@ PLATEAU SDK for Unrealは、[PLATEAU](https://www.mlit.go.jp/plateau/)の3D都 PLATEAU SDK for Unrealを利用することで、実世界を舞台にしたアプリケーションの開発や、PLATEAUの豊富なデータを活用したシミュレーションを簡単に行うことができます。 +PLATEAU SDK for Unityは利用者アンケートを実施しています。 今後の開発の参考にするため、ユーザーの皆様の忌憚ないご意見をお聞かせください。 +[アンケートはこちら](https://docs.google.com/forms/d/e/1FAIpQLSeICxDJd6eQ311_rDbCudc2c8UUZ8A0oE6LXppKoHgT2mwYQQ/viewform) + # サンプルプロジェクト 本SDKを使用して作成されたサンプルプロジェクトを[こちら](https://github.com/Project-PLATEAU/PLATEAU-SDK-for-Unreal-Samples)で配布しています。 From 8ff4a15be112fa5ddf87f947b2fcf1e8c98d06f2 Mon Sep 17 00:00:00 2001 From: Linoal <1321932+linoal@users.noreply.github.com> Date: Tue, 30 Jan 2024 12:29:45 +0900 Subject: [PATCH 04/13] =?UTF-8?q?=20README=E6=9B=B4=E6=96=B0:=20=E5=8F=A4?= =?UTF-8?q?=E3=81=8F=E3=81=AA=E3=81=A3=E3=81=9F=E3=83=81=E3=83=A5=E3=83=BC?= =?UTF-8?q?=E3=83=88=E3=83=AA=E3=82=A2=E3=83=AB=E3=81=B8=E3=81=AE=E3=83=AA?= =?UTF-8?q?=E3=83=B3=E3=82=AF=E3=82=92=E5=89=8A=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index fe1b5a0c..a258b2e0 100644 --- a/README.md +++ b/README.md @@ -42,7 +42,6 @@ PLATEAU SDK for Unityは利用者アンケートを実施しています。 今 # 利用手順 - SDKの最新版は[Releaseページ](https://github.com/Project-PLATEAU/PLATEAU-SDK-for-Unreal/releases)からダウンロードしてください。 - 詳しい利用方法については、こちらの [マニュアル](https://Project-PLATEAU.github.io/PLATEAU-SDK-for-Unreal/index.html) をご覧ください。 -- PLATEAU公式ウェブサイトでは当SDKの [チュートリアル記事](https://www.mlit.go.jp/plateau/learning/tpc17-2/) も公開しています。 # プロジェクトに貢献する このプロジェクトでは、バグ報告・プルリクエストなど皆さんの貢献を歓迎しています。 From 46237ab268a8ba555370efb9f6ceb7500e81b1ea Mon Sep 17 00:00:00 2001 From: Linoal <1321932+linoal@users.noreply.github.com> Date: Fri, 2 Feb 2024 01:39:36 +0900 Subject: [PATCH 05/13] =?UTF-8?q?=E3=83=90=E3=83=BC=E3=82=B8=E3=83=A7?= =?UTF-8?q?=E3=83=B3=E6=83=85=E5=A0=B1=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PLATEAU-SDK-for-Unreal.uplugin | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PLATEAU-SDK-for-Unreal.uplugin b/PLATEAU-SDK-for-Unreal.uplugin index 96e399c7..0687b57e 100644 --- a/PLATEAU-SDK-for-Unreal.uplugin +++ b/PLATEAU-SDK-for-Unreal.uplugin @@ -1,7 +1,7 @@ { "FileVersion": 3, "Version": 3, - "VersionName": "2.0.1-alpha", + "VersionName": "2.2.0", "FriendlyName": "PLATEAU SDK for Unreal", "Description": "", "Category": "Geospatial", From 5594e146f614d34fbaff25353a847d29aea0f36d Mon Sep 17 00:00:00 2001 From: Linoal <1321932+linoal@users.noreply.github.com> Date: Fri, 2 Feb 2024 01:40:54 +0900 Subject: [PATCH 06/13] =?UTF-8?q?uplugin=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PLATEAU-SDK-for-Unreal.uplugin | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PLATEAU-SDK-for-Unreal.uplugin b/PLATEAU-SDK-for-Unreal.uplugin index 0687b57e..325e933c 100644 --- a/PLATEAU-SDK-for-Unreal.uplugin +++ b/PLATEAU-SDK-for-Unreal.uplugin @@ -14,7 +14,7 @@ "IsBetaVersion": false, "IsExperimentalVersion": false, "Installed": false, - "EngineVersion" : ["5.2.0"], + "EngineVersion" : ["5.3.2"], "Modules": [ { "Name": "PLATEAURuntime", From e180025d1abce22942c84167be5941271c717523 Mon Sep 17 00:00:00 2001 From: Linoal <1321932+linoal@users.noreply.github.com> Date: Fri, 2 Feb 2024 01:39:36 +0900 Subject: [PATCH 07/13] =?UTF-8?q?=E3=83=90=E3=83=BC=E3=82=B8=E3=83=A7?= =?UTF-8?q?=E3=83=B3=E6=83=85=E5=A0=B1=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PLATEAU-SDK-for-Unreal.uplugin | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PLATEAU-SDK-for-Unreal.uplugin b/PLATEAU-SDK-for-Unreal.uplugin index 96e399c7..0687b57e 100644 --- a/PLATEAU-SDK-for-Unreal.uplugin +++ b/PLATEAU-SDK-for-Unreal.uplugin @@ -1,7 +1,7 @@ { "FileVersion": 3, "Version": 3, - "VersionName": "2.0.1-alpha", + "VersionName": "2.2.0", "FriendlyName": "PLATEAU SDK for Unreal", "Description": "", "Category": "Geospatial", From 902f8b043bc4d88b44cae80d1dcdbafb40b81217 Mon Sep 17 00:00:00 2001 From: Linoal <1321932+linoal@users.noreply.github.com> Date: Fri, 2 Feb 2024 01:40:54 +0900 Subject: [PATCH 08/13] =?UTF-8?q?uplugin=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PLATEAU-SDK-for-Unreal.uplugin | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PLATEAU-SDK-for-Unreal.uplugin b/PLATEAU-SDK-for-Unreal.uplugin index 0687b57e..325e933c 100644 --- a/PLATEAU-SDK-for-Unreal.uplugin +++ b/PLATEAU-SDK-for-Unreal.uplugin @@ -14,7 +14,7 @@ "IsBetaVersion": false, "IsExperimentalVersion": false, "Installed": false, - "EngineVersion" : ["5.2.0"], + "EngineVersion" : ["5.3.2"], "Modules": [ { "Name": "PLATEAURuntime", From 81a80e055a765472dd0ee1979313451fcd83d4d1 Mon Sep 17 00:00:00 2001 From: Linoal <1321932+linoal@users.noreply.github.com> Date: Fri, 2 Feb 2024 15:21:44 +0900 Subject: [PATCH 09/13] =?UTF-8?q?=E3=83=98=E3=83=83=E3=83=80=E3=83=BC?= =?UTF-8?q?=E3=83=95=E3=82=A1=E3=82=A4=E3=83=AB=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../include/plateau/polygon_mesh/mesh_extractor.h | 1 + Source/ThirdParty/include/plateau/polygon_mesh/node.h | 10 +++++++++- .../include/plateau/texture/map_zoom_level_searcher.h | 9 +++++++++ 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/Source/ThirdParty/include/plateau/polygon_mesh/mesh_extractor.h b/Source/ThirdParty/include/plateau/polygon_mesh/mesh_extractor.h index 5d5bdf4c..bf1a44e9 100644 --- a/Source/ThirdParty/include/plateau/polygon_mesh/mesh_extractor.h +++ b/Source/ThirdParty/include/plateau/polygon_mesh/mesh_extractor.h @@ -60,5 +60,6 @@ namespace plateau::polygonMesh { * そのため橋梁の関数の戻り地は true です。 */ static bool shouldContainPrimaryMesh(unsigned lod, const citygml::CityObject& primary_obj); + static bool isTypeToSkip(citygml::CityObject::CityObjectsType type); }; } diff --git a/Source/ThirdParty/include/plateau/polygon_mesh/node.h b/Source/ThirdParty/include/plateau/polygon_mesh/node.h index a57c246c..d39b017f 100644 --- a/Source/ThirdParty/include/plateau/polygon_mesh/node.h +++ b/Source/ThirdParty/include/plateau/polygon_mesh/node.h @@ -57,13 +57,21 @@ namespace plateau::polygonMesh { /// Node 以下の階層構造を stringstream に書き込みます。 void debugString(std::stringstream& ss, int indent) const; - void setIsPrimary(bool is_primary_); // GranularityConverterでのみ利用します。 + void setGranularityConvertInfo(bool is_primary, bool is_active); // GranularityConverterの内部でのみ利用する情報を付与します。 bool isPrimary() const; // GranularityConverterでのみ利用します。 + void setIsActive(bool is_active); // GranularityConverterでのみ利用します。 + bool isActive() const; // GranularityConverterでのみ利用します。 void reserveChild(size_t reserve_count); private: std::string name_; std::vector child_nodes_; std::unique_ptr mesh_; bool is_primary_; // GranularityConverterでのみ利用します。 + + /** + * ゲームエンジン上でNodeに相当するゲームオブジェクトがアクティブかどうかです。 + * GranularityConverterでのみ利用します。それ以外の用途では常にtrueになります。 + */ + bool is_active_; }; } diff --git a/Source/ThirdParty/include/plateau/texture/map_zoom_level_searcher.h b/Source/ThirdParty/include/plateau/texture/map_zoom_level_searcher.h index 694b9c3f..702bdd9f 100644 --- a/Source/ThirdParty/include/plateau/texture/map_zoom_level_searcher.h +++ b/Source/ThirdParty/include/plateau/texture/map_zoom_level_searcher.h @@ -5,6 +5,9 @@ namespace plateau::texture { + /** + * 指定の地図タイルURLが利用可能かどうか、利用可能な最小と最大のズームレベルが何かを調べた結果です。 + */ struct LIBPLATEAU_EXPORT MapZoomLevelSearchResult { MapZoomLevelSearchResult(bool is_valid, int available_zoom_level_min, int available_zoom_level_max) : is_valid_(is_valid), available_zoom_level_min_(available_zoom_level_min), @@ -17,8 +20,14 @@ namespace plateau::texture { int available_zoom_level_max_; }; + /** + * 指定の地図タイルURLが利用可能かどうか、利用可能な最小と最大のズームレベルが何かを調べます。 + */ class LIBPLATEAU_EXPORT MapZoomLevelSearcher { public: static MapZoomLevelSearchResult search(const std::string& url_template, geometry::GeoCoordinate geo_coord); + private: + static constexpr int zoom_level_search_range_min = 1; + static constexpr int zoom_level_search_range_max = 20; }; } From 89d43cd67195f7cf61609026a5a484b91bfb12b8 Mon Sep 17 00:00:00 2001 From: linoal <1321932+linoal@users.noreply.github.com> Date: Fri, 2 Feb 2024 17:21:51 +0900 Subject: [PATCH 10/13] =?UTF-8?q?Mac=20x86=5F64=E3=81=A7=E3=81=AE=E3=83=93?= =?UTF-8?q?=E3=83=AB=E3=83=89=E3=82=A8=E3=83=A9=E3=83=BC=E3=82=92=E9=83=A8?= =?UTF-8?q?=E5=88=86=E7=9A=84=E3=81=AB=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Source/PLATEAUEditor/PLATEAUEditor.Build.cs | 7 ++++++- .../PLATEAUEditorBPLibraries.Build.cs | 9 ++++++--- Source/PLATEAURuntime/PLATEAURuntime.Build.cs | 9 +++++---- .../PLATEAURuntimeBPLibraries.Build.cs | 10 +++++++--- Source/PLATEAUTests/PLATEAUTests.Build.cs | 9 ++++++--- 5 files changed, 30 insertions(+), 14 deletions(-) diff --git a/Source/PLATEAUEditor/PLATEAUEditor.Build.cs b/Source/PLATEAUEditor/PLATEAUEditor.Build.cs index 4846f643..938157ee 100644 --- a/Source/PLATEAUEditor/PLATEAUEditor.Build.cs +++ b/Source/PLATEAUEditor/PLATEAUEditor.Build.cs @@ -93,12 +93,16 @@ public void IncludeLibPlateau() if (Target.Platform == UnrealTargetPlatform.Win64) { libPlateauPath += "/windows/plateau_combined.lib"; + PublicAdditionalLibraries.Add(libPlateauPath); PublicAdditionalLibraries.Add("glu32.lib"); PublicAdditionalLibraries.Add("opengl32.lib"); } else if (Target.Platform == UnrealTargetPlatform.Mac) { - libPlateauPath += "/macos/arm64/libplateau_combined.a"; + PublicAdditionalLibraries.Add(libPlateauPath + "/macos/arm64/libplateau_combined.a"); + PublicAdditionalLibraries.Add(libPlateauPath + "/macos/x86_64/libplateau_combined.a"); + + PublicAdditionalLibraries.Add("/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/lib/libiconv.tbd"); PublicAdditionalLibraries.Add("/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/lib/liblzma.tbd"); // PublicAdditionalLibraries.Add("GLU"); @@ -107,6 +111,7 @@ public void IncludeLibPlateau() else if (Target.Platform == UnrealTargetPlatform.Linux) { libPlateauPath += "linux/libplateau.a"; + PublicAdditionalLibraries.Add(libPlateauPath); } else { diff --git a/Source/PLATEAUEditorBPLibraries/PLATEAUEditorBPLibraries.Build.cs b/Source/PLATEAUEditorBPLibraries/PLATEAUEditorBPLibraries.Build.cs index 2c7995e8..9010dbd0 100644 --- a/Source/PLATEAUEditorBPLibraries/PLATEAUEditorBPLibraries.Build.cs +++ b/Source/PLATEAUEditorBPLibraries/PLATEAUEditorBPLibraries.Build.cs @@ -51,10 +51,14 @@ public void IncludeLibPlateau() { if (Target.Platform == UnrealTargetPlatform.Win64) { libPlateauPath = libPlateauPath + "/windows/plateau_combined.lib"; + PublicAdditionalLibraries.Add(libPlateauPath); PublicAdditionalLibraries.Add("glu32.lib"); PublicAdditionalLibraries.Add("opengl32.lib"); } else if (Target.Platform == UnrealTargetPlatform.Mac) { - libPlateauPath = libPlateauPath + "/macos/arm64/libplateau_combined.a"; + + PublicAdditionalLibraries.Add(libPlateauPath + "/macos/arm64/libplateau_combined.a"); + PublicAdditionalLibraries.Add(libPlateauPath + "/macos/x86_64/libplateau_combined.a"); + PublicAdditionalLibraries.Add( "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/lib/libiconv.tbd"); PublicAdditionalLibraries.Add("/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/lib/liblzma.tbd"); @@ -62,12 +66,11 @@ public void IncludeLibPlateau() { "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/OpenGL.framework/Versions/A/OpenGL.tbd"); } else if (Target.Platform == UnrealTargetPlatform.Linux) { libPlateauPath = libPlateauPath + "/linux/libplateau.a"; + PublicAdditionalLibraries.Add(libPlateauPath); } else { throw new Exception("Unknown OS."); } - PublicAdditionalLibraries.Add(libPlateauPath); - //using c++17 CppStandard = CppStandardVersion.Cpp17; } diff --git a/Source/PLATEAURuntime/PLATEAURuntime.Build.cs b/Source/PLATEAURuntime/PLATEAURuntime.Build.cs index ce9dd1da..4f12cb38 100644 --- a/Source/PLATEAURuntime/PLATEAURuntime.Build.cs +++ b/Source/PLATEAURuntime/PLATEAURuntime.Build.cs @@ -81,12 +81,15 @@ public void IncludeLibPlateau() if (Target.Platform == UnrealTargetPlatform.Win64) { libPlateauPath = libPlateauPath + "/windows/plateau_combined.lib"; + PublicAdditionalLibraries.Add(libPlateauPath); PublicAdditionalLibraries.Add("glu32.lib"); PublicAdditionalLibraries.Add("opengl32.lib"); } else if (Target.Platform == UnrealTargetPlatform.Mac) { - libPlateauPath = libPlateauPath + "/macos/arm64/libplateau_combined.a"; + PublicAdditionalLibraries.Add(libPlateauPath + "/macos/arm64/libplateau_combined.a"); + PublicAdditionalLibraries.Add(libPlateauPath + "/macos/x86_64/libplateau_combined.a"); + PublicAdditionalLibraries.Add("/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/lib/libiconv.tbd"); PublicAdditionalLibraries.Add("/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/lib/liblzma.tbd"); PublicAdditionalLibraries.Add("/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/OpenGL.framework/Versions/A/OpenGL.tbd"); @@ -94,15 +97,13 @@ public void IncludeLibPlateau() else if (Target.Platform == UnrealTargetPlatform.Linux) { libPlateauPath = libPlateauPath + "/linux/libplateau.a"; + PublicAdditionalLibraries.Add(libPlateauPath); } else { throw new Exception("Unknown OS."); } - PublicAdditionalLibraries.Add(libPlateauPath); - - //using c++17 CppStandard = CppStandardVersion.Cpp17; diff --git a/Source/PLATEAURuntimeBPLibraries/PLATEAURuntimeBPLibraries.Build.cs b/Source/PLATEAURuntimeBPLibraries/PLATEAURuntimeBPLibraries.Build.cs index 11ec22ad..fea2ceb9 100644 --- a/Source/PLATEAURuntimeBPLibraries/PLATEAURuntimeBPLibraries.Build.cs +++ b/Source/PLATEAURuntimeBPLibraries/PLATEAURuntimeBPLibraries.Build.cs @@ -45,10 +45,15 @@ public void IncludeLibPlateau() { if (Target.Platform == UnrealTargetPlatform.Win64) { libPlateauPath = libPlateauPath + "/windows/plateau_combined.lib"; + PublicAdditionalLibraries.Add(libPlateauPath); PublicAdditionalLibraries.Add("glu32.lib"); PublicAdditionalLibraries.Add("opengl32.lib"); } else if (Target.Platform == UnrealTargetPlatform.Mac) { - libPlateauPath = libPlateauPath + "/macos/arm64/libplateau_combined.a"; + + PublicAdditionalLibraries.Add(libPlateauPath + "/macos/arm64/libplateau_combined.a"); + PublicAdditionalLibraries.Add(libPlateauPath + "/macos/x86_64/libplateau_combined.a"); + + PublicAdditionalLibraries.Add( "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/lib/libiconv.tbd"); PublicAdditionalLibraries.Add("/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/lib/liblzma.tbd"); @@ -56,12 +61,11 @@ public void IncludeLibPlateau() { "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/OpenGL.framework/Versions/A/OpenGL.tbd"); } else if (Target.Platform == UnrealTargetPlatform.Linux) { libPlateauPath = libPlateauPath + "/linux/libplateau.a"; + PublicAdditionalLibraries.Add(libPlateauPath); } else { throw new Exception("Unknown OS."); } - PublicAdditionalLibraries.Add(libPlateauPath); - //using c++17 CppStandard = CppStandardVersion.Cpp17; } diff --git a/Source/PLATEAUTests/PLATEAUTests.Build.cs b/Source/PLATEAUTests/PLATEAUTests.Build.cs index e32be245..32909d78 100644 --- a/Source/PLATEAUTests/PLATEAUTests.Build.cs +++ b/Source/PLATEAUTests/PLATEAUTests.Build.cs @@ -49,10 +49,14 @@ public void IncludeLibPlateau() { if (Target.Platform == UnrealTargetPlatform.Win64) { libPlateauPath = libPlateauPath + "/windows/plateau_combined.lib"; + PublicAdditionalLibraries.Add(libPlateauPath); PublicAdditionalLibraries.Add("glu32.lib"); PublicAdditionalLibraries.Add("opengl32.lib"); } else if (Target.Platform == UnrealTargetPlatform.Mac) { - libPlateauPath = libPlateauPath + "/macos/arm64/libplateau_combined.a"; + + PublicAdditionalLibraries.Add(libPlateauPath + "/macos/arm64/libplateau_combined.a"); + PublicAdditionalLibraries.Add(libPlateauPath + "/macos/x86_64/libplateau_combined.a"); + PublicAdditionalLibraries.Add( "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/lib/libiconv.tbd"); PublicAdditionalLibraries.Add("/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/lib/liblzma.tbd"); @@ -60,12 +64,11 @@ public void IncludeLibPlateau() { "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/OpenGL.framework/Versions/A/OpenGL.tbd"); } else if (Target.Platform == UnrealTargetPlatform.Linux) { libPlateauPath = libPlateauPath + "/linux/libplateau.a"; + PublicAdditionalLibraries.Add(libPlateauPath); } else { throw new Exception("Unknown OS."); } - PublicAdditionalLibraries.Add(libPlateauPath); - //using c++17 CppStandard = CppStandardVersion.Cpp17; } From bf9542b3c7d2491e3b0c93ad8cd568a7a733c78d Mon Sep 17 00:00:00 2001 From: linoal <1321932+linoal@users.noreply.github.com> Date: Fri, 2 Feb 2024 20:43:04 +0900 Subject: [PATCH 11/13] =?UTF-8?q?=E3=83=90=E3=82=A4=E3=83=8A=E3=83=AA?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=EF=BC=88mac=20x86=5F64=E4=BB=A5=E5=A4=96?= =?UTF-8?q?=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Source/ThirdParty/lib/linux/libplateau.a | 4 ++-- Source/ThirdParty/lib/macos/arm64/libplateau_combined.a | 4 ++-- Source/ThirdParty/lib/macos/x86_64/libplateau_combined.a | 4 ++-- Source/ThirdParty/lib/windows/plateau_combined.lib | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Source/ThirdParty/lib/linux/libplateau.a b/Source/ThirdParty/lib/linux/libplateau.a index b1e0ce0e..36f9158a 100644 --- a/Source/ThirdParty/lib/linux/libplateau.a +++ b/Source/ThirdParty/lib/linux/libplateau.a @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f71522e8808645d39f6db9549aef73d6c79a962f7adc9ff7e895d78c25529c10 -size 28856510 +oid sha256:6610d4e1789dde9fec0a2a2c7c7afff178d5a0a3323176c1f2d8ff93f5858dcd +size 28857632 diff --git a/Source/ThirdParty/lib/macos/arm64/libplateau_combined.a b/Source/ThirdParty/lib/macos/arm64/libplateau_combined.a index 50e51b56..bf2f5697 100644 --- a/Source/ThirdParty/lib/macos/arm64/libplateau_combined.a +++ b/Source/ThirdParty/lib/macos/arm64/libplateau_combined.a @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8141a989946d620f215145b87398716e7e400ac3348d74f0b99614f7650bfd4c -size 102661576 +oid sha256:fef303e83a79e45b43509021d55b5d1e15bdcd7ae213e1367a04f4ec4cb2ed7b +size 102662504 diff --git a/Source/ThirdParty/lib/macos/x86_64/libplateau_combined.a b/Source/ThirdParty/lib/macos/x86_64/libplateau_combined.a index 9344f117..0a70042e 100644 --- a/Source/ThirdParty/lib/macos/x86_64/libplateau_combined.a +++ b/Source/ThirdParty/lib/macos/x86_64/libplateau_combined.a @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:aed5a1434a07c17fbb208d611dec9260733af36b464b7fbceefbb9e51b54e77e -size 115405536 +oid sha256:9aead5981393f27bcf1c0277f6cf163040e0583d04ebb966a6129bde000419c0 +size 115425472 diff --git a/Source/ThirdParty/lib/windows/plateau_combined.lib b/Source/ThirdParty/lib/windows/plateau_combined.lib index 9bc8aa5b..dfc681f7 100644 --- a/Source/ThirdParty/lib/windows/plateau_combined.lib +++ b/Source/ThirdParty/lib/windows/plateau_combined.lib @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0ec261e341feda9e32f5df94f03621bb411231a7bc7c9db46e2723196c724040 -size 268098702 +oid sha256:0eba57d8a3c02f72fe2a038a72705a5bd9bd93f75a2dee49c5b5675329ebe18c +size 268098522 From 05b10eaf58ed224b46afc2ce5c934f61c45f8ed7 Mon Sep 17 00:00:00 2001 From: Kazumasa Sakiyama Date: Thu, 8 Feb 2024 16:13:26 +0900 Subject: [PATCH 12/13] =?UTF-8?q?CityModelLoader=E3=81=AEImportGml?= =?UTF-8?q?=E9=96=A2=E6=95=B0=E3=81=A7Phase=E3=81=A8FinishedDelegate?= =?UTF-8?q?=E3=81=8C=E5=8F=8D=E6=98=A0=E3=81=95=E3=82=8C=E3=81=A6=E3=81=84?= =?UTF-8?q?=E3=81=AA=E3=81=84=E5=95=8F=E9=A1=8C=E3=81=AE=E4=BF=AE=E6=AD=A3?= =?UTF-8?q?=20(#209)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Private/PLATEAUCityModelLoader.cpp | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/Source/PLATEAURuntime/Private/PLATEAUCityModelLoader.cpp b/Source/PLATEAURuntime/Private/PLATEAUCityModelLoader.cpp index 53e99826..88fcea6c 100644 --- a/Source/PLATEAURuntime/Private/PLATEAUCityModelLoader.cpp +++ b/Source/PLATEAURuntime/Private/PLATEAUCityModelLoader.cpp @@ -476,6 +476,8 @@ void APLATEAUCityModelLoader::LoadAsync(const bool bAutomationTest) { void APLATEAUCityModelLoader::LoadGmlAsync(const FString& GmlPath) { #if WITH_EDITOR + Phase = ECityModelLoadingPhase::Start; + // アクター生成 APLATEAUInstancedCityModel* ModelActor = GetWorld()->SpawnActor(); CreateRootComponent(*ModelActor); @@ -495,7 +497,9 @@ void APLATEAUCityModelLoader::LoadGmlAsync(const FString& GmlPath) { Async(EAsyncExecution::Thread, [ ModelActor, GmlPath, - GeoReference = GeoReference + GeoReference = GeoReference, + ImportFinishedDelegate = ImportFinishedDelegate, + Phase = &Phase ]() mutable { const auto CityModel = FCityModelLoaderImpl::ParseCityGml(GmlPath); @@ -519,6 +523,13 @@ void APLATEAUCityModelLoader::LoadGmlAsync(const FString& GmlPath) { TAtomic Canceled = false; FPLATEAUMeshLoader(false).LoadModel(ModelActor, GmlRootComponent, Model, InputData, CityModel, &Canceled); + *Phase = ECityModelLoadingPhase::Finished; + + FFunctionGraphTask::CreateAndDispatchWhenReady( + [ImportFinishedDelegate] { + ImportFinishedDelegate.Broadcast(); + }, TStatId(), nullptr, ENamedThreads::GameThread); + return true; }); #endif From 4cb3077ef56e300fcdfed61dc67d66e44d537975 Mon Sep 17 00:00:00 2001 From: linoal <1321932+linoal@users.noreply.github.com> Date: Thu, 8 Feb 2024 16:57:19 +0900 Subject: [PATCH 13/13] =?UTF-8?q?mac=20x86=5F=2064=E5=90=91=E3=81=91?= =?UTF-8?q?=E3=81=AE=E5=85=B1=E9=80=9A=E3=83=A9=E3=82=A4=E3=83=96=E3=83=A9?= =?UTF-8?q?=E3=83=AA=E3=83=90=E3=82=A4=E3=83=8A=E3=83=AA=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Source/ThirdParty/lib/macos/x86_64/libplateau_combined.a | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/ThirdParty/lib/macos/x86_64/libplateau_combined.a b/Source/ThirdParty/lib/macos/x86_64/libplateau_combined.a index 0a70042e..7c16b7b0 100644 --- a/Source/ThirdParty/lib/macos/x86_64/libplateau_combined.a +++ b/Source/ThirdParty/lib/macos/x86_64/libplateau_combined.a @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9aead5981393f27bcf1c0277f6cf163040e0583d04ebb966a6129bde000419c0 -size 115425472 +oid sha256:769bce3234686dc0c397d35ec3afcb500ddf3cb87e75a225cf8e2d8b210f0a2b +size 252623232