Merge remote-tracking branch 'remotes/origin/develop' into features/g…

…isView-trajectories # Conflicts: # TEST_RELEASE_NOTES.md # paket.lock # src/PRo3D.Base/Utilities.fs # src/PRo3D.Viewer/Viewer/Viewer-Utils.fs # src/PRo3D.Viewer/Viewer/ViewerLenses.fs
pro3d-space · Oct 18, 2024 · c1c9248 · c1c9248
2 parents a6542e2 + 37e8619
commit c1c9248
Show file tree

Hide file tree

Showing 125 changed files with 847 additions and 6,955 deletions.
diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
@@ -3,28 +3,32 @@
   "isRoot": true,
   "tools": {
     "paket": {
-      "version": "7.0.0-alpha003",
+      "version": "8.0.3",
       "commands": [
         "paket"
-      ]
+      ],
+      "rollForward": false
     },
     "aardpack": {
       "version": "1.0.10",
       "commands": [
         "aardpack"
-      ]
+      ],
+      "rollForward": false
     },
     "adaptify": {
-      "version": "1.1.9",
+      "version": "1.3.3",
       "commands": [
         "adaptify"
-      ]
+      ],
+      "rollForward": false
     },
     "fantomas": {
       "version": "6.2.3",
       "commands": [
         "fantomas"
-      ]
+      ],
+      "rollForward": false
     }
   }
 }
diff --git a/TEST_RELEASE_NOTES.md b/TEST_RELEASE_NOTES.md
@@ -1,3 +1,6 @@
+## 4.25.0-prerelease10
+- optimized kd tree loading from caches
+
 ## 4.25.0-prerelease6
 - #413 (without footprints part), #330, #414, #397
 

diff --git a/global.json b/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "6.0.100",
+    "version": "8.0.0",
     "rollForward": "latestMinor"
   }
 }
diff --git a/paket.dependencies b/paket.dependencies
@@ -5,53 +5,53 @@ source https://vrvis.myget.org/F/aardvark_public/api/v3/index.json
 
 storage: none
 
-nuget Aardvark.Build                        ~> 1.0.11
+nuget Aardvark.Build                        ~> 1.0.25
 
-nuget FSharp.Core                           ~> 6.0.2 lowest_matching: true
+nuget FSharp.Core                           >= 8.0.0 lowest_matching: true
 nuget FSharp.Data                           ~> 3.1.1
 
-nuget FSharp.Data.Adaptive                  ~> 1.2.13
 
-nuget Aardvark.Base                         ~> 5.2.13
-nuget Aardvark.Base.Incremental             ~> 5.2.13
-nuget Aardvark.Base.FSharp                  ~> 5.2.13
-nuget Aardvark.Geometry                     ~> 5.2.13
-nuget Aardvark.PixImage.DevIL               ~> 5.2.13
+nuget Aardvark.Base                         ~> 5.3.2
+nuget Aardvark.Base.Incremental             ~> 5.3.2
+nuget Aardvark.Base.FSharp                  ~> 5.3.2
+nuget Aardvark.Geometry                     ~> 5.3.2
 
-nuget SixLabors.ImageSharp                  ~> 2.1.7
+nuget Aardvark.PixImage.DevIL               
 
-nuget Aardvark.Rendering                    ~> 5.4.0
-nuget Aardvark.Application.Slim             ~> 5.4.0
-nuget Aardvark.Application.Slim.GL          ~> 5.4.0
-nuget Aardvark.Application.Slim.Vulkan      ~> 5.4.0
-nuget Aardvark.SceneGraph                   ~> 5.4.0
-nuget Aardvark.SceneGraph.IO                ~> 5.4.0
-nuget Aardvark.SceneGraph.Opc               ~> 5.4.0
-nuget Aardvark.Rendering.Text               ~> 5.4.0
-nuget Aardvark.Rendering.Vulkan             ~> 5.4.0
-nuget Aardvark.Rendering.GL                 ~> 5.4.0
-nuget Aardvark.GPGPU                        ~> 5.4.0
 
-nuget Aardvark.Geometry.Intersection        ~> 5.2.25
-nuget Aardvark.Geometry.PointTree           ~> 5.2.25
-nuget Aardvark.Geometry.PolyMesh            ~> 5.2.25
-nuget Aardvark.Geometry.Clustering          ~> 5.2.25
+nuget SixLabors.ImageSharp                  ~> 2.1.9
 
-nuget Aardvark.Service                      ~> 5.4.0
-nuget Aardvark.UI                           ~> 5.4.0
-nuget Aardvark.UI.Primitives                ~> 5.4.0
-nuget Aardvark.Service.Giraffe              ~> 5.4.0
+nuget Aardvark.Rendering                    ~> 5.5.0
+nuget Aardvark.Application.Slim             ~> 5.5.0
+nuget Aardvark.Application.Slim.GL          ~> 5.5.0
+nuget Aardvark.Application.Slim.Vulkan      ~> 5.5.0
+nuget Aardvark.SceneGraph                   ~> 5.5.0
+nuget Aardvark.Rendering.Text               ~> 5.5.0
+nuget Aardvark.Rendering.Vulkan             ~> 5.5.0
+nuget Aardvark.Rendering.GL                 ~> 5.5.0
+nuget Aardvark.GPGPU                        ~> 5.5.0
+nuget Aardvark.SceneGraph.Assimp            ~> 5.5.0
 
-nuget Adaptify.MSBuild                      ~> 1.1.9
-nuget Adaptify.Core                         ~> 1.1.9
+nuget Aardvark.Geometry.Intersection        ~> 5.5.0
+nuget Aardvark.Geometry.PointTree           ~> 5.5.0
+nuget Aardvark.Geometry.PolyMesh            ~> 5.5.0
+nuget Aardvark.Geometry.Clustering          ~> 5.5.0
 
+nuget Aardvark.Service                      ~> 5.5.0
+nuget Aardvark.UI                           ~> 5.5.0
+nuget Aardvark.UI.Primitives                ~> 5.5.0
+nuget Aardvark.Service.Giraffe              ~> 5.5.0
 
-nuget Aardvark.Data.Wavefront               ~> 5.2.25
-nuget Aardvark.GeoSpatial.Opc               ~> 5.10.8
+nuget Adaptify.MSBuild                      ~> 1.3.0
+nuget Adaptify.Core                         ~> 1.3.0
 
-nuget Aardium                               ~> 2.0.10-prerelease0007
+nuget Aardvark.Data.Opc                     ~> 0.11.0
+nuget Aardvark.Data.Wavefront               ~> 5.3.10
+nuget Aardvark.GeoSpatial.Opc               ~> 5.11.2
 
-nuget OPCViewer.Base                        ~> 1.7.2
+nuget Aardium                               ~> 2.1.1
+
+nuget OPCViewer.Base                        ~> 1.9.2
 
 nuget Uncodium.Eigensystems                 ~> 1.1.2
 nuget Chiron                                ~> 6.3.1
@@ -116,12 +116,13 @@ nuget Fake.IO.FileSystem
 nuget Fake.Api.GitHub          
 nuget Fake.Core.ReleaseNotes    
 nuget Octokit
-nuget Fake.Core.Target
+nuget Fake.Core.Target    
 nuget Farmer
-nuget Fake.DotNet.Cli ~> 5.23.0
-nuget Fake.DotNet.NuGet
-nuget Fake.Tools.Git
-nuget Fake.DotNet.Paket
+nuget Fake.DotNet.Cli     = 5.23.0
+nuget Fake.DotNet.MSBuild = 5.23.0
+nuget Fake.DotNet.NuGet  
+nuget Fake.Tools.Git     
+nuget Fake.DotNet.Paket   
 nuget fake-cli
 nuget Argu
 nuget Mono.Cecil