Skip to content

Commit 22df667

Browse files
hyazinthhhyazinthh
committed
Update to Aardvark.Rendering 5.6.0-prerelease0002
1 parent 75faffd commit 22df667

File tree

3 files changed

+77
-76
lines changed

3 files changed

+77
-76
lines changed

‎paket.dependencies‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@ nuget FSharp.Core >= 8.0.0 low
99
nuget System.Text.Json >= 8.0.5 lowest_matching: true
1010
nuget Microsoft.NETFramework.ReferenceAssemblies >= 1.0.0 lowest_matching: true
1111

12-
nuget Aardvark.Rendering ~> 5.6.0-prerelease0001
13-
nuget Aardvark.Application.WinForms.GL ~> 5.6.0-prerelease0001
14-
nuget Aardvark.Application.Slim.GL ~> 5.6.0-prerelease0001
15-
nuget Aardvark.SceneGraph ~> 5.6.0-prerelease0001
16-
nuget Aardvark.SceneGraph.Assimp ~> 5.6.0-prerelease0001
17-
nuget Aardvark.Rendering.Text ~> 5.6.0-prerelease0001
18-
nuget Aardvark.Rendering.Vulkan ~> 5.6.0-prerelease0001
19-
nuget Aardvark.GPGPU ~> 5.6.0-prerelease0001
12+
nuget Aardvark.Rendering ~> 5.6.0-prerelease0002
13+
nuget Aardvark.Application.WinForms.GL ~> 5.6.0-prerelease0002
14+
nuget Aardvark.Application.Slim.GL ~> 5.6.0-prerelease0002
15+
nuget Aardvark.SceneGraph ~> 5.6.0-prerelease0002
16+
nuget Aardvark.SceneGraph.Assimp ~> 5.6.0-prerelease0002
17+
nuget Aardvark.Rendering.Text ~> 5.6.0-prerelease0002
18+
nuget Aardvark.Rendering.Vulkan ~> 5.6.0-prerelease0002
19+
nuget Aardvark.GPGPU ~> 5.6.0-prerelease0002
2020

2121
nuget Adaptify.Core ~> 1.3.5
2222
nuget Adaptify.MSBuild ~> 1.3.5

‎paket.lock‎

Lines changed: 64 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -6,50 +6,50 @@ NUGET
66
Aardvark.Base (>= 5.3 < 5.4)
77
FSharp.Core (>= 8.0)
88
FSys (>= 0.0.1 < 0.1)
9-
Aardvark.Application (5.6.0-prerelease0001)
9+
Aardvark.Application (5.6.0-prerelease0002)
1010
Aardvark.Base.Essentials (>= 5.3.6 < 5.4)
1111
Aardvark.Base.Incremental (>= 5.3.6 < 5.4)
12-
Aardvark.Rendering (5.6.0-prerelease0001)
12+
Aardvark.Rendering (5.6.0-prerelease0002)
1313
FShade.Core (>= 5.6 < 5.7)
1414
FShade.GLSL (>= 5.6)
1515
FSharp.Core (>= 8.0)
16-
Aardvark.Application.Slim (5.6.0-prerelease0001)
17-
Aardvark.Application (5.6.0-prerelease0001)
16+
Aardvark.Application.Slim (5.6.0-prerelease0002)
17+
Aardvark.Application (5.6.0-prerelease0002)
1818
Aardvark.Base.Essentials (>= 5.3.6 < 5.4)
1919
Aardvark.Base.Incremental (>= 5.3.6 < 5.4)
20-
Aardvark.Rendering (5.6.0-prerelease0001)
20+
Aardvark.Rendering (5.6.0-prerelease0002)
2121
FShade (>= 5.6 < 5.7)
2222
FSharp.Core (>= 8.0)
2323
Silk.NET.GLFW (2.15)
2424
Unofficial.OpenTK (>= 3.0.21 < 3.1)
25-
Aardvark.Application.Slim.GL (5.6.0-prerelease0001)
26-
Aardvark.Application (5.6.0-prerelease0001)
27-
Aardvark.Application.Slim (5.6.0-prerelease0001)
25+
Aardvark.Application.Slim.GL (5.6.0-prerelease0002)
26+
Aardvark.Application (5.6.0-prerelease0002)
27+
Aardvark.Application.Slim (5.6.0-prerelease0002)
2828
Aardvark.Base.Essentials (>= 5.3.6 < 5.4)
2929
Aardvark.Base.Incremental (>= 5.3.6 < 5.4)
3030
Aardvark.Base.Tensors (>= 5.3.6 < 5.4)
31-
Aardvark.Rendering (5.6.0-prerelease0001)
32-
Aardvark.Rendering.GL (5.6.0-prerelease0001)
31+
Aardvark.Rendering (5.6.0-prerelease0002)
32+
Aardvark.Rendering.GL (5.6.0-prerelease0002)
3333
FShade (>= 5.6 < 5.7)
3434
FSharp.Core (>= 8.0)
3535
Silk.NET.Core (2.15)
3636
Silk.NET.GLFW (2.15)
3737
Unofficial.OpenTK (>= 3.0.21 < 3.1)
38-
Aardvark.Application.WinForms (5.6.0-prerelease0001)
39-
Aardvark.Application (5.6.0-prerelease0001)
38+
Aardvark.Application.WinForms (5.6.0-prerelease0002)
39+
Aardvark.Application (5.6.0-prerelease0002)
4040
Aardvark.Base.Essentials (>= 5.3.6 < 5.4)
4141
Aardvark.Base.Incremental (>= 5.3.6 < 5.4)
42-
Aardvark.Rendering (5.6.0-prerelease0001)
42+
Aardvark.Rendering (5.6.0-prerelease0002)
4343
FShade.Core (>= 5.6 < 5.7)
4444
FShade.GLSL (>= 5.6)
4545
FSharp.Core (>= 8.0)
46-
Aardvark.Application.WinForms.GL (5.6.0-prerelease0001)
47-
Aardvark.Application (5.6.0-prerelease0001)
48-
Aardvark.Application.WinForms (5.6.0-prerelease0001)
46+
Aardvark.Application.WinForms.GL (5.6.0-prerelease0002)
47+
Aardvark.Application (5.6.0-prerelease0002)
48+
Aardvark.Application.WinForms (5.6.0-prerelease0002)
4949
Aardvark.Base.Essentials (>= 5.3.6 < 5.4)
5050
Aardvark.Base.Incremental (>= 5.3.6 < 5.4)
51-
Aardvark.Rendering (5.6.0-prerelease0001)
52-
Aardvark.Rendering.GL (5.6.0-prerelease0001)
51+
Aardvark.Rendering (5.6.0-prerelease0002)
52+
Aardvark.Rendering.GL (5.6.0-prerelease0002)
5353
FShade.Core (>= 5.6 < 5.7)
5454
FShade.GLSL (>= 5.6)
5555
FSharp.Core (>= 8.0)
@@ -59,48 +59,53 @@ NUGET
5959
Aardvark.Base.FSharp (>= 5.3)
6060
FSharp.Core (>= 8.0)
6161
FSharp.Data.Adaptive (>= 1.2.13 < 1.3)
62-
Aardvark.Base (5.3.6)
63-
Aardvark.Base.Telemetry (5.3.6)
62+
Aardvark.Base (5.3.8)
63+
Aardvark.Base.Telemetry (5.3.8)
6464
SingleFileExtractor.Core (>= 2.2.1 < 2.3)
6565
System.Collections.Immutable (>= 8.0)
6666
System.Reflection.Metadata (>= 8.0)
6767
System.Text.Json (>= 8.0.5)
68-
Aardvark.Base.Essentials (5.3.6)
69-
Aardvark.Base (5.3.6)
68+
Aardvark.Base.Essentials (5.3.8)
69+
Aardvark.Base (5.3.8)
7070
System.Collections.Immutable (>= 8.0)
71-
Aardvark.Base.Fonts (5.3.6)
72-
Aardvark.Base.FSharp (5.3.6)
71+
Aardvark.Base.Fonts (5.3.8)
72+
Aardvark.Base.FSharp (5.3.8)
7373
FSharp.Core (>= 8.0)
7474
FuzzySharp (>= 2.0.2 < 2.1)
7575
Unofficial.LibTessDotNet (>= 2.0.2 < 2.1)
7676
Unofficial.Typography (>= 0.1 < 0.2)
77-
Aardvark.Base.FSharp (5.3.6)
78-
Aardvark.Base (5.3.6)
77+
Aardvark.Base.FSharp (5.3.8)
78+
Aardvark.Base (5.3.8)
7979
Aardvark.Base.TypeProviders (>= 4.5.15 < 4.6)
8080
FSharp.Core (>= 8.0)
8181
FSharp.Data.Adaptive (>= 1.2 < 1.3)
8282
FsPickler (>= 5.3.2 < 5.4)
8383
System.Dynamic.Runtime (>= 4.3 < 4.4)
84-
Aardvark.Base.Incremental (5.3.6)
85-
Aardvark.Base (5.3.6)
86-
Aardvark.Base.FSharp (5.3.6)
84+
Aardvark.Base.Incremental (5.3.8)
85+
Aardvark.Base (5.3.8)
86+
Aardvark.Base.FSharp (5.3.8)
8787
Aardvark.Base.TypeProviders (>= 4.5.15 < 4.6)
8888
FSharp.Core (>= 8.0)
8989
FSharp.Data.Adaptive (>= 1.2 < 1.3)
9090
FsPickler (>= 5.3.2 < 5.4)
91-
Aardvark.Base.IO (5.3.6)
92-
Aardvark.Base (5.3.6)
93-
Aardvark.Base.Tensors (5.3.6)
91+
Aardvark.Base.IO (5.3.8)
92+
Aardvark.Base (5.3.8)
93+
Aardvark.Base.Tensors (5.3.8)
9494
System.Dynamic.Runtime (>= 4.3 < 4.4)
95-
Aardvark.Base.Telemetry (5.3.6)
96-
Aardvark.Base.Tensors (5.3.6)
97-
Aardvark.Base (5.3.6)
98-
Aardvark.Base.FSharp (5.3.6)
95+
Aardvark.Base.Telemetry (5.3.8)
96+
Aardvark.Base.Tensors (5.3.8)
97+
Aardvark.Base (5.3.8)
98+
Aardvark.Base.FSharp (5.3.8)
9999
FSharp.Core (>= 8.0)
100100
Aardvark.Base.TypeProviders (4.5.15)
101101
FSharp.Core (>= 3.1.2.5) - restriction: || (== net471) (&& (== net8.0) (>= net45)) (&& (== net8.0-windows10.0.17763.0) (>= net45)) (&& (== netstandard2.0) (>= net45))
102102
FSharp.Core (>= 4.2.3) - restriction: || (&& (== net471) (< net45)) (== net8.0) (== net8.0-windows10.0.17763.0) (== netstandard2.0)
103103
Aardvark.Build (2.0.3)
104+
Aardvark.Data.Assimp (1.0.1)
105+
Aardvark.Base (>= 5.3 < 5.4)
106+
System.Memory (>= 4.5.5)
107+
System.Numerics.Vectors (>= 4.5)
108+
System.Runtime.CompilerServices.Unsafe (>= 6.0)
104109
Aardvark.Data.Opc (0.11)
105110
Aardvark.Base.Tensors (>= 5.3.4 < 5.4)
106111
Aardvark.Rendering.Common (>= 5.5)
@@ -109,72 +114,72 @@ NUGET
109114
Aardvark.FontProvider (0.1)
110115
Aardvark.Base.Fonts (>= 5.3)
111116
FSharp.Core (>= 8.0.100)
112-
Aardvark.Geometry (5.3.6)
113-
Aardvark.Base (5.3.6)
114-
Aardvark.Base.FSharp (5.3.6)
115-
Aardvark.Base.Tensors (5.3.6)
117+
Aardvark.Geometry (5.3.8)
118+
Aardvark.Base (5.3.8)
119+
Aardvark.Base.FSharp (5.3.8)
120+
Aardvark.Base.Tensors (5.3.8)
116121
Aardvark.Base.TypeProviders (>= 4.5.15 < 4.6)
117122
FSharp.Core (>= 8.0)
118123
FSharp.Data.Adaptive (>= 1.2 < 1.3)
119124
FsPickler (>= 5.3.2 < 5.4)
120125
Unofficial.LibTessDotNet (>= 2.0.2 < 2.1)
121126
Aardvark.Geometry.Intersection (5.5.4)
122127
Aardvark.Base.IO (>= 5.3.5 < 5.4)
123-
Aardvark.GPGPU (5.6.0-prerelease0001)
128+
Aardvark.GPGPU (5.6.0-prerelease0002)
124129
Aardvark.Base.Incremental (>= 5.3.6 < 5.4)
125-
Aardvark.Rendering (5.6.0-prerelease0001)
130+
Aardvark.Rendering (5.6.0-prerelease0002)
126131
FShade.Core (>= 5.6 < 5.7)
127132
FShade.GLSL (>= 5.6)
128133
FSharp.Core (>= 8.0)
129-
Aardvark.Rendering (5.6.0-prerelease0001)
134+
Aardvark.Rendering (5.6.0-prerelease0002)
130135
Aardvark.Base.Essentials (>= 5.3.6 < 5.4)
131136
Aardvark.Base.Incremental (>= 5.3.6 < 5.4)
132137
Aardvark.Base.Tensors (>= 5.3.6 < 5.4)
133-
Aardvark.Rendering.Common (5.6.0-prerelease0001)
138+
Aardvark.Rendering.Common (5.6.0-prerelease0002)
134139
FShade.Core (>= 5.6 < 5.7)
135140
FShade.GLSL (>= 5.6)
136141
FSharp.Core (>= 8.0)
137142
FSharp.Data.Adaptive (>= 1.2.19 < 1.3)
138-
Aardvark.Rendering.Common (5.6.0-prerelease0001)
139-
Aardvark.Base (>= 5.3.6)
143+
Aardvark.Rendering.Common (5.6.0-prerelease0002)
144+
Aardvark.Base (>= 5.3.8)
140145
FSharp.Core (>= 8.0)
141146
System.Reflection.Emit.Lightweight (>= 4.7)
142-
Aardvark.Rendering.GL (5.6.0-prerelease0001)
147+
Aardvark.Rendering.GL (5.6.0-prerelease0002)
143148
Aardvark.Assembler (>= 0.1 < 0.2)
144149
Aardvark.Base.Essentials (>= 5.3.6 < 5.4)
145150
Aardvark.Base.Incremental (>= 5.3.6 < 5.4)
146151
Aardvark.Base.Tensors (>= 5.3.6 < 5.4)
147152
Aardvark.Geometry (>= 5.3.6 < 5.4)
148-
Aardvark.Rendering (5.6.0-prerelease0001)
153+
Aardvark.Rendering (5.6.0-prerelease0002)
149154
FShade (>= 5.6 < 5.7)
150155
FSharp.Core (>= 8.0)
151156
Unofficial.OpenTK (>= 3.0.21 < 3.1)
152-
Aardvark.Rendering.Text (5.6.0-prerelease0001)
157+
Aardvark.Rendering.Text (5.6.0-prerelease0002)
153158
Aardvark.FontProvider (>= 0.1 < 0.2)
154-
Aardvark.Rendering (5.6.0-prerelease0001)
155-
Aardvark.SceneGraph (5.6.0-prerelease0001)
159+
Aardvark.Rendering (5.6.0-prerelease0002)
160+
Aardvark.SceneGraph (5.6.0-prerelease0002)
156161
CommonMark.NET (>= 0.15.1 < 0.16)
157162
FSharp.Core (>= 8.0)
158-
Aardvark.Rendering.Vulkan (5.6.0-prerelease0001)
163+
Aardvark.Rendering.Vulkan (5.6.0-prerelease0002)
159164
Aardvark.Base.FSharp (>= 5.3.6 < 5.4)
160165
Aardvark.Base.Incremental (>= 5.3.6 < 5.4)
161166
Aardvark.Base.Tensors (>= 5.3.6 < 5.4)
162-
Aardvark.Rendering (5.6.0-prerelease0001)
167+
Aardvark.Rendering (5.6.0-prerelease0002)
163168
FShade (>= 5.6 < 5.7)
164169
FSharp.Core (>= 8.0)
165170
GLSLangSharp (>= 0.4.14 < 0.5)
166-
Aardvark.SceneGraph (5.6.0-prerelease0001)
171+
Aardvark.SceneGraph (5.6.0-prerelease0002)
167172
Aardvark.Base.Incremental (>= 5.3.6 < 5.4)
168-
Aardvark.Rendering (5.6.0-prerelease0001)
173+
Aardvark.Rendering (5.6.0-prerelease0002)
169174
FShade.Core (>= 5.6 < 5.7)
170175
FShade.GLSL (>= 5.6)
171176
FSharp.Core (>= 8.0)
172-
Aardvark.SceneGraph.Assimp (5.6.0-prerelease0001)
177+
Aardvark.SceneGraph.Assimp (5.6.0-prerelease0002)
173178
Aardvark.Base.Incremental (>= 5.3.6 < 5.4)
174179
Aardvark.Base.Tensors (>= 5.3.6 < 5.4)
175-
Aardvark.Rendering (5.6.0-prerelease0001)
176-
Aardvark.SceneGraph (5.6.0-prerelease0001)
177-
AssimpNet (>= 5.0.0-beta1 < 5.1.0-beta)
180+
Aardvark.Data.Assimp (>= 1.0.1 < 1.1)
181+
Aardvark.Rendering (5.6.0-prerelease0002)
182+
Aardvark.SceneGraph (5.6.0-prerelease0002)
178183
FShade.Core (>= 5.6 < 5.7)
179184
FShade.GLSL (>= 5.6)
180185
FSharp.Core (>= 8.0)
@@ -193,8 +198,6 @@ NUGET
193198
SharpZipLib (>= 1.4.2 < 1.5)
194199
Another.Unofficial.Xilium.CefGlue.WindowsForms (0.4)
195200
Another.Unofficial.Xilium.CefGlue (0.4)
196-
AssimpNet (5.0.0-beta1)
197-
NETStandard.Library (>= 1.6.1) - restriction: || (&& (== net471) (< net35)) (== net8.0) (== net8.0-windows10.0.17763.0) (== netstandard2.0)
198201
BenchmarkDotNet (0.14)
199202
BenchmarkDotNet.Annotations (>= 0.14)
200203
CommandLineParser (>= 2.9.1)
@@ -455,8 +458,6 @@ NUGET
455458
System.Security.AccessControl (>= 5.0)
456459
System.Security.Principal.Windows (>= 5.0)
457460
Mono.Cecil (0.11.6) - restriction: || (&& (== net471) (>= net6.0)) (== net8.0) (== net8.0-windows10.0.17763.0) (&& (== netstandard2.0) (>= net6.0))
458-
NETStandard.Library (2.0.3) - restriction: || (&& (== net471) (< net35)) (== net8.0) (== net8.0-windows10.0.17763.0) (== netstandard2.0)
459-
Microsoft.NETCore.Platforms (>= 1.1)
460461
Newtonsoft.Json (13.0.3)
461462
Perfolizer (0.3.17)
462463
System.Memory (>= 4.5.5) - restriction: || (== net471) (&& (== net8.0) (< netstandard2.1)) (&& (== net8.0-windows10.0.17763.0) (< netstandard2.1)) (== netstandard2.0)

‎src/Aardvark.UI/Sg.fs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -312,7 +312,7 @@ module ``F# Sg`` =
312312
let adapter (o : obj) =
313313
Sg.adapter o |> box
314314

315-
/// Applies the given activation function to the the given scene graph.
315+
/// Applies the given activation function to the given scene graph.
316316
/// An activation function is invoked when the render objects of the scene graph are prepared.
317317
/// The resulting IDisposable is disposed when the render objects are disposed.
318318
let onActivation (f : unit -> IDisposable) (sg : ISg<'msg>) =
@@ -422,12 +422,12 @@ module ``F# Sg`` =
422422

423423
/// Sets the sampler state for the texture slot with the given name.
424424
/// The name can be a string, Symbol, or TypedSymbol<ITexture>.
425-
let inline samplerState (name : ^Name) (state : aval<SamplerState option>) (sg : ISg<'msg>) =
425+
let inline samplerState (name : ^Name) (state : aval<SamplerState>) (sg : ISg<'msg>) =
426426
sg |> unboxed (Sg.samplerState name state)
427427

428428
/// Sets the sampler state for the texture slot with the given name.
429429
/// The name can be a string, Symbol, or TypedSymbol<ITexture>.
430-
let inline samplerState' (name : ^Name) (state : Option<SamplerState>) (sg : ISg<'msg>) =
430+
let inline samplerState' (name : ^Name) (state : SamplerState) (sg : ISg<'msg>) =
431431
sg |> unboxed (Sg.samplerState' name state)
432432

433433

@@ -861,13 +861,13 @@ module ``F# Sg`` =
861861
let inline instanceArray (name : ^Name) (value : System.Array) (sg : ISg<'msg>) =
862862
sg |> unboxed (Sg.instanceArray name value)
863863

864-
/// Provides a instance attribute with the given name by supplying a single value.
864+
/// Provides an instance attribute with the given name by supplying a single value.
865865
/// The name can be a string, Symbol, or TypedSymbol.
866866
/// The value has to be compatible with V4f.
867867
let inline instanceBufferValue (name : ^Name) (value : aval< ^Value>) (sg : ISg<'msg>) =
868868
sg |> unboxed (Sg.instanceBufferValue name value)
869869

870-
/// Provides a instance attribute with the given name by supplying a single value.
870+
/// Provides an instance attribute with the given name by supplying a single value.
871871
/// The name can be a string, Symbol, or TypedSymbol.
872872
/// The value has to be compatible with V4f.
873873
let inline instanceBufferValue' (name : ^Name) (value : ^Value) (sg : ISg<'msg>) =

0 commit comments

Comments
 (0)