reworked kdtree loading (allows to skip master kdtree)

aardvark-platform · Feb 20, 2024 · 45e9609 · 45e9609
1 parent add986b
commit 45e9609
Show file tree

Hide file tree

Showing 7 changed files with 268 additions and 208 deletions.
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -1,3 +1,6 @@
+### 1.4.0
+- KdTree loading now parametrized and allows to create kdtrees
+
 ### 1.3.0
 - updated to Aardvark.Rendering 5.4
 - [Rabbyte] simplified model and actions by using dropdownUnclearable

diff --git a/src/2D3DLinking/App.fs b/src/2D3DLinking/App.fs
@@ -277,10 +277,11 @@ module App =
                 for h in patchHierarchies do
 
                     let rootTree = h.tree |> QTree.getRoot
+                    let kd = (KdTrees.loadKdTrees' h Trafo3d.Identity true ViewerModality.XYZ OpcSelectionViewer.Serialization.binarySerializer false) false (fun _ -> failwith "no function for creating triangle sets")
 
                     yield {
                         patchHierarchy = h
-                        kdTree         = Aardvark.VRVis.Opc.KdTrees.expandKdTreePaths h.opcPaths.Opc_DirAbsPath (KdTrees.loadKdTrees' h Trafo3d.Identity true ViewerModality.XYZ OpcSelectionViewer.Serialization.binarySerializer)
+                        kdTree         = Aardvark.VRVis.Opc.KdTrees.expandKdTreePaths h.opcPaths.Opc_DirAbsPath kd
                         localBB        = rootTree.info.LocalBoundingBox 
                         globalBB       = rootTree.info.GlobalBoundingBox
                         neighborMap    = HashMap.empty

diff --git a/src/3DGis/App.fs b/src/3DGis/App.fs
@@ -830,10 +830,11 @@ module App =
                 for h in patchHierarchies do
 
                   let rootTree = h.tree |> QTree.getRoot
-
+                  let kd = KdTrees.loadKdTrees' h Trafo3d.Identity true ViewerModality.XYZ OpcSelectionViewer.Serialization.binarySerializer false false (fun _ _ -> failwith "no triangleset function")
+
                   yield {
                       patchHierarchy = h
-                      kdTree         = Aardvark.VRVis.Opc.KdTrees.expandKdTreePaths h.opcPaths.Opc_DirAbsPath (KdTrees.loadKdTrees' h Trafo3d.Identity true ViewerModality.XYZ OpcSelectionViewer.Serialization.binarySerializer)
+                      kdTree         = Aardvark.VRVis.Opc.KdTrees.expandKdTreePaths h.opcPaths.Opc_DirAbsPath kd
                       localBB        = rootTree.info.LocalBoundingBox 
                       globalBB       = rootTree.info.GlobalBoundingBox
                       neighborMap    = HashMap.empty