fixed Effect-IDs avoiding wrong cache-hits

aardvark-community · Oct 21, 2024 · 9d1448c · 9d1448c
1 parent ed86f48
commit 9d1448c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -1,3 +1,6 @@
+### 1.0.5
+* fixed Effect-IDs avoiding wrong cache-hits
+
 ### 1.0.4
 * SceneHandler now used RGBA32F for rendering Pick Information (better compatibility)
 

diff --git a/src/Aardvark.Dom/SceneGraph/SceneHandler.fs b/src/Aardvark.Dom/SceneGraph/SceneHandler.fs
@@ -119,15 +119,15 @@ module internal PickShader =
     let pickId(v : Vertex) =
         fragment {
             let n32 = Normal32.encode (Vec.normalize v.vn) |> int
-            let d = (2.0 * v.d - 1.0) |> Bitwise.FloatBitsToInt
-            return { c = v.c; id = V4d(Bitwise.IntBitsToFloat uniform.PickId, Bitwise.IntBitsToFloat n32, Bitwise.IntBitsToFloat d, 0.0) }
+            let d = (2.0 * v.d - 1.0) 
+            return { c = v.c; id = V4d(Bitwise.IntBitsToFloat uniform.PickId, Bitwise.IntBitsToFloat n32, d, 0.0) }
         }
 
     let pickIdNoNormal(v : Vertex) =
         fragment {
             let n32 = 0
-            let d = (2.0 * v.d - 1.0) |> Bitwise.FloatBitsToInt
-            return { c = v.c; id = V4d(Bitwise.IntBitsToFloat uniform.PickId, Bitwise.IntBitsToFloat n32, Bitwise.IntBitsToFloat d, 0.0) }
+            let d = (2.0 * v.d - 1.0) 
+            return { c = v.c; id = V4d(Bitwise.IntBitsToFloat uniform.PickId, Bitwise.IntBitsToFloat n32, d, 0.0) }
         }
 
     let vertexPickEffect = Effect.ofFunction pickVertex
@@ -762,7 +762,7 @@ type SceneHandler(signature : IFramebufferSignature, trigger : RenderControlEven
                                 newShader.Shaders
                             )
 
-                        let newEffect = FShade.Effect("pick_" + eff.Id, newShaders, [])
+                        let newEffect = FShade.Effect("fpick_" + eff.Id, newShaders, [])
 
                         let r = RenderObject.Clone o
                         r.Uniforms <- UniformProvider.union o.Uniforms (UniformProvider.ofList ["PickId", AVal.constant pickId :> IAdaptiveValue])