better debugging when kdtrees are missing

Author: haraldsteinlechner

src/PRo3D.Base/PRo3D.Base.fsproj

@@ -17,6 +17,7 @@
   </PropertyGroup>
   <ItemGroup>
     <!-- <Compile Include="InteropHelpers.fs" /> -->
+    <Compile Include="KdTrees.fs" />
     <Compile Include="Multitexturing.fs" />
     <Compile Include="ErrorReporting.fs" />
     <EmbeddedResource Include="resources\CooTransformationConfig.zip" />

src/PRo3D.Core/Surface.fs

@@ -149,6 +149,8 @@ module DebugKdTreesX =
     let intersectKdTrees bb (hitObject : Surface) (cache : HashMap<string, ConcreteKdIntersectionTree>) (ray : FastRay3d) (kdTreeMap: HashMap<Box3d, KdTrees.Level0KdTree>) = 
 
         let kdtree, c = kdTreeMap |> HashMap.find bb |> loadObjectSet cache
+        if isNull kdtree.KdIntersectionTree.ObjectSet then
+            Log.warn "object set null"
 
         let kdi = kdtree.KdIntersectionTree 
         let mutable hit = ObjectRayHit.MaxRange
@@ -228,7 +230,7 @@ module SurfaceIntersection =
                         let closestHit =
                             hitBoxes
                             |> List.choose(fun key -> 
-                                //Log.line "intersection: %s; pr: %f" surf.name surf.priority.value                                                             
+                                Log.startTimed "intersection: %s; pr: %f" surf.name surf.priority.value                                                             
                                 //let ray = r.Ray.Transformed(surf.preTransform.Backward) |> FastRay3d  //combine pre and current transform         
                                 let backward = 
                                     if surf.transformation.flipZ then
@@ -241,6 +243,7 @@ module SurfaceIntersection =
                                 let ray = r.Ray.Transformed(backward) |> FastRay3d
                                 let hit, c = 
                                   kd |> DebugKdTreesX.intersectKdTrees key surf cache ray
+                                Log.stop()
                                 cache <- c
                                 hit
                             )

src/PRo3D.Core/Surface/Surface.Sg.fs

@@ -171,24 +171,24 @@ module Sg =
             [| 
                 for h in patchHierarchies do
                     if createKdTrees then   
-                        yield KdTrees.loadKdTrees h Trafo3d.Identity ViewerModality.XYZ Serialization.binarySerializer false false DebugKdTreesX.loadTriangles' true              
+                        Log.startTimed "[KdTrees] Loading kdtrees: %s" h.opcPaths.Patches_DirAbsPath
+                        let m = Aardvark.VRVis.Opc.KdTrees.loadKdTrees h Trafo3d.Identity ViewerModality.XYZ Serialization.binarySerializer false true DebugKdTreesX.loadTriangles' true    
+                        Log.stop()
+                        if HashMap.isEmpty m then
+                            Log.warn "[KdTrees], KdTree map for %s is empty." h.opcPaths.Patches_DirAbsPath
+                            yield m
+                        else
+                            yield m
                     else 
                         yield HashMap.empty
             |]
 
         let totalKdTrees = kdTreesPerHierarchy.Length
-        Log.line "creating %d kdTrees" totalKdTrees
+        Log.line "fusing %d kdTrees" totalKdTrees
 
         let kdTrees = 
             kdTreesPerHierarchy                     
-            |> Array.Parallel.mapi (fun i e ->
-                Log.start "creating kdtree #%d of %d" i totalKdTrees
-                let r = e
-                Log.stop()
-                r
-            )
-            |> Array.fold (fun a b -> HashMap.union a b) HashMap.empty
-        
+            |> Array.fold HashMap.union HashMap.empty
 
 
         let createShadowContext (f : Aardvark.GeoSpatial.Opc.PatchLod.PatchNode) (scope : Scope) =

src/PRo3D.Core/Surface/SurfaceApp.fs

@@ -879,12 +879,13 @@ module SurfaceApp =
                         )
                     Log.stop()
                     Log.startTimed "[RebuildKdTrees] creating kdtrees"
-                    let kdTrees =
-                        hs |> Array.mapi (fun i h -> 
-                            KdTrees.loadKdTrees' h Trafo3d.Identity true ViewerModality.XYZ Serialization.binarySerializer true true PRo3D.Core.Surface.DebugKdTreesX.loadTriangles' false    
+                    let cnt = 
+                        hs |> Array.sumBy (fun h -> 
+                            let m = KdTrees.loadKdTrees' h Trafo3d.Identity true ViewerModality.XYZ Serialization.binarySerializer true true PRo3D.Core.Surface.DebugKdTreesX.loadTriangles' false Aardvark.VRVis.Opc.KdTrees.KdTreeParameters.legacyDefault   
+                            HashMap.count m
                         )
                     Log.stop()
-                    Log.line "[RebuildKdTrees] created/validated KdTrees for %d opcs." kdTrees.Length
+                    Log.line "[RebuildKdTrees] created/validated KdTrees for %d opcs." cnt
                     model
                 | None -> model                         
             | _ -> model

src/opc-tool/Properties/launchSettings.json

@@ -2,7 +2,7 @@
   "profiles": {
     "opc-tool": {
       "commandName": "Project",
-      "commandLineArgs": "--ignoremasterkdtree \"I:\\OPC\\GardenCity\\MSL_Mastcam_Sol_925_id_48420\" --forcekdtreerebuild"
+      "commandLineArgs": "--ignoremasterkdtree \"I:\\OPC\\GardenCity\\MSL_Mastcam_Sol_926_id_48427\" --forcekdtreerebuild"
     }
   }
 }