updating console output + dependencies++

Geodan · Jun 5, 2024 · 0ad35f0 · 0ad35f0
1 parent 4a8cb0d
commit 0ad35f0
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 8 deletions.
diff --git a/src/Program.cs b/src/Program.cs
@@ -8,6 +8,7 @@
 using subtree;
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using System.Numerics;
@@ -33,6 +34,9 @@ static void Main(string[] args)
 
             var version = Assembly.GetExecutingAssembly().GetName().Version;
 
+            var stopWatch = new Stopwatch();
+            stopWatch.Start();
+
             Console.WriteLine("Tool: I3dm.export");
             Console.WriteLine("Version: " + version);
             Console.WriteLine($"Exporting instances from {o.Table}...");
@@ -126,12 +130,14 @@ static void Main(string[] args)
             }
 
             Console.WriteLine($"Maximum instances per tile: " + o.MaxFeaturesPerTile);
+            Console.WriteLine("Start generating tiles...");
 
             var tile = new Tile(0, 0, 0);
             var tiles = ImplicitTiling.GenerateTiles(o, conn, bbox_wgs84, tile, new List<Tile>(), contentDirectory, epsg, translate, (bool)o.UseGpuInstancing);
-            Console.WriteLine("Start generating tiles...");
+
             Console.WriteLine();
             Console.WriteLine($"Tiles written: {tiles.Count}");
+            Console.WriteLine("Start writing tileset files...");
 
             var subtreeFiles = SubtreeCreator.GenerateSubtreefiles(tiles);
             foreach (var s in subtreeFiles)
@@ -140,19 +146,26 @@ static void Main(string[] args)
                 var subtreefile = $"{subtreesDirectory}{Path.AltDirectorySeparatorChar}{t.Z}_{t.X}_{t.Y}.subtree";
                 File.WriteAllBytes(subtreefile, s.Value);
             }
-            Console.WriteLine($"Subtree tiles written: {subtreeFiles.Count}");
 
             var subtreeLevels = subtreeFiles.Count > 1 ? ((Tile)subtreeFiles.ElementAt(1).Key).Z : 2;
             var availableLevels = tiles.Max(t => t.Z) + 1;
 
             var tilesetjson = TreeSerializer.ToImplicitTileset(rootBoundingVolumeRegion, o.GeometricError, availableLevels, subtreeLevels, version, translate, (bool)o.UseGpuInstancing, transform);
             var file = $"{o.Output}{Path.AltDirectorySeparatorChar}tileset.json";
+            Console.WriteLine($"Subtree files written: {subtreeFiles.Count}");
             Console.WriteLine("SubtreeLevels: " + subtreeLevels);
             Console.WriteLine("SubdivisionScheme: QUADTREE");
             Console.WriteLine("Refine method: ADD");
             Console.WriteLine($"Geometric error: {o.GeometricError}");
             Console.WriteLine($"Writing {file}...");
             File.WriteAllText(file, tilesetjson);
+
+
+            stopWatch.Stop();
+
+            var timeSpan = stopWatch.Elapsed;
+            Console.WriteLine("Time: {0}h {1}m {2}s {3}ms", Math.Floor(timeSpan.TotalHours), timeSpan.Minutes, timeSpan.Seconds, timeSpan.Milliseconds);
+
             Console.WriteLine("End of process");
         });
     }

diff --git a/src/i3dm.export.csproj b/src/i3dm.export.csproj
@@ -27,11 +27,11 @@
     <PackageReference Include="Dapper" Version="2.1.35" />
     <PackageReference Include="i3dm.tile" Version="1.0.0" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-    <PackageReference Include="Npgsql" Version="8.0.2" />
-    <PackageReference Include="SharpGLTF.Ext.3DTiles" Version="1.0.0-alpha0031" />
-    <PackageReference Include="SharpGLTF.Toolkit" Version="1.0.0-alpha0031" />
+    <PackageReference Include="Npgsql" Version="8.0.3" />
+    <PackageReference Include="SharpGLTF.Ext.3DTiles" Version="1.0.0" />
+    <PackageReference Include="SharpGLTF.Toolkit" Version="1.0.0" />
     <PackageReference Include="ShellProgressBar" Version="5.2.0" />
-    <PackageReference Include="subtree" Version="1.4.4" />
+    <PackageReference Include="subtree" Version="1.4.7" />
     <PackageReference Include="Wkx" Version="0.5.1" />
   </ItemGroup>
 

diff --git a/src/nuget.config b/src/nuget.config
@@ -2,6 +2,5 @@
 <configuration>
   <packageSources>
     <add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
-    <add key="myget.org" value="https://www.myget.org/F/bertt/api/v3/index.json"/>
   </packageSources>
 </configuration>
diff --git a/tests/i3dm.export.tests.csproj b/tests/i3dm.export.tests.csproj
@@ -9,7 +9,7 @@
   <ItemGroup>
     <PackageReference Include="NUnit" Version="4.1.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
   </ItemGroup>
 
   <ItemGroup>