Skip to content

Commit 54b3d9e

Browse files
bimanglebimangle
committed
Added support for 3D Tiles 1.1
1 parent d05dc5d commit 54b3d9e

File tree

96 files changed

+1874
-963
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

96 files changed

+1874
-963
lines changed

‎Bimangle.ForgeEngine.3DXML/Bimangle.ForgeEngine.3DXML.csproj‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -73,17 +73,17 @@
7373
<Prefer32Bit>false</Prefer32Bit>
7474
</PropertyGroup>
7575
<ItemGroup>
76-
<Reference Include="Bimangle.ForgeEngine.3DXML, Version=1.1.5.0, Culture=neutral, processorArchitecture=MSIL">
77-
<HintPath>..\packages\Bimangle.ForgeEngine.3DXML.1.1.5\lib\net452\Bimangle.ForgeEngine.3DXML.dll</HintPath>
76+
<Reference Include="Bimangle.ForgeEngine.3DXML, Version=1.1.8.0, Culture=neutral, processorArchitecture=MSIL">
77+
<HintPath>..\packages\Bimangle.ForgeEngine.3DXML.1.1.8\lib\net452\Bimangle.ForgeEngine.3DXML.dll</HintPath>
7878
</Reference>
79-
<Reference Include="Bimangle.ForgeEngine.Common, Version=1.7.7.0, Culture=neutral, PublicKeyToken=20bc10ce2f34a3e5, processorArchitecture=MSIL">
80-
<HintPath>..\packages\Bimangle.ForgeEngine.Common.1.7.7\lib\net45\Bimangle.ForgeEngine.Common.dll</HintPath>
79+
<Reference Include="Bimangle.ForgeEngine.Common, Version=1.8.1.0, Culture=neutral, PublicKeyToken=20bc10ce2f34a3e5, processorArchitecture=MSIL">
80+
<HintPath>..\packages\Bimangle.ForgeEngine.Common.1.8.1\lib\net45\Bimangle.ForgeEngine.Common.dll</HintPath>
8181
</Reference>
82-
<Reference Include="Bimangle.Libs, Version=2023.8.29.1435, Culture=neutral, PublicKeyToken=20bc10ce2f34a3e5, processorArchitecture=AMD64">
83-
<HintPath>..\packages\Bimangle.ForgeEngine.3DXML.1.1.5\lib\net452\Bimangle.Libs.dll</HintPath>
82+
<Reference Include="Bimangle.Libs, Version=2023.12.4.1545, Culture=neutral, PublicKeyToken=20bc10ce2f34a3e5, processorArchitecture=AMD64">
83+
<HintPath>..\packages\Bimangle.ForgeEngine.3DXML.1.1.8\lib\net452\Bimangle.Libs.dll</HintPath>
8484
</Reference>
85-
<Reference Include="Bimangle.Libs.Proj, Version=2023.8.29.1435, Culture=neutral, PublicKeyToken=20bc10ce2f34a3e5, processorArchitecture=AMD64">
86-
<HintPath>..\packages\Bimangle.ForgeEngine.3DXML.1.1.5\lib\net452\Bimangle.Libs.Proj.dll</HintPath>
85+
<Reference Include="Bimangle.Libs.Proj, Version=2023.12.4.1545, Culture=neutral, PublicKeyToken=20bc10ce2f34a3e5, processorArchitecture=AMD64">
86+
<HintPath>..\packages\Bimangle.ForgeEngine.3DXML.1.1.8\lib\net452\Bimangle.Libs.Proj.dll</HintPath>
8787
</Reference>
8888
<Reference Include="CommandLine, Version=2.9.1.0, Culture=neutral, PublicKeyToken=5a870481e358d379, processorArchitecture=MSIL">
8989
<HintPath>..\packages\CommandLineParser.2.9.1\lib\net45\CommandLine.dll</HintPath>

‎Bimangle.ForgeEngine.3DXML/Strings.Designer.cs‎

Lines changed: 39 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Bimangle.ForgeEngine.3DXML/Strings.resx‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -630,4 +630,16 @@
630630
<data name="FeatureDescriptionForEarthSdk" xml:space="preserve">
631631
<value>The output data is compatible with EarthSDK</value>
632632
</data>
633+
<data name="FeatureDescriptionOptimizationFaceMaterial" xml:space="preserve">
634+
<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>
635+
</data>
636+
<data name="FeatureNameOptimizationFaceMaterial" xml:space="preserve">
637+
<value>Optimization face material</value>
638+
</data>
639+
<data name="FeatureNameUse3DTilesSpecification11" xml:space="preserve">
640+
<value>Using 3D Tiles 1.1</value>
641+
</data>
642+
<data name="FeatureDescriptionUse3DTilesSpecification11" xml:space="preserve">
643+
<value>Publish data using 3D Tiles 1.1 specification</value>
644+
</data>
633645
</root>

‎Bimangle.ForgeEngine.3DXML/Strings.zh-Hans.resx‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -636,4 +636,16 @@
636636
<data name="FeatureDescriptionForEarthSdk" xml:space="preserve">
637637
<value>输出的数据兼容 EarthSDK</value>
638638
</data>
639+
<data name="FeatureDescriptionOptimizationFaceMaterial" xml:space="preserve">
640+
<value>优化几何面材质，将对于双面材质几何面智能调整为单面材质输出，缓解闪烁问题</value>
641+
</data>
642+
<data name="FeatureNameOptimizationFaceMaterial" xml:space="preserve">
643+
<value>优化几何面材质</value>
644+
</data>
645+
<data name="FeatureNameUse3DTilesSpecification11" xml:space="preserve">
646+
<value>使用 3D Tiles 1.1</value>
647+
</data>
648+
<data name="FeatureDescriptionUse3DTilesSpecification11" xml:space="preserve">
649+
<value>使用 3D Tiles 1.1 规范发布数据</value>
650+
</data>
639651
</root>

‎Bimangle.ForgeEngine.3DXML/StringsUI.Designer.cs‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Bimangle.ForgeEngine.3DXML/StringsUI.zh-Hans.resx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@
126126
<value>请选择或输入源模型文件.</value>
127127
</data>
128128
<data name="NavisworksNotInstalledConfirm" xml:space="preserve">
129-
<value>当前计算机未安装 Autodesk Navisworks Manager r2014 - r2019 , 本次操作将会失败, 真的要继续吗?</value>
129+
<value>当前计算机未安装 Autodesk Navisworks Manager, 本次操作将会失败, 真的要继续吗?</value>
130130
</data>
131131
<data name="UpgradeModelDisabledExportConfirm" xml:space="preserve">
132132
<value>当前计算机未安装 Revit {0}, 当前未选择升级模式, 本次操作将会失败, 真的要继续吗?</value>

‎Bimangle.ForgeEngine.3DXML/UI/Controls/ExportCesium3DTiles.Designer.cs‎

Lines changed: 10 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Bimangle.ForgeEngine.3DXML/UI/Controls/ExportCesium3DTiles.cs‎

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,7 @@ void IExportControl.Init(IExportForm form, AppConfig config)
100100
new FeatureInfo(FeatureType.EnableMeshQuantized, string.Empty, string.Empty, true, false),
101101
new FeatureInfo(FeatureType.UseGoogleDracoPatch, string.Empty, string.Empty, true, false),
102102
new FeatureInfo(FeatureType.ForEarthSdk, string.Empty, Strings.FeatureDescriptionForEarthSdk, true, false),
103+
new FeatureInfo(FeatureType.Use3DTilesSpecification11, Strings.FeatureNameUse3DTilesSpecification11, Strings.FeatureDescriptionUse3DTilesSpecification11, true, false),
103104
};
104105

105106
_VisualStyles = new List<VisualStyleInfo>();
@@ -197,6 +198,7 @@ void IExportControl.Reset()
197198
cbGenerateOutline.Checked = false;
198199
cbEnableUnlitMaterials.Checked = false;
199200
cbForEarthSdk.Checked = false;
201+
cbUse3DTilesSpecification11.Checked = false;
200202

201203
{
202204
_LocalConfig.GeoreferencedSetting = _GeoreferncingHost.CreateDefaultSetting();
@@ -220,7 +222,7 @@ private void FormExport_Load(object sender, EventArgs e)
220222
cbVisualStyle,
221223
cbGenerateThumbnail, cbGenerateOutline,
222224
cbExcludeLines, cbExcludeModelPoints, cbExcludeUnselectedElements,
223-
cbEnableGeometryCompress, cbGeometryCompressTypes, cbForEarthSdk,
225+
cbEnableGeometryCompress, cbGeometryCompressTypes, cbForEarthSdk, cbUse3DTilesSpecification11,
224226
cbGeneratePropDbSqlite, cbExportSvfzip, cbEnableTextureCompress, cbTextureCompressTypes, cbEnableUnlitMaterials,
225227
cbContentType)
226228
.AddEventListener(RefreshCommand);
@@ -335,6 +337,7 @@ bool IsAllowFeature(FeatureType feature)
335337
toolTip1.SetToolTip(cbGenerateOutline, Strings.FeatureDescriptionEnableCesiumPrimitiveOutline);
336338
toolTip1.SetToolTip(cbEnableUnlitMaterials, Strings.FeatureDescriptionEnableUnlitMaterials);
337339
toolTip1.SetToolTip(cbForEarthSdk, Strings.FeatureDescriptionForEarthSdk);
340+
toolTip1.SetToolTip(cbUse3DTilesSpecification11, Strings.FeatureDescriptionUse3DTilesSpecification11);
338341

339342
if (IsAllowFeature(FeatureType.UseGoogleDraco))
340343
{
@@ -412,6 +415,11 @@ bool IsAllowFeature(FeatureType feature)
412415
{
413416
cbForEarthSdk.Checked = true;
414417
}
418+
419+
if (IsAllowFeature(FeatureType.Use3DTilesSpecification11))
420+
{
421+
cbUse3DTilesSpecification11.Checked = true;
422+
}
415423
}
416424
#endregion
417425

@@ -475,9 +483,9 @@ public override string ToString()
475483

476484
private class ComboItemInfo
477485
{
478-
public int Value { get; }
486+
public int Value { get; }
479487

480-
private string Text { get; }
488+
private string Text { get; }
481489

482490
public ComboItemInfo(int value, string text)
483491
{
@@ -573,6 +581,7 @@ void SetFeature(FeatureType featureType, bool selected)
573581
SetFeature(FeatureType.EnableCesiumPrimitiveOutline, cbGenerateOutline.Checked);
574582
SetFeature(FeatureType.EnableUnlitMaterials, cbEnableUnlitMaterials.Checked);
575583
SetFeature(FeatureType.ForEarthSdk, cbForEarthSdk.Checked);
584+
SetFeature(FeatureType.Use3DTilesSpecification11, cbUse3DTilesSpecification11.Checked);
576585

577586
SetFeature(FeatureType.EnableTextureWebP, false);
578587
SetFeature(FeatureType.EnableTextureKtx2, false);
@@ -597,7 +606,7 @@ void SetFeature(FeatureType featureType, bool selected)
597606

598607
if(_LocalConfig.GeoreferencedSetting != null)
599608
{
600-
var d = _GeoreferncingHost.CreateTargetSetting(_LocalConfig.GeoreferencedSetting);
609+
var d = _GeoreferncingHost.CreateTargetSettingForCLI(_LocalConfig.GeoreferencedSetting);
601610
r.GeoreferencedBase64 = d.ToBase64();
602611
}
603612

0 commit comments

Comments
 (0)