geometric (IIntersectable) picking now respects Sg.Active

aardvark-community · Oct 19, 2024 · 5f19dbe · 5f19dbe
1 parent 5af7d43
commit 5f19dbe
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 14 deletions.
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -1,5 +1,7 @@
-- Fixed render control samples attribute
-- Fixed multisampled raw download
+### 1.0.2
+* geometric (IIntersectable) picking now respects `Sg.Active`
+* Fixed render control samples attribute
+* Fixed multisampled raw download
 
 ### 1.0.1
 * net8.0 updates 

diff --git a/src/Aardvark.Dom/SceneGraph/SceneHandler.fs b/src/Aardvark.Dom/SceneGraph/SceneHandler.fs
@@ -1033,18 +1033,21 @@ type SceneHandler(signature : IFramebufferSignature, trigger : RenderControlEven
 
 
                 let tryIntersect (skipPickThrough : bool) (tmin : float) (tmax : float) (state : TraversalState) (i : IIntersectable, trafo : Trafo3d) =
-                    let mutable r = 0.0
-                    let mutable n = V3d.Zero
-                    let mutable hit = V3d.Zero
-                    let skip =
-                        if skipPickThrough then state.PickThrough
-                        else false
-                    let localRay = ray.Transformed(trafo.Backward)
-                    if not skip && i.Intersects(localRay, tmin, tmax, &r, &hit, &n) then
-                        let worldPoint = trafo.Forward.TransformPos hit
-                        let depth = vp.Forward.TransformPosProj(worldPoint).Z
-                        let vn = Vec.normalize (v.Backward.TransposedTransformDir (trafo.Backward.TransposedTransformDir n))
-                        Some (r, (state, depth, v.Forward.TransformPos worldPoint, vn))
+                    if AVal.force state.Active then
+                        let mutable r = 0.0
+                        let mutable n = V3d.Zero
+                        let mutable hit = V3d.Zero
+                        let skip =
+                            if skipPickThrough then state.PickThrough
+                            else false
+                        let localRay = ray.Transformed(trafo.Backward)
+                        if not skip && i.Intersects(localRay, tmin, tmax, &r, &hit, &n) then
+                            let worldPoint = trafo.Forward.TransformPos hit
+                            let depth = vp.Forward.TransformPosProj(worldPoint).Z
+                            let vn = Vec.normalize (v.Backward.TransposedTransformDir (trafo.Backward.TransposedTransformDir n))
+                            Some (r, (state, depth, v.Forward.TransformPos worldPoint, vn))
+                        else
+                            None
                     else
                         None