diff --git a/Bimangle.ForgeEngine.3DXML/Bimangle.ForgeEngine.3DXML.csproj b/Bimangle.ForgeEngine.3DXML/Bimangle.ForgeEngine.3DXML.csproj index dc30416..098099e 100644 --- a/Bimangle.ForgeEngine.3DXML/Bimangle.ForgeEngine.3DXML.csproj +++ b/Bimangle.ForgeEngine.3DXML/Bimangle.ForgeEngine.3DXML.csproj @@ -73,17 +73,17 @@ false - - ..\packages\Bimangle.ForgeEngine.3DXML.1.1.5\lib\net452\Bimangle.ForgeEngine.3DXML.dll + + ..\packages\Bimangle.ForgeEngine.3DXML.1.1.8\lib\net452\Bimangle.ForgeEngine.3DXML.dll - - ..\packages\Bimangle.ForgeEngine.Common.1.7.7\lib\net45\Bimangle.ForgeEngine.Common.dll + + ..\packages\Bimangle.ForgeEngine.Common.1.8.1\lib\net45\Bimangle.ForgeEngine.Common.dll - - ..\packages\Bimangle.ForgeEngine.3DXML.1.1.5\lib\net452\Bimangle.Libs.dll + + ..\packages\Bimangle.ForgeEngine.3DXML.1.1.8\lib\net452\Bimangle.Libs.dll - - ..\packages\Bimangle.ForgeEngine.3DXML.1.1.5\lib\net452\Bimangle.Libs.Proj.dll + + ..\packages\Bimangle.ForgeEngine.3DXML.1.1.8\lib\net452\Bimangle.Libs.Proj.dll ..\packages\CommandLineParser.2.9.1\lib\net45\CommandLine.dll diff --git a/Bimangle.ForgeEngine.3DXML/Strings.Designer.cs b/Bimangle.ForgeEngine.3DXML/Strings.Designer.cs index 2f4b47d..57ef1d0 100644 --- a/Bimangle.ForgeEngine.3DXML/Strings.Designer.cs +++ b/Bimangle.ForgeEngine.3DXML/Strings.Designer.cs @@ -47,8 +47,8 @@ internal Strings() { } /// - /// 重写当前线程的 CurrentUICulture 属性 - /// 重写当前线程的 CurrentUICulture 属性。 + /// 重写当前线程的 CurrentUICulture 属性，对 + /// 使用此强类型资源类的所有资源查找执行重写。 /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] internal static global::System.Globalization.CultureInfo Culture { @@ -403,7 +403,7 @@ internal static string FeatureDescriptionForce2DViewUseWireframe { } /// - /// 查找类似 的本地化字符串。 + /// 查找类似 The output data is compatible with EarthSDK 的本地化字符串。 /// internal static string FeatureDescriptionForEarthSdk { get { @@ -474,6 +474,15 @@ internal static string FeatureDescriptionOnlySelected { } } + /// + /// 查找类似 Optimize the geometry surface material, and intelligently adjust the geometry surface for double-sided material to single-sided material output, reducing flicker problems 的本地化字符串。 + /// + internal static string FeatureDescriptionOptimizationFaceMaterial { + get { + return ResourceManager.GetString("FeatureDescriptionOptimizationFaceMaterial", resourceCulture); + } + } + /// /// 查找类似 Enable Reduce Geometry Node To Parent Node 的本地化字符串。 /// @@ -510,6 +519,15 @@ internal static string FeatureDescriptionRegroupForWorkSet { } } + /// + /// 查找类似 Publish data using 3D Tiles 1.1 specification 的本地化字符串。 + /// + internal static string FeatureDescriptionUse3DTilesSpecification11 { + get { + return ResourceManager.GetString("FeatureDescriptionUse3DTilesSpecification11", resourceCulture); + } + } + /// /// 查找类似 Use level category by element's bounding box 的本地化字符串。 /// @@ -879,6 +897,15 @@ internal static string FeatureNameOnlySelected { } } + /// + /// 查找类似 Optimization face material 的本地化字符串。 + /// + internal static string FeatureNameOptimizationFaceMaterial { + get { + return ResourceManager.GetString("FeatureNameOptimizationFaceMaterial", resourceCulture); + } + } + /// /// 查找类似 Enable Reduce Geometry Node 的本地化字符串。 /// @@ -915,6 +942,15 @@ internal static string FeatureNameRegroupForWorkSet { } } + /// + /// 查找类似 Using 3D Tiles 1.1 的本地化字符串。 + /// + internal static string FeatureNameUse3DTilesSpecification11 { + get { + return ResourceManager.GetString("FeatureNameUse3DTilesSpecification11", resourceCulture); + } + } + /// /// 查找类似 Use level(bound) category 的本地化字符串。 /// diff --git a/Bimangle.ForgeEngine.3DXML/Strings.resx b/Bimangle.ForgeEngine.3DXML/Strings.resx index 52dac2e..ea3a280 100644 --- a/Bimangle.ForgeEngine.3DXML/Strings.resx +++ b/Bimangle.ForgeEngine.3DXML/Strings.resx @@ -630,4 +630,16 @@ The output data is compatible with EarthSDK + + Optimize the geometry surface material, and intelligently adjust the geometry surface for double-sided material to single-sided material output, reducing flicker problems + + + Optimization face material + + + Using 3D Tiles 1.1 + + + Publish data using 3D Tiles 1.1 specification + \ No newline at end of file diff --git a/Bimangle.ForgeEngine.3DXML/Strings.zh-Hans.resx b/Bimangle.ForgeEngine.3DXML/Strings.zh-Hans.resx index 8c24610..7344669 100644 --- a/Bimangle.ForgeEngine.3DXML/Strings.zh-Hans.resx +++ b/Bimangle.ForgeEngine.3DXML/Strings.zh-Hans.resx @@ -636,4 +636,16 @@ 输出的数据兼容 EarthSDK + + 优化几何面材质，将对于双面材质几何面智能调整为单面材质输出，缓解闪烁问题 + + + 优化几何面材质 + + + 使用 3D Tiles 1.1 + + + 使用 3D Tiles 1.1 规范发布数据 + \ No newline at end of file diff --git a/Bimangle.ForgeEngine.3DXML/StringsUI.Designer.cs b/Bimangle.ForgeEngine.3DXML/StringsUI.Designer.cs index 6826c42..f4e746a 100644 --- a/Bimangle.ForgeEngine.3DXML/StringsUI.Designer.cs +++ b/Bimangle.ForgeEngine.3DXML/StringsUI.Designer.cs @@ -47,8 +47,8 @@ internal StringsUI() { } /// - /// 重写当前线程的 CurrentUICulture 属性 - /// 重写当前线程的 CurrentUICulture 属性。 + /// 重写当前线程的 CurrentUICulture 属性，对 + /// 使用此强类型资源类的所有资源查找执行重写。 /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] internal static global::System.Globalization.CultureInfo Culture { diff --git a/Bimangle.ForgeEngine.3DXML/StringsUI.zh-Hans.resx b/Bimangle.ForgeEngine.3DXML/StringsUI.zh-Hans.resx index 5b7aca8..f1d5690 100644 --- a/Bimangle.ForgeEngine.3DXML/StringsUI.zh-Hans.resx +++ b/Bimangle.ForgeEngine.3DXML/StringsUI.zh-Hans.resx @@ -126,7 +126,7 @@ 请选择或输入源模型文件. - 当前计算机未安装 Autodesk Navisworks Manager r2014 - r2019 , 本次操作将会失败, 真的要继续吗? + 当前计算机未安装 Autodesk Navisworks Manager, 本次操作将会失败, 真的要继续吗? 当前计算机未安装 Revit {0}, 当前未选择升级模式, 本次操作将会失败, 真的要继续吗? diff --git a/Bimangle.ForgeEngine.3DXML/UI/Controls/ExportCesium3DTiles.Designer.cs b/Bimangle.ForgeEngine.3DXML/UI/Controls/ExportCesium3DTiles.Designer.cs index 70d9798..574f554 100644 --- a/Bimangle.ForgeEngine.3DXML/UI/Controls/ExportCesium3DTiles.Designer.cs +++ b/Bimangle.ForgeEngine.3DXML/UI/Controls/ExportCesium3DTiles.Designer.cs @@ -37,6 +37,7 @@ private void InitializeComponent() this.cbContentType = new System.Windows.Forms.ComboBox(); this.lblContents = new System.Windows.Forms.Label(); this.gbAdvanced = new System.Windows.Forms.GroupBox(); + this.cbUse3DTilesSpecification11 = new System.Windows.Forms.CheckBox(); this.cbForEarthSdk = new System.Windows.Forms.CheckBox(); this.cbGeometryCompressTypes = new System.Windows.Forms.ComboBox(); this.cbEnableGeometryCompress = new System.Windows.Forms.CheckBox(); @@ -120,6 +121,7 @@ private void InitializeComponent() // gbAdvanced // resources.ApplyResources(this.gbAdvanced, "gbAdvanced"); + this.gbAdvanced.Controls.Add(this.cbUse3DTilesSpecification11); this.gbAdvanced.Controls.Add(this.cbForEarthSdk); this.gbAdvanced.Controls.Add(this.cbGeometryCompressTypes); this.gbAdvanced.Controls.Add(this.cbEnableGeometryCompress); @@ -132,6 +134,13 @@ private void InitializeComponent() this.gbAdvanced.TabStop = false; this.toolTip1.SetToolTip(this.gbAdvanced, resources.GetString("gbAdvanced.ToolTip")); // + // cbUse3DTilesSpecification11 + // + resources.ApplyResources(this.cbUse3DTilesSpecification11, "cbUse3DTilesSpecification11"); + this.cbUse3DTilesSpecification11.Name = "cbUse3DTilesSpecification11"; + this.toolTip1.SetToolTip(this.cbUse3DTilesSpecification11, resources.GetString("cbUse3DTilesSpecification11.ToolTip")); + this.cbUse3DTilesSpecification11.UseVisualStyleBackColor = true; + // // cbForEarthSdk // resources.ApplyResources(this.cbForEarthSdk, "cbForEarthSdk"); @@ -377,5 +386,6 @@ private void InitializeComponent() private System.Windows.Forms.CheckBox cbForEarthSdk; private System.Windows.Forms.ComboBox cbGeometryCompressTypes; private System.Windows.Forms.CheckBox cbEnableGeometryCompress; + private System.Windows.Forms.CheckBox cbUse3DTilesSpecification11; } } \ No newline at end of file diff --git a/Bimangle.ForgeEngine.3DXML/UI/Controls/ExportCesium3DTiles.cs b/Bimangle.ForgeEngine.3DXML/UI/Controls/ExportCesium3DTiles.cs index 02414e0..bb0170a 100644 --- a/Bimangle.ForgeEngine.3DXML/UI/Controls/ExportCesium3DTiles.cs +++ b/Bimangle.ForgeEngine.3DXML/UI/Controls/ExportCesium3DTiles.cs @@ -100,6 +100,7 @@ void IExportControl.Init(IExportForm form, AppConfig config) new FeatureInfo(FeatureType.EnableMeshQuantized, string.Empty, string.Empty, true, false), new FeatureInfo(FeatureType.UseGoogleDracoPatch, string.Empty, string.Empty, true, false), new FeatureInfo(FeatureType.ForEarthSdk, string.Empty, Strings.FeatureDescriptionForEarthSdk, true, false), + new FeatureInfo(FeatureType.Use3DTilesSpecification11, Strings.FeatureNameUse3DTilesSpecification11, Strings.FeatureDescriptionUse3DTilesSpecification11, true, false), }; _VisualStyles = new List(); @@ -197,6 +198,7 @@ void IExportControl.Reset() cbGenerateOutline.Checked = false; cbEnableUnlitMaterials.Checked = false; cbForEarthSdk.Checked = false; + cbUse3DTilesSpecification11.Checked = false; { _LocalConfig.GeoreferencedSetting = _GeoreferncingHost.CreateDefaultSetting(); @@ -220,7 +222,7 @@ private void FormExport_Load(object sender, EventArgs e) cbVisualStyle, cbGenerateThumbnail, cbGenerateOutline, cbExcludeLines, cbExcludeModelPoints, cbExcludeUnselectedElements, - cbEnableGeometryCompress, cbGeometryCompressTypes, cbForEarthSdk, + cbEnableGeometryCompress, cbGeometryCompressTypes, cbForEarthSdk, cbUse3DTilesSpecification11, cbGeneratePropDbSqlite, cbExportSvfzip, cbEnableTextureCompress, cbTextureCompressTypes, cbEnableUnlitMaterials, cbContentType) .AddEventListener(RefreshCommand); @@ -335,6 +337,7 @@ bool IsAllowFeature(FeatureType feature) toolTip1.SetToolTip(cbGenerateOutline, Strings.FeatureDescriptionEnableCesiumPrimitiveOutline); toolTip1.SetToolTip(cbEnableUnlitMaterials, Strings.FeatureDescriptionEnableUnlitMaterials); toolTip1.SetToolTip(cbForEarthSdk, Strings.FeatureDescriptionForEarthSdk); + toolTip1.SetToolTip(cbUse3DTilesSpecification11, Strings.FeatureDescriptionUse3DTilesSpecification11); if (IsAllowFeature(FeatureType.UseGoogleDraco)) { @@ -412,6 +415,11 @@ bool IsAllowFeature(FeatureType feature) { cbForEarthSdk.Checked = true; } + + if (IsAllowFeature(FeatureType.Use3DTilesSpecification11)) + { + cbUse3DTilesSpecification11.Checked = true; + } } #endregion @@ -475,9 +483,9 @@ public override string ToString() private class ComboItemInfo { - public int Value { get; } + public int Value { get; } - private string Text { get; } + private string Text { get; } public ComboItemInfo(int value, string text) { @@ -573,6 +581,7 @@ void SetFeature(FeatureType featureType, bool selected) SetFeature(FeatureType.EnableCesiumPrimitiveOutline, cbGenerateOutline.Checked); SetFeature(FeatureType.EnableUnlitMaterials, cbEnableUnlitMaterials.Checked); SetFeature(FeatureType.ForEarthSdk, cbForEarthSdk.Checked); + SetFeature(FeatureType.Use3DTilesSpecification11, cbUse3DTilesSpecification11.Checked); SetFeature(FeatureType.EnableTextureWebP, false); SetFeature(FeatureType.EnableTextureKtx2, false); @@ -597,7 +606,7 @@ void SetFeature(FeatureType featureType, bool selected) if(_LocalConfig.GeoreferencedSetting != null) { - var d = _GeoreferncingHost.CreateTargetSetting(_LocalConfig.GeoreferencedSetting); + var d = _GeoreferncingHost.CreateTargetSettingForCLI(_LocalConfig.GeoreferencedSetting); r.GeoreferencedBase64 = d.ToBase64(); } diff --git a/Bimangle.ForgeEngine.3DXML/UI/Controls/ExportCesium3DTiles.resx b/Bimangle.ForgeEngine.3DXML/UI/Controls/ExportCesium3DTiles.resx index 5edbc3f..125ef81 100644 --- a/Bimangle.ForgeEngine.3DXML/UI/Controls/ExportCesium3DTiles.resx +++ b/Bimangle.ForgeEngine.3DXML/UI/Controls/ExportCesium3DTiles.resx @@ -156,6 +156,9 @@ NoControl + + 1 + $this @@ -219,9 +222,6 @@ 3 - - Thumbnail - Exclude @@ -240,17 +240,20 @@ gb3DTiles - - 3 - 4 3D Tiles - - 144, 21 + + gbAdvanced + + + 15, 167 + + + $this @@ -261,6 +264,9 @@ 369, 153 + + NoControl + Contents: @@ -294,6 +300,9 @@ cbEnableTextureCompress + + 12 + 0 @@ -306,6 +315,9 @@ True + + + 0 @@ -375,8 +387,8 @@ gpGeneral - - 1 + + Thumbnail System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -396,8 +408,8 @@ Top, Left, Right - - + + 3 True @@ -442,13 +454,13 @@ NoControl - 5 + 6 gbAdvanced - 6 + 7 Model Lines @@ -456,8 +468,8 @@ 1 - - MiddleRight + + 0 Top, Bottom, Left, Right @@ -594,12 +606,18 @@ False + + + 4 - + 2 + + gpGeneral + Vertical @@ -615,6 +633,9 @@ 208, 22 + + gbAdvanced + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -633,9 +654,6 @@ - - 0 - NoControl @@ -670,7 +688,7 @@ System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - 4 + 5 0 @@ -681,8 +699,8 @@ 0 - - + + lblLevelOfDetail Options: @@ -697,7 +715,7 @@ 108, 20 - 0 + 1 2 @@ -744,8 +762,8 @@ MiddleLeft - - + + MiddleRight 101, 153 @@ -777,8 +795,8 @@ 3 - - gpGeneral + + NoControl 3 @@ -789,9 +807,15 @@ Compatible with EarthSDK + + + 3 + + 2 + Model Points @@ -801,6 +825,9 @@ 1 + + + Top, Left, Right @@ -849,9 +876,6 @@ 110, 22 - - lblLevelOfDetail - 7 @@ -865,10 +889,7 @@ lblGeoreferncing - 7 - - - NoControl + 8 720, 360 @@ -909,12 +930,18 @@ 7 - - 2 + + + + + 0 lblContents + + 124, 18 + cbEnableGeometryCompress @@ -940,7 +967,7 @@ 2 - 2 + 3 1 @@ -978,11 +1005,14 @@ 262, 203 + + + 141, 18 - - + + 2 2 @@ -999,8 +1029,8 @@ 101, 14 - - 1 + + 144, 21 System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -1020,8 +1050,8 @@ True - - $this + + cbUse3DTilesSpecification11 toolTip1 @@ -1044,9 +1074,6 @@ - - gb3DTiles - 6 @@ -1062,6 +1089,9 @@ System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + @@ -1071,9 +1101,6 @@ 4 - - gbAdvanced - True @@ -1090,7 +1117,10 @@ 0 - 3 + 4 + + + True 302, 116 @@ -1101,8 +1131,11 @@ 95, 18 - - + + Using 3D Tiles 1.1 + + + gb3DTiles System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 diff --git a/Bimangle.ForgeEngine.3DXML/UI/Controls/ExportCesium3DTiles.zh-Hans.resx b/Bimangle.ForgeEngine.3DXML/UI/Controls/ExportCesium3DTiles.zh-Hans.resx index 6c074a9..dee7ba7 100644 --- a/Bimangle.ForgeEngine.3DXML/UI/Controls/ExportCesium3DTiles.zh-Hans.resx +++ b/Bimangle.ForgeEngine.3DXML/UI/Controls/ExportCesium3DTiles.zh-Hans.resx @@ -145,6 +145,15 @@ + + 119, 18 + + + 使用 3D Tiles 1.1 + + + + 105, 18 diff --git a/Bimangle.ForgeEngine.3DXML/packages.config b/Bimangle.ForgeEngine.3DXML/packages.config index ac4beac..a315347 100644 --- a/Bimangle.ForgeEngine.3DXML/packages.config +++ b/Bimangle.ForgeEngine.3DXML/packages.config @@ -1,7 +1,7 @@  - - + + diff --git a/Bimangle.ForgeEngine.Dgn/Bimangle.ForgeEngine.Dgn.csproj b/Bimangle.ForgeEngine.Dgn/Bimangle.ForgeEngine.Dgn.csproj index eb94bb6..2598963 100644 --- a/Bimangle.ForgeEngine.Dgn/Bimangle.ForgeEngine.Dgn.csproj +++ b/Bimangle.ForgeEngine.Dgn/Bimangle.ForgeEngine.Dgn.csproj @@ -73,20 +73,20 @@ C:\Program Files\Bentley\MicroStation CONNECT Edition\MicroStation\Assemblies\ECFramework\Bentley.UI.dll False - - ..\packages\Bimangle.ForgeEngine.Common.1.7.7\lib\net45\Bimangle.ForgeEngine.Common.dll + + ..\packages\Bimangle.ForgeEngine.Common.1.8.1\lib\net45\Bimangle.ForgeEngine.Common.dll - - ..\packages\Bimangle.ForgeEngine.Dgn.2.0.2\lib\net462\Bimangle.ForgeEngine.Dgn.dll + + ..\packages\Bimangle.ForgeEngine.Dgn.2.0.5\lib\net462\Bimangle.ForgeEngine.Dgn.dll - ..\packages\Bimangle.ForgeEngine.Dgn.2.0.2\lib\net462\Bimangle.ForgeEngine.Dgn.Support.dll + ..\packages\Bimangle.ForgeEngine.Dgn.2.0.5\lib\net462\Bimangle.ForgeEngine.Dgn.Support.dll - - ..\packages\Bimangle.ForgeEngine.Dgn.2.0.2\lib\net462\Bimangle.Libs.dll + + ..\packages\Bimangle.ForgeEngine.Dgn.2.0.5\lib\net462\Bimangle.Libs.dll - - ..\packages\Bimangle.ForgeEngine.Dgn.2.0.2\lib\net462\Bimangle.Libs.Proj.dll + + ..\packages\Bimangle.ForgeEngine.Dgn.2.0.5\lib\net462\Bimangle.Libs.Proj.dll ..\packages\DotNetZip.1.13.2\lib\net40\DotNetZip.dll diff --git a/Bimangle.ForgeEngine.Dgn/Strings.Designer.cs b/Bimangle.ForgeEngine.Dgn/Strings.Designer.cs index 145e1b2..c37981b 100644 --- a/Bimangle.ForgeEngine.Dgn/Strings.Designer.cs +++ b/Bimangle.ForgeEngine.Dgn/Strings.Designer.cs @@ -47,8 +47,8 @@ internal Strings() { } /// - /// 重写当前线程的 CurrentUICulture 属性 - /// 重写当前线程的 CurrentUICulture 属性。 + /// 重写当前线程的 CurrentUICulture 属性，对 + /// 使用此强类型资源类的所有资源查找执行重写。 /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] internal static global::System.Globalization.CultureInfo Culture { @@ -403,7 +403,7 @@ internal static string FeatureDescriptionForce2DViewUseWireframe { } /// - /// 查找类似 的本地化字符串。 + /// 查找类似 The output data is compatible with EarthSDK 的本地化字符串。 /// internal static string FeatureDescriptionForEarthSdk { get { @@ -474,6 +474,15 @@ internal static string FeatureDescriptionOnlySelected { } } + /// + /// 查找类似 Optimize the geometry surface material, and intelligently adjust the geometry surface for double-sided material to single-sided material output, reducing flicker problems 的本地化字符串。 + /// + internal static string FeatureDescriptionOptimizationFaceMaterial { + get { + return ResourceManager.GetString("FeatureDescriptionOptimizationFaceMaterial", resourceCulture); + } + } + /// /// 查找类似 Enable Reduce Geometry Node To Parent Node 的本地化字符串。 /// @@ -510,6 +519,15 @@ internal static string FeatureDescriptionRegroupForWorkSet { } } + /// + /// 查找类似 Publish data using 3D Tiles 1.1 specification 的本地化字符串。 + /// + internal static string FeatureDescriptionUse3DTilesSpecification11 { + get { + return ResourceManager.GetString("FeatureDescriptionUse3DTilesSpecification11", resourceCulture); + } + } + /// /// 查找类似 Use level category by element's bounding box 的本地化字符串。 /// @@ -879,6 +897,15 @@ internal static string FeatureNameOnlySelected { } } + /// + /// 查找类似 Optimization face material 的本地化字符串。 + /// + internal static string FeatureNameOptimizationFaceMaterial { + get { + return ResourceManager.GetString("FeatureNameOptimizationFaceMaterial", resourceCulture); + } + } + /// /// 查找类似 Enable Reduce Geometry Node 的本地化字符串。 /// @@ -915,6 +942,15 @@ internal static string FeatureNameRegroupForWorkSet { } } + /// + /// 查找类似 Using 3D Tiles 1.1 的本地化字符串。 + /// + internal static string FeatureNameUse3DTilesSpecification11 { + get { + return ResourceManager.GetString("FeatureNameUse3DTilesSpecification11", resourceCulture); + } + } + /// /// 查找类似 Use level(bound) category 的本地化字符串。 /// diff --git a/Bimangle.ForgeEngine.Dgn/Strings.resx b/Bimangle.ForgeEngine.Dgn/Strings.resx index 52dac2e..ea3a280 100644 --- a/Bimangle.ForgeEngine.Dgn/Strings.resx +++ b/Bimangle.ForgeEngine.Dgn/Strings.resx @@ -630,4 +630,16 @@ The output data is compatible with EarthSDK + + Optimize the geometry surface material, and intelligently adjust the geometry surface for double-sided material to single-sided material output, reducing flicker problems + + + Optimization face material + + + Using 3D Tiles 1.1 + + + Publish data using 3D Tiles 1.1 specification + \ No newline at end of file diff --git a/Bimangle.ForgeEngine.Dgn/Strings.zh-Hans.resx b/Bimangle.ForgeEngine.Dgn/Strings.zh-Hans.resx index 8c24610..7344669 100644 --- a/Bimangle.ForgeEngine.Dgn/Strings.zh-Hans.resx +++ b/Bimangle.ForgeEngine.Dgn/Strings.zh-Hans.resx @@ -636,4 +636,16 @@ 输出的数据兼容 EarthSDK + + 优化几何面材质，将对于双面材质几何面智能调整为单面材质输出，缓解闪烁问题 + + + 优化几何面材质 + + + 使用 3D Tiles 1.1 + + + 使用 3D Tiles 1.1 规范发布数据 + \ No newline at end of file diff --git a/Bimangle.ForgeEngine.Dgn/UI/Controls/ExportCesium3DTiles.cs b/Bimangle.ForgeEngine.Dgn/UI/Controls/ExportCesium3DTiles.cs index b27ad76..da4234c 100644 --- a/Bimangle.ForgeEngine.Dgn/UI/Controls/ExportCesium3DTiles.cs +++ b/Bimangle.ForgeEngine.Dgn/UI/Controls/ExportCesium3DTiles.cs @@ -122,6 +122,7 @@ void IExportControl.Init(Viewport view, AppConfig config, bool hasSelectElements new FeatureInfo(FeatureType.EnableMeshQuantized, string.Empty, string.Empty, true, false), new FeatureInfo(FeatureType.UseGoogleDracoPatch, string.Empty, string.Empty, true, false), new FeatureInfo(FeatureType.ForEarthSdk, string.Empty, Strings.FeatureDescriptionForEarthSdk, true, false), + new FeatureInfo(FeatureType.Use3DTilesSpecification11, Strings.FeatureNameUse3DTilesSpecification11, Strings.FeatureDescriptionUse3DTilesSpecification11, true, false), }; _VisualStyles = new List(); @@ -325,6 +326,8 @@ void SetFeature(FeatureType featureType, bool selected) SetFeature(FeatureType.EnableCesiumPrimitiveOutline, cbGenerateOutline.Checked); SetFeature(FeatureType.EnableUnlitMaterials, cbEnableUnlitMaterials.Checked); SetFeature(FeatureType.ForEarthSdk, cbForEarthSdk.Checked); + SetFeature(FeatureType.Use3DTilesSpecification11, cbUse3DTilesSpecification11.Checked); + SetFeature(FeatureType.EnableTextureWebP, false); SetFeature(FeatureType.EnableTextureKtx2, false); @@ -446,6 +449,7 @@ void IExportControl.Reset() cbGenerateOutline.Checked = false; cbEnableUnlitMaterials.Checked = false; cbForEarthSdk.Checked = false; + cbUse3DTilesSpecification11.Checked = false; { _LocalConfig.GeoreferencedSetting = _GeoreferncingHost.CreateDefaultSetting(); @@ -595,6 +599,7 @@ bool IsAllowFeature(FeatureType feature) toolTip1.SetToolTip(cbGenerateOutline, Strings.FeatureDescriptionEnableCesiumPrimitiveOutline); toolTip1.SetToolTip(cbEnableUnlitMaterials, Strings.FeatureDescriptionEnableUnlitMaterials); toolTip1.SetToolTip(cbForEarthSdk, Strings.FeatureDescriptionForEarthSdk); + toolTip1.SetToolTip(cbUse3DTilesSpecification11, Strings.FeatureDescriptionUse3DTilesSpecification11); if (IsAllowFeature(FeatureType.UseGoogleDraco)) { @@ -672,6 +677,11 @@ bool IsAllowFeature(FeatureType feature) { cbForEarthSdk.Checked = true; } + + if (IsAllowFeature(FeatureType.Use3DTilesSpecification11)) + { + cbUse3DTilesSpecification11.Checked = true; + } } #endregion diff --git a/Bimangle.ForgeEngine.Dgn/UI/Controls/ExportCesium3DTiles.designer.cs b/Bimangle.ForgeEngine.Dgn/UI/Controls/ExportCesium3DTiles.designer.cs index ac07190..479bdb5 100644 --- a/Bimangle.ForgeEngine.Dgn/UI/Controls/ExportCesium3DTiles.designer.cs +++ b/Bimangle.ForgeEngine.Dgn/UI/Controls/ExportCesium3DTiles.designer.cs @@ -38,6 +38,7 @@ private void InitializeComponent() this.cbContentType = new System.Windows.Forms.ComboBox(); this.lblContents = new System.Windows.Forms.Label(); this.gbAdvanced = new System.Windows.Forms.GroupBox(); + this.cbUse3DTilesSpecification11 = new System.Windows.Forms.CheckBox(); this.cbForEarthSdk = new System.Windows.Forms.CheckBox(); this.cbGeometryCompressTypes = new System.Windows.Forms.ComboBox(); this.cbEnableGeometryCompress = new System.Windows.Forms.CheckBox(); @@ -160,6 +161,7 @@ private void InitializeComponent() // gbAdvanced // resources.ApplyResources(this.gbAdvanced, "gbAdvanced"); + this.gbAdvanced.Controls.Add(this.cbUse3DTilesSpecification11); this.gbAdvanced.Controls.Add(this.cbForEarthSdk); this.gbAdvanced.Controls.Add(this.cbGeometryCompressTypes); this.gbAdvanced.Controls.Add(this.cbEnableGeometryCompress); @@ -175,6 +177,16 @@ private void InitializeComponent() this.gbAdvanced.TabStop = false; this.toolTip1.SetToolTip(this.gbAdvanced, resources.GetString("gbAdvanced.ToolTip")); // + // cbUse3DTilesSpecification11 + // + resources.ApplyResources(this.cbUse3DTilesSpecification11, "cbUse3DTilesSpecification11"); + this.errorProvider1.SetError(this.cbUse3DTilesSpecification11, resources.GetString("cbUse3DTilesSpecification11.Error")); + this.errorProvider1.SetIconAlignment(this.cbUse3DTilesSpecification11, ((System.Windows.Forms.ErrorIconAlignment)(resources.GetObject("cbUse3DTilesSpecification11.IconAlignment")))); + this.errorProvider1.SetIconPadding(this.cbUse3DTilesSpecification11, ((int)(resources.GetObject("cbUse3DTilesSpecification11.IconPadding")))); + this.cbUse3DTilesSpecification11.Name = "cbUse3DTilesSpecification11"; + this.toolTip1.SetToolTip(this.cbUse3DTilesSpecification11, resources.GetString("cbUse3DTilesSpecification11.ToolTip")); + this.cbUse3DTilesSpecification11.UseVisualStyleBackColor = true; + // // cbForEarthSdk // resources.ApplyResources(this.cbForEarthSdk, "cbForEarthSdk"); @@ -497,5 +509,6 @@ private void InitializeComponent() private System.Windows.Forms.CheckBox cbForEarthSdk; private System.Windows.Forms.ComboBox cbGeometryCompressTypes; private System.Windows.Forms.CheckBox cbEnableGeometryCompress; + private System.Windows.Forms.CheckBox cbUse3DTilesSpecification11; } } \ No newline at end of file diff --git a/Bimangle.ForgeEngine.Dgn/UI/Controls/ExportCesium3DTiles.resx b/Bimangle.ForgeEngine.Dgn/UI/Controls/ExportCesium3DTiles.resx index fb546fb..35bc946 100644 --- a/Bimangle.ForgeEngine.Dgn/UI/Controls/ExportCesium3DTiles.resx +++ b/Bimangle.ForgeEngine.Dgn/UI/Controls/ExportCesium3DTiles.resx @@ -138,6 +138,9 @@ + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -204,8 +207,8 @@ 0 - - 6 + + 0 331, 216 @@ -267,8 +270,8 @@ True - - Node's Propperties + + gbAdvanced gb3DTiles @@ -291,8 +294,11 @@ gbAdvanced - - cbExportSvfzip + + 15, 168 + + + gpContainer TopLeft @@ -309,6 +315,9 @@ + + NoControl + Contents: @@ -324,9 +333,6 @@ 0 - - - @@ -351,12 +357,21 @@ MiddleRight + + System.Windows.Forms.ToolTip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 cbEnableTextureCompress + + 11 + 0 @@ -372,6 +387,9 @@ True + + + 0 @@ -456,8 +474,8 @@ Thumbnail - - 52, 75 + + 0 System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -562,13 +580,13 @@ - 5 + 6 gbAdvanced - 6 + 7 Model Lines @@ -618,9 +636,12 @@ - + MiddleRight + + 12, 12 + NoControl @@ -660,8 +681,8 @@ gpExclude - - + + 110, 43 @@ -675,9 +696,6 @@ 3 - - cbEnableGeometryCompress - 0 @@ -693,8 +711,8 @@ 0 - - NoControl + + 52, 75 cbForEarthSdk @@ -780,6 +798,9 @@ cbExcludeUnselectedElements + + True + 208, 22 @@ -789,6 +810,9 @@ + + gbAdvanced + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -807,12 +831,18 @@ System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 0 + + MiddleRight + NoControl @@ -843,8 +873,8 @@ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 110, 43 + + Node's Propperties System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -865,7 +895,7 @@ $this - 4 + 5 0 @@ -879,11 +909,8 @@ - - 0 - - - lblLevelOfDetail + + 2 0 @@ -907,7 +934,7 @@ 110, 15 - 0 + 1 2 @@ -987,9 +1014,6 @@ 5 - - gbAdvanced - ExportCesium3DTiles @@ -1011,8 +1035,8 @@ 4 - - True + + lblLevelOfDetail Compatible with EarthSDK @@ -1020,9 +1044,15 @@ 167, 22 + + + 3 + + 6 + 2 @@ -1041,6 +1071,9 @@ + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + Top, Left, Right @@ -1068,8 +1101,8 @@ Georeferncing: - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Output Path: 129, 18 @@ -1080,8 +1113,8 @@ 0 - - True + + NoControl 4 @@ -1104,8 +1137,8 @@ cbGeneratePropDbSqlite - - 12, 12 + + cbExportSvfzip 0 @@ -1123,7 +1156,7 @@ lblGeoreferncing - 7 + 8 errorProvider1 @@ -1134,19 +1167,22 @@ MiddleRight + + True + 0 760, 450 - - System.Windows.Forms.ToolTip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + True 0 - + @@ -1185,20 +1221,17 @@ 0 - + 0 - - 1 - lblContents - - + + 124, 18 - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + cbEnableGeometryCompress System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -1206,9 +1239,6 @@ 7 - - True - cbGenerateOutline @@ -1222,7 +1252,7 @@ 2 - 2 + 3 1 @@ -1308,6 +1338,9 @@ 145, 22 + + + 0 @@ -1320,6 +1353,9 @@ + + MiddleRight + gpContainer @@ -1332,8 +1368,8 @@ True - - gpContainer + + cbUse3DTilesSpecification11 System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -1377,6 +1413,12 @@ System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 0 + @@ -1405,10 +1447,10 @@ 7 - 3 + 4 - - MiddleRight + + True 0 @@ -1422,8 +1464,8 @@ 95, 18 - - + + Using 3D Tiles 1.1 gb3DTiles @@ -1431,8 +1473,8 @@ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Output Path: + + zh-Hans diff --git a/Bimangle.ForgeEngine.Dgn/UI/Controls/ExportCesium3DTiles.zh-Hans.resx b/Bimangle.ForgeEngine.Dgn/UI/Controls/ExportCesium3DTiles.zh-Hans.resx index 225129d..503217c 100644 --- a/Bimangle.ForgeEngine.Dgn/UI/Controls/ExportCesium3DTiles.zh-Hans.resx +++ b/Bimangle.ForgeEngine.Dgn/UI/Controls/ExportCesium3DTiles.zh-Hans.resx @@ -206,13 +206,31 @@ + + + + + MiddleRight + + + 0 + + + + 119, 18 + + + 使用 3D Tiles 1.1 + + + + 0 - 105, 18 diff --git a/Bimangle.ForgeEngine.Dgn/packages.config b/Bimangle.ForgeEngine.Dgn/packages.config index 2d84e6b..e10d5da 100644 --- a/Bimangle.ForgeEngine.Dgn/packages.config +++ b/Bimangle.ForgeEngine.Dgn/packages.config @@ -1,7 +1,7 @@  - - + + \ No newline at end of file diff --git a/Bimangle.ForgeEngine.Georeferncing/Bimangle.ForgeEngine.Georeferncing.csproj b/Bimangle.ForgeEngine.Georeferncing/Bimangle.ForgeEngine.Georeferncing.csproj index 4c3775f..bf82aba 100644 --- a/Bimangle.ForgeEngine.Georeferncing/Bimangle.ForgeEngine.Georeferncing.csproj +++ b/Bimangle.ForgeEngine.Georeferncing/Bimangle.ForgeEngine.Georeferncing.csproj @@ -32,8 +32,8 @@ 4 - - ..\packages\Bimangle.ForgeEngine.Common.1.7.7\lib\net45\Bimangle.ForgeEngine.Common.dll + + ..\packages\Bimangle.ForgeEngine.Common.1.8.1\lib\net45\Bimangle.ForgeEngine.Common.dll ..\packages\Newtonsoft.Json.5.0.8\lib\net45\Newtonsoft.Json.dll diff --git a/Bimangle.ForgeEngine.Georeferncing/packages.config b/Bimangle.ForgeEngine.Georeferncing/packages.config index c9fd690..23ce383 100644 --- a/Bimangle.ForgeEngine.Georeferncing/packages.config +++ b/Bimangle.ForgeEngine.Georeferncing/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file diff --git a/Bimangle.ForgeEngine.Navisworks/Bimangle.ForgeEngine.Nw_R2014.csproj b/Bimangle.ForgeEngine.Navisworks/Bimangle.ForgeEngine.Nw_R2014.csproj index 0434dca..14f2b3b 100644 --- a/Bimangle.ForgeEngine.Navisworks/Bimangle.ForgeEngine.Nw_R2014.csproj +++ b/Bimangle.ForgeEngine.Navisworks/Bimangle.ForgeEngine.Nw_R2014.csproj @@ -51,17 +51,17 @@ C:\Program Files\Autodesk\Navisworks Manage 2014\Autodesk.Navisworks.Interop.ComApi.dll True - - ..\packages\Bimangle.ForgeEngine.Common.1.7.7\lib\net45\Bimangle.ForgeEngine.Common.dll + + ..\packages\Bimangle.ForgeEngine.Common.1.8.1\lib\net45\Bimangle.ForgeEngine.Common.dll - - ..\packages\Bimangle.ForgeEngine.Navisworks2014.3.9.5\lib\net45\Bimangle.ForgeEngine.Nw2014.dll + + ..\packages\Bimangle.ForgeEngine.Navisworks2014.3.9.8\lib\net45\Bimangle.ForgeEngine.Nw2014.dll - - ..\packages\Bimangle.ForgeEngine.Navisworks2014.3.9.5\lib\net45\Bimangle.Libs.dll + + ..\packages\Bimangle.ForgeEngine.Navisworks2014.3.9.8\lib\net45\Bimangle.Libs.dll - - ..\packages\Bimangle.ForgeEngine.Navisworks2014.3.9.5\lib\net45\Bimangle.Libs.Proj.dll + + ..\packages\Bimangle.ForgeEngine.Navisworks2014.3.9.8\lib\net45\Bimangle.Libs.Proj.dll ..\packages\DotNetZip.1.10.1\lib\net20\DotNetZip.dll diff --git a/Bimangle.ForgeEngine.Navisworks/Bimangle.ForgeEngine.Nw_R2015.csproj b/Bimangle.ForgeEngine.Navisworks/Bimangle.ForgeEngine.Nw_R2015.csproj index 39a096f..51c34a8 100644 --- a/Bimangle.ForgeEngine.Navisworks/Bimangle.ForgeEngine.Nw_R2015.csproj +++ b/Bimangle.ForgeEngine.Navisworks/Bimangle.ForgeEngine.Nw_R2015.csproj @@ -51,17 +51,17 @@ C:\Program Files\Autodesk\Navisworks Manage 2015\Autodesk.Navisworks.Interop.ComApi.dll True - - ..\packages\Bimangle.ForgeEngine.Common.1.7.7\lib\net45\Bimangle.ForgeEngine.Common.dll + + ..\packages\Bimangle.ForgeEngine.Common.1.8.1\lib\net45\Bimangle.ForgeEngine.Common.dll - - ..\packages\Bimangle.ForgeEngine.Navisworks2015.3.9.5\lib\net45\Bimangle.ForgeEngine.Nw2015.dll + + ..\packages\Bimangle.ForgeEngine.Navisworks2015.3.9.8\lib\net45\Bimangle.ForgeEngine.Nw2015.dll - - ..\packages\Bimangle.ForgeEngine.Navisworks2015.3.9.5\lib\net45\Bimangle.Libs.dll + + ..\packages\Bimangle.ForgeEngine.Navisworks2015.3.9.8\lib\net45\Bimangle.Libs.dll - - ..\packages\Bimangle.ForgeEngine.Navisworks2015.3.9.5\lib\net45\Bimangle.Libs.Proj.dll + + ..\packages\Bimangle.ForgeEngine.Navisworks2015.3.9.8\lib\net45\Bimangle.Libs.Proj.dll ..\packages\DotNetZip.1.13.2\lib\net40\DotNetZip.dll diff --git a/Bimangle.ForgeEngine.Navisworks/Bimangle.ForgeEngine.Nw_R2016.csproj b/Bimangle.ForgeEngine.Navisworks/Bimangle.ForgeEngine.Nw_R2016.csproj index b5f4ece..5150763 100644 --- a/Bimangle.ForgeEngine.Navisworks/Bimangle.ForgeEngine.Nw_R2016.csproj +++ b/Bimangle.ForgeEngine.Navisworks/Bimangle.ForgeEngine.Nw_R2016.csproj @@ -51,17 +51,17 @@ C:\Program Files\Autodesk\Navisworks Manage 2016\Autodesk.Navisworks.Interop.ComApi.dll True - - ..\packages\Bimangle.ForgeEngine.Common.1.7.7\lib\net45\Bimangle.ForgeEngine.Common.dll + + ..\packages\Bimangle.ForgeEngine.Common.1.8.1\lib\net45\Bimangle.ForgeEngine.Common.dll - - ..\packages\Bimangle.ForgeEngine.Navisworks2016.3.9.5\lib\net45\Bimangle.ForgeEngine.Nw2016.dll + + ..\packages\Bimangle.ForgeEngine.Navisworks2016.3.9.8\lib\net45\Bimangle.ForgeEngine.Nw2016.dll - - ..\packages\Bimangle.ForgeEngine.Navisworks2016.3.9.5\lib\net45\Bimangle.Libs.dll + + ..\packages\Bimangle.ForgeEngine.Navisworks2016.3.9.8\lib\net45\Bimangle.Libs.dll - - ..\packages\Bimangle.ForgeEngine.Navisworks2016.3.9.5\lib\net45\Bimangle.Libs.Proj.dll + + ..\packages\Bimangle.ForgeEngine.Navisworks2016.3.9.8\lib\net45\Bimangle.Libs.Proj.dll ..\packages\DotNetZip.1.10.1\lib\net20\DotNetZip.dll diff --git a/Bimangle.ForgeEngine.Navisworks/Bimangle.ForgeEngine.Nw_R2017.csproj b/Bimangle.ForgeEngine.Navisworks/Bimangle.ForgeEngine.Nw_R2017.csproj index f6bd051..40f93ea 100644 --- a/Bimangle.ForgeEngine.Navisworks/Bimangle.ForgeEngine.Nw_R2017.csproj +++ b/Bimangle.ForgeEngine.Navisworks/Bimangle.ForgeEngine.Nw_R2017.csproj @@ -51,17 +51,17 @@ C:\Program Files\Autodesk\Navisworks Manage 2017\Autodesk.Navisworks.Interop.ComApi.dll True - - ..\packages\Bimangle.ForgeEngine.Common.1.7.7\lib\net45\Bimangle.ForgeEngine.Common.dll + + ..\packages\Bimangle.ForgeEngine.Common.1.8.1\lib\net45\Bimangle.ForgeEngine.Common.dll - - ..\packages\Bimangle.ForgeEngine.Navisworks2017.3.9.5\lib\net452\Bimangle.ForgeEngine.Nw2017.dll + + ..\packages\Bimangle.ForgeEngine.Navisworks2017.3.9.8\lib\net452\Bimangle.ForgeEngine.Nw2017.dll - - ..\packages\Bimangle.ForgeEngine.Navisworks2017.3.9.5\lib\net452\Bimangle.Libs.dll + + ..\packages\Bimangle.ForgeEngine.Navisworks2017.3.9.8\lib\net452\Bimangle.Libs.dll - - ..\packages\Bimangle.ForgeEngine.Navisworks2017.3.9.5\lib\net452\Bimangle.Libs.Proj.dll + + ..\packages\Bimangle.ForgeEngine.Navisworks2017.3.9.8\lib\net452\Bimangle.Libs.Proj.dll ..\packages\DotNetZip.1.13.2\lib\net40\DotNetZip.dll diff --git a/Bimangle.ForgeEngine.Navisworks/Bimangle.ForgeEngine.Nw_R2018.csproj b/Bimangle.ForgeEngine.Navisworks/Bimangle.ForgeEngine.Nw_R2018.csproj index a0d3230..9a12142 100644 --- a/Bimangle.ForgeEngine.Navisworks/Bimangle.ForgeEngine.Nw_R2018.csproj +++ b/Bimangle.ForgeEngine.Navisworks/Bimangle.ForgeEngine.Nw_R2018.csproj @@ -51,17 +51,17 @@ C:\Program Files\Autodesk\Navisworks Manage 2018\Autodesk.Navisworks.Interop.ComApi.dll True - - ..\packages\Bimangle.ForgeEngine.Common.1.7.7\lib\net45\Bimangle.ForgeEngine.Common.dll + + ..\packages\Bimangle.ForgeEngine.Common.1.8.1\lib\net45\Bimangle.ForgeEngine.Common.dll - - ..\packages\Bimangle.ForgeEngine.Navisworks2018.3.9.5\lib\net452\Bimangle.ForgeEngine.Nw2018.dll + + ..\packages\Bimangle.ForgeEngine.Navisworks2018.3.9.8\lib\net452\Bimangle.ForgeEngine.Nw2018.dll - - ..\packages\Bimangle.ForgeEngine.Navisworks2018.3.9.5\lib\net452\Bimangle.Libs.dll + + ..\packages\Bimangle.ForgeEngine.Navisworks2018.3.9.8\lib\net452\Bimangle.Libs.dll - - ..\packages\Bimangle.ForgeEngine.Navisworks2018.3.9.5\lib\net452\Bimangle.Libs.Proj.dll + + ..\packages\Bimangle.ForgeEngine.Navisworks2018.3.9.8\lib\net452\Bimangle.Libs.Proj.dll ..\packages\DotNetZip.1.13.2\lib\net40\DotNetZip.dll diff --git a/Bimangle.ForgeEngine.Navisworks/Bimangle.ForgeEngine.Nw_R2019.csproj b/Bimangle.ForgeEngine.Navisworks/Bimangle.ForgeEngine.Nw_R2019.csproj index 3ec66ca..e4500f5 100644 --- a/Bimangle.ForgeEngine.Navisworks/Bimangle.ForgeEngine.Nw_R2019.csproj +++ b/Bimangle.ForgeEngine.Navisworks/Bimangle.ForgeEngine.Nw_R2019.csproj @@ -52,17 +52,17 @@ C:\Program Files\Autodesk\Navisworks Manage 2019\Autodesk.Navisworks.Interop.ComApi.dll True - - ..\packages\Bimangle.ForgeEngine.Common.1.7.7\lib\net45\Bimangle.ForgeEngine.Common.dll + + ..\packages\Bimangle.ForgeEngine.Common.1.8.1\lib\net45\Bimangle.ForgeEngine.Common.dll - - ..\packages\Bimangle.ForgeEngine.Navisworks2019.3.9.5\lib\net47\Bimangle.ForgeEngine.Nw2019.dll + + ..\packages\Bimangle.ForgeEngine.Navisworks2019.3.9.8\lib\net47\Bimangle.ForgeEngine.Nw2019.dll - - ..\packages\Bimangle.ForgeEngine.Navisworks2019.3.9.5\lib\net47\Bimangle.Libs.dll + + ..\packages\Bimangle.ForgeEngine.Navisworks2019.3.9.8\lib\net47\Bimangle.Libs.dll - - ..\packages\Bimangle.ForgeEngine.Navisworks2019.3.9.5\lib\net47\Bimangle.Libs.Proj.dll + + ..\packages\Bimangle.ForgeEngine.Navisworks2019.3.9.8\lib\net47\Bimangle.Libs.Proj.dll ..\packages\DotNetZip.1.13.2\lib\net40\DotNetZip.dll diff --git a/Bimangle.ForgeEngine.Navisworks/Bimangle.ForgeEngine.Nw_R2020.csproj b/Bimangle.ForgeEngine.Navisworks/Bimangle.ForgeEngine.Nw_R2020.csproj index 37cfef4..058471c 100644 --- a/Bimangle.ForgeEngine.Navisworks/Bimangle.ForgeEngine.Nw_R2020.csproj +++ b/Bimangle.ForgeEngine.Navisworks/Bimangle.ForgeEngine.Nw_R2020.csproj @@ -52,17 +52,17 @@ C:\Program Files\Autodesk\Navisworks Manage 2020\Autodesk.Navisworks.Interop.ComApi.dll True - - ..\packages\Bimangle.ForgeEngine.Common.1.7.7\lib\net45\Bimangle.ForgeEngine.Common.dll + + ..\packages\Bimangle.ForgeEngine.Common.1.8.1\lib\net45\Bimangle.ForgeEngine.Common.dll - - ..\packages\Bimangle.ForgeEngine.Navisworks2020.3.9.5\lib\net47\Bimangle.ForgeEngine.Nw2020.dll + + ..\packages\Bimangle.ForgeEngine.Navisworks2020.3.9.8\lib\net47\Bimangle.ForgeEngine.Nw2020.dll - - ..\packages\Bimangle.ForgeEngine.Navisworks2020.3.9.5\lib\net47\Bimangle.Libs.dll + + ..\packages\Bimangle.ForgeEngine.Navisworks2020.3.9.8\lib\net47\Bimangle.Libs.dll - - ..\packages\Bimangle.ForgeEngine.Navisworks2020.3.9.5\lib\net47\Bimangle.Libs.Proj.dll + + ..\packages\Bimangle.ForgeEngine.Navisworks2020.3.9.8\lib\net47\Bimangle.Libs.Proj.dll ..\packages\DotNetZip.1.13.2\lib\net40\DotNetZip.dll diff --git a/Bimangle.ForgeEngine.Navisworks/Bimangle.ForgeEngine.Nw_R2021.csproj b/Bimangle.ForgeEngine.Navisworks/Bimangle.ForgeEngine.Nw_R2021.csproj index 72b6a8b..a4e7e46 100644 --- a/Bimangle.ForgeEngine.Navisworks/Bimangle.ForgeEngine.Nw_R2021.csproj +++ b/Bimangle.ForgeEngine.Navisworks/Bimangle.ForgeEngine.Nw_R2021.csproj @@ -52,17 +52,17 @@ C:\Program Files\Autodesk\Navisworks Manage 2021\Autodesk.Navisworks.Interop.ComApi.dll True - - ..\packages\Bimangle.ForgeEngine.Common.1.7.7\lib\net45\Bimangle.ForgeEngine.Common.dll + + ..\packages\Bimangle.ForgeEngine.Common.1.8.1\lib\net45\Bimangle.ForgeEngine.Common.dll - - ..\packages\Bimangle.ForgeEngine.Navisworks2021.3.9.5\lib\net47\Bimangle.ForgeEngine.Nw2021.dll + + ..\packages\Bimangle.ForgeEngine.Navisworks2021.3.9.8\lib\net47\Bimangle.ForgeEngine.Nw2021.dll - - ..\packages\Bimangle.ForgeEngine.Navisworks2021.3.9.5\lib\net47\Bimangle.Libs.dll + + ..\packages\Bimangle.ForgeEngine.Navisworks2021.3.9.8\lib\net47\Bimangle.Libs.dll - - ..\packages\Bimangle.ForgeEngine.Navisworks2021.3.9.5\lib\net47\Bimangle.Libs.Proj.dll + + ..\packages\Bimangle.ForgeEngine.Navisworks2021.3.9.8\lib\net47\Bimangle.Libs.Proj.dll ..\packages\DotNetZip.1.13.2\lib\net40\DotNetZip.dll diff --git a/Bimangle.ForgeEngine.Navisworks/Bimangle.ForgeEngine.Nw_R2022.csproj b/Bimangle.ForgeEngine.Navisworks/Bimangle.ForgeEngine.Nw_R2022.csproj index 881043f..9580e3e 100644 --- a/Bimangle.ForgeEngine.Navisworks/Bimangle.ForgeEngine.Nw_R2022.csproj +++ b/Bimangle.ForgeEngine.Navisworks/Bimangle.ForgeEngine.Nw_R2022.csproj @@ -52,17 +52,17 @@ C:\Program Files\Autodesk\Navisworks Manage 2022\Autodesk.Navisworks.Interop.ComApi.dll True - - ..\packages\Bimangle.ForgeEngine.Common.1.7.7\lib\net45\Bimangle.ForgeEngine.Common.dll + + ..\packages\Bimangle.ForgeEngine.Common.1.8.1\lib\net45\Bimangle.ForgeEngine.Common.dll - - ..\packages\Bimangle.ForgeEngine.Navisworks2022.3.9.5\lib\net47\Bimangle.ForgeEngine.Nw2022.dll + + ..\packages\Bimangle.ForgeEngine.Navisworks2022.3.9.8\lib\net47\Bimangle.ForgeEngine.Nw2022.dll - - ..\packages\Bimangle.ForgeEngine.Navisworks2022.3.9.5\lib\net47\Bimangle.Libs.dll + + ..\packages\Bimangle.ForgeEngine.Navisworks2022.3.9.8\lib\net47\Bimangle.Libs.dll - - ..\packages\Bimangle.ForgeEngine.Navisworks2022.3.9.5\lib\net47\Bimangle.Libs.Proj.dll + + ..\packages\Bimangle.ForgeEngine.Navisworks2022.3.9.8\lib\net47\Bimangle.Libs.Proj.dll ..\packages\DotNetZip.1.13.2\lib\net40\DotNetZip.dll diff --git a/Bimangle.ForgeEngine.Navisworks/Bimangle.ForgeEngine.Nw_R2023.csproj b/Bimangle.ForgeEngine.Navisworks/Bimangle.ForgeEngine.Nw_R2023.csproj index ccd41fd..ff1ce08 100644 --- a/Bimangle.ForgeEngine.Navisworks/Bimangle.ForgeEngine.Nw_R2023.csproj +++ b/Bimangle.ForgeEngine.Navisworks/Bimangle.ForgeEngine.Nw_R2023.csproj @@ -49,17 +49,17 @@ C:\Program Files\Autodesk\Navisworks Manage 2023\Autodesk.Navisworks.Interop.ComApi.dll True - - ..\packages\Bimangle.ForgeEngine.Common.1.7.7\lib\net45\Bimangle.ForgeEngine.Common.dll + + ..\packages\Bimangle.ForgeEngine.Common.1.8.1\lib\net45\Bimangle.ForgeEngine.Common.dll - - ..\packages\Bimangle.ForgeEngine.Navisworks2023.3.9.5\lib\net48\Bimangle.ForgeEngine.Nw2023.dll + + ..\packages\Bimangle.ForgeEngine.Navisworks2023.3.9.8\lib\net48\Bimangle.ForgeEngine.Nw2023.dll - - ..\packages\Bimangle.ForgeEngine.Navisworks2023.3.9.5\lib\net48\Bimangle.Libs.dll + + ..\packages\Bimangle.ForgeEngine.Navisworks2023.3.9.8\lib\net48\Bimangle.Libs.dll - - ..\packages\Bimangle.ForgeEngine.Navisworks2023.3.9.5\lib\net48\Bimangle.Libs.Proj.dll + + ..\packages\Bimangle.ForgeEngine.Navisworks2023.3.9.8\lib\net48\Bimangle.Libs.Proj.dll ..\packages\DotNetZip.1.13.2\lib\net40\DotNetZip.dll diff --git a/Bimangle.ForgeEngine.Navisworks/Bimangle.ForgeEngine.Nw_R2024.csproj b/Bimangle.ForgeEngine.Navisworks/Bimangle.ForgeEngine.Nw_R2024.csproj index 2aaf6a1..edb3f35 100644 --- a/Bimangle.ForgeEngine.Navisworks/Bimangle.ForgeEngine.Nw_R2024.csproj +++ b/Bimangle.ForgeEngine.Navisworks/Bimangle.ForgeEngine.Nw_R2024.csproj @@ -49,17 +49,17 @@ C:\Program Files\Autodesk\Navisworks Manage 2024\Autodesk.Navisworks.Interop.ComApi.dll True - - ..\packages\Bimangle.ForgeEngine.Common.1.7.7\lib\net45\Bimangle.ForgeEngine.Common.dll + + ..\packages\Bimangle.ForgeEngine.Common.1.8.1\lib\net45\Bimangle.ForgeEngine.Common.dll - - ..\packages\Bimangle.ForgeEngine.Navisworks2024.3.9.5\lib\net48\Bimangle.ForgeEngine.Nw2024.dll + + ..\packages\Bimangle.ForgeEngine.Navisworks2024.3.9.8\lib\net48\Bimangle.ForgeEngine.Nw2024.dll - - ..\packages\Bimangle.ForgeEngine.Navisworks2024.3.9.5\lib\net48\Bimangle.Libs.dll + + ..\packages\Bimangle.ForgeEngine.Navisworks2024.3.9.8\lib\net48\Bimangle.Libs.dll - - ..\packages\Bimangle.ForgeEngine.Navisworks2024.3.9.5\lib\net48\Bimangle.Libs.Proj.dll + + ..\packages\Bimangle.ForgeEngine.Navisworks2024.3.9.8\lib\net48\Bimangle.Libs.Proj.dll ..\packages\DotNetZip.1.13.2\lib\net40\DotNetZip.dll diff --git a/Bimangle.ForgeEngine.Navisworks/Strings.Designer.cs b/Bimangle.ForgeEngine.Navisworks/Strings.Designer.cs index 093352f..3069fc5 100644 --- a/Bimangle.ForgeEngine.Navisworks/Strings.Designer.cs +++ b/Bimangle.ForgeEngine.Navisworks/Strings.Designer.cs @@ -47,8 +47,8 @@ internal Strings() { } /// - /// 重写当前线程的 CurrentUICulture 属性 - /// 重写当前线程的 CurrentUICulture 属性。 + /// 重写当前线程的 CurrentUICulture 属性，对 + /// 使用此强类型资源类的所有资源查找执行重写。 /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] internal static global::System.Globalization.CultureInfo Culture { @@ -403,7 +403,7 @@ internal static string FeatureDescriptionForce2DViewUseWireframe { } /// - /// 查找类似 的本地化字符串。 + /// 查找类似 The output data is compatible with EarthSDK 的本地化字符串。 /// internal static string FeatureDescriptionForEarthSdk { get { @@ -474,6 +474,15 @@ internal static string FeatureDescriptionOnlySelected { } } + /// + /// 查找类似 Optimize the geometry surface material, and intelligently adjust the geometry surface for double-sided material to single-sided material output, reducing flicker problems 的本地化字符串。 + /// + internal static string FeatureDescriptionOptimizationFaceMaterial { + get { + return ResourceManager.GetString("FeatureDescriptionOptimizationFaceMaterial", resourceCulture); + } + } + /// /// 查找类似 Enable Reduce Geometry Node To Parent Node 的本地化字符串。 /// @@ -510,6 +519,15 @@ internal static string FeatureDescriptionRegroupForWorkSet { } } + /// + /// 查找类似 Publish data using 3D Tiles 1.1 specification 的本地化字符串。 + /// + internal static string FeatureDescriptionUse3DTilesSpecification11 { + get { + return ResourceManager.GetString("FeatureDescriptionUse3DTilesSpecification11", resourceCulture); + } + } + /// /// 查找类似 Use level category by element's bounding box 的本地化字符串。 /// @@ -879,6 +897,15 @@ internal static string FeatureNameOnlySelected { } } + /// + /// 查找类似 Optimization face material 的本地化字符串。 + /// + internal static string FeatureNameOptimizationFaceMaterial { + get { + return ResourceManager.GetString("FeatureNameOptimizationFaceMaterial", resourceCulture); + } + } + /// /// 查找类似 Enable Reduce Geometry Node 的本地化字符串。 /// @@ -915,6 +942,15 @@ internal static string FeatureNameRegroupForWorkSet { } } + /// + /// 查找类似 Using 3D Tiles 1.1 的本地化字符串。 + /// + internal static string FeatureNameUse3DTilesSpecification11 { + get { + return ResourceManager.GetString("FeatureNameUse3DTilesSpecification11", resourceCulture); + } + } + /// /// 查找类似 Use level(bound) category 的本地化字符串。 /// diff --git a/Bimangle.ForgeEngine.Navisworks/Strings.resx b/Bimangle.ForgeEngine.Navisworks/Strings.resx index 2d58560..3680a24 100644 --- a/Bimangle.ForgeEngine.Navisworks/Strings.resx +++ b/Bimangle.ForgeEngine.Navisworks/Strings.resx @@ -630,4 +630,16 @@ The output data is compatible with EarthSDK + + Optimize the geometry surface material, and intelligently adjust the geometry surface for double-sided material to single-sided material output, reducing flicker problems + + + Optimization face material + + + Using 3D Tiles 1.1 + + + Publish data using 3D Tiles 1.1 specification + \ No newline at end of file diff --git a/Bimangle.ForgeEngine.Navisworks/Strings.zh-Hans.resx b/Bimangle.ForgeEngine.Navisworks/Strings.zh-Hans.resx index ca1721a..9161eff 100644 --- a/Bimangle.ForgeEngine.Navisworks/Strings.zh-Hans.resx +++ b/Bimangle.ForgeEngine.Navisworks/Strings.zh-Hans.resx @@ -636,4 +636,16 @@ 输出的数据兼容 EarthSDK + + 优化几何面材质，将对于双面材质几何面智能调整为单面材质输出，缓解闪烁问题 + + + 优化几何面材质 + + + 使用 3D Tiles 1.1 + + + 使用 3D Tiles 1.1 规范发布数据 + \ No newline at end of file diff --git a/Bimangle.ForgeEngine.Navisworks/UI/Controls/ExportCesium3DTiles.cs b/Bimangle.ForgeEngine.Navisworks/UI/Controls/ExportCesium3DTiles.cs index 987d7ec..c596295 100644 --- a/Bimangle.ForgeEngine.Navisworks/UI/Controls/ExportCesium3DTiles.cs +++ b/Bimangle.ForgeEngine.Navisworks/UI/Controls/ExportCesium3DTiles.cs @@ -112,6 +112,7 @@ void IExportControl.Init(AppConfig config) new FeatureInfo(FeatureType.EnableMeshQuantized, string.Empty, string.Empty, true, false), new FeatureInfo(FeatureType.UseGoogleDracoPatch, string.Empty, string.Empty, true, false), new FeatureInfo(FeatureType.ForEarthSdk, string.Empty, Strings.FeatureDescriptionForEarthSdk, true, false), + new FeatureInfo(FeatureType.Use3DTilesSpecification11, Strings.FeatureNameUse3DTilesSpecification11, Strings.FeatureDescriptionUse3DTilesSpecification11, true, false), }; _VisualStyles = new List(); @@ -299,6 +300,8 @@ void SetFeature(FeatureType featureType, bool selected) SetFeature(FeatureType.EnableCesiumPrimitiveOutline, cbGenerateOutline.Checked); SetFeature(FeatureType.EnableUnlitMaterials, cbEnableUnlitMaterials.Checked); SetFeature(FeatureType.ForEarthSdk, cbForEarthSdk.Checked); + SetFeature(FeatureType.Use3DTilesSpecification11, cbUse3DTilesSpecification11.Checked); + SetFeature(FeatureType.EnableTextureWebP, false); SetFeature(FeatureType.EnableTextureKtx2, false); @@ -411,6 +414,7 @@ void IExportControl.Reset() cbGenerateOutline.Checked = false; cbEnableUnlitMaterials.Checked = false; cbForEarthSdk.Checked = false; + cbUse3DTilesSpecification11.Checked = false; { _LocalConfig.GeoreferencedSetting = _GeoreferncingHost.CreateDefaultSetting(); @@ -554,6 +558,7 @@ bool IsAllowFeature(FeatureType feature) toolTip1.SetToolTip(cbGenerateOutline, Strings.FeatureDescriptionEnableCesiumPrimitiveOutline); toolTip1.SetToolTip(cbEnableUnlitMaterials, Strings.FeatureDescriptionEnableUnlitMaterials); toolTip1.SetToolTip(cbForEarthSdk, Strings.FeatureDescriptionForEarthSdk); + toolTip1.SetToolTip(cbUse3DTilesSpecification11, Strings.FeatureDescriptionUse3DTilesSpecification11); if (IsAllowFeature(FeatureType.UseGoogleDraco)) { @@ -631,6 +636,11 @@ bool IsAllowFeature(FeatureType feature) { cbForEarthSdk.Checked = true; } + + if (IsAllowFeature(FeatureType.Use3DTilesSpecification11)) + { + cbUse3DTilesSpecification11.Checked = true; + } } #endregion diff --git a/Bimangle.ForgeEngine.Navisworks/UI/Controls/ExportCesium3DTiles.designer.cs b/Bimangle.ForgeEngine.Navisworks/UI/Controls/ExportCesium3DTiles.designer.cs index a6d1388..fe9cfd3 100644 --- a/Bimangle.ForgeEngine.Navisworks/UI/Controls/ExportCesium3DTiles.designer.cs +++ b/Bimangle.ForgeEngine.Navisworks/UI/Controls/ExportCesium3DTiles.designer.cs @@ -38,6 +38,7 @@ private void InitializeComponent() this.cbContentType = new System.Windows.Forms.ComboBox(); this.lblContents = new System.Windows.Forms.Label(); this.gbAdvanced = new System.Windows.Forms.GroupBox(); + this.cbUse3DTilesSpecification11 = new System.Windows.Forms.CheckBox(); this.cbForEarthSdk = new System.Windows.Forms.CheckBox(); this.cbGeometryCompressTypes = new System.Windows.Forms.ComboBox(); this.cbEnableGeometryCompress = new System.Windows.Forms.CheckBox(); @@ -160,6 +161,7 @@ private void InitializeComponent() // gbAdvanced // resources.ApplyResources(this.gbAdvanced, "gbAdvanced"); + this.gbAdvanced.Controls.Add(this.cbUse3DTilesSpecification11); this.gbAdvanced.Controls.Add(this.cbForEarthSdk); this.gbAdvanced.Controls.Add(this.cbGeometryCompressTypes); this.gbAdvanced.Controls.Add(this.cbEnableGeometryCompress); @@ -175,6 +177,16 @@ private void InitializeComponent() this.gbAdvanced.TabStop = false; this.toolTip1.SetToolTip(this.gbAdvanced, resources.GetString("gbAdvanced.ToolTip")); // + // cbUse3DTilesSpecification11 + // + resources.ApplyResources(this.cbUse3DTilesSpecification11, "cbUse3DTilesSpecification11"); + this.errorProvider1.SetError(this.cbUse3DTilesSpecification11, resources.GetString("cbUse3DTilesSpecification11.Error")); + this.errorProvider1.SetIconAlignment(this.cbUse3DTilesSpecification11, ((System.Windows.Forms.ErrorIconAlignment)(resources.GetObject("cbUse3DTilesSpecification11.IconAlignment")))); + this.errorProvider1.SetIconPadding(this.cbUse3DTilesSpecification11, ((int)(resources.GetObject("cbUse3DTilesSpecification11.IconPadding")))); + this.cbUse3DTilesSpecification11.Name = "cbUse3DTilesSpecification11"; + this.toolTip1.SetToolTip(this.cbUse3DTilesSpecification11, resources.GetString("cbUse3DTilesSpecification11.ToolTip")); + this.cbUse3DTilesSpecification11.UseVisualStyleBackColor = true; + // // cbForEarthSdk // resources.ApplyResources(this.cbForEarthSdk, "cbForEarthSdk"); @@ -497,5 +509,6 @@ private void InitializeComponent() private System.Windows.Forms.CheckBox cbForEarthSdk; private System.Windows.Forms.ComboBox cbGeometryCompressTypes; private System.Windows.Forms.CheckBox cbEnableGeometryCompress; + private System.Windows.Forms.CheckBox cbUse3DTilesSpecification11; } } \ No newline at end of file diff --git a/Bimangle.ForgeEngine.Navisworks/UI/Controls/ExportCesium3DTiles.resx b/Bimangle.ForgeEngine.Navisworks/UI/Controls/ExportCesium3DTiles.resx index 3f173de..8bea997 100644 --- a/Bimangle.ForgeEngine.Navisworks/UI/Controls/ExportCesium3DTiles.resx +++ b/Bimangle.ForgeEngine.Navisworks/UI/Controls/ExportCesium3DTiles.resx @@ -204,8 +204,8 @@ 0 - - 6 + + 0 331, 227 @@ -267,8 +267,8 @@ True - - Enable Node's Propperties + + gbAdvanced gb3DTiles @@ -291,8 +291,11 @@ gbAdvanced - - cbExportSvfzip + + 15, 169 + + + gpContainer TopLeft @@ -309,6 +312,9 @@ + + NoControl + Contents: @@ -348,12 +354,21 @@ MiddleRight + + System.Windows.Forms.ToolTip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 cbEnableTextureCompress + + 11 + 0 @@ -369,6 +384,9 @@ True + + + 0 @@ -450,8 +468,8 @@ Thumbnail - - 52, 74 + + 0 System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -562,13 +580,13 @@ - 5 + 6 gbAdvanced - 6 + 7 Model Lines @@ -618,9 +636,12 @@ - + MiddleRight + + 12, 12 + NoControl @@ -663,8 +684,8 @@ gpExclude - - + + 108, 50 @@ -678,9 +699,6 @@ 3 - - cbEnableGeometryCompress - 0 @@ -696,8 +714,8 @@ 0 - - NoControl + + 52, 74 System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -762,6 +780,9 @@ 4 + + 2 + gpGeneral @@ -783,6 +804,9 @@ cbExcludeUnselectedElements + + True + 208, 22 @@ -792,6 +816,9 @@ + + gbAdvanced + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -810,12 +837,18 @@ System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 0 + + MiddleRight + NoControl @@ -846,8 +879,8 @@ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 108, 50 + + Enable Node's Propperties System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -868,7 +901,7 @@ $this - 4 + 5 0 @@ -882,9 +915,6 @@ - - 0 - lblLevelOfDetail @@ -910,7 +940,7 @@ 108, 22 - 0 + 1 2 @@ -990,9 +1020,6 @@ 5 - - gbAdvanced - ExportCesium3DTiles @@ -1020,9 +1047,15 @@ Compatible with EarthSDK + + + 3 + + 6 + 2 @@ -1041,6 +1074,9 @@ + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + Top, Left, Right @@ -1077,8 +1113,8 @@ 0 - - True + + NoControl 6 @@ -1101,8 +1137,8 @@ gpContainer - - 12, 12 + + cbExportSvfzip 0 @@ -1123,7 +1159,7 @@ lblGeoreferncing - 7 + 8 errorProvider1 @@ -1143,13 +1179,13 @@ 760, 450 - - System.Windows.Forms.ToolTip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + True 0 - + @@ -1185,20 +1221,17 @@ 0 - + 0 - - 1 - lblContents - - + + 124, 18 - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + cbEnableGeometryCompress System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -1206,9 +1239,6 @@ 7 - - True - cbGenerateOutline @@ -1222,7 +1252,7 @@ 2 - 2 + 3 1 @@ -1308,6 +1338,9 @@ 145, 22 + + + 0 @@ -1320,6 +1353,9 @@ + + MiddleRight + gpContainer @@ -1332,8 +1368,8 @@ True - - gpContainer + + cbUse3DTilesSpecification11 toolTip1 @@ -1377,6 +1413,12 @@ System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 0 + @@ -1405,10 +1447,10 @@ 7 - 3 + 4 - - MiddleRight + + True 0 @@ -1422,8 +1464,8 @@ 95, 18 - - + + Using 3D Tiles 1.1 gb3DTiles diff --git a/Bimangle.ForgeEngine.Navisworks/UI/Controls/ExportCesium3DTiles.zh-Hans.resx b/Bimangle.ForgeEngine.Navisworks/UI/Controls/ExportCesium3DTiles.zh-Hans.resx index 55d43be..c910ab9 100644 --- a/Bimangle.ForgeEngine.Navisworks/UI/Controls/ExportCesium3DTiles.zh-Hans.resx +++ b/Bimangle.ForgeEngine.Navisworks/UI/Controls/ExportCesium3DTiles.zh-Hans.resx @@ -212,13 +212,31 @@ + + + + + MiddleRight + + + 0 + + + + 119, 18 + + + 使用 3D Tiles 1.1 + + + + 0 - 105, 18 diff --git a/Bimangle.ForgeEngine.Navisworks/packages.Bimangle.ForgeEngine.Nw_R2014.config b/Bimangle.ForgeEngine.Navisworks/packages.Bimangle.ForgeEngine.Nw_R2014.config index 3be772b..bc13599 100644 --- a/Bimangle.ForgeEngine.Navisworks/packages.Bimangle.ForgeEngine.Nw_R2014.config +++ b/Bimangle.ForgeEngine.Navisworks/packages.Bimangle.ForgeEngine.Nw_R2014.config @@ -1,7 +1,7 @@  - - + + diff --git a/Bimangle.ForgeEngine.Navisworks/packages.Bimangle.ForgeEngine.Nw_R2015.config b/Bimangle.ForgeEngine.Navisworks/packages.Bimangle.ForgeEngine.Nw_R2015.config index 4589b75..e927210 100644 --- a/Bimangle.ForgeEngine.Navisworks/packages.Bimangle.ForgeEngine.Nw_R2015.config +++ b/Bimangle.ForgeEngine.Navisworks/packages.Bimangle.ForgeEngine.Nw_R2015.config @@ -1,7 +1,7 @@  - - + + diff --git a/Bimangle.ForgeEngine.Navisworks/packages.Bimangle.ForgeEngine.Nw_R2016.config b/Bimangle.ForgeEngine.Navisworks/packages.Bimangle.ForgeEngine.Nw_R2016.config index 703dd11..703788e 100644 --- a/Bimangle.ForgeEngine.Navisworks/packages.Bimangle.ForgeEngine.Nw_R2016.config +++ b/Bimangle.ForgeEngine.Navisworks/packages.Bimangle.ForgeEngine.Nw_R2016.config @@ -1,7 +1,7 @@  - - + + diff --git a/Bimangle.ForgeEngine.Navisworks/packages.Bimangle.ForgeEngine.Nw_R2017.config b/Bimangle.ForgeEngine.Navisworks/packages.Bimangle.ForgeEngine.Nw_R2017.config index 18d1729..7c4cdba 100644 --- a/Bimangle.ForgeEngine.Navisworks/packages.Bimangle.ForgeEngine.Nw_R2017.config +++ b/Bimangle.ForgeEngine.Navisworks/packages.Bimangle.ForgeEngine.Nw_R2017.config @@ -1,7 +1,7 @@  - - + + diff --git a/Bimangle.ForgeEngine.Navisworks/packages.Bimangle.ForgeEngine.Nw_R2018.config b/Bimangle.ForgeEngine.Navisworks/packages.Bimangle.ForgeEngine.Nw_R2018.config index 1021a37..2f366ba 100644 --- a/Bimangle.ForgeEngine.Navisworks/packages.Bimangle.ForgeEngine.Nw_R2018.config +++ b/Bimangle.ForgeEngine.Navisworks/packages.Bimangle.ForgeEngine.Nw_R2018.config @@ -1,7 +1,7 @@  - - + + diff --git a/Bimangle.ForgeEngine.Navisworks/packages.Bimangle.ForgeEngine.Nw_R2019.config b/Bimangle.ForgeEngine.Navisworks/packages.Bimangle.ForgeEngine.Nw_R2019.config index c6db819..1a492cf 100644 --- a/Bimangle.ForgeEngine.Navisworks/packages.Bimangle.ForgeEngine.Nw_R2019.config +++ b/Bimangle.ForgeEngine.Navisworks/packages.Bimangle.ForgeEngine.Nw_R2019.config @@ -1,7 +1,7 @@  - - + + diff --git a/Bimangle.ForgeEngine.Navisworks/packages.Bimangle.ForgeEngine.Nw_R2020.config b/Bimangle.ForgeEngine.Navisworks/packages.Bimangle.ForgeEngine.Nw_R2020.config index b0d27a0..6d61bb9 100644 --- a/Bimangle.ForgeEngine.Navisworks/packages.Bimangle.ForgeEngine.Nw_R2020.config +++ b/Bimangle.ForgeEngine.Navisworks/packages.Bimangle.ForgeEngine.Nw_R2020.config @@ -1,7 +1,7 @@  - - + + diff --git a/Bimangle.ForgeEngine.Navisworks/packages.Bimangle.ForgeEngine.Nw_R2021.config b/Bimangle.ForgeEngine.Navisworks/packages.Bimangle.ForgeEngine.Nw_R2021.config index ede87f0..fb1edef 100644 --- a/Bimangle.ForgeEngine.Navisworks/packages.Bimangle.ForgeEngine.Nw_R2021.config +++ b/Bimangle.ForgeEngine.Navisworks/packages.Bimangle.ForgeEngine.Nw_R2021.config @@ -1,7 +1,7 @@  - - + + diff --git a/Bimangle.ForgeEngine.Navisworks/packages.Bimangle.ForgeEngine.Nw_R2022.config b/Bimangle.ForgeEngine.Navisworks/packages.Bimangle.ForgeEngine.Nw_R2022.config index 8020486..e5812cf 100644 --- a/Bimangle.ForgeEngine.Navisworks/packages.Bimangle.ForgeEngine.Nw_R2022.config +++ b/Bimangle.ForgeEngine.Navisworks/packages.Bimangle.ForgeEngine.Nw_R2022.config @@ -1,7 +1,7 @@  - - + + diff --git a/Bimangle.ForgeEngine.Navisworks/packages.Bimangle.ForgeEngine.Nw_R2023.config b/Bimangle.ForgeEngine.Navisworks/packages.Bimangle.ForgeEngine.Nw_R2023.config index 71b96f2..fc539f9 100644 --- a/Bimangle.ForgeEngine.Navisworks/packages.Bimangle.ForgeEngine.Nw_R2023.config +++ b/Bimangle.ForgeEngine.Navisworks/packages.Bimangle.ForgeEngine.Nw_R2023.config @@ -1,7 +1,7 @@  - - + + diff --git a/Bimangle.ForgeEngine.Navisworks/packages.Bimangle.ForgeEngine.Nw_R2024.config b/Bimangle.ForgeEngine.Navisworks/packages.Bimangle.ForgeEngine.Nw_R2024.config index 8f9eec0..7626a2d 100644 --- a/Bimangle.ForgeEngine.Navisworks/packages.Bimangle.ForgeEngine.Nw_R2024.config +++ b/Bimangle.ForgeEngine.Navisworks/packages.Bimangle.ForgeEngine.Nw_R2024.config @@ -1,7 +1,7 @@  - - + + diff --git a/Bimangle.ForgeEngine.Revit/Bimangle.ForgeEngine.Revit_R2014.csproj b/Bimangle.ForgeEngine.Revit/Bimangle.ForgeEngine.Revit_R2014.csproj index f502757..70623c4 100644 --- a/Bimangle.ForgeEngine.Revit/Bimangle.ForgeEngine.Revit_R2014.csproj +++ b/Bimangle.ForgeEngine.Revit/Bimangle.ForgeEngine.Revit_R2014.csproj @@ -37,23 +37,23 @@ true - - ..\packages\Bimangle.ForgeEngine.Common.1.7.7\lib\net45\Bimangle.ForgeEngine.Common.dll + + ..\packages\Bimangle.ForgeEngine.Common.1.8.1\lib\net45\Bimangle.ForgeEngine.Common.dll - - ..\packages\Bimangle.ForgeEngine.Revit2014.6.8.6\lib\net45\Bimangle.ForgeEngine.Dwf.Base.dll + + ..\packages\Bimangle.ForgeEngine.Revit2014.6.9.4\lib\net45\Bimangle.ForgeEngine.Dwf.Base.dll - - ..\packages\Bimangle.ForgeEngine.Revit2014.6.8.6\lib\net45\Bimangle.ForgeEngine.Dwf.Support.dll + + ..\packages\Bimangle.ForgeEngine.Revit2014.6.9.4\lib\net45\Bimangle.ForgeEngine.Dwf.Support.dll - - ..\packages\Bimangle.ForgeEngine.Revit2014.6.8.6\lib\net45\Bimangle.ForgeEngine.Revit2014.dll + + ..\packages\Bimangle.ForgeEngine.Revit2014.6.9.4\lib\net45\Bimangle.ForgeEngine.Revit2014.dll - - ..\packages\Bimangle.ForgeEngine.Revit2014.6.8.6\lib\net45\Bimangle.Libs.dll + + ..\packages\Bimangle.ForgeEngine.Revit2014.6.9.4\lib\net45\Bimangle.Libs.dll - - ..\packages\Bimangle.ForgeEngine.Revit2014.6.8.6\lib\net45\Bimangle.Libs.Proj.dll + + ..\packages\Bimangle.ForgeEngine.Revit2014.6.9.4\lib\net45\Bimangle.Libs.Proj.dll ..\packages\DotNetZip.1.10.1\lib\net20\DotNetZip.dll diff --git a/Bimangle.ForgeEngine.Revit/Bimangle.ForgeEngine.Revit_R2015.csproj b/Bimangle.ForgeEngine.Revit/Bimangle.ForgeEngine.Revit_R2015.csproj index 9800251..244c17d 100644 --- a/Bimangle.ForgeEngine.Revit/Bimangle.ForgeEngine.Revit_R2015.csproj +++ b/Bimangle.ForgeEngine.Revit/Bimangle.ForgeEngine.Revit_R2015.csproj @@ -37,23 +37,23 @@ true - - ..\packages\Bimangle.ForgeEngine.Common.1.7.7\lib\net45\Bimangle.ForgeEngine.Common.dll + + ..\packages\Bimangle.ForgeEngine.Common.1.8.1\lib\net45\Bimangle.ForgeEngine.Common.dll - - ..\packages\Bimangle.ForgeEngine.Revit2015.6.8.6\lib\net45\Bimangle.ForgeEngine.Dwf.Base.dll + + ..\packages\Bimangle.ForgeEngine.Revit2015.6.9.4\lib\net45\Bimangle.ForgeEngine.Dwf.Base.dll - - ..\packages\Bimangle.ForgeEngine.Revit2015.6.8.6\lib\net45\Bimangle.ForgeEngine.Dwf.Support.dll + + ..\packages\Bimangle.ForgeEngine.Revit2015.6.9.4\lib\net45\Bimangle.ForgeEngine.Dwf.Support.dll - - ..\packages\Bimangle.ForgeEngine.Revit2015.6.8.6\lib\net45\Bimangle.ForgeEngine.Revit2015.dll + + ..\packages\Bimangle.ForgeEngine.Revit2015.6.9.4\lib\net45\Bimangle.ForgeEngine.Revit2015.dll - - ..\packages\Bimangle.ForgeEngine.Revit2015.6.8.6\lib\net45\Bimangle.Libs.dll + + ..\packages\Bimangle.ForgeEngine.Revit2015.6.9.4\lib\net45\Bimangle.Libs.dll - - ..\packages\Bimangle.ForgeEngine.Revit2015.6.8.6\lib\net45\Bimangle.Libs.Proj.dll + + ..\packages\Bimangle.ForgeEngine.Revit2015.6.9.4\lib\net45\Bimangle.Libs.Proj.dll ..\packages\DotNetZip.1.13.2\lib\net40\DotNetZip.dll diff --git a/Bimangle.ForgeEngine.Revit/Bimangle.ForgeEngine.Revit_R2016.csproj b/Bimangle.ForgeEngine.Revit/Bimangle.ForgeEngine.Revit_R2016.csproj index 043e988..e9fecf6 100644 --- a/Bimangle.ForgeEngine.Revit/Bimangle.ForgeEngine.Revit_R2016.csproj +++ b/Bimangle.ForgeEngine.Revit/Bimangle.ForgeEngine.Revit_R2016.csproj @@ -37,23 +37,23 @@ true - - ..\packages\Bimangle.ForgeEngine.Common.1.7.7\lib\net45\Bimangle.ForgeEngine.Common.dll + + ..\packages\Bimangle.ForgeEngine.Common.1.8.1\lib\net45\Bimangle.ForgeEngine.Common.dll - - ..\packages\Bimangle.ForgeEngine.Revit2016.6.8.6\lib\net45\Bimangle.ForgeEngine.Dwf.Base.dll + + ..\packages\Bimangle.ForgeEngine.Revit2016.6.9.4\lib\net45\Bimangle.ForgeEngine.Dwf.Base.dll - - ..\packages\Bimangle.ForgeEngine.Revit2016.6.8.6\lib\net45\Bimangle.ForgeEngine.Dwf.Support.dll + + ..\packages\Bimangle.ForgeEngine.Revit2016.6.9.4\lib\net45\Bimangle.ForgeEngine.Dwf.Support.dll - - ..\packages\Bimangle.ForgeEngine.Revit2016.6.8.6\lib\net45\Bimangle.ForgeEngine.Revit2016.dll + + ..\packages\Bimangle.ForgeEngine.Revit2016.6.9.4\lib\net45\Bimangle.ForgeEngine.Revit2016.dll - - ..\packages\Bimangle.ForgeEngine.Revit2016.6.8.6\lib\net45\Bimangle.Libs.dll + + ..\packages\Bimangle.ForgeEngine.Revit2016.6.9.4\lib\net45\Bimangle.Libs.dll - - ..\packages\Bimangle.ForgeEngine.Revit2016.6.8.6\lib\net45\Bimangle.Libs.Proj.dll + + ..\packages\Bimangle.ForgeEngine.Revit2016.6.9.4\lib\net45\Bimangle.Libs.Proj.dll ..\packages\DotNetZip.1.13.2\lib\net40\DotNetZip.dll diff --git a/Bimangle.ForgeEngine.Revit/Bimangle.ForgeEngine.Revit_R2017.csproj b/Bimangle.ForgeEngine.Revit/Bimangle.ForgeEngine.Revit_R2017.csproj index 27558ee..80c8099 100644 --- a/Bimangle.ForgeEngine.Revit/Bimangle.ForgeEngine.Revit_R2017.csproj +++ b/Bimangle.ForgeEngine.Revit/Bimangle.ForgeEngine.Revit_R2017.csproj @@ -37,23 +37,23 @@ true - - ..\packages\Bimangle.ForgeEngine.Common.1.7.7\lib\net45\Bimangle.ForgeEngine.Common.dll + + ..\packages\Bimangle.ForgeEngine.Common.1.8.1\lib\net45\Bimangle.ForgeEngine.Common.dll - - ..\packages\Bimangle.ForgeEngine.Revit2017.6.8.6\lib\net452\Bimangle.ForgeEngine.Dwf.Base.dll + + ..\packages\Bimangle.ForgeEngine.Revit2017.6.9.4\lib\net452\Bimangle.ForgeEngine.Dwf.Base.dll - - ..\packages\Bimangle.ForgeEngine.Revit2017.6.8.6\lib\net452\Bimangle.ForgeEngine.Dwf.Support.dll + + ..\packages\Bimangle.ForgeEngine.Revit2017.6.9.4\lib\net452\Bimangle.ForgeEngine.Dwf.Support.dll - - ..\packages\Bimangle.ForgeEngine.Revit2017.6.8.6\lib\net452\Bimangle.ForgeEngine.Revit2017.dll + + ..\packages\Bimangle.ForgeEngine.Revit2017.6.9.4\lib\net452\Bimangle.ForgeEngine.Revit2017.dll - - ..\packages\Bimangle.ForgeEngine.Revit2017.6.8.6\lib\net452\Bimangle.Libs.dll + + ..\packages\Bimangle.ForgeEngine.Revit2017.6.9.4\lib\net452\Bimangle.Libs.dll - - ..\packages\Bimangle.ForgeEngine.Revit2017.6.8.6\lib\net452\Bimangle.Libs.Proj.dll + + ..\packages\Bimangle.ForgeEngine.Revit2017.6.9.4\lib\net452\Bimangle.Libs.Proj.dll ..\packages\DotNetZip.1.13.2\lib\net40\DotNetZip.dll diff --git a/Bimangle.ForgeEngine.Revit/Bimangle.ForgeEngine.Revit_R2018.csproj b/Bimangle.ForgeEngine.Revit/Bimangle.ForgeEngine.Revit_R2018.csproj index 3d48eec..b4fc4b2 100644 --- a/Bimangle.ForgeEngine.Revit/Bimangle.ForgeEngine.Revit_R2018.csproj +++ b/Bimangle.ForgeEngine.Revit/Bimangle.ForgeEngine.Revit_R2018.csproj @@ -37,23 +37,23 @@ true - - ..\packages\Bimangle.ForgeEngine.Common.1.7.7\lib\net45\Bimangle.ForgeEngine.Common.dll + + ..\packages\Bimangle.ForgeEngine.Common.1.8.1\lib\net45\Bimangle.ForgeEngine.Common.dll - - ..\packages\Bimangle.ForgeEngine.Revit2018.6.8.6\lib\net452\Bimangle.ForgeEngine.Dwf.Base.dll + + ..\packages\Bimangle.ForgeEngine.Revit2018.6.9.4\lib\net452\Bimangle.ForgeEngine.Dwf.Base.dll - - ..\packages\Bimangle.ForgeEngine.Revit2018.6.8.6\lib\net452\Bimangle.ForgeEngine.Dwf.Support.dll + + ..\packages\Bimangle.ForgeEngine.Revit2018.6.9.4\lib\net452\Bimangle.ForgeEngine.Dwf.Support.dll - - ..\packages\Bimangle.ForgeEngine.Revit2018.6.8.6\lib\net452\Bimangle.ForgeEngine.Revit2018.dll + + ..\packages\Bimangle.ForgeEngine.Revit2018.6.9.4\lib\net452\Bimangle.ForgeEngine.Revit2018.dll - - ..\packages\Bimangle.ForgeEngine.Revit2018.6.8.6\lib\net452\Bimangle.Libs.dll + + ..\packages\Bimangle.ForgeEngine.Revit2018.6.9.4\lib\net452\Bimangle.Libs.dll - - ..\packages\Bimangle.ForgeEngine.Revit2018.6.8.6\lib\net452\Bimangle.Libs.Proj.dll + + ..\packages\Bimangle.ForgeEngine.Revit2018.6.9.4\lib\net452\Bimangle.Libs.Proj.dll ..\packages\DotNetZip.1.13.2\lib\net40\DotNetZip.dll diff --git a/Bimangle.ForgeEngine.Revit/Bimangle.ForgeEngine.Revit_R2019.csproj b/Bimangle.ForgeEngine.Revit/Bimangle.ForgeEngine.Revit_R2019.csproj index e4ff038..5473b3a 100644 --- a/Bimangle.ForgeEngine.Revit/Bimangle.ForgeEngine.Revit_R2019.csproj +++ b/Bimangle.ForgeEngine.Revit/Bimangle.ForgeEngine.Revit_R2019.csproj @@ -35,23 +35,23 @@ false - - ..\packages\Bimangle.ForgeEngine.Common.1.7.7\lib\net45\Bimangle.ForgeEngine.Common.dll + + ..\packages\Bimangle.ForgeEngine.Common.1.8.1\lib\net45\Bimangle.ForgeEngine.Common.dll - - ..\packages\Bimangle.ForgeEngine.Revit2019.6.8.6\lib\net47\Bimangle.ForgeEngine.Dwf.Base.dll + + ..\packages\Bimangle.ForgeEngine.Revit2019.6.9.4\lib\net47\Bimangle.ForgeEngine.Dwf.Base.dll - - ..\packages\Bimangle.ForgeEngine.Revit2019.6.8.6\lib\net47\Bimangle.ForgeEngine.Dwf.Support.dll + + ..\packages\Bimangle.ForgeEngine.Revit2019.6.9.4\lib\net47\Bimangle.ForgeEngine.Dwf.Support.dll - - ..\packages\Bimangle.ForgeEngine.Revit2019.6.8.6\lib\net47\Bimangle.ForgeEngine.Revit2019.dll + + ..\packages\Bimangle.ForgeEngine.Revit2019.6.9.4\lib\net47\Bimangle.ForgeEngine.Revit2019.dll - - ..\packages\Bimangle.ForgeEngine.Revit2019.6.8.6\lib\net47\Bimangle.Libs.dll + + ..\packages\Bimangle.ForgeEngine.Revit2019.6.9.4\lib\net47\Bimangle.Libs.dll - - ..\packages\Bimangle.ForgeEngine.Revit2019.6.8.6\lib\net47\Bimangle.Libs.Proj.dll + + ..\packages\Bimangle.ForgeEngine.Revit2019.6.9.4\lib\net47\Bimangle.Libs.Proj.dll ..\packages\DotNetZip.1.13.2\lib\net40\DotNetZip.dll diff --git a/Bimangle.ForgeEngine.Revit/Bimangle.ForgeEngine.Revit_R2020.csproj b/Bimangle.ForgeEngine.Revit/Bimangle.ForgeEngine.Revit_R2020.csproj index fd67dbc..a4c8b5a 100644 --- a/Bimangle.ForgeEngine.Revit/Bimangle.ForgeEngine.Revit_R2020.csproj +++ b/Bimangle.ForgeEngine.Revit/Bimangle.ForgeEngine.Revit_R2020.csproj @@ -35,23 +35,23 @@ false - - ..\packages\Bimangle.ForgeEngine.Common.1.7.7\lib\net45\Bimangle.ForgeEngine.Common.dll + + ..\packages\Bimangle.ForgeEngine.Common.1.8.1\lib\net45\Bimangle.ForgeEngine.Common.dll - - ..\packages\Bimangle.ForgeEngine.Revit2020.6.8.6\lib\net47\Bimangle.ForgeEngine.Dwf.Base.dll + + ..\packages\Bimangle.ForgeEngine.Revit2020.6.9.4\lib\net47\Bimangle.ForgeEngine.Dwf.Base.dll - - ..\packages\Bimangle.ForgeEngine.Revit2020.6.8.6\lib\net47\Bimangle.ForgeEngine.Dwf.Support.dll + + ..\packages\Bimangle.ForgeEngine.Revit2020.6.9.4\lib\net47\Bimangle.ForgeEngine.Dwf.Support.dll - - ..\packages\Bimangle.ForgeEngine.Revit2020.6.8.6\lib\net47\Bimangle.ForgeEngine.Revit2020.dll + + ..\packages\Bimangle.ForgeEngine.Revit2020.6.9.4\lib\net47\Bimangle.ForgeEngine.Revit2020.dll - - ..\packages\Bimangle.ForgeEngine.Revit2020.6.8.6\lib\net47\Bimangle.Libs.dll + + ..\packages\Bimangle.ForgeEngine.Revit2020.6.9.4\lib\net47\Bimangle.Libs.dll - - ..\packages\Bimangle.ForgeEngine.Revit2020.6.8.6\lib\net47\Bimangle.Libs.Proj.dll + + ..\packages\Bimangle.ForgeEngine.Revit2020.6.9.4\lib\net47\Bimangle.Libs.Proj.dll ..\packages\DotNetZip.1.13.2\lib\net40\DotNetZip.dll diff --git a/Bimangle.ForgeEngine.Revit/Bimangle.ForgeEngine.Revit_R2021.csproj b/Bimangle.ForgeEngine.Revit/Bimangle.ForgeEngine.Revit_R2021.csproj index 4692af8..6959a43 100644 --- a/Bimangle.ForgeEngine.Revit/Bimangle.ForgeEngine.Revit_R2021.csproj +++ b/Bimangle.ForgeEngine.Revit/Bimangle.ForgeEngine.Revit_R2021.csproj @@ -35,23 +35,23 @@ false - - ..\packages\Bimangle.ForgeEngine.Common.1.7.7\lib\net45\Bimangle.ForgeEngine.Common.dll + + ..\packages\Bimangle.ForgeEngine.Common.1.8.1\lib\net45\Bimangle.ForgeEngine.Common.dll - - ..\packages\Bimangle.ForgeEngine.Revit2021.6.8.6\lib\net48\Bimangle.ForgeEngine.Dwf.Base.dll + + ..\packages\Bimangle.ForgeEngine.Revit2021.6.9.4\lib\net48\Bimangle.ForgeEngine.Dwf.Base.dll - - ..\packages\Bimangle.ForgeEngine.Revit2021.6.8.6\lib\net48\Bimangle.ForgeEngine.Dwf.Support.dll + + ..\packages\Bimangle.ForgeEngine.Revit2021.6.9.4\lib\net48\Bimangle.ForgeEngine.Dwf.Support.dll - - ..\packages\Bimangle.ForgeEngine.Revit2021.6.8.6\lib\net48\Bimangle.ForgeEngine.Revit2021.dll + + ..\packages\Bimangle.ForgeEngine.Revit2021.6.9.4\lib\net48\Bimangle.ForgeEngine.Revit2021.dll - - ..\packages\Bimangle.ForgeEngine.Revit2021.6.8.6\lib\net48\Bimangle.Libs.dll + + ..\packages\Bimangle.ForgeEngine.Revit2021.6.9.4\lib\net48\Bimangle.Libs.dll - - ..\packages\Bimangle.ForgeEngine.Revit2021.6.8.6\lib\net48\Bimangle.Libs.Proj.dll + + ..\packages\Bimangle.ForgeEngine.Revit2021.6.9.4\lib\net48\Bimangle.Libs.Proj.dll ..\packages\DotNetZip.1.13.2\lib\net40\DotNetZip.dll diff --git a/Bimangle.ForgeEngine.Revit/Bimangle.ForgeEngine.Revit_R2022.csproj b/Bimangle.ForgeEngine.Revit/Bimangle.ForgeEngine.Revit_R2022.csproj index 4f3760a..ab110c9 100644 --- a/Bimangle.ForgeEngine.Revit/Bimangle.ForgeEngine.Revit_R2022.csproj +++ b/Bimangle.ForgeEngine.Revit/Bimangle.ForgeEngine.Revit_R2022.csproj @@ -35,23 +35,23 @@ false - - ..\packages\Bimangle.ForgeEngine.Common.1.7.7\lib\net45\Bimangle.ForgeEngine.Common.dll + + ..\packages\Bimangle.ForgeEngine.Common.1.8.1\lib\net45\Bimangle.ForgeEngine.Common.dll - - ..\packages\Bimangle.ForgeEngine.Revit2022.6.8.6\lib\net48\Bimangle.ForgeEngine.Dwf.Base.dll + + ..\packages\Bimangle.ForgeEngine.Revit2022.6.9.4\lib\net48\Bimangle.ForgeEngine.Dwf.Base.dll - - ..\packages\Bimangle.ForgeEngine.Revit2022.6.8.6\lib\net48\Bimangle.ForgeEngine.Dwf.Support.dll + + ..\packages\Bimangle.ForgeEngine.Revit2022.6.9.4\lib\net48\Bimangle.ForgeEngine.Dwf.Support.dll - - ..\packages\Bimangle.ForgeEngine.Revit2022.6.8.6\lib\net48\Bimangle.ForgeEngine.Revit2022.dll + + ..\packages\Bimangle.ForgeEngine.Revit2022.6.9.4\lib\net48\Bimangle.ForgeEngine.Revit2022.dll - - ..\packages\Bimangle.ForgeEngine.Revit2022.6.8.6\lib\net48\Bimangle.Libs.dll + + ..\packages\Bimangle.ForgeEngine.Revit2022.6.9.4\lib\net48\Bimangle.Libs.dll - - ..\packages\Bimangle.ForgeEngine.Revit2022.6.8.6\lib\net48\Bimangle.Libs.Proj.dll + + ..\packages\Bimangle.ForgeEngine.Revit2022.6.9.4\lib\net48\Bimangle.Libs.Proj.dll ..\packages\DotNetZip.1.13.2\lib\net40\DotNetZip.dll diff --git a/Bimangle.ForgeEngine.Revit/Bimangle.ForgeEngine.Revit_R2023.csproj b/Bimangle.ForgeEngine.Revit/Bimangle.ForgeEngine.Revit_R2023.csproj index 6523481..a53d1f1 100644 --- a/Bimangle.ForgeEngine.Revit/Bimangle.ForgeEngine.Revit_R2023.csproj +++ b/Bimangle.ForgeEngine.Revit/Bimangle.ForgeEngine.Revit_R2023.csproj @@ -35,23 +35,23 @@ false - - ..\packages\Bimangle.ForgeEngine.Common.1.7.7\lib\net45\Bimangle.ForgeEngine.Common.dll + + ..\packages\Bimangle.ForgeEngine.Common.1.8.1\lib\net45\Bimangle.ForgeEngine.Common.dll - - ..\packages\Bimangle.ForgeEngine.Revit2023.6.8.6\lib\net48\Bimangle.ForgeEngine.Dwf.Base.dll + + ..\packages\Bimangle.ForgeEngine.Revit2023.6.9.4\lib\net48\Bimangle.ForgeEngine.Dwf.Base.dll - - ..\packages\Bimangle.ForgeEngine.Revit2023.6.8.6\lib\net48\Bimangle.ForgeEngine.Dwf.Support.dll + + ..\packages\Bimangle.ForgeEngine.Revit2023.6.9.4\lib\net48\Bimangle.ForgeEngine.Dwf.Support.dll - - ..\packages\Bimangle.ForgeEngine.Revit2023.6.8.6\lib\net48\Bimangle.ForgeEngine.Revit2023.dll + + ..\packages\Bimangle.ForgeEngine.Revit2023.6.9.4\lib\net48\Bimangle.ForgeEngine.Revit2023.dll - - ..\packages\Bimangle.ForgeEngine.Revit2023.6.8.6\lib\net48\Bimangle.Libs.dll + + ..\packages\Bimangle.ForgeEngine.Revit2023.6.9.4\lib\net48\Bimangle.Libs.dll - - ..\packages\Bimangle.ForgeEngine.Revit2023.6.8.6\lib\net48\Bimangle.Libs.Proj.dll + + ..\packages\Bimangle.ForgeEngine.Revit2023.6.9.4\lib\net48\Bimangle.Libs.Proj.dll ..\packages\DotNetZip.1.13.2\lib\net40\DotNetZip.dll diff --git a/Bimangle.ForgeEngine.Revit/Bimangle.ForgeEngine.Revit_R2024.csproj b/Bimangle.ForgeEngine.Revit/Bimangle.ForgeEngine.Revit_R2024.csproj index c88c4fb..e40460c 100644 --- a/Bimangle.ForgeEngine.Revit/Bimangle.ForgeEngine.Revit_R2024.csproj +++ b/Bimangle.ForgeEngine.Revit/Bimangle.ForgeEngine.Revit_R2024.csproj @@ -35,23 +35,23 @@ false - - ..\packages\Bimangle.ForgeEngine.Common.1.7.7\lib\net45\Bimangle.ForgeEngine.Common.dll + + ..\packages\Bimangle.ForgeEngine.Common.1.8.1\lib\net45\Bimangle.ForgeEngine.Common.dll - - ..\packages\Bimangle.ForgeEngine.Revit2024.6.8.6\lib\net48\Bimangle.ForgeEngine.Dwf.Base.dll + + ..\packages\Bimangle.ForgeEngine.Revit2024.6.9.4\lib\net48\Bimangle.ForgeEngine.Dwf.Base.dll - - ..\packages\Bimangle.ForgeEngine.Revit2024.6.8.6\lib\net48\Bimangle.ForgeEngine.Dwf.Support.dll + + ..\packages\Bimangle.ForgeEngine.Revit2024.6.9.4\lib\net48\Bimangle.ForgeEngine.Dwf.Support.dll - - ..\packages\Bimangle.ForgeEngine.Revit2024.6.8.6\lib\net48\Bimangle.ForgeEngine.Revit2024.dll + + ..\packages\Bimangle.ForgeEngine.Revit2024.6.9.4\lib\net48\Bimangle.ForgeEngine.Revit2024.dll - - ..\packages\Bimangle.ForgeEngine.Revit2024.6.8.6\lib\net48\Bimangle.Libs.dll + + ..\packages\Bimangle.ForgeEngine.Revit2024.6.9.4\lib\net48\Bimangle.Libs.dll - - ..\packages\Bimangle.ForgeEngine.Revit2024.6.8.6\lib\net48\Bimangle.Libs.Proj.dll + + ..\packages\Bimangle.ForgeEngine.Revit2024.6.9.4\lib\net48\Bimangle.Libs.Proj.dll ..\packages\DotNetZip.1.13.2\lib\net40\DotNetZip.dll diff --git a/Bimangle.ForgeEngine.Revit/Strings.Designer.cs b/Bimangle.ForgeEngine.Revit/Strings.Designer.cs index 1265834..7622b1b 100644 --- a/Bimangle.ForgeEngine.Revit/Strings.Designer.cs +++ b/Bimangle.ForgeEngine.Revit/Strings.Designer.cs @@ -47,8 +47,8 @@ internal Strings() { } /// - /// 重写当前线程的 CurrentUICulture 属性 - /// 重写当前线程的 CurrentUICulture 属性。 + /// 重写当前线程的 CurrentUICulture 属性，对 + /// 使用此强类型资源类的所有资源查找执行重写。 /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] internal static global::System.Globalization.CultureInfo Culture { @@ -403,7 +403,7 @@ internal static string FeatureDescriptionForce2DViewUseWireframe { } /// - /// 查找类似 的本地化字符串。 + /// 查找类似 The output data is compatible with EarthSDK 的本地化字符串。 /// internal static string FeatureDescriptionForEarthSdk { get { @@ -474,6 +474,15 @@ internal static string FeatureDescriptionOnlySelected { } } + /// + /// 查找类似 Optimize the geometry surface material, and intelligently adjust the geometry surface for double-sided material to single-sided material output, reducing flicker problems 的本地化字符串。 + /// + internal static string FeatureDescriptionOptimizationFaceMaterial { + get { + return ResourceManager.GetString("FeatureDescriptionOptimizationFaceMaterial", resourceCulture); + } + } + /// /// 查找类似 Enable Reduce Geometry Node To Parent Node 的本地化字符串。 /// @@ -510,6 +519,15 @@ internal static string FeatureDescriptionRegroupForWorkSet { } } + /// + /// 查找类似 Publish data using 3D Tiles 1.1 specification 的本地化字符串。 + /// + internal static string FeatureDescriptionUse3DTilesSpecification11 { + get { + return ResourceManager.GetString("FeatureDescriptionUse3DTilesSpecification11", resourceCulture); + } + } + /// /// 查找类似 Use level category by element's bounding box 的本地化字符串。 /// @@ -879,6 +897,15 @@ internal static string FeatureNameOnlySelected { } } + /// + /// 查找类似 Optimization face material 的本地化字符串。 + /// + internal static string FeatureNameOptimizationFaceMaterial { + get { + return ResourceManager.GetString("FeatureNameOptimizationFaceMaterial", resourceCulture); + } + } + /// /// 查找类似 Enable Reduce Geometry Node 的本地化字符串。 /// @@ -915,6 +942,15 @@ internal static string FeatureNameRegroupForWorkSet { } } + /// + /// 查找类似 Using 3D Tiles 1.1 的本地化字符串。 + /// + internal static string FeatureNameUse3DTilesSpecification11 { + get { + return ResourceManager.GetString("FeatureNameUse3DTilesSpecification11", resourceCulture); + } + } + /// /// 查找类似 Use level(bound) category 的本地化字符串。 /// diff --git a/Bimangle.ForgeEngine.Revit/Strings.resx b/Bimangle.ForgeEngine.Revit/Strings.resx index 52dac2e..ea3a280 100644 --- a/Bimangle.ForgeEngine.Revit/Strings.resx +++ b/Bimangle.ForgeEngine.Revit/Strings.resx @@ -630,4 +630,16 @@ The output data is compatible with EarthSDK + + Optimize the geometry surface material, and intelligently adjust the geometry surface for double-sided material to single-sided material output, reducing flicker problems + + + Optimization face material + + + Using 3D Tiles 1.1 + + + Publish data using 3D Tiles 1.1 specification + \ No newline at end of file diff --git a/Bimangle.ForgeEngine.Revit/Strings.zh-Hans.resx b/Bimangle.ForgeEngine.Revit/Strings.zh-Hans.resx index 8c24610..7344669 100644 --- a/Bimangle.ForgeEngine.Revit/Strings.zh-Hans.resx +++ b/Bimangle.ForgeEngine.Revit/Strings.zh-Hans.resx @@ -636,4 +636,16 @@ 输出的数据兼容 EarthSDK + + 优化几何面材质，将对于双面材质几何面智能调整为单面材质输出，缓解闪烁问题 + + + 优化几何面材质 + + + 使用 3D Tiles 1.1 + + + 使用 3D Tiles 1.1 规范发布数据 + \ No newline at end of file diff --git a/Bimangle.ForgeEngine.Revit/UI/Controls/ExportCesium3DTiles.Designer.cs b/Bimangle.ForgeEngine.Revit/UI/Controls/ExportCesium3DTiles.Designer.cs index 125405d..d4876ed 100644 --- a/Bimangle.ForgeEngine.Revit/UI/Controls/ExportCesium3DTiles.Designer.cs +++ b/Bimangle.ForgeEngine.Revit/UI/Controls/ExportCesium3DTiles.Designer.cs @@ -38,6 +38,7 @@ private void InitializeComponent() this.cbContentType = new System.Windows.Forms.ComboBox(); this.lblContents = new System.Windows.Forms.Label(); this.gbAdvanced = new System.Windows.Forms.GroupBox(); + this.cbUse3DTilesSpecification11 = new System.Windows.Forms.CheckBox(); this.cbForEarthSdk = new System.Windows.Forms.CheckBox(); this.cbGeometryCompressTypes = new System.Windows.Forms.ComboBox(); this.cbEnableGeometryCompress = new System.Windows.Forms.CheckBox(); @@ -160,6 +161,7 @@ private void InitializeComponent() // gbAdvanced // resources.ApplyResources(this.gbAdvanced, "gbAdvanced"); + this.gbAdvanced.Controls.Add(this.cbUse3DTilesSpecification11); this.gbAdvanced.Controls.Add(this.cbForEarthSdk); this.gbAdvanced.Controls.Add(this.cbGeometryCompressTypes); this.gbAdvanced.Controls.Add(this.cbEnableGeometryCompress); @@ -175,6 +177,16 @@ private void InitializeComponent() this.gbAdvanced.TabStop = false; this.toolTip1.SetToolTip(this.gbAdvanced, resources.GetString("gbAdvanced.ToolTip")); // + // cbUse3DTilesSpecification11 + // + resources.ApplyResources(this.cbUse3DTilesSpecification11, "cbUse3DTilesSpecification11"); + this.errorProvider1.SetError(this.cbUse3DTilesSpecification11, resources.GetString("cbUse3DTilesSpecification11.Error")); + this.errorProvider1.SetIconAlignment(this.cbUse3DTilesSpecification11, ((System.Windows.Forms.ErrorIconAlignment)(resources.GetObject("cbUse3DTilesSpecification11.IconAlignment")))); + this.errorProvider1.SetIconPadding(this.cbUse3DTilesSpecification11, ((int)(resources.GetObject("cbUse3DTilesSpecification11.IconPadding")))); + this.cbUse3DTilesSpecification11.Name = "cbUse3DTilesSpecification11"; + this.toolTip1.SetToolTip(this.cbUse3DTilesSpecification11, resources.GetString("cbUse3DTilesSpecification11.ToolTip")); + this.cbUse3DTilesSpecification11.UseVisualStyleBackColor = true; + // // cbForEarthSdk // resources.ApplyResources(this.cbForEarthSdk, "cbForEarthSdk"); @@ -497,5 +509,6 @@ private void InitializeComponent() private System.Windows.Forms.CheckBox cbForEarthSdk; private System.Windows.Forms.ComboBox cbGeometryCompressTypes; private System.Windows.Forms.CheckBox cbEnableGeometryCompress; + private System.Windows.Forms.CheckBox cbUse3DTilesSpecification11; } } \ No newline at end of file diff --git a/Bimangle.ForgeEngine.Revit/UI/Controls/ExportCesium3DTiles.cs b/Bimangle.ForgeEngine.Revit/UI/Controls/ExportCesium3DTiles.cs index 8d62a48..a542edc 100644 --- a/Bimangle.ForgeEngine.Revit/UI/Controls/ExportCesium3DTiles.cs +++ b/Bimangle.ForgeEngine.Revit/UI/Controls/ExportCesium3DTiles.cs @@ -130,6 +130,7 @@ void IExportControl.Init(UIDocument uidoc, View3D view, AppConfig config, Dictio new FeatureInfo(FeatureType.EnableMeshQuantized, string.Empty, string.Empty, true, false), new FeatureInfo(FeatureType.UseGoogleDracoPatch, string.Empty, string.Empty, true, false), new FeatureInfo(FeatureType.ForEarthSdk, string.Empty, Strings.FeatureDescriptionForEarthSdk, true, false), + new FeatureInfo(FeatureType.Use3DTilesSpecification11, Strings.FeatureNameUse3DTilesSpecification11, Strings.FeatureDescriptionUse3DTilesSpecification11, true, false), }; _VisualStyles = new List(); @@ -341,6 +342,8 @@ void SetFeature(FeatureType featureType, bool selected) SetFeature(FeatureType.EnableCesiumPrimitiveOutline, cbGenerateOutline.Checked); SetFeature(FeatureType.EnableUnlitMaterials, cbEnableUnlitMaterials.Checked); SetFeature(FeatureType.ForEarthSdk, cbForEarthSdk.Checked); + SetFeature(FeatureType.Use3DTilesSpecification11, cbUse3DTilesSpecification11.Checked); + SetFeature(FeatureType.EnableTextureWebP, false); SetFeature(FeatureType.EnableTextureKtx2, false); @@ -483,6 +486,7 @@ void IExportControl.Reset() cbGenerateOutline.Checked = false; cbEnableUnlitMaterials.Checked = false; cbForEarthSdk.Checked = false; + cbUse3DTilesSpecification11.Checked = false; { _LocalConfig.GeoreferencedSetting = _GeoreferncingHost.CreateDefaultSetting(); @@ -632,6 +636,7 @@ bool IsAllowFeature(FeatureType feature) toolTip1.SetToolTip(cbGenerateOutline, Strings.FeatureDescriptionEnableCesiumPrimitiveOutline); toolTip1.SetToolTip(cbEnableUnlitMaterials, Strings.FeatureDescriptionEnableUnlitMaterials); toolTip1.SetToolTip(cbForEarthSdk, Strings.FeatureDescriptionForEarthSdk); + toolTip1.SetToolTip(cbUse3DTilesSpecification11, Strings.FeatureDescriptionUse3DTilesSpecification11); if (IsAllowFeature(FeatureType.UseGoogleDraco)) { @@ -704,11 +709,16 @@ bool IsAllowFeature(FeatureType feature) { cbEnableUnlitMaterials.Checked = true; } - + if (IsAllowFeature(FeatureType.ForEarthSdk)) { cbForEarthSdk.Checked = true; } + + if (IsAllowFeature(FeatureType.Use3DTilesSpecification11)) + { + cbUse3DTilesSpecification11.Checked = true; + } } #endregion diff --git a/Bimangle.ForgeEngine.Revit/UI/Controls/ExportCesium3DTiles.resx b/Bimangle.ForgeEngine.Revit/UI/Controls/ExportCesium3DTiles.resx index 05e8c14..337ab84 100644 --- a/Bimangle.ForgeEngine.Revit/UI/Controls/ExportCesium3DTiles.resx +++ b/Bimangle.ForgeEngine.Revit/UI/Controls/ExportCesium3DTiles.resx @@ -138,6 +138,9 @@ + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -204,8 +207,8 @@ 0 - - 6 + + 0 331, 227 @@ -267,8 +270,8 @@ True - - Enable Node's Propperties + + gbAdvanced gb3DTiles @@ -291,8 +294,11 @@ gbAdvanced - - cbExportSvfzip + + 15, 165 + + + gpContainer TopLeft @@ -309,6 +315,9 @@ + + NoControl + Contents: @@ -324,9 +333,6 @@ 0 - - - @@ -351,12 +357,21 @@ MiddleRight + + System.Windows.Forms.ToolTip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 cbEnableTextureCompress + + 10 + 0 @@ -372,6 +387,9 @@ True + + + 0 @@ -456,8 +474,8 @@ Thumbnail - - 52, 75 + + 0 System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -562,13 +580,13 @@ - 5 + 6 gbAdvanced - 6 + 7 Model Lines @@ -618,9 +636,12 @@ - + MiddleRight + + 12, 12 + NoControl @@ -660,8 +681,8 @@ gpExclude - - + + 110, 47 @@ -675,9 +696,6 @@ 3 - - cbEnableGeometryCompress - 0 @@ -693,8 +711,8 @@ 0 - - NoControl + + 52, 75 cbForEarthSdk @@ -780,6 +798,9 @@ cbExcludeUnselectedElements + + True + 208, 22 @@ -789,6 +810,9 @@ + + gbAdvanced + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -807,12 +831,18 @@ System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 0 + + MiddleRight + NoControl @@ -843,8 +873,8 @@ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 110, 47 + + Enable Node's Propperties System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -865,7 +895,7 @@ $this - 4 + 5 0 @@ -879,11 +909,8 @@ - - 0 - - - lblLevelOfDetail + + 2 0 @@ -907,7 +934,7 @@ 110, 19 - 0 + 1 2 @@ -987,9 +1014,6 @@ 5 - - gbAdvanced - ExportCesium3DTiles @@ -1011,8 +1035,8 @@ 4 - - True + + lblLevelOfDetail Compatible with EarthSDK @@ -1020,9 +1044,15 @@ 167, 22 + + + 3 + + 6 + 2 @@ -1041,6 +1071,9 @@ + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + Top, Left, Right @@ -1068,8 +1101,8 @@ Georeferncing: - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Output Path: 169, 18 @@ -1080,8 +1113,8 @@ 0 - - True + + NoControl 4 @@ -1104,8 +1137,8 @@ cbGeneratePropDbSqlite - - 12, 12 + + cbExportSvfzip 0 @@ -1123,7 +1156,7 @@ lblGeoreferncing - 7 + 8 errorProvider1 @@ -1134,19 +1167,22 @@ MiddleRight + + True + 0 760, 450 - - System.Windows.Forms.ToolTip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + True 0 - + @@ -1185,20 +1221,17 @@ 0 - + 0 - - 1 - lblContents - - + + 124, 18 - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + cbEnableGeometryCompress System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -1206,9 +1239,6 @@ 7 - - True - cbGenerateOutline @@ -1222,7 +1252,7 @@ 2 - 2 + 3 1 @@ -1308,6 +1338,9 @@ 146, 21 + + + 0 @@ -1320,6 +1353,9 @@ + + MiddleRight + gpContainer @@ -1332,8 +1368,8 @@ True - - gpContainer + + cbUse3DTilesSpecification11 System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -1377,6 +1413,12 @@ System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 0 + @@ -1405,10 +1447,10 @@ 7 - 3 + 4 - - MiddleRight + + True 0 @@ -1422,8 +1464,8 @@ 95, 18 - - + + Using 3D Tiles 1.1 gb3DTiles @@ -1431,12 +1473,9 @@ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Output Path: + + - - zh-Hans - True diff --git a/Bimangle.ForgeEngine.Revit/UI/Controls/ExportCesium3DTiles.zh-Hans.resx b/Bimangle.ForgeEngine.Revit/UI/Controls/ExportCesium3DTiles.zh-Hans.resx index 8d45c15..c16e810 100644 --- a/Bimangle.ForgeEngine.Revit/UI/Controls/ExportCesium3DTiles.zh-Hans.resx +++ b/Bimangle.ForgeEngine.Revit/UI/Controls/ExportCesium3DTiles.zh-Hans.resx @@ -206,13 +206,31 @@ + + + + + MiddleRight + + + 0 + + + + 119, 18 + + + 使用 3D Tiles 1.1 + + + + 0 - 105, 18 diff --git a/Bimangle.ForgeEngine.Revit/Utility/AppHelper.cs b/Bimangle.ForgeEngine.Revit/Utility/AppHelper.cs index 7965c41..a4f95a3 100644 --- a/Bimangle.ForgeEngine.Revit/Utility/AppHelper.cs +++ b/Bimangle.ForgeEngine.Revit/Utility/AppHelper.cs @@ -14,8 +14,6 @@ namespace Bimangle.ForgeEngine.Revit.Utility { static class AppHelper { - private static readonly Dictionary _BuiltInParameterGroupLabels = new Dictionary(); - /// /// 细线选项是否处于启用状态 /// diff --git a/Bimangle.ForgeEngine.Revit/packages.Bimangle.ForgeEngine.Revit_R2014.config b/Bimangle.ForgeEngine.Revit/packages.Bimangle.ForgeEngine.Revit_R2014.config index 1b96b1a..d7e720f 100644 --- a/Bimangle.ForgeEngine.Revit/packages.Bimangle.ForgeEngine.Revit_R2014.config +++ b/Bimangle.ForgeEngine.Revit/packages.Bimangle.ForgeEngine.Revit_R2014.config @@ -1,7 +1,7 @@  - - + + diff --git a/Bimangle.ForgeEngine.Revit/packages.Bimangle.ForgeEngine.Revit_R2015.config b/Bimangle.ForgeEngine.Revit/packages.Bimangle.ForgeEngine.Revit_R2015.config index 81e001d..fe3a992 100644 --- a/Bimangle.ForgeEngine.Revit/packages.Bimangle.ForgeEngine.Revit_R2015.config +++ b/Bimangle.ForgeEngine.Revit/packages.Bimangle.ForgeEngine.Revit_R2015.config @@ -1,7 +1,7 @@  - - + + diff --git a/Bimangle.ForgeEngine.Revit/packages.Bimangle.ForgeEngine.Revit_R2016.config b/Bimangle.ForgeEngine.Revit/packages.Bimangle.ForgeEngine.Revit_R2016.config index 7cc4724..27d3f68 100644 --- a/Bimangle.ForgeEngine.Revit/packages.Bimangle.ForgeEngine.Revit_R2016.config +++ b/Bimangle.ForgeEngine.Revit/packages.Bimangle.ForgeEngine.Revit_R2016.config @@ -1,7 +1,7 @@  - - + + diff --git a/Bimangle.ForgeEngine.Revit/packages.Bimangle.ForgeEngine.Revit_R2017.config b/Bimangle.ForgeEngine.Revit/packages.Bimangle.ForgeEngine.Revit_R2017.config index 794210b..9f609a2 100644 --- a/Bimangle.ForgeEngine.Revit/packages.Bimangle.ForgeEngine.Revit_R2017.config +++ b/Bimangle.ForgeEngine.Revit/packages.Bimangle.ForgeEngine.Revit_R2017.config @@ -1,7 +1,7 @@  - - + + diff --git a/Bimangle.ForgeEngine.Revit/packages.Bimangle.ForgeEngine.Revit_R2018.config b/Bimangle.ForgeEngine.Revit/packages.Bimangle.ForgeEngine.Revit_R2018.config index 68f7bda..539efc1 100644 --- a/Bimangle.ForgeEngine.Revit/packages.Bimangle.ForgeEngine.Revit_R2018.config +++ b/Bimangle.ForgeEngine.Revit/packages.Bimangle.ForgeEngine.Revit_R2018.config @@ -1,7 +1,7 @@  - - + + diff --git a/Bimangle.ForgeEngine.Revit/packages.Bimangle.ForgeEngine.Revit_R2019.config b/Bimangle.ForgeEngine.Revit/packages.Bimangle.ForgeEngine.Revit_R2019.config index aab636f..01500f4 100644 --- a/Bimangle.ForgeEngine.Revit/packages.Bimangle.ForgeEngine.Revit_R2019.config +++ b/Bimangle.ForgeEngine.Revit/packages.Bimangle.ForgeEngine.Revit_R2019.config @@ -1,7 +1,7 @@  - - + + diff --git a/Bimangle.ForgeEngine.Revit/packages.Bimangle.ForgeEngine.Revit_R2020.config b/Bimangle.ForgeEngine.Revit/packages.Bimangle.ForgeEngine.Revit_R2020.config index 650c816..f3a4445 100644 --- a/Bimangle.ForgeEngine.Revit/packages.Bimangle.ForgeEngine.Revit_R2020.config +++ b/Bimangle.ForgeEngine.Revit/packages.Bimangle.ForgeEngine.Revit_R2020.config @@ -1,7 +1,7 @@  - - + + diff --git a/Bimangle.ForgeEngine.Revit/packages.Bimangle.ForgeEngine.Revit_R2021.config b/Bimangle.ForgeEngine.Revit/packages.Bimangle.ForgeEngine.Revit_R2021.config index 109c8b9..12e9316 100644 --- a/Bimangle.ForgeEngine.Revit/packages.Bimangle.ForgeEngine.Revit_R2021.config +++ b/Bimangle.ForgeEngine.Revit/packages.Bimangle.ForgeEngine.Revit_R2021.config @@ -1,7 +1,7 @@  - - + + diff --git a/Bimangle.ForgeEngine.Revit/packages.Bimangle.ForgeEngine.Revit_R2022.config b/Bimangle.ForgeEngine.Revit/packages.Bimangle.ForgeEngine.Revit_R2022.config index 5e058df..20dcde7 100644 --- a/Bimangle.ForgeEngine.Revit/packages.Bimangle.ForgeEngine.Revit_R2022.config +++ b/Bimangle.ForgeEngine.Revit/packages.Bimangle.ForgeEngine.Revit_R2022.config @@ -1,7 +1,7 @@  - - + + diff --git a/Bimangle.ForgeEngine.Revit/packages.Bimangle.ForgeEngine.Revit_R2023.config b/Bimangle.ForgeEngine.Revit/packages.Bimangle.ForgeEngine.Revit_R2023.config index 74d0626..0da4cf5 100644 --- a/Bimangle.ForgeEngine.Revit/packages.Bimangle.ForgeEngine.Revit_R2023.config +++ b/Bimangle.ForgeEngine.Revit/packages.Bimangle.ForgeEngine.Revit_R2023.config @@ -1,7 +1,7 @@  - - + + diff --git a/Bimangle.ForgeEngine.Revit/packages.Bimangle.ForgeEngine.Revit_R2024.config b/Bimangle.ForgeEngine.Revit/packages.Bimangle.ForgeEngine.Revit_R2024.config index a2b55e5..c652993 100644 --- a/Bimangle.ForgeEngine.Revit/packages.Bimangle.ForgeEngine.Revit_R2024.config +++ b/Bimangle.ForgeEngine.Revit/packages.Bimangle.ForgeEngine.Revit_R2024.config @@ -1,7 +1,7 @@  - - + + diff --git a/Bimangle.ForgeEngine.Skp/Bimangle.ForgeEngine.Skp.csproj b/Bimangle.ForgeEngine.Skp/Bimangle.ForgeEngine.Skp.csproj index c13d3a9..c49d575 100644 --- a/Bimangle.ForgeEngine.Skp/Bimangle.ForgeEngine.Skp.csproj +++ b/Bimangle.ForgeEngine.Skp/Bimangle.ForgeEngine.Skp.csproj @@ -85,17 +85,17 @@ - - ..\packages\Bimangle.ForgeEngine.Common.1.7.7\lib\net45\Bimangle.ForgeEngine.Common.dll + + ..\packages\Bimangle.ForgeEngine.Common.1.8.1\lib\net45\Bimangle.ForgeEngine.Common.dll - - ..\packages\Bimangle.ForgeEngine.Skp.1.4.6\lib\net452\Bimangle.ForgeEngine.Skp.dll + + ..\packages\Bimangle.ForgeEngine.Skp.1.5.3\lib\net452\Bimangle.ForgeEngine.Skp.dll - - ..\packages\Bimangle.ForgeEngine.Skp.1.4.6\lib\net452\Bimangle.Libs.dll + + ..\packages\Bimangle.ForgeEngine.Skp.1.5.3\lib\net452\Bimangle.Libs.dll - - ..\packages\Bimangle.ForgeEngine.Skp.1.4.6\lib\net452\Bimangle.Libs.Proj.dll + + ..\packages\Bimangle.ForgeEngine.Skp.1.5.3\lib\net452\Bimangle.Libs.Proj.dll ..\packages\CommandLineParser.2.8.0\lib\net45\CommandLine.dll @@ -284,7 +284,7 @@ 这台计算机上缺少此项目引用的 NuGet 程序包。使用“NuGet 程序包还原”可下载这些程序包。有关更多信息，请参见 http://go.microsoft.com/fwlink/?LinkID=322105。缺少的文件是 {0}。 - + - + \ No newline at end of file diff --git a/Bimangle.ForgeEngine.Skp/Strings.Designer.cs b/Bimangle.ForgeEngine.Skp/Strings.Designer.cs index 330d819..b2bff05 100644 --- a/Bimangle.ForgeEngine.Skp/Strings.Designer.cs +++ b/Bimangle.ForgeEngine.Skp/Strings.Designer.cs @@ -19,7 +19,7 @@ namespace Bimangle.ForgeEngine.Skp { // 类通过类似于 ResGen 或 Visual Studio 的工具自动生成的。 // 若要添加或移除成员，请编辑 .ResX 文件，然后重新运行 ResGen // (以 /str 作为命令选项)，或重新生成 VS 项目。 - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Strings { @@ -47,8 +47,8 @@ internal Strings() { } /// - /// 重写当前线程的 CurrentUICulture 属性 - /// 重写当前线程的 CurrentUICulture 属性。 + /// 重写当前线程的 CurrentUICulture 属性，对 + /// 使用此强类型资源类的所有资源查找执行重写。 /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] internal static global::System.Globalization.CultureInfo Culture { @@ -403,7 +403,7 @@ internal static string FeatureDescriptionForce2DViewUseWireframe { } /// - /// 查找类似 的本地化字符串。 + /// 查找类似 The output data is compatible with EarthSDK 的本地化字符串。 /// internal static string FeatureDescriptionForEarthSdk { get { @@ -474,6 +474,15 @@ internal static string FeatureDescriptionOnlySelected { } } + /// + /// 查找类似 Optimize the geometry surface material, and intelligently adjust the geometry surface for double-sided material to single-sided material output, reducing flicker problems 的本地化字符串。 + /// + internal static string FeatureDescriptionOptimizationFaceMaterial { + get { + return ResourceManager.GetString("FeatureDescriptionOptimizationFaceMaterial", resourceCulture); + } + } + /// /// 查找类似 Enable Reduce Geometry Node To Parent Node 的本地化字符串。 /// @@ -510,6 +519,15 @@ internal static string FeatureDescriptionRegroupForWorkSet { } } + /// + /// 查找类似 Publish data using 3D Tiles 1.1 specification 的本地化字符串。 + /// + internal static string FeatureDescriptionUse3DTilesSpecification11 { + get { + return ResourceManager.GetString("FeatureDescriptionUse3DTilesSpecification11", resourceCulture); + } + } + /// /// 查找类似 Use level category by element's bounding box 的本地化字符串。 /// @@ -879,6 +897,15 @@ internal static string FeatureNameOnlySelected { } } + /// + /// 查找类似 Optimization face material 的本地化字符串。 + /// + internal static string FeatureNameOptimizationFaceMaterial { + get { + return ResourceManager.GetString("FeatureNameOptimizationFaceMaterial", resourceCulture); + } + } + /// /// 查找类似 Enable Reduce Geometry Node 的本地化字符串。 /// @@ -915,6 +942,15 @@ internal static string FeatureNameRegroupForWorkSet { } } + /// + /// 查找类似 Using 3D Tiles 1.1 的本地化字符串。 + /// + internal static string FeatureNameUse3DTilesSpecification11 { + get { + return ResourceManager.GetString("FeatureNameUse3DTilesSpecification11", resourceCulture); + } + } + /// /// 查找类似 Use level(bound) category 的本地化字符串。 /// diff --git a/Bimangle.ForgeEngine.Skp/Strings.resx b/Bimangle.ForgeEngine.Skp/Strings.resx index 52dac2e..ea3a280 100644 --- a/Bimangle.ForgeEngine.Skp/Strings.resx +++ b/Bimangle.ForgeEngine.Skp/Strings.resx @@ -630,4 +630,16 @@ The output data is compatible with EarthSDK + + Optimize the geometry surface material, and intelligently adjust the geometry surface for double-sided material to single-sided material output, reducing flicker problems + + + Optimization face material + + + Using 3D Tiles 1.1 + + + Publish data using 3D Tiles 1.1 specification + \ No newline at end of file diff --git a/Bimangle.ForgeEngine.Skp/Strings.zh-Hans.resx b/Bimangle.ForgeEngine.Skp/Strings.zh-Hans.resx index 8c24610..7344669 100644 --- a/Bimangle.ForgeEngine.Skp/Strings.zh-Hans.resx +++ b/Bimangle.ForgeEngine.Skp/Strings.zh-Hans.resx @@ -636,4 +636,16 @@ 输出的数据兼容 EarthSDK + + 优化几何面材质，将对于双面材质几何面智能调整为单面材质输出，缓解闪烁问题 + + + 优化几何面材质 + + + 使用 3D Tiles 1.1 + + + 使用 3D Tiles 1.1 规范发布数据 + \ No newline at end of file diff --git a/Bimangle.ForgeEngine.Skp/StringsUI.Designer.cs b/Bimangle.ForgeEngine.Skp/StringsUI.Designer.cs index 93b3a14..d9f23c2 100644 --- a/Bimangle.ForgeEngine.Skp/StringsUI.Designer.cs +++ b/Bimangle.ForgeEngine.Skp/StringsUI.Designer.cs @@ -19,7 +19,7 @@ namespace Bimangle.ForgeEngine.Skp { // 类通过类似于 ResGen 或 Visual Studio 的工具自动生成的。 // 若要添加或移除成员，请编辑 .ResX 文件，然后重新运行 ResGen // (以 /str 作为命令选项)，或重新生成 VS 项目。 - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class StringsUI { @@ -47,8 +47,8 @@ internal StringsUI() { } /// - /// 重写当前线程的 CurrentUICulture 属性 - /// 重写当前线程的 CurrentUICulture 属性。 + /// 重写当前线程的 CurrentUICulture 属性，对 + /// 使用此强类型资源类的所有资源查找执行重写。 /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] internal static global::System.Globalization.CultureInfo Culture { diff --git a/Bimangle.ForgeEngine.Skp/StringsUI.zh-Hans.resx b/Bimangle.ForgeEngine.Skp/StringsUI.zh-Hans.resx index 7d9ef0b..bb2bb0e 100644 --- a/Bimangle.ForgeEngine.Skp/StringsUI.zh-Hans.resx +++ b/Bimangle.ForgeEngine.Skp/StringsUI.zh-Hans.resx @@ -126,7 +126,7 @@ 请选择或输入源模型文件. - 当前计算机未安装 Autodesk Navisworks Manager r2014 - r2019 , 本次操作将会失败, 真的要继续吗? + 当前计算机未安装 Autodesk Navisworks Manager, 本次操作将会失败, 真的要继续吗? 当前计算机未安装 Revit {0}, 当前未选择升级模式, 本次操作将会失败, 真的要继续吗? diff --git a/Bimangle.ForgeEngine.Skp/UI/Controls/ExportCesium3DTiles.Designer.cs b/Bimangle.ForgeEngine.Skp/UI/Controls/ExportCesium3DTiles.Designer.cs index 4cf8fe0..f10398e 100644 --- a/Bimangle.ForgeEngine.Skp/UI/Controls/ExportCesium3DTiles.Designer.cs +++ b/Bimangle.ForgeEngine.Skp/UI/Controls/ExportCesium3DTiles.Designer.cs @@ -37,6 +37,7 @@ private void InitializeComponent() this.cbContentType = new System.Windows.Forms.ComboBox(); this.lblContents = new System.Windows.Forms.Label(); this.gbAdvanced = new System.Windows.Forms.GroupBox(); + this.cbUse3DTilesSpecification11 = new System.Windows.Forms.CheckBox(); this.cbForEarthSdk = new System.Windows.Forms.CheckBox(); this.cbGeometryCompressTypes = new System.Windows.Forms.ComboBox(); this.cbEnableGeometryCompress = new System.Windows.Forms.CheckBox(); @@ -120,6 +121,7 @@ private void InitializeComponent() // gbAdvanced // resources.ApplyResources(this.gbAdvanced, "gbAdvanced"); + this.gbAdvanced.Controls.Add(this.cbUse3DTilesSpecification11); this.gbAdvanced.Controls.Add(this.cbForEarthSdk); this.gbAdvanced.Controls.Add(this.cbGeometryCompressTypes); this.gbAdvanced.Controls.Add(this.cbEnableGeometryCompress); @@ -132,6 +134,13 @@ private void InitializeComponent() this.gbAdvanced.TabStop = false; this.toolTip1.SetToolTip(this.gbAdvanced, resources.GetString("gbAdvanced.ToolTip")); // + // cbUse3DTilesSpecification11 + // + resources.ApplyResources(this.cbUse3DTilesSpecification11, "cbUse3DTilesSpecification11"); + this.cbUse3DTilesSpecification11.Name = "cbUse3DTilesSpecification11"; + this.toolTip1.SetToolTip(this.cbUse3DTilesSpecification11, resources.GetString("cbUse3DTilesSpecification11.ToolTip")); + this.cbUse3DTilesSpecification11.UseVisualStyleBackColor = true; + // // cbForEarthSdk // resources.ApplyResources(this.cbForEarthSdk, "cbForEarthSdk"); @@ -377,5 +386,6 @@ private void InitializeComponent() private System.Windows.Forms.CheckBox cbForEarthSdk; private System.Windows.Forms.ComboBox cbGeometryCompressTypes; private System.Windows.Forms.CheckBox cbEnableGeometryCompress; + private System.Windows.Forms.CheckBox cbUse3DTilesSpecification11; } } \ No newline at end of file diff --git a/Bimangle.ForgeEngine.Skp/UI/Controls/ExportCesium3DTiles.cs b/Bimangle.ForgeEngine.Skp/UI/Controls/ExportCesium3DTiles.cs index 299c65c..4dd4087 100644 --- a/Bimangle.ForgeEngine.Skp/UI/Controls/ExportCesium3DTiles.cs +++ b/Bimangle.ForgeEngine.Skp/UI/Controls/ExportCesium3DTiles.cs @@ -100,6 +100,7 @@ void IExportControl.Init(IExportForm form, AppConfig config) new FeatureInfo(FeatureType.EnableMeshQuantized, string.Empty, string.Empty, true, false), new FeatureInfo(FeatureType.UseGoogleDracoPatch, string.Empty, string.Empty, true, false), new FeatureInfo(FeatureType.ForEarthSdk, string.Empty, Strings.FeatureDescriptionForEarthSdk, true, false), + new FeatureInfo(FeatureType.Use3DTilesSpecification11, Strings.FeatureNameUse3DTilesSpecification11, Strings.FeatureDescriptionUse3DTilesSpecification11, true, false), }; _VisualStyles = new List(); @@ -197,6 +198,7 @@ void IExportControl.Reset() cbGenerateOutline.Checked = false; cbEnableUnlitMaterials.Checked = false; cbForEarthSdk.Checked = false; + cbUse3DTilesSpecification11.Checked = false; { _LocalConfig.GeoreferencedSetting = _GeoreferncingHost.CreateDefaultSetting(); @@ -220,7 +222,7 @@ private void FormExport_Load(object sender, EventArgs e) cbVisualStyle, cbGenerateThumbnail, cbGenerateOutline, cbExcludeLines, cbExcludeModelPoints, cbExcludeUnselectedElements, - cbEnableGeometryCompress, cbGeometryCompressTypes, cbForEarthSdk, + cbEnableGeometryCompress, cbGeometryCompressTypes, cbForEarthSdk, cbUse3DTilesSpecification11, cbGeneratePropDbSqlite, cbExportSvfzip, cbEnableTextureCompress, cbTextureCompressTypes, cbEnableUnlitMaterials, cbContentType) .AddEventListener(RefreshCommand); @@ -335,6 +337,7 @@ bool IsAllowFeature(FeatureType feature) toolTip1.SetToolTip(cbGenerateOutline, Strings.FeatureDescriptionEnableCesiumPrimitiveOutline); toolTip1.SetToolTip(cbEnableUnlitMaterials, Strings.FeatureDescriptionEnableUnlitMaterials); toolTip1.SetToolTip(cbForEarthSdk, Strings.FeatureDescriptionForEarthSdk); + toolTip1.SetToolTip(cbUse3DTilesSpecification11, Strings.FeatureDescriptionUse3DTilesSpecification11); if (IsAllowFeature(FeatureType.UseGoogleDraco)) { @@ -412,6 +415,11 @@ bool IsAllowFeature(FeatureType feature) { cbForEarthSdk.Checked = true; } + + if (IsAllowFeature(FeatureType.Use3DTilesSpecification11)) + { + cbUse3DTilesSpecification11.Checked = true; + } } #endregion @@ -475,9 +483,9 @@ public override string ToString() private class ComboItemInfo { - public int Value { get; } + public int Value { get; } - private string Text { get; } + private string Text { get; } public ComboItemInfo(int value, string text) { @@ -573,6 +581,7 @@ void SetFeature(FeatureType featureType, bool selected) SetFeature(FeatureType.EnableCesiumPrimitiveOutline, cbGenerateOutline.Checked); SetFeature(FeatureType.EnableUnlitMaterials, cbEnableUnlitMaterials.Checked); SetFeature(FeatureType.ForEarthSdk, cbForEarthSdk.Checked); + SetFeature(FeatureType.Use3DTilesSpecification11, cbUse3DTilesSpecification11.Checked); SetFeature(FeatureType.EnableTextureWebP, false); SetFeature(FeatureType.EnableTextureKtx2, false); @@ -597,7 +606,7 @@ void SetFeature(FeatureType featureType, bool selected) if(_LocalConfig.GeoreferencedSetting != null) { - var d = _GeoreferncingHost.CreateTargetSetting(_LocalConfig.GeoreferencedSetting); + var d = _GeoreferncingHost.CreateTargetSettingForCLI(_LocalConfig.GeoreferencedSetting); r.GeoreferencedBase64 = d.ToBase64(); } diff --git a/Bimangle.ForgeEngine.Skp/UI/Controls/ExportCesium3DTiles.resx b/Bimangle.ForgeEngine.Skp/UI/Controls/ExportCesium3DTiles.resx index 9230d1d..bc9c98e 100644 --- a/Bimangle.ForgeEngine.Skp/UI/Controls/ExportCesium3DTiles.resx +++ b/Bimangle.ForgeEngine.Skp/UI/Controls/ExportCesium3DTiles.resx @@ -156,6 +156,9 @@ NoControl + + 1 + $this @@ -219,9 +222,6 @@ 3 - - Thumbnail - Exclude @@ -240,17 +240,20 @@ gb3DTiles - - 3 - 4 3D Tiles - - 144, 22 + + gbAdvanced + + + 15, 168 + + + $this @@ -261,6 +264,9 @@ 369, 153 + + NoControl + Contents: @@ -294,6 +300,9 @@ cbEnableTextureCompress + + 11 + 0 @@ -306,6 +315,9 @@ True + + + 0 @@ -375,8 +387,8 @@ gpGeneral - - 1 + + Thumbnail System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -396,8 +408,8 @@ Top, Left, Right - - + + 3 True @@ -442,13 +454,13 @@ NoControl - 5 + 6 gbAdvanced - 6 + 7 Model Lines @@ -456,8 +468,8 @@ 1 - - MiddleRight + + 0 Top, Bottom, Left, Right @@ -594,12 +606,18 @@ False + + + 4 - + 2 + + gpGeneral + Vertical @@ -615,6 +633,9 @@ 208, 22 + + gbAdvanced + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -633,9 +654,6 @@ - - 0 - NoControl @@ -670,7 +688,7 @@ System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - 4 + 5 0 @@ -681,8 +699,8 @@ 0 - - + + lblLevelOfDetail Options: @@ -697,7 +715,7 @@ 108, 20 - 0 + 1 2 @@ -744,8 +762,8 @@ MiddleLeft - - + + MiddleRight 101, 153 @@ -777,8 +795,8 @@ 3 - - gpGeneral + + NoControl 3 @@ -789,9 +807,15 @@ Compatible with EarthSDK + + + 3 + + 2 + Model Points @@ -801,6 +825,9 @@ 1 + + + Top, Left, Right @@ -849,9 +876,6 @@ 110, 22 - - lblLevelOfDetail - 7 @@ -865,10 +889,7 @@ lblGeoreferncing - 7 - - - NoControl + 8 720, 360 @@ -909,12 +930,18 @@ 7 - - 2 + + + + + 0 lblContents + + 124, 18 + cbEnableGeometryCompress @@ -940,7 +967,7 @@ 2 - 2 + 3 1 @@ -978,11 +1005,14 @@ 262, 203 + + + 141, 18 - - + + 2 2 @@ -999,8 +1029,8 @@ 101, 14 - - 1 + + 144, 22 System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -1020,8 +1050,8 @@ True - - $this + + cbUse3DTilesSpecification11 toolTip1 @@ -1044,9 +1074,6 @@ - - gb3DTiles - 6 @@ -1062,6 +1089,9 @@ System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + @@ -1071,9 +1101,6 @@ 4 - - gbAdvanced - True @@ -1090,7 +1117,10 @@ 0 - 3 + 4 + + + True 302, 116 @@ -1101,8 +1131,11 @@ 95, 18 - - + + Using 3D Tiles 1.1 + + + gb3DTiles System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -1110,15 +1143,15 @@ + + zh-Hans + True 161, 17 - - zh-Hans - 262, 17 diff --git a/Bimangle.ForgeEngine.Skp/UI/Controls/ExportCesium3DTiles.zh-Hans.resx b/Bimangle.ForgeEngine.Skp/UI/Controls/ExportCesium3DTiles.zh-Hans.resx index 43dd94c..4eef338 100644 --- a/Bimangle.ForgeEngine.Skp/UI/Controls/ExportCesium3DTiles.zh-Hans.resx +++ b/Bimangle.ForgeEngine.Skp/UI/Controls/ExportCesium3DTiles.zh-Hans.resx @@ -145,6 +145,15 @@ + + 119, 18 + + + 使用 3D Tiles 1.1 + + + + 105, 18 diff --git a/Bimangle.ForgeEngine.Skp/UI/Controls/ExportSvfzip.Designer.cs b/Bimangle.ForgeEngine.Skp/UI/Controls/ExportSvfzip.Designer.cs index 45baa88..78cacaf 100644 --- a/Bimangle.ForgeEngine.Skp/UI/Controls/ExportSvfzip.Designer.cs +++ b/Bimangle.ForgeEngine.Skp/UI/Controls/ExportSvfzip.Designer.cs @@ -49,46 +49,55 @@ private void InitializeComponent() this.lblOutputPath = new System.Windows.Forms.Label(); this.toolTip1 = new System.Windows.Forms.ToolTip(this.components); this.dlgSelectFolder = new System.Windows.Forms.FolderBrowserDialog(); + this.gbAdvanced = new System.Windows.Forms.GroupBox(); + this.cbOptimizationFaceMaterial = new System.Windows.Forms.CheckBox(); this.gpExclude.SuspendLayout(); this.gpGeneral.SuspendLayout(); + this.gbAdvanced.SuspendLayout(); this.SuspendLayout(); // // gpExclude // + resources.ApplyResources(this.gpExclude, "gpExclude"); this.gpExclude.Controls.Add(this.cbExcludeUnselectedElements); this.gpExclude.Controls.Add(this.cbExcludeModelPoints); this.gpExclude.Controls.Add(this.cbExcludeLines); this.gpExclude.Controls.Add(this.cbExcludeElementProperties); - resources.ApplyResources(this.gpExclude, "gpExclude"); this.gpExclude.Name = "gpExclude"; this.gpExclude.TabStop = false; + this.toolTip1.SetToolTip(this.gpExclude, resources.GetString("gpExclude.ToolTip")); // // cbExcludeUnselectedElements // resources.ApplyResources(this.cbExcludeUnselectedElements, "cbExcludeUnselectedElements"); this.cbExcludeUnselectedElements.Name = "cbExcludeUnselectedElements"; + this.toolTip1.SetToolTip(this.cbExcludeUnselectedElements, resources.GetString("cbExcludeUnselectedElements.ToolTip")); this.cbExcludeUnselectedElements.UseVisualStyleBackColor = true; // // cbExcludeModelPoints // resources.ApplyResources(this.cbExcludeModelPoints, "cbExcludeModelPoints"); this.cbExcludeModelPoints.Name = "cbExcludeModelPoints"; + this.toolTip1.SetToolTip(this.cbExcludeModelPoints, resources.GetString("cbExcludeModelPoints.ToolTip")); this.cbExcludeModelPoints.UseVisualStyleBackColor = true; // // cbExcludeLines // resources.ApplyResources(this.cbExcludeLines, "cbExcludeLines"); this.cbExcludeLines.Name = "cbExcludeLines"; + this.toolTip1.SetToolTip(this.cbExcludeLines, resources.GetString("cbExcludeLines.ToolTip")); this.cbExcludeLines.UseVisualStyleBackColor = true; // // cbExcludeElementProperties // resources.ApplyResources(this.cbExcludeElementProperties, "cbExcludeElementProperties"); this.cbExcludeElementProperties.Name = "cbExcludeElementProperties"; + this.toolTip1.SetToolTip(this.cbExcludeElementProperties, resources.GetString("cbExcludeElementProperties.ToolTip")); this.cbExcludeElementProperties.UseVisualStyleBackColor = true; // // gpGeneral // + resources.ApplyResources(this.gpGeneral, "gpGeneral"); this.gpGeneral.Controls.Add(this.cbGeneratePropDbSqlite); this.gpGeneral.Controls.Add(this.label1); this.gpGeneral.Controls.Add(this.cbGenerateThumbnail); @@ -96,61 +105,70 @@ private void InitializeComponent() this.gpGeneral.Controls.Add(this.lblVisualStyle); this.gpGeneral.Controls.Add(this.cbLevelOfDetail); this.gpGeneral.Controls.Add(this.lblLevelOfDetail); - resources.ApplyResources(this.gpGeneral, "gpGeneral"); this.gpGeneral.Name = "gpGeneral"; this.gpGeneral.TabStop = false; + this.toolTip1.SetToolTip(this.gpGeneral, resources.GetString("gpGeneral.ToolTip")); // // cbGeneratePropDbSqlite // resources.ApplyResources(this.cbGeneratePropDbSqlite, "cbGeneratePropDbSqlite"); this.cbGeneratePropDbSqlite.Name = "cbGeneratePropDbSqlite"; + this.toolTip1.SetToolTip(this.cbGeneratePropDbSqlite, resources.GetString("cbGeneratePropDbSqlite.ToolTip")); this.cbGeneratePropDbSqlite.UseVisualStyleBackColor = true; // // label1 // resources.ApplyResources(this.label1, "label1"); this.label1.Name = "label1"; + this.toolTip1.SetToolTip(this.label1, resources.GetString("label1.ToolTip")); // // cbGenerateThumbnail // resources.ApplyResources(this.cbGenerateThumbnail, "cbGenerateThumbnail"); this.cbGenerateThumbnail.Name = "cbGenerateThumbnail"; + this.toolTip1.SetToolTip(this.cbGenerateThumbnail, resources.GetString("cbGenerateThumbnail.ToolTip")); this.cbGenerateThumbnail.UseVisualStyleBackColor = true; // // cbVisualStyle // + resources.ApplyResources(this.cbVisualStyle, "cbVisualStyle"); this.cbVisualStyle.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.cbVisualStyle.FormattingEnabled = true; - resources.ApplyResources(this.cbVisualStyle, "cbVisualStyle"); this.cbVisualStyle.Name = "cbVisualStyle"; + this.toolTip1.SetToolTip(this.cbVisualStyle, resources.GetString("cbVisualStyle.ToolTip")); this.cbVisualStyle.SelectedIndexChanged += new System.EventHandler(this.cbVisualStyle_SelectedIndexChanged); // // lblVisualStyle // resources.ApplyResources(this.lblVisualStyle, "lblVisualStyle"); this.lblVisualStyle.Name = "lblVisualStyle"; + this.toolTip1.SetToolTip(this.lblVisualStyle, resources.GetString("lblVisualStyle.ToolTip")); // // cbLevelOfDetail // + resources.ApplyResources(this.cbLevelOfDetail, "cbLevelOfDetail"); this.cbLevelOfDetail.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.cbLevelOfDetail.FormattingEnabled = true; - resources.ApplyResources(this.cbLevelOfDetail, "cbLevelOfDetail"); this.cbLevelOfDetail.Name = "cbLevelOfDetail"; + this.toolTip1.SetToolTip(this.cbLevelOfDetail, resources.GetString("cbLevelOfDetail.ToolTip")); // // lblLevelOfDetail // resources.ApplyResources(this.lblLevelOfDetail, "lblLevelOfDetail"); this.lblLevelOfDetail.Name = "lblLevelOfDetail"; + this.toolTip1.SetToolTip(this.lblLevelOfDetail, resources.GetString("lblLevelOfDetail.ToolTip")); // // lblOptions // resources.ApplyResources(this.lblOptions, "lblOptions"); this.lblOptions.Name = "lblOptions"; + this.toolTip1.SetToolTip(this.lblOptions, resources.GetString("lblOptions.ToolTip")); // // btnBrowse // resources.ApplyResources(this.btnBrowse, "btnBrowse"); this.btnBrowse.Name = "btnBrowse"; + this.toolTip1.SetToolTip(this.btnBrowse, resources.GetString("btnBrowse.ToolTip")); this.btnBrowse.UseVisualStyleBackColor = true; this.btnBrowse.Click += new System.EventHandler(this.btnBrowse_Click); // @@ -159,20 +177,39 @@ private void InitializeComponent() resources.ApplyResources(this.txtTargetPath, "txtTargetPath"); this.txtTargetPath.Name = "txtTargetPath"; this.txtTargetPath.ReadOnly = true; + this.toolTip1.SetToolTip(this.txtTargetPath, resources.GetString("txtTargetPath.ToolTip")); // // lblOutputPath // resources.ApplyResources(this.lblOutputPath, "lblOutputPath"); this.lblOutputPath.Name = "lblOutputPath"; + this.toolTip1.SetToolTip(this.lblOutputPath, resources.GetString("lblOutputPath.ToolTip")); // // dlgSelectFolder // + resources.ApplyResources(this.dlgSelectFolder, "dlgSelectFolder"); this.dlgSelectFolder.RootFolder = System.Environment.SpecialFolder.MyComputer; // + // gbAdvanced + // + resources.ApplyResources(this.gbAdvanced, "gbAdvanced"); + this.gbAdvanced.Controls.Add(this.cbOptimizationFaceMaterial); + this.gbAdvanced.Name = "gbAdvanced"; + this.gbAdvanced.TabStop = false; + this.toolTip1.SetToolTip(this.gbAdvanced, resources.GetString("gbAdvanced.ToolTip")); + // + // cbOptimizationFaceMaterial + // + resources.ApplyResources(this.cbOptimizationFaceMaterial, "cbOptimizationFaceMaterial"); + this.cbOptimizationFaceMaterial.Name = "cbOptimizationFaceMaterial"; + this.toolTip1.SetToolTip(this.cbOptimizationFaceMaterial, resources.GetString("cbOptimizationFaceMaterial.ToolTip")); + this.cbOptimizationFaceMaterial.UseVisualStyleBackColor = true; + // // ExportSvfzip // resources.ApplyResources(this, "$this"); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi; + this.Controls.Add(this.gbAdvanced); this.Controls.Add(this.lblOutputPath); this.Controls.Add(this.txtTargetPath); this.Controls.Add(this.btnBrowse); @@ -180,11 +217,14 @@ private void InitializeComponent() this.Controls.Add(this.gpGeneral); this.Controls.Add(this.gpExclude); this.Name = "ExportSvfzip"; + this.toolTip1.SetToolTip(this, resources.GetString("$this.ToolTip")); this.Load += new System.EventHandler(this.FormExport_Load); this.gpExclude.ResumeLayout(false); this.gpExclude.PerformLayout(); this.gpGeneral.ResumeLayout(false); this.gpGeneral.PerformLayout(); + this.gbAdvanced.ResumeLayout(false); + this.gbAdvanced.PerformLayout(); this.ResumeLayout(false); this.PerformLayout(); @@ -210,5 +250,7 @@ private void InitializeComponent() private System.Windows.Forms.CheckBox cbExcludeElementProperties; private System.Windows.Forms.Label label1; private System.Windows.Forms.FolderBrowserDialog dlgSelectFolder; + private System.Windows.Forms.GroupBox gbAdvanced; + private System.Windows.Forms.CheckBox cbOptimizationFaceMaterial; } } \ No newline at end of file diff --git a/Bimangle.ForgeEngine.Skp/UI/Controls/ExportSvfzip.cs b/Bimangle.ForgeEngine.Skp/UI/Controls/ExportSvfzip.cs index 99b5a06..0b9d844 100644 --- a/Bimangle.ForgeEngine.Skp/UI/Controls/ExportSvfzip.cs +++ b/Bimangle.ForgeEngine.Skp/UI/Controls/ExportSvfzip.cs @@ -52,6 +52,7 @@ void IExportControl.Init(IExportForm form, AppConfig config) new FeatureInfo(FeatureType.GenerateModelsDb, Strings.FeatureNameGenerateModelsDb, Strings.FeatureDescriptionGenerateModelsDb), new FeatureInfo(FeatureType.GenerateThumbnail, Strings.FeatureNameGenerateThumbnail, Strings.FeatureDescriptionGenerateThumbnail), new FeatureInfo(FeatureType.ConsolidateCompositeElement, Strings.FeatureNameConsolidateCompositeElement, Strings.FeatureDescriptionConsolidateCompositeElement), + new FeatureInfo(FeatureType.OptimizationFaceMaterial, Strings.FeatureNameOptimizationFaceMaterial, Strings.FeatureDescriptionOptimizationFaceMaterial), }; _VisualStyles = new List(); @@ -125,6 +126,8 @@ void IExportControl.Reset() cbExcludeLines.Checked = false; cbExcludeModelPoints.Checked = false; cbExcludeUnselectedElements.Checked = false; + + cbOptimizationFaceMaterial.Checked = false; } void IExportControl.RefreshCommand() @@ -139,7 +142,8 @@ private void FormExport_Load(object sender, EventArgs e) FormHelper .ToArray(txtTargetPath, cbVisualStyle, cbLevelOfDetail, cbGenerateThumbnail, cbGeneratePropDbSqlite, - cbExcludeElementProperties, cbExcludeLines, cbExcludeModelPoints, cbExcludeUnselectedElements) + cbExcludeElementProperties, cbExcludeLines, cbExcludeModelPoints, cbExcludeUnselectedElements, + cbOptimizationFaceMaterial) .AddEventListener(RefreshCommand); InitUI(); @@ -263,6 +267,17 @@ bool IsAllowFeature(FeatureType feature) //} } #endregion + + #region 高级 + { + toolTip1.SetToolTip(cbOptimizationFaceMaterial, Strings.FeatureDescriptionOptimizationFaceMaterial); + + if (IsAllowFeature(FeatureType.OptimizationFaceMaterial)) + { + cbOptimizationFaceMaterial.Checked = true; + } + } + #endregion } private class VisualStyleInfo @@ -359,6 +374,8 @@ void SetFeature(FeatureType featureType, bool selected) SetFeature(FeatureType.ExcludePoints, cbExcludeModelPoints.Checked); //SetFeature(FeatureType.OnlySelected, cbExcludeUnselectedElements.Checked); + SetFeature(FeatureType.OptimizationFaceMaterial, cbOptimizationFaceMaterial.Checked); + #endregion var r = new Options(); diff --git a/Bimangle.ForgeEngine.Skp/UI/Controls/ExportSvfzip.resx b/Bimangle.ForgeEngine.Skp/UI/Controls/ExportSvfzip.resx index da64522..c825709 100644 --- a/Bimangle.ForgeEngine.Skp/UI/Controls/ExportSvfzip.resx +++ b/Bimangle.ForgeEngine.Skp/UI/Controls/ExportSvfzip.resx @@ -117,523 +117,640 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - True + + 0 - - - NoControl + + cbGenerateThumbnail - - 17, 93 + + 101, 51 - - 141, 18 + + + 4 - - 3 + + MiddleRight - - Unselected Elements + + 122, 16 - - cbExcludeUnselectedElements + + - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 5 - - gpExclude + + True - + 0 - - True + + 17, 21 - - NoControl + + $this - - 17, 69 + + cbExcludeElementProperties - - 95, 18 + + 26, 47 - + + Unselected Elements + + + gbAdvanced + + 2 - - Model Points + + 4 - - cbExcludeModelPoints + + MiddleRight - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Thumbnail - - gpExclude + + lblOutputPath + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 1 - - True + + 48, 22 - + + NoControl - - 17, 46 + + cbExcludeUnselectedElements - - 89, 18 + + 9 - - 1 + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Model Lines + + 101, 14 - - cbExcludeLines + + lblLevelOfDetail + + + cbLevelOfDetail System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - gpExclude - - - 2 - - - True - - - NoControl + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 17, 21 + + - - 132, 18 + + 3 - - 0 + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Element Properities + + 42, 51 - - cbExcludeElementProperties + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Tahoma, 9pt - + gpExclude - - 3 - - - 411, 51 + + 652, 14 - - 235, 120 + + cbExcludeLines - - 7 + + NoControl - - Exclude + + 1 - - gpExclude + + label1 - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + True - + $this - - 5 - - - True - - - NoControl + + MiddleRight - - 212, 75 + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 66, 18 - + 6 - - PropDb + + lblVisualStyle - - cbGeneratePropDbSqlite + + 96, 96 - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + cbOptimizationFaceMaterial - + + 6 + + + cbExcludeModelPoints + + gpGeneral - - 0 + + - - True + + 2 - - NoControl + + 3 - - 54, 75 + + 44, 19 - - 62, 14 + + gpGeneral - - 4 + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Generate: + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - MiddleRight + + 235, 120 - - label1 + + 2 - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + + + 122, 74 gpGeneral - - 1 + + - + True - - NoControl + + 7 - - 122, 74 + + - - 82, 18 + + $this - - 5 + + 3 - - Thumbnail + + 90, 14 - - cbGenerateThumbnail + + $this - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 3 - + + + + + 53, 14 + + + NoControl + + gpGeneral - - 2 + + 80, 14 - - 122, 16 + + NoControl - - 165, 22 + + Exclude - + + ... + + + MiddleRight + + 1 - - cbVisualStyle + + NoControl - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + NoControl - - gpGeneral + + 0 - - 3 + + Other - + + $this + + True - - NoControl + + dlgSelectFolder - - 44, 19 + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Model Lines + + + General 72, 14 - - 0 + + 132, 18 - - Visual Style: + + 165, 22 - - MiddleRight + + False - - lblVisualStyle + + - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.ToolTip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 gpGeneral - - 4 + + - - 122, 44 + + 0 - - 165, 22 + + 6 - - 3 + + 1 - - False + + 212, 75 - - cbLevelOfDetail + + $this - + + gpExclude + + + $this + + + + + + + + + gbAdvanced + + + 17, 46 + + + 720, 360 + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - gpGeneral + + 95, 18 - - 5 + + True - - NoControl + + txtTargetPath - - 26, 47 + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 90, 14 + + 4 - - 2 + + Visual Style: - - Level Of Detail: + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - MiddleRight + + 1 - - False + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - lblLevelOfDetail + + 17, 69 - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 5 - - gpGeneral + + - - 6 + + 545, 129 - - 101, 51 + + - - 304, 120 + + Output Path: - - 4 + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - General + + - - gpGeneral + + lblOptions - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + gpExclude - - $this + + 89, 18 - - 4 + + ExportSvfzip - + + 2 + + + cbVisualStyle + + + 0 + + + 0 + + + gpGeneral + + True - - 42, 51 + + System.Windows.Forms.UserControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 53, 14 + + NoControl - - 3 + + True - - Options: + + 0 - + MiddleRight - - lblOptions + + True - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 165, 22 - - $this + + NoControl + + + NoControl + + + 2 + + + 5 + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - 3 + 4 - - 652, 14 + + gpGeneral - - 48, 22 + + True - - 2 + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - ... + + True - - btnBrowse + + 62, 14 - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 167, 18 - - $this + + 101, 177 - - 2 + + - - 101, 14 + + System.Windows.Forms.FolderBrowserDialog, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 545, 22 + + Generate: - + + 141, 18 + + + True + + + PropDb + + 1 - - txtTargetPath + + - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - $this + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Model Points + + + + + + toolTip1 - 1 + 2 - - True + + 82, 18 + + + gpExclude + + + btnBrowse + + + 0 + + + Optimization Face Material + + + Level Of Detail: + + + Options: + + + False 15, 17 - - 80, 14 + + - - 0 + + gpExclude - - Output Path: + + 122, 44 - - MiddleRight + + 304, 120 - - lblOutputPath + + 3 - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + gpGeneral - - $this + + cbGeneratePropDbSqlite - - 0 + + Element Properities - - 163, 17 - - - 511, 15 - - - True - - - 96, 96 + + 27, 30 - - Tahoma, 9pt + + - - 720, 360 + + 17, 93 - - toolTip1 + + 54, 75 - - System.Windows.Forms.ToolTip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 545, 22 - - dlgSelectFolder + + 411, 51 - - System.Windows.Forms.FolderBrowserDialog, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 3 - - ExportSvfzip + + True - - System.Windows.Forms.UserControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + NoControl + + zh-Hans + + + True + + + 163, 17 + + + 511, 15 + \ No newline at end of file diff --git a/Bimangle.ForgeEngine.Skp/UI/Controls/ExportSvfzip.zh-Hans.resx b/Bimangle.ForgeEngine.Skp/UI/Controls/ExportSvfzip.zh-Hans.resx index fcc0620..2afe4fc 100644 --- a/Bimangle.ForgeEngine.Skp/UI/Controls/ExportSvfzip.zh-Hans.resx +++ b/Bimangle.ForgeEngine.Skp/UI/Controls/ExportSvfzip.zh-Hans.resx @@ -124,27 +124,42 @@ 未选中图元 + + + 62, 18 模型点 + + + 62, 18 模型线 + + + 74, 18 图元属性 + + + 排除 + + + 154, 73 @@ -154,6 +169,9 @@ 属性数据库(SQLite) + + + 42, 73 @@ -163,6 +181,9 @@ 生成: + + + 83, 73 @@ -172,12 +193,18 @@ 缩略图 + + + 83, 20 203, 22 + + + 18, 25 @@ -187,12 +214,18 @@ 视觉样式: + + + 83, 44 203, 22 + + + 18, 47 @@ -202,9 +235,15 @@ 详细程度: + + + 基本 + + + NoControl @@ -218,12 +257,21 @@ 高级选项: + + + NoControl 50, 22 + + + + + + NoControl @@ -236,4 +284,25 @@ 输出路径: + + + + + 110, 18 + + + 优化几何面材质 + + + + + + 其它 + + + + + + + \ No newline at end of file diff --git a/Bimangle.ForgeEngine.Skp/packages.config b/Bimangle.ForgeEngine.Skp/packages.config index 56e9b47..1753fc1 100644 --- a/Bimangle.ForgeEngine.Skp/packages.config +++ b/Bimangle.ForgeEngine.Skp/packages.config @@ -1,7 +1,7 @@  - - + +