updated Aardvark.Data.Opc & moved lazy kdtree structures to old namespace to maintain backward compatibility

Author: haraldsteinlechner

paket.dependencies

@@ -10,7 +10,7 @@ nuget Aardvark.Base                         ~> 5.3.2
 nuget Aardvark.Base.FSharp                  ~> 5.3.2
 nuget Aardvark.Geometry                     ~> 5.3.2
 
-nuget Aardvark.Data.OPC                     ~> 0.9.0
+nuget Aardvark.Data.Opc                     ~> 0.10.0
 
 nuget Aardvark.Rendering                    ~> 5.5.0
 nuget Aardvark.Rendering.Text               ~> 5.5.0

paket.lock

@@ -13,58 +13,59 @@ NUGET
       Aardvark.Base.FSharp (>= 5.3)
       FSharp.Core (>= 8.0)
       FSharp.Data.Adaptive (>= 1.2.13 < 1.3)
-    Aardvark.Base (5.3.2)
-      Aardvark.Base.Telemetry (5.3.2)
+    Aardvark.Base (5.3.4)
+      Aardvark.Base.Telemetry (5.3.4)
+      SingleFileExtractor.Core (>= 2.2.1 < 2.3)
       System.Collections.Immutable (>= 8.0)
       System.Reflection.Metadata (>= 8.0)
       System.Text.Json (>= 8.0.4)
-    Aardvark.Base.Essentials (5.3.2)
-      Aardvark.Base (5.3.2)
+    Aardvark.Base.Essentials (5.3.4)
+      Aardvark.Base (5.3.4)
       System.Collections.Immutable (>= 8.0)
-    Aardvark.Base.Fonts (5.3.2)
-      Aardvark.Base.FSharp (5.3.2)
+    Aardvark.Base.Fonts (5.3.4)
+      Aardvark.Base.FSharp (5.3.4)
       FSharp.Core (>= 8.0)
       FuzzySharp (>= 2.0.2 < 2.1)
       Unofficial.LibTessDotNet (>= 2.0.2 < 2.1)
       Unofficial.Typography (>= 0.1 < 0.2)
-    Aardvark.Base.FSharp (5.3.2)
-      Aardvark.Base (5.3.2)
+    Aardvark.Base.FSharp (5.3.4)
+      Aardvark.Base (5.3.4)
       Aardvark.Base.TypeProviders (>= 4.5.15 < 4.6)
       FSharp.Core (>= 8.0)
       FSharp.Data.Adaptive (>= 1.2 < 1.3)
       FsPickler (>= 5.3.2 < 5.4)
       System.Dynamic.Runtime (>= 4.3 < 4.4)
-    Aardvark.Base.Incremental (5.3.2)
-      Aardvark.Base (5.3.2)
-      Aardvark.Base.FSharp (5.3.2)
+    Aardvark.Base.Incremental (5.3.4)
+      Aardvark.Base (5.3.4)
+      Aardvark.Base.FSharp (5.3.4)
       Aardvark.Base.TypeProviders (>= 4.5.15 < 4.6)
       FSharp.Core (>= 8.0)
       FSharp.Data.Adaptive (>= 1.2 < 1.3)
       FsPickler (>= 5.3.2 < 5.4)
-    Aardvark.Base.IO (5.3.2)
-      Aardvark.Base (5.3.2)
-      Aardvark.Base.Tensors (5.3.2)
+    Aardvark.Base.IO (5.3.4)
+      Aardvark.Base (5.3.4)
+      Aardvark.Base.Tensors (5.3.4)
       System.Dynamic.Runtime (>= 4.3 < 4.4)
-    Aardvark.Base.Telemetry (5.3.2)
-    Aardvark.Base.Tensors (5.3.2)
-      Aardvark.Base (5.3.2)
-      Aardvark.Base.FSharp (5.3.2)
+    Aardvark.Base.Telemetry (5.3.4)
+    Aardvark.Base.Tensors (5.3.4)
+      Aardvark.Base (5.3.4)
+      Aardvark.Base.FSharp (5.3.4)
       FSharp.Core (>= 8.0)
     Aardvark.Base.TypeProviders (4.5.15)
       FSharp.Core (>= 4.2.3)
     Aardvark.Build (1.0.25)
-    Aardvark.Data.OPC (0.9)
-      Aardvark.Base.Tensors (>= 5.3.2 < 5.4)
+    Aardvark.Data.OPC (0.10)
+      Aardvark.Base.Tensors (>= 5.3.4 < 5.4)
       Aardvark.Rendering.Common (>= 5.5)
       FSharp.Core (>= 8.0)
       SharpZipLib (>= 1.4.1 < 1.5)
     Aardvark.FontProvider (0.1)
       Aardvark.Base.Fonts (>= 5.3)
       FSharp.Core (>= 8.0.100)
-    Aardvark.Geometry (5.3.2)
-      Aardvark.Base (5.3.2)
-      Aardvark.Base.FSharp (5.3.2)
-      Aardvark.Base.Tensors (5.3.2)
+    Aardvark.Geometry (5.3.4)
+      Aardvark.Base (5.3.4)
+      Aardvark.Base.FSharp (5.3.4)
+      Aardvark.Base.Tensors (5.3.4)
       Aardvark.Base.TypeProviders (>= 4.5.15 < 4.6)
       FSharp.Core (>= 8.0)
       FSharp.Data.Adaptive (>= 1.2 < 1.3)
@@ -192,6 +193,8 @@ NUGET
     SharpZipLib (1.4.2)
       System.Memory (>= 4.5.4) - restriction: || (&& (== net8.0) (< netstandard2.1)) (== netstandard2.0)
       System.Threading.Tasks.Extensions (>= 4.5.2) - restriction: || (&& (== net8.0) (< netstandard2.1)) (== netstandard2.0)
+    SingleFileExtractor.Core (2.2.1)
+      System.Memory (>= 4.5.5) - restriction: || (&& (== net8.0) (< netstandard2.1)) (== netstandard2.0)
     Suave (2.5.6)
       FSharp.Core (>= 4.3.4)
     System.Buffers (4.5.1) - restriction: || (&& (== net8.0) (>= net462)) (&& (== net8.0) (< net6.0)) (== netstandard2.0)
@@ -255,7 +258,7 @@ NUGET
       System.Runtime (>= 4.3)
       System.Runtime.Extensions (>= 4.3)
       System.Threading (>= 4.3)
-    System.Memory (4.5.5) - restriction: || (&& (== net8.0) (>= net462)) (&& (== net8.0) (< net6.0)) (== netstandard2.0)
+    System.Memory (4.5.5) - restriction: || (&& (== net8.0) (< netstandard2.1)) (== netstandard2.0)
       System.Buffers (>= 4.5.1) - restriction: || (&& (== net8.0) (>= monotouch)) (&& (== net8.0) (>= net461)) (&& (== net8.0) (< netcoreapp2.0)) (&& (== net8.0) (< netstandard1.1)) (&& (== net8.0) (< netstandard2.0)) (&& (== net8.0) (>= xamarinios)) (&& (== net8.0) (>= xamarinmac)) (&& (== net8.0) (>= xamarintvos)) (&& (== net8.0) (>= xamarinwatchos)) (== netstandard2.0)
       System.Numerics.Vectors (>= 4.4) - restriction: || (&& (== net8.0) (< netcoreapp2.0)) (== netstandard2.0)
       System.Runtime.CompilerServices.Unsafe (>= 4.5.3) - restriction: || (&& (== net8.0) (>= monotouch)) (&& (== net8.0) (>= net461)) (&& (== net8.0) (< netcoreapp2.0)) (&& (== net8.0) (< netcoreapp2.1)) (&& (== net8.0) (< netstandard1.1)) (&& (== net8.0) (< netstandard2.0)) (&& (== net8.0) (>= uap10.1)) (&& (== net8.0) (>= xamarinios)) (&& (== net8.0) (>= xamarinmac)) (&& (== net8.0) (>= xamarintvos)) (&& (== net8.0) (>= xamarinwatchos)) (== netstandard2.0)

src/OPCViewer.Base/KdTrees.fs

@@ -1,15 +1,8 @@
-namespace OpcViewer.Base
+// The KdTree types live in the legacy namespace Aardvark.VRVis.Opc for compatibility reasons (hurdleless legacy code and deserialization)
+namespace Aardvark.VRVis.Opc
 
-open System
-open System.IO
 open Aardvark.Geometry
 open Aardvark.Base
-open Aardvark.Base.Coder
-open Aardvark.Data.Opc
-open MBrace.FsPickler
-open MBrace.FsPickler.Combinators
-open FSharp.Data.Adaptive
-open System.Collections.Generic
 
 module KdTrees =
 
@@ -30,6 +23,30 @@ module KdTrees =
         | LazyKdTree of LazyKdTree
         | InCoreKdTree of InCoreKdTree
 
+
+namespace OpcViewer.Base
+
+
+open System
+open System.IO
+open Aardvark.Geometry
+open Aardvark.Base
+open Aardvark.Base.Coder
+open Aardvark.Data.Opc
+open MBrace.FsPickler
+open MBrace.FsPickler.Combinators
+open FSharp.Data.Adaptive
+open System.Collections.Generic
+
+open Aardvark.VRVis.Opc.KdTrees
+
+module KdTrees =
+
+    type LazyKdTree = Aardvark.VRVis.Opc.KdTrees.LazyKdTree
+    type InCoreKdTree = Aardvark.VRVis.Opc.KdTrees.InCoreKdTree
+    type Level0KdTree = Aardvark.VRVis.Opc.KdTrees.Level0KdTree
+
+
     let relativePath (path: string) (remaining: int) =
         path.Split([| "/"; "\\" |], StringSplitOptions.None)
         |> List.ofArray

src/OPCViewer.Base/Picking/IntersectionController.fs

@@ -10,7 +10,7 @@ open Aardvark.UI
 open Aardvark.Geometry
 open Aardvark.Data.Opc
 open OpcViewer.Base
-open OpcViewer.Base.KdTrees
+open Aardvark.VRVis.Opc.KdTrees
 open FSharp.Data.Adaptive
 
 module IntersectionController =   

src/OPCViewer.Base/Picking/Picking-Model.fs

@@ -3,7 +3,7 @@ namespace OpcViewer.Base.Picking
 open Aardvark.UI
 open Aardvark.Base
 open FSharp.Data.Adaptive
-open OpcViewer.Base.KdTrees
+open Aardvark.VRVis.Opc.KdTrees
 open Aardvark.Data.Opc
 
 open Adaptify