Merge remote-tracking branch 'remotes/origin/develop' into features/area-of-polygons

Brunnhuber · Brunnhuber · commit 995c138679a1 · 2025-11-18T15:05:58.000+01:00
# Conflicts:
#	src/PRo3D.Core/SequencedBookmarks/SequencedBookmarks-Model.g.fs
#	src/PRo3D.Viewer/TraverseApp.fs
diff --git a/PRODUCT_RELEASE_NOTES.md b/PRODUCT_RELEASE_NOTES.md
@@ -1,3 +1,8 @@
+## 5.3.0-prerelease1
+- axis-ellipses added 
+- area calculation for closed polygons and ellipses included
+- surface intersection preview added
+
 ## 5.1.2           
 - fixed legacy traverse scene file / m20 waypoint loading
 
diff --git a/aardium/package.json b/aardium/package.json
@@ -1,7 +1,7 @@
 {
   "name": "PRo3D",
   "productName": "PRo3D.Viewer",
-  "version": "5.1.2",
+  "version": "5.3.0-prerelease1",
   "description": "PRo3D, short for Planetary Robotics 3D Viewer, is an interactive 3D visualization tool to allow planetary scientists to work with high-resolution 3D reconstructions of the Martian surface.",
   "license": "AGPL",
   "copyright": "VRVis Zentrum für Virtual Reality und Visualisierung Forschungs-GmbH",
diff --git a/docs/AdvancedAnnotations.md b/docs/AdvancedAnnotations.md
@@ -0,0 +1,19 @@
+## Advanced Annotation & Preview picking
+
+
+Previously PRo3D provided no feedback where the intersection will happen. This one adds a 3D cursor which is continously computes intersections given cursor movements.
+It runs in a background thread.
+
+The feature can be explicityly disabled via `--disablePreviewIntersections`
+
+Here is the additional annotation type: https://github.com/pro3d-space/PRo3D/pull/542/commits/54ff51f2545b7727b8bd2121a94a3a90a5d35c83#diff-e3ae8667e8128f79e46ea606a6958260ad62ddc73b7e187fccace130e9f14a01R33
+
+Preview intersections can be controlled via: https://github.com/pro3d-space/PRo3D/pull/542/commits/54ff51f2545b7727b8bd2121a94a3a90a5d35c83#diff-5b8179e37acaceeb2a6bf8b9ce4ceedf9785501303594064bbee53391179b622R88
+
+
+Async preview pickign is controlled via `PreviewPickSurface` message, see https://github.com/pro3d-space/PRo3D/pull/542/commits/c7435faa1963e592cdd5829157b4c804744d40d9#diff-0e871cb4421e88e1ad3efc5e947173c95acb60eedb089a13a0477143e2199f11R516.
+
+## Caveats
+
+Additional memory footprint due to stressed kdtre cache. The kdtree cache however should be reworked to use a LRU queue or similarly.
+
diff --git a/src/PRo3D.Base/PRo3D.Base.fsproj b/src/PRo3D.Base/PRo3D.Base.fsproj
@@ -18,7 +18,7 @@
   </PropertyGroup>
   <ItemGroup>
     <!-- <Compile Include="InteropHelpers.fs" /> -->
-    <Compile Include="KdTrees.fs" />
+    <!--<Compile Include="KdTrees.fs" />-->
     <Compile Include="WebClientDeprecation.fs" />
     <Compile Include="DeprecatedModel.fs" />
     <Compile Include="DeprecatedModel.g.fs" />
diff --git a/src/PRo3D.Core/SequencedBookmarks/SequencedBookmarks-Model.g.fs b/src/PRo3D.Core/SequencedBookmarks/SequencedBookmarks-Model.g.fs
@@ -1,5 +1,5 @@
 //9d9091e1-5600-7fb5-3f95-4778d9ab3384
-//1e24ccba-0dfd-72a0-1a9b-46d37ccb59c4
+//07c4e7cd-6ca4-9380-e8d4-36ba571d6c7c
 #nowarn "49" // upper case patterns
 #nowarn "66" // upcast is unncecessary
 #nowarn "1337" // internal types
@@ -12,11 +12,11 @@ open Adaptify
 open PRo3D.Core.SequencedBookmarks
 [<System.Diagnostics.CodeAnalysis.SuppressMessage("NameConventions", "*")>]
 type AdaptiveSequencedBookmarkModel(value : SequencedBookmarkModel) =
-    let mutable _name_ = FSharp.Data.Adaptive.cval(value.name)
-    let mutable _path_ = FSharp.Data.Adaptive.cval(value.path)
     let mutable _cameraView_ = FSharp.Data.Adaptive.cval(value.cameraView)
     let mutable _filename_ = FSharp.Data.Adaptive.cval(value.filename)
     let mutable _key_ = FSharp.Data.Adaptive.cval(value.key)
+    let mutable _path_ = FSharp.Data.Adaptive.cval(value.path)
+    let mutable _name_ = FSharp.Data.Adaptive.cval(value.name)
     let _bookmark_ = PRo3D.Core.AdaptiveBookmark(value.bookmark)
     let _metadata_ = FSharp.Data.Adaptive.cval(value.metadata)
     let _frustumParameters_ = FSharp.Data.Adaptive.cval(value.frustumParameters)
@@ -41,11 +41,11 @@ type AdaptiveSequencedBookmarkModel(value : SequencedBookmarkModel) =
         if Microsoft.FSharp.Core.Operators.not((FSharp.Data.Adaptive.ShallowEqualityComparer<SequencedBookmarkModel>.ShallowEquals(value, __value))) then
             __value <- value
             __adaptive.MarkOutdated()
-            _name_.Value <- value.name
-            _path_.Value <- value.path
             _cameraView_.Value <- value.cameraView
             _filename_.Value <- value.filename
             _key_.Value <- value.key
+            _path_.Value <- value.path
+            _name_.Value <- value.name
             _bookmark_.Update(value.bookmark)
             _metadata_.Value <- value.metadata
             _frustumParameters_.Value <- value.frustumParameters
@@ -56,11 +56,11 @@ type AdaptiveSequencedBookmarkModel(value : SequencedBookmarkModel) =
             _duration_.Update(value.duration)
             _observationInfo_.Update(value.observationInfo)
     member __.Current = __adaptive
-    member __.name = _name_ :> FSharp.Data.Adaptive.aval<Microsoft.FSharp.Core.string>
-    member __.path = _path_ :> FSharp.Data.Adaptive.aval<Microsoft.FSharp.Core.string>
     member __.cameraView = _cameraView_ :> FSharp.Data.Adaptive.aval<Aardvark.Rendering.CameraView>
     member __.filename = _filename_ :> FSharp.Data.Adaptive.aval<Microsoft.FSharp.Core.string>
     member __.key = _key_ :> FSharp.Data.Adaptive.aval<System.Guid>
+    member __.path = _path_ :> FSharp.Data.Adaptive.aval<Microsoft.FSharp.Core.string>
+    member __.name = _name_ :> FSharp.Data.Adaptive.aval<Microsoft.FSharp.Core.string>
     member __.version = __value.version
     member __.bookmark = _bookmark_
     member __.metadata = _metadata_ :> FSharp.Data.Adaptive.aval<Microsoft.FSharp.Core.option<Microsoft.FSharp.Core.string>>
diff --git a/src/PRo3D.Core/Traverse-Model.g.fs b/src/PRo3D.Core/Traverse-Model.g.fs
@@ -1,4 +1,4 @@
-//4e38c644-867c-783b-1111-2776d7c97950
+//89d392ae-36bd-a5b1-961d-8aa759096e16
 //a72739d7-0c27-cc36-4689-a3f0d8b9df9c
 #nowarn "49" // upper case patterns
 #nowarn "66" // upcast is unncecessary
diff --git a/src/PRo3D.Core/ViewConfigModel.fs b/src/PRo3D.Core/ViewConfigModel.fs
@@ -186,7 +186,7 @@ module ViewConfigModel =
         //useSurfaceHighlighting = true
         showExplorationPointGui = true
         showLeafLabels = false
-        showPreviewIntersection = true
+        showPreviewIntersection = false
         previewIntersectionWorldSize = previewIntersectionWorldSize
     }
        
@@ -222,7 +222,7 @@ module ViewConfigModel =
                     filterTexture         = false
                     showExplorationPointGui = true
                     showLeafLabels        = false
-                    showPreviewIntersection = true
+                    showPreviewIntersection = false
                     previewIntersectionWorldSize = previewIntersectionWorldSize
                 }
             }
@@ -259,7 +259,7 @@ module ViewConfigModel =
                     filterTexture         = false
                     showExplorationPointGui = true
                     showLeafLabels        = false
-                    showPreviewIntersection = true
+                    showPreviewIntersection = false
                     previewIntersectionWorldSize = previewIntersectionWorldSize
                 }
             }
@@ -298,7 +298,7 @@ module ViewConfigModel =
                     filterTexture         = false
                     showExplorationPointGui = true
                     showLeafLabels        = false
-                    showPreviewIntersection = true
+                    showPreviewIntersection = false
                     previewIntersectionWorldSize = previewIntersectionWorldSize
                 }
             }
@@ -335,7 +335,7 @@ module ViewConfigModel =
                     filterTexture         = filterTexture 
                     showExplorationPointGui = true
                     showLeafLabels        = false
-                    showPreviewIntersection = true
+                    showPreviewIntersection = false
                     previewIntersectionWorldSize = previewIntersectionWorldSize
                 }
             }
@@ -377,7 +377,7 @@ module ViewConfigModel =
                     filterTexture           = filterTexture 
                     showExplorationPointGui = if showExplorationPointGui.IsSome then showExplorationPointGui.Value else true
                     showLeafLabels          = false
-                    showPreviewIntersection = Option.defaultValue true showPreviewIntersection'
+                    showPreviewIntersection = Option.defaultValue false showPreviewIntersection'
                     previewIntersectionWorldSize = { previewIntersectionWorldSize with value = Option.defaultValue previewIntersectionWorldSize.value previewIntersectionWorldSize' }
                 }
             }
diff --git a/src/PRo3D.Core/ViewConfigModel.g.fs b/src/PRo3D.Core/ViewConfigModel.g.fs
@@ -1,4 +1,4 @@
-//1d0054e1-e6be-b8ec-f62a-9c651ffe17bc
+//57b9242c-047a-0ff9-986f-7c551ccc57e7
 //70d32aec-d119-7ea2-fc09-332a209fd05e
 #nowarn "49" // upper case patterns
 #nowarn "66" // upcast is unncecessary
diff --git a/src/PRo3D.Viewer/CommandLine/CommandLine.fs b/src/PRo3D.Viewer/CommandLine/CommandLine.fs
@@ -73,6 +73,8 @@ module CommandLine =
 
             let spiceKernelPath = parseArg "--defaultSpiceKernel" argv
 
+            let disablePreviewIntersections = argv |> hasFlag "disablePreviewIntersections"
+
             Log.line "[Arguments] Server mode: %s" (b2str server)
             Log.line "[Arguments] Using linear magnification filtering%s" (b2str magFilter)
             Log.line "[Arguments] Show exploration centre%s" (b2str showExplorationCentre)
@@ -103,5 +105,6 @@ module CommandLine =
                 isBatchRendering         = false
                 defaultSpiceKernelPath   = spiceKernelPath
                 loadScene                = loadScene
+                allowPreviewIntersections = not disablePreviewIntersections
             }
             args
diff --git a/src/PRo3D.Viewer/Config.fs b/src/PRo3D.Viewer/Config.fs
@@ -16,6 +16,6 @@ module Config =
   let mutable title = "PRo3D"
 
 
-  let previewIntersections = true
+  let mutable previewIntersections = true
 
   let diagnosticTimings = false
diff --git a/src/PRo3D.Viewer/Models/Model.fs b/src/PRo3D.Viewer/Models/Model.fs
@@ -76,6 +76,8 @@ type StartupArgs = {
 
     defaultSpiceKernelPath : Option<string>
 
+    allowPreviewIntersections : bool
+
     verbose               : bool    
 
 } with 
@@ -98,6 +100,7 @@ type StartupArgs = {
           isBatchRendering         = false
           defaultSpiceKernelPath   = None
           loadScene                = None
+          allowPreviewIntersections = true
       }
 
 
diff --git a/src/PRo3D.Viewer/Models/Model.g.fs b/src/PRo3D.Viewer/Models/Model.g.fs
@@ -1,4 +1,4 @@
-//4170be4c-46f5-619a-ce37-1affc8fc9e89
+//d700a48c-e6c8-5686-3466-d3f6f89cf485
 //2dfc2734-8d0c-d14a-e49c-3ccf8fc745b3
 #nowarn "49" // upper case patterns
 #nowarn "66" // upcast is unncecessary
diff --git a/src/PRo3D.Viewer/Program.fs b/src/PRo3D.Viewer/Program.fs
@@ -161,7 +161,8 @@ let main argv =
             Log.warn "system aardium"; 
             Aardium.init()
 
-    
+    Config.previewIntersections <- startupArgs.allowPreviewIntersections
+
     Aardvark.Init()
     let mutable cooTrafoInitialized = false
     let disposables = List<IDisposable>()
diff --git a/src/PRo3D.Viewer/TraverseApp.fs b/src/PRo3D.Viewer/TraverseApp.fs
@@ -136,7 +136,7 @@ module TraverseApp =
                         None 
                     | h::_ -> 
                         match h.geometry with
-                        | GeoJsonGeometry.Point (p,_) -> 
+                        | GeoJsonGeometry.Point(p, _) -> 
                             Log.warn "[TraverseApp] Missing properties for traverse %s. Fallback waypoint traverse " name
                             Some (WayPointsTraverseApp.parseTraverse (traverse), TraverseType.WayPoints, false, true, true)
                         | e -> 
diff --git a/src/PRo3D.Viewer/Viewer/Viewer-Utils.fs b/src/PRo3D.Viewer/Viewer/Viewer-Utils.fs
@@ -271,6 +271,7 @@ module ViewerUtils =
         (frustum         : aval<Frustum>) 
         (selectedId      : aval<Option<Guid>>)
         (surfacePicking  : aval<bool>)
+        (previewPickingEnabled : aval<bool>)
         (globalBB        : aval<Box3d>) 
         (refsys          : AdaptiveReferenceSystem)
         (observedSystem  : aval<Option<SpiceReferenceSystem>>) 
@@ -516,7 +517,7 @@ module ViewerUtils =
 
 
                     |> Sg.withEvents [
-                        if Config.previewIntersections then
+                        if Config.previewIntersections && previewPickingEnabled.GetValue() then
                             yield SceneEventKind.Move, (
                                 fun sceneHit -> 
                                     let name  = surf.name |> AVal.force        
@@ -948,6 +949,7 @@ module ViewerUtils =
                             m.frustum 
                             selected 
                             m.ctrlFlag 
+                            m.scene.config.showPreviewIntersection
                             sf.globalBB 
                             refSystem 
                             observationSystem
@@ -1041,6 +1043,7 @@ module ViewerUtils =
                             m.frustum 
                             selected 
                             surfacePicking
+                            m.scene.config.showPreviewIntersection
                             surface.globalBB
                             refSystem 
                             observationSystem
diff --git a/src/PRo3D.sln b/src/PRo3D.sln
@@ -30,6 +30,7 @@ Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "opc-tool", "opc-tool\opc-to
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Docs", "Docs", "{235F058E-EA9C-4858-854A-7DDECC0C5724}"
 	ProjectSection(SolutionItems) = preProject
+		AdvancedAnnotations.md = AdvancedAnnotations.md
 		..\docs\Build-Deploy-System.md = ..\docs\Build-Deploy-System.md
 		..\docs\Feature-Multitexture.md = ..\docs\Feature-Multitexture.md
 		..\docs\Feature-Queries.md = ..\docs\Feature-Queries.md

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "PRo3D",`
`3`	`3`	`"productName": "PRo3D.Viewer",`
`4`		`- "version": "5.1.2",`
	`4`	`+ "version": "5.3.0-prerelease1",`
`5`	`5`	`"description": "PRo3D, short for Planetary Robotics 3D Viewer, is an interactive 3D visualization tool to allow planetary scientists to work with high-resolution 3D reconstructions of the Martian surface.",`
`6`	`6`	`"license": "AGPL",`
`7`	`7`	`"copyright": "VRVis Zentrum für Virtual Reality und Visualisierung Forschungs-GmbH",`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-//4e38c644-867c-783b-1111-2776d7c97950`
	`1`	`+//89d392ae-36bd-a5b1-961d-8aa759096e16`
`2`	`2`	`//a72739d7-0c27-cc36-4689-a3f0d8b9df9c`
`3`	`3`	`#nowarn "49" // upper case patterns`
`4`	`4`	`#nowarn "66" // upcast is unncecessary`
Original file line number	Diff line number	Diff line change
`@@ -186,7 +186,7 @@ module ViewConfigModel =`
`186`	`186`	`//useSurfaceHighlighting = true`
`187`	`187`	`showExplorationPointGui = true`
`188`	`188`	`showLeafLabels = false`
`189`		`- showPreviewIntersection = true`
	`189`	`+ showPreviewIntersection = false`
`190`	`190`	`previewIntersectionWorldSize = previewIntersectionWorldSize`
`191`	`191`	`}`
`192`	`192`
`@@ -222,7 +222,7 @@ module ViewConfigModel =`
`222`	`222`	`filterTexture = false`
`223`	`223`	`showExplorationPointGui = true`
`224`	`224`	`showLeafLabels = false`
`225`		`- showPreviewIntersection = true`
	`225`	`+ showPreviewIntersection = false`
`226`	`226`	`previewIntersectionWorldSize = previewIntersectionWorldSize`
`227`	`227`	`}`
`228`	`228`	`}`
`@@ -259,7 +259,7 @@ module ViewConfigModel =`
`259`	`259`	`filterTexture = false`
`260`	`260`	`showExplorationPointGui = true`
`261`	`261`	`showLeafLabels = false`
`262`		`- showPreviewIntersection = true`
	`262`	`+ showPreviewIntersection = false`
`263`	`263`	`previewIntersectionWorldSize = previewIntersectionWorldSize`
`264`	`264`	`}`
`265`	`265`	`}`
`@@ -298,7 +298,7 @@ module ViewConfigModel =`
`298`	`298`	`filterTexture = false`
`299`	`299`	`showExplorationPointGui = true`
`300`	`300`	`showLeafLabels = false`
`301`		`- showPreviewIntersection = true`
	`301`	`+ showPreviewIntersection = false`
`302`	`302`	`previewIntersectionWorldSize = previewIntersectionWorldSize`
`303`	`303`	`}`
`304`	`304`	`}`
`@@ -335,7 +335,7 @@ module ViewConfigModel =`
`335`	`335`	`filterTexture = filterTexture`
`336`	`336`	`showExplorationPointGui = true`
`337`	`337`	`showLeafLabels = false`
`338`		`- showPreviewIntersection = true`
	`338`	`+ showPreviewIntersection = false`
`339`	`339`	`previewIntersectionWorldSize = previewIntersectionWorldSize`
`340`	`340`	`}`
`341`	`341`	`}`
`@@ -377,7 +377,7 @@ module ViewConfigModel =`
`377`	`377`	`filterTexture = filterTexture`
`378`	`378`	`showExplorationPointGui = if showExplorationPointGui.IsSome then showExplorationPointGui.Value else true`
`379`	`379`	`showLeafLabels = false`
`380`		`- showPreviewIntersection = Option.defaultValue true showPreviewIntersection'`
	`380`	`+ showPreviewIntersection = Option.defaultValue false showPreviewIntersection'`
`381`	`381`	`previewIntersectionWorldSize = { previewIntersectionWorldSize with value = Option.defaultValue previewIntersectionWorldSize.value previewIntersectionWorldSize' }`
`382`	`382`	`}`
`383`	`383`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-//1d0054e1-e6be-b8ec-f62a-9c651ffe17bc`
	`1`	`+//57b9242c-047a-0ff9-986f-7c551ccc57e7`
`2`	`2`	`//70d32aec-d119-7ea2-fc09-332a209fd05e`
`3`	`3`	`#nowarn "49" // upper case patterns`
`4`	`4`	`#nowarn "66" // upcast is unncecessary`