Added support for 3D Tiles 1.1

bimangle · Dec 4, 2023 · 54b3d9e · 54b3d9e
1 parent d05dc5d
commit 54b3d9e
Show file tree

Hide file tree

Showing 96 changed files with 1,874 additions and 963 deletions.
diff --git a/Bimangle.ForgeEngine.3DXML/Bimangle.ForgeEngine.3DXML.csproj b/Bimangle.ForgeEngine.3DXML/Bimangle.ForgeEngine.3DXML.csproj
@@ -73,17 +73,17 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Bimangle.ForgeEngine.3DXML, Version=1.1.5.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Bimangle.ForgeEngine.3DXML.1.1.5\lib\net452\Bimangle.ForgeEngine.3DXML.dll</HintPath>
+    <Reference Include="Bimangle.ForgeEngine.3DXML, Version=1.1.8.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Bimangle.ForgeEngine.3DXML.1.1.8\lib\net452\Bimangle.ForgeEngine.3DXML.dll</HintPath>
     </Reference>
-    <Reference Include="Bimangle.ForgeEngine.Common, Version=1.7.7.0, Culture=neutral, PublicKeyToken=20bc10ce2f34a3e5, processorArchitecture=MSIL">
-      <HintPath>..\packages\Bimangle.ForgeEngine.Common.1.7.7\lib\net45\Bimangle.ForgeEngine.Common.dll</HintPath>
+    <Reference Include="Bimangle.ForgeEngine.Common, Version=1.8.1.0, Culture=neutral, PublicKeyToken=20bc10ce2f34a3e5, processorArchitecture=MSIL">
+      <HintPath>..\packages\Bimangle.ForgeEngine.Common.1.8.1\lib\net45\Bimangle.ForgeEngine.Common.dll</HintPath>
     </Reference>
-    <Reference Include="Bimangle.Libs, Version=2023.8.29.1435, Culture=neutral, PublicKeyToken=20bc10ce2f34a3e5, processorArchitecture=AMD64">
-      <HintPath>..\packages\Bimangle.ForgeEngine.3DXML.1.1.5\lib\net452\Bimangle.Libs.dll</HintPath>
+    <Reference Include="Bimangle.Libs, Version=2023.12.4.1545, Culture=neutral, PublicKeyToken=20bc10ce2f34a3e5, processorArchitecture=AMD64">
+      <HintPath>..\packages\Bimangle.ForgeEngine.3DXML.1.1.8\lib\net452\Bimangle.Libs.dll</HintPath>
     </Reference>
-    <Reference Include="Bimangle.Libs.Proj, Version=2023.8.29.1435, Culture=neutral, PublicKeyToken=20bc10ce2f34a3e5, processorArchitecture=AMD64">
-      <HintPath>..\packages\Bimangle.ForgeEngine.3DXML.1.1.5\lib\net452\Bimangle.Libs.Proj.dll</HintPath>
+    <Reference Include="Bimangle.Libs.Proj, Version=2023.12.4.1545, Culture=neutral, PublicKeyToken=20bc10ce2f34a3e5, processorArchitecture=AMD64">
+      <HintPath>..\packages\Bimangle.ForgeEngine.3DXML.1.1.8\lib\net452\Bimangle.Libs.Proj.dll</HintPath>
     </Reference>
     <Reference Include="CommandLine, Version=2.9.1.0, Culture=neutral, PublicKeyToken=5a870481e358d379, processorArchitecture=MSIL">
       <HintPath>..\packages\CommandLineParser.2.9.1\lib\net45\CommandLine.dll</HintPath>

diff --git a/Bimangle.ForgeEngine.3DXML/Strings.Designer.cs b/Bimangle.ForgeEngine.3DXML/Strings.Designer.cs
diff --git a/Bimangle.ForgeEngine.3DXML/Strings.resx b/Bimangle.ForgeEngine.3DXML/Strings.resx
@@ -630,4 +630,16 @@
   <data name="FeatureDescriptionForEarthSdk" xml:space="preserve">
     <value>The output data is compatible with EarthSDK</value>
   </data>
+  <data name="FeatureDescriptionOptimizationFaceMaterial" xml:space="preserve">
+    <value>Optimize the geometry surface material, and intelligently adjust the geometry surface for double-sided material to single-sided material output, reducing flicker problems</value>
+  </data>
+  <data name="FeatureNameOptimizationFaceMaterial" xml:space="preserve">
+    <value>Optimization face material</value>
+  </data>
+  <data name="FeatureNameUse3DTilesSpecification11" xml:space="preserve">
+    <value>Using 3D Tiles 1.1</value>
+  </data>
+  <data name="FeatureDescriptionUse3DTilesSpecification11" xml:space="preserve">
+    <value>Publish data using 3D Tiles 1.1 specification</value>
+  </data>
 </root>
diff --git a/Bimangle.ForgeEngine.3DXML/Strings.zh-Hans.resx b/Bimangle.ForgeEngine.3DXML/Strings.zh-Hans.resx
@@ -636,4 +636,16 @@
   <data name="FeatureDescriptionForEarthSdk" xml:space="preserve">
     <value>输出的数据兼容 EarthSDK</value>
   </data>
+  <data name="FeatureDescriptionOptimizationFaceMaterial" xml:space="preserve">
+    <value>优化几何面材质，将对于双面材质几何面智能调整为单面材质输出，缓解闪烁问题</value>
+  </data>
+  <data name="FeatureNameOptimizationFaceMaterial" xml:space="preserve">
+    <value>优化几何面材质</value>
+  </data>
+  <data name="FeatureNameUse3DTilesSpecification11" xml:space="preserve">
+    <value>使用 3D Tiles 1.1</value>
+  </data>
+  <data name="FeatureDescriptionUse3DTilesSpecification11" xml:space="preserve">
+    <value>使用 3D Tiles 1.1 规范发布数据</value>
+  </data>
 </root>
diff --git a/Bimangle.ForgeEngine.3DXML/StringsUI.Designer.cs b/Bimangle.ForgeEngine.3DXML/StringsUI.Designer.cs
diff --git a/Bimangle.ForgeEngine.3DXML/StringsUI.zh-Hans.resx b/Bimangle.ForgeEngine.3DXML/StringsUI.zh-Hans.resx
@@ -126,7 +126,7 @@
     <value>请选择或输入源模型文件.</value>
   </data>
   <data name="NavisworksNotInstalledConfirm" xml:space="preserve">
-    <value>当前计算机未安装 Autodesk Navisworks Manager r2014 - r2019 , 本次操作将会失败, 真的要继续吗?</value>
+    <value>当前计算机未安装 Autodesk Navisworks Manager, 本次操作将会失败, 真的要继续吗?</value>
   </data>
   <data name="UpgradeModelDisabledExportConfirm" xml:space="preserve">
     <value>当前计算机未安装 Revit {0}, 当前未选择升级模式, 本次操作将会失败, 真的要继续吗?</value>

diff --git a/Bimangle.ForgeEngine.3DXML/UI/Controls/ExportCesium3DTiles.Designer.cs b/Bimangle.ForgeEngine.3DXML/UI/Controls/ExportCesium3DTiles.Designer.cs
diff --git 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<VisualStyleInfo>();
@@ -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();
             }