Skip to content

Commit f6f0a81

Browse files
author
aardvark-platform
committed
disabled blending for PickBuffer
1 parent 40696e0 commit f6f0a81

File tree

6 files changed

+112
-86
lines changed

6 files changed

+112
-86
lines changed

‎RELEASE_NOTES.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
### 1.0.10
2+
* disabled blending for PickBuffer
3+
14
### 1.0.9
25
* SceneEvent pick-rays are now really independent of pick-depth
36

‎paket.dependencies‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@ source https://api.nuget.org/v3/index.json
55
nuget FSharp.Core >= 8.0.0 lowest_matching: true
66
nuget Aardvark.Build ~> 2.0.3
77

8-
nuget Aardvark.SceneGraph ~> 5.5.1
9-
nuget Aardvark.Rendering.GL ~> 5.5.1
10-
nuget Aardvark.Application.Slim.GL ~> 5.5.1
11-
nuget Aardvark.Rendering.Vulkan ~> 5.5.1
12-
nuget Aardvark.Application.Slim.Vulkan ~> 5.5.1
13-
nuget Aardvark.Rendering.Text ~> 5.5.1
8+
nuget Aardvark.SceneGraph ~> 5.5.15
9+
nuget Aardvark.Rendering.GL ~> 5.5.15
10+
nuget Aardvark.Application.Slim.GL ~> 5.5.15
11+
nuget Aardvark.Rendering.Vulkan ~> 5.5.15
12+
nuget Aardvark.Application.Slim.Vulkan ~> 5.5.15
13+
nuget Aardvark.Rendering.Text ~> 5.5.15
1414

15-
nuget Adaptify.Core ~> 1.3.4
16-
nuget Adaptify.MSBuild ~> 1.3.4
15+
nuget Adaptify.Core ~> 1.3.5
16+
nuget Adaptify.MSBuild ~> 1.3.5
1717

1818
nuget Giraffe ~> 7.0.0

‎paket.lock‎

Lines changed: 75 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -2,42 +2,42 @@ STORAGE: NONE
22
RESTRICTION: == net8.0
33
NUGET
44
remote: https://api.nuget.org/v3/index.json
5-
Aardvark.Application (5.5.2)
6-
Aardvark.Base.Essentials (>= 5.3.5 < 5.4)
7-
Aardvark.Base.Incremental (>= 5.3.5 < 5.4)
8-
Aardvark.Rendering (5.5.2)
5+
Aardvark.Application (5.5.15)
6+
Aardvark.Base.Essentials (>= 5.3.6 < 5.4)
7+
Aardvark.Base.Incremental (>= 5.3.6 < 5.4)
8+
Aardvark.Rendering (5.5.15)
99
FShade.Core (>= 5.6 < 5.7)
1010
FShade.GLSL (>= 5.6)
1111
FSharp.Core (>= 8.0)
12-
Aardvark.Application.Slim (5.5.2)
13-
Aardvark.Application (5.5.2)
14-
Aardvark.Base.Essentials (>= 5.3.5 < 5.4)
15-
Aardvark.Base.Incremental (>= 5.3.5 < 5.4)
16-
Aardvark.Rendering (5.5.2)
12+
Aardvark.Application.Slim (5.5.15)
13+
Aardvark.Application (5.5.15)
14+
Aardvark.Base.Essentials (>= 5.3.6 < 5.4)
15+
Aardvark.Base.Incremental (>= 5.3.6 < 5.4)
16+
Aardvark.Rendering (5.5.15)
1717
FShade (>= 5.6 < 5.7)
1818
FSharp.Core (>= 8.0)
1919
Silk.NET.GLFW (2.15)
2020
Unofficial.OpenTK (>= 3.0.21 < 3.1)
21-
Aardvark.Application.Slim.GL (5.5.2)
22-
Aardvark.Application (5.5.2)
23-
Aardvark.Application.Slim (5.5.2)
24-
Aardvark.Base.Essentials (>= 5.3.5 < 5.4)
25-
Aardvark.Base.Incremental (>= 5.3.5 < 5.4)
26-
Aardvark.Base.Tensors (>= 5.3.5 < 5.4)
27-
Aardvark.Rendering (5.5.2)
28-
Aardvark.Rendering.GL (5.5.2)
21+
Aardvark.Application.Slim.GL (5.5.15)
22+
Aardvark.Application (5.5.15)
23+
Aardvark.Application.Slim (5.5.15)
24+
Aardvark.Base.Essentials (>= 5.3.6 < 5.4)
25+
Aardvark.Base.Incremental (>= 5.3.6 < 5.4)
26+
Aardvark.Base.Tensors (>= 5.3.6 < 5.4)
27+
Aardvark.Rendering (5.5.15)
28+
Aardvark.Rendering.GL (5.5.15)
2929
FShade (>= 5.6 < 5.7)
3030
FSharp.Core (>= 8.0)
3131
Silk.NET.Core (2.15)
3232
Silk.NET.GLFW (2.15)
3333
Unofficial.OpenTK (>= 3.0.21 < 3.1)
34-
Aardvark.Application.Slim.Vulkan (5.5.2)
35-
Aardvark.Application (5.5.2)
36-
Aardvark.Application.Slim (5.5.2)
37-
Aardvark.Base.Essentials (>= 5.3.5 < 5.4)
38-
Aardvark.Base.Incremental (>= 5.3.5 < 5.4)
39-
Aardvark.Rendering (5.5.2)
40-
Aardvark.Rendering.Vulkan (5.5.2)
34+
Aardvark.Application.Slim.Vulkan (5.5.15)
35+
Aardvark.Application (5.5.15)
36+
Aardvark.Application.Slim (5.5.15)
37+
Aardvark.Base.Essentials (>= 5.3.6 < 5.4)
38+
Aardvark.Base.Incremental (>= 5.3.6 < 5.4)
39+
Aardvark.Rendering (5.5.15)
40+
Aardvark.Rendering.Vulkan (5.5.15)
4141
FShade (>= 5.6 < 5.7)
4242
FSharp.Core (>= 8.0)
4343
GLSLangSharp (>= 0.4.14 < 0.5)
@@ -47,102 +47,103 @@ NUGET
4747
Aardvark.Base.FSharp (>= 5.3)
4848
FSharp.Core (>= 8.0)
4949
FSharp.Data.Adaptive (>= 1.2.13 < 1.3)
50-
Aardvark.Base (5.3.5)
51-
Aardvark.Base.Telemetry (5.3.5)
50+
Aardvark.Base (5.3.8)
51+
Aardvark.Base.Telemetry (5.3.8)
5252
SingleFileExtractor.Core (>= 2.2.1 < 2.3)
5353
System.Collections.Immutable (>= 8.0)
5454
System.Reflection.Metadata (>= 8.0)
55-
System.Text.Json (>= 8.0.4)
56-
Aardvark.Base.Essentials (5.3.5)
57-
Aardvark.Base (5.3.5)
55+
System.Text.Json (>= 8.0.5)
56+
Aardvark.Base.Essentials (5.3.8)
57+
Aardvark.Base (5.3.8)
5858
System.Collections.Immutable (>= 8.0)
59-
Aardvark.Base.Fonts (5.3.5)
60-
Aardvark.Base.FSharp (5.3.5)
59+
Aardvark.Base.Fonts (5.3.8)
60+
Aardvark.Base.FSharp (5.3.8)
6161
FSharp.Core (>= 8.0)
6262
FuzzySharp (>= 2.0.2 < 2.1)
6363
Unofficial.LibTessDotNet (>= 2.0.2 < 2.1)
6464
Unofficial.Typography (>= 0.1 < 0.2)
65-
Aardvark.Base.FSharp (5.3.5)
66-
Aardvark.Base (5.3.5)
65+
Aardvark.Base.FSharp (5.3.8)
66+
Aardvark.Base (5.3.8)
6767
Aardvark.Base.TypeProviders (>= 4.5.15 < 4.6)
6868
FSharp.Core (>= 8.0)
6969
FSharp.Data.Adaptive (>= 1.2 < 1.3)
7070
FsPickler (>= 5.3.2 < 5.4)
7171
System.Dynamic.Runtime (>= 4.3 < 4.4)
72-
Aardvark.Base.Incremental (5.3.5)
73-
Aardvark.Base (5.3.5)
74-
Aardvark.Base.FSharp (5.3.5)
72+
Aardvark.Base.Incremental (5.3.8)
73+
Aardvark.Base (5.3.8)
74+
Aardvark.Base.FSharp (5.3.8)
7575
Aardvark.Base.TypeProviders (>= 4.5.15 < 4.6)
7676
FSharp.Core (>= 8.0)
7777
FSharp.Data.Adaptive (>= 1.2 < 1.3)
7878
FsPickler (>= 5.3.2 < 5.4)
79-
Aardvark.Base.Telemetry (5.3.5)
80-
Aardvark.Base.Tensors (5.3.5)
81-
Aardvark.Base (5.3.5)
82-
Aardvark.Base.FSharp (5.3.5)
79+
Aardvark.Base.Telemetry (5.3.8)
80+
Aardvark.Base.Tensors (5.3.8)
81+
Aardvark.Base (5.3.8)
82+
Aardvark.Base.FSharp (5.3.8)
8383
FSharp.Core (>= 8.0)
8484
Aardvark.Base.TypeProviders (4.5.15)
8585
FSharp.Core (>= 4.2.3)
8686
Aardvark.Build (2.0.3)
8787
Aardvark.FontProvider (0.1)
8888
Aardvark.Base.Fonts (>= 5.3)
8989
FSharp.Core (>= 8.0.100)
90-
Aardvark.Geometry (5.3.5)
91-
Aardvark.Base (5.3.5)
92-
Aardvark.Base.FSharp (5.3.5)
93-
Aardvark.Base.Tensors (5.3.5)
90+
Aardvark.Geometry (5.3.8)
91+
Aardvark.Base (5.3.8)
92+
Aardvark.Base.FSharp (5.3.8)
93+
Aardvark.Base.Tensors (5.3.8)
9494
Aardvark.Base.TypeProviders (>= 4.5.15 < 4.6)
9595
FSharp.Core (>= 8.0)
9696
FSharp.Data.Adaptive (>= 1.2 < 1.3)
9797
FsPickler (>= 5.3.2 < 5.4)
9898
Unofficial.LibTessDotNet (>= 2.0.2 < 2.1)
99-
Aardvark.Rendering (5.5.2)
100-
Aardvark.Base.Essentials (>= 5.3.5 < 5.4)
101-
Aardvark.Base.Incremental (>= 5.3.5 < 5.4)
102-
Aardvark.Base.Tensors (>= 5.3.5 < 5.4)
103-
Aardvark.Rendering.Common (5.5.2)
99+
Aardvark.Rendering (5.5.15)
100+
Aardvark.Base.Essentials (>= 5.3.6 < 5.4)
101+
Aardvark.Base.Incremental (>= 5.3.6 < 5.4)
102+
Aardvark.Base.Tensors (>= 5.3.6 < 5.4)
103+
Aardvark.Rendering.Common (5.5.15)
104104
FShade.Core (>= 5.6 < 5.7)
105105
FShade.GLSL (>= 5.6)
106106
FSharp.Core (>= 8.0)
107-
FSharp.Data.Adaptive (>= 1.2.13 < 1.3)
108-
Aardvark.Rendering.Common (5.5.2)
109-
Aardvark.Base (>= 5.3.5)
107+
FSharp.Data.Adaptive (>= 1.2.19 < 1.3)
108+
Aardvark.Rendering.Common (5.5.15)
109+
Aardvark.Base (>= 5.3.6)
110110
FSharp.Core (>= 8.0)
111111
System.Reflection.Emit.Lightweight (>= 4.7)
112-
Aardvark.Rendering.GL (5.5.2)
112+
Aardvark.Rendering.GL (5.5.15)
113113
Aardvark.Assembler (>= 0.1 < 0.2)
114-
Aardvark.Base.Essentials (>= 5.3.5 < 5.4)
115-
Aardvark.Base.Incremental (>= 5.3.5 < 5.4)
116-
Aardvark.Base.Tensors (>= 5.3.5 < 5.4)
117-
Aardvark.Geometry (>= 5.3.5 < 5.4)
118-
Aardvark.Rendering (5.5.2)
114+
Aardvark.Base.Essentials (>= 5.3.6 < 5.4)
115+
Aardvark.Base.Incremental (>= 5.3.6 < 5.4)
116+
Aardvark.Base.Tensors (>= 5.3.6 < 5.4)
117+
Aardvark.Geometry (>= 5.3.6 < 5.4)
118+
Aardvark.Rendering (5.5.15)
119119
FShade (>= 5.6 < 5.7)
120120
FSharp.Core (>= 8.0)
121121
Unofficial.OpenTK (>= 3.0.21 < 3.1)
122-
Aardvark.Rendering.Text (5.5.2)
122+
Aardvark.Rendering.Text (5.5.15)
123123
Aardvark.FontProvider (>= 0.1 < 0.2)
124-
Aardvark.Rendering (5.5.2)
125-
Aardvark.SceneGraph (5.5.2)
124+
Aardvark.Rendering (5.5.15)
125+
Aardvark.SceneGraph (5.5.15)
126126
CommonMark.NET (>= 0.15.1 < 0.16)
127127
FSharp.Core (>= 8.0)
128-
Aardvark.Rendering.Vulkan (5.5.2)
129-
Aardvark.Base.FSharp (>= 5.3.5 < 5.4)
130-
Aardvark.Base.Incremental (>= 5.3.5 < 5.4)
131-
Aardvark.Base.Tensors (>= 5.3.5 < 5.4)
132-
Aardvark.Rendering (5.5.2)
128+
Aardvark.Rendering.Vulkan (5.5.15)
129+
Aardvark.Base.FSharp (>= 5.3.6 < 5.4)
130+
Aardvark.Base.Incremental (>= 5.3.6 < 5.4)
131+
Aardvark.Base.Tensors (>= 5.3.6 < 5.4)
132+
Aardvark.Rendering (5.5.15)
133133
FShade (>= 5.6 < 5.7)
134134
FSharp.Core (>= 8.0)
135135
GLSLangSharp (>= 0.4.14 < 0.5)
136-
Aardvark.SceneGraph (5.5.2)
137-
Aardvark.Base.Incremental (>= 5.3.5 < 5.4)
138-
Aardvark.Rendering (5.5.2)
136+
Aardvark.SceneGraph (5.5.15)
137+
Aardvark.Base.Incremental (>= 5.3.6 < 5.4)
138+
Aardvark.Rendering (5.5.15)
139139
FShade.Core (>= 5.6 < 5.7)
140140
FShade.GLSL (>= 5.6)
141141
FSharp.Core (>= 8.0)
142-
Adaptify.Core (1.3.4)
143-
FSharp.Data.Adaptive (>= 1.2.14 < 1.3)
144-
Adaptify.MSBuild (1.3.4)
145-
Adaptify.Core (1.3.4)
142+
Adaptify.Core (1.3.5)
143+
FSharp.Core (>= 6.0)
144+
FSharp.Data.Adaptive (>= 1.2.18 < 1.3)
145+
Adaptify.MSBuild (1.3.5)
146+
Adaptify.Core (1.3.5)
146147
CommonMark.NET (0.15.1)
147148
FShade (5.6)
148149
FShade.Core (5.6)
@@ -172,7 +173,7 @@ NUGET
172173
FShade.Imperative (5.6)
173174
FSharp.Core (>= 8.0)
174175
FSharp.Core (8.0.100)
175-
FSharp.Data.Adaptive (1.2.15)
176+
FSharp.Data.Adaptive (1.2.20)
176177
FSharp.Core (>= 4.7)
177178
System.Reflection.Emit.Lightweight (>= 4.6)
178179
FSharp.SystemTextJson (1.3.13)

‎src/Aardvark.Dom.Utilities/OrbitController/OrbitState.g.fs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
//23ab9d32-1f9c-2ae0-3bbd-78730d28d2fc
2-
//f8c4462a-042c-2ef1-d791-98747fca12f7
2+
//a7847903-a973-1463-d1e9-349d77f8a8c9
33
#nowarn "49" // upper case patterns
44
#nowarn "66" // upcast is unncecessary
55
#nowarn "1337" // internal types
@@ -12,8 +12,8 @@ open Adaptify
1212
open Aardvark.Dom.Utilities.OrbitController
1313
[<System.Diagnostics.CodeAnalysis.SuppressMessage("NameConventions", "*")>]
1414
type AdaptiveOrbitState(value : OrbitState) =
15-
let mutable _animationRunning_ = FSharp.Data.Adaptive.cval(value.animationRunning)
1615
let mutable _super_ = FSharp.Data.Adaptive.cval(value.super)
16+
let mutable _animationRunning_ = FSharp.Data.Adaptive.cval(value.animationRunning)
1717
let _sky_ = FSharp.Data.Adaptive.cval(value.sky)
1818
let _center_ = FSharp.Data.Adaptive.cval(value.center)
1919
let _phi_ = FSharp.Data.Adaptive.cval(value.phi)
@@ -46,8 +46,8 @@ type AdaptiveOrbitState(value : OrbitState) =
4646
if Microsoft.FSharp.Core.Operators.not((FSharp.Data.Adaptive.ShallowEqualityComparer<OrbitState>.ShallowEquals(value, __value))) then
4747
__value <- value
4848
__adaptive.MarkOutdated()
49-
_animationRunning_.Value <- value.animationRunning
5049
_super_.Value <- value.super
50+
_animationRunning_.Value <- value.animationRunning
5151
_sky_.Value <- value.sky
5252
_center_.Value <- value.center
5353
_phi_.Value <- value.phi
@@ -73,8 +73,8 @@ type AdaptiveOrbitState(value : OrbitState) =
7373
_speed_.Value <- value.speed
7474
_pick_.Value <- value.pick
7575
member __.Current = __adaptive
76-
member __.animationRunning = _animationRunning_ :> FSharp.Data.Adaptive.aval<Microsoft.FSharp.Core.bool>
7776
member __.super = _super_ :> FSharp.Data.Adaptive.aval<Microsoft.FSharp.Core.int>
77+
member __.animationRunning = _animationRunning_ :> FSharp.Data.Adaptive.aval<Microsoft.FSharp.Core.bool>
7878
member __.sky = _sky_ :> FSharp.Data.Adaptive.aval<Aardvark.Base.V3d>
7979
member __.center = _center_ :> FSharp.Data.Adaptive.aval<Aardvark.Base.V3d>
8080
member __.phi = _phi_ :> FSharp.Data.Adaptive.aval<Microsoft.FSharp.Core.float>

‎src/Aardvark.Dom/SceneGraph/SceneHandler.fs‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -832,8 +832,29 @@ type SceneHandler(signature : IFramebufferSignature, trigger : RenderControlEven
832832
let newEffect = FShade.Effect("fpick_" + eff.Id, newShaders, [])
833833

834834
let r = RenderObject.Clone o
835+
836+
let newBlendState =
837+
let newModes =
838+
o.BlendState.AttachmentMode |> AVal.map (fun map ->
839+
Map.add pickBuffer BlendMode.None map
840+
)
841+
let newWrites =
842+
o.BlendState.AttachmentWriteMask |> AVal.map (fun map ->
843+
Map.add pickBuffer ColorMask.All map
844+
)
845+
846+
{
847+
Mode = o.BlendState.Mode
848+
AttachmentMode = newModes
849+
AttachmentWriteMask = newWrites
850+
ConstantColor = o.BlendState.ConstantColor
851+
ColorWriteMask = o.BlendState.ColorWriteMask
852+
}
853+
854+
835855
r.Uniforms <- UniformProvider.union o.Uniforms (UniformProvider.ofList ["PickId", AVal.constant pickId :> IAdaptiveValue])
836856
r.Surface <- Surface.Effect newEffect
857+
r.BlendState <- newBlendState
837858
r :> IRenderObject, true
838859
| s ->
839860
Log.warn "cannot change surface: %A" s

‎src/Demo/Program.fs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -428,6 +428,7 @@ let testApp (_runtime : IRuntime) =
428428
Shader.withViewPos
429429
}
430430
Translate(0.5, 0.0, 0.0)
431+
Sg.BlendMode BlendMode.Blend
431432
Primitives.Teapot(C4b.Green)
432433
}
433434

0 commit comments

Comments
 (0)