From 10a9be21450c067fbc19fa1cb46bcfe1502db368 Mon Sep 17 00:00:00 2001 From: Christian Luksch Date: Wed, 31 May 2023 01:57:12 +0200 Subject: [PATCH] updated to aardvark rendering 5.4 --- RELEASE_NOTES.md | 3 + paket.dependencies | 4 +- paket.lock | 326 ++++++++++++++++++++++----------------------- 3 files changed, 168 insertions(+), 165 deletions(-) diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index e2d838e..50539c0 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -1,2 +1,5 @@ +### 0.0.1-prerelease0002 +* updated to Aardvark.Rendering 5.4 + ### 0.0.1-prerelease0001 * initial version \ No newline at end of file diff --git a/paket.dependencies b/paket.dependencies index 7a31150..d07f72b 100644 --- a/paket.dependencies +++ b/paket.dependencies @@ -11,8 +11,8 @@ nuget Aardvark.Base ~> 5.2.18 nuget Aardvark.Base.FSharp ~> 5.2.18 nuget Aardvark.Base.Tensors ~> 5.2.18 -nuget Aardvark.Rendering ~> 5.3.3 -nuget Aardvark.Application.Utilities ~> 5.3.3 +nuget Aardvark.Rendering ~> 5.4.0 +nuget Aardvark.Application.Utilities ~> 5.4.0 nuget glTF2Loader ~> 1.1.4-alpha diff --git a/paket.lock b/paket.lock index 6beca8a..c45af43 100644 --- a/paket.lock +++ b/paket.lock @@ -2,207 +2,207 @@ STORAGE: NONE RESTRICTION: || (== net6.0) (== netstandard2.0) NUGET remote: https://api.nuget.org/v3/index.json - Aardvark.Application (5.3.3) - Aardvark.Base.Essentials (>= 5.2.15 < 5.3) - Aardvark.Base.Incremental (>= 5.2.15 < 5.3) - Aardvark.Rendering (5.3.3) - FShade.Core (>= 5.3.3 < 5.4) - FShade.GLSL (>= 5.3.3) + Aardvark.Application (5.4) + Aardvark.Base.Essentials (>= 5.2.23 < 5.3) + Aardvark.Base.Incremental (>= 5.2.23 < 5.3) + Aardvark.Rendering (5.4) + FShade.Core (>= 5.4 < 5.5) + FShade.GLSL (>= 5.4) FSharp.Core (>= 5.0.1) - Aardvark.Application.OpenVR (5.3.3) - Aardvark.Application (5.3.3) - Aardvark.Base.Essentials (>= 5.2.15 < 5.3) - Aardvark.Base.Incremental (>= 5.2.15 < 5.3) - Aardvark.Base.Tensors (>= 5.2.15 < 5.3) - Aardvark.Rendering (5.3.3) - Aardvark.Rendering.Text (5.3.3) - Aardvark.SceneGraph (5.3.3) - FShade.Core (>= 5.3.3 < 5.4) - FShade.GLSL (>= 5.3.3) + Aardvark.Application.OpenVR (5.4) + Aardvark.Application (5.4) + Aardvark.Base.Essentials (>= 5.2.23 < 5.3) + Aardvark.Base.Incremental (>= 5.2.23 < 5.3) + Aardvark.Base.Tensors (>= 5.2.23 < 5.3) + Aardvark.Rendering (5.4) + Aardvark.Rendering.Text (5.4) + Aardvark.SceneGraph (5.4) + FShade.Core (>= 5.4 < 5.5) + FShade.GLSL (>= 5.4) FSharp.Core (>= 5.0.1) Unofficial.OpenVR (>= 1.1 < 1.2) - Aardvark.Application.OpenVR.GL (5.3.3) - Aardvark.Application (5.3.3) - Aardvark.Application.OpenVR (5.3.3) - Aardvark.Application.Slim (5.3.3) - Aardvark.Application.Slim.GL (5.3.3) - Aardvark.Base.Essentials (>= 5.2.15 < 5.3) - Aardvark.Base.Incremental (>= 5.2.15 < 5.3) - Aardvark.Base.Runtime (>= 5.2.15 < 5.3) - Aardvark.Rendering (5.3.3) - Aardvark.Rendering.GL (5.3.3) - Aardvark.SceneGraph (5.3.3) - FShade.Core (>= 5.3.3 < 5.4) - FShade.GLSL (>= 5.3.3) + Aardvark.Application.OpenVR.GL (5.4) + Aardvark.Application (5.4) + Aardvark.Application.OpenVR (5.4) + Aardvark.Application.Slim (5.4) + Aardvark.Application.Slim.GL (5.4) + Aardvark.Base.Essentials (>= 5.2.23 < 5.3) + Aardvark.Base.Incremental (>= 5.2.23 < 5.3) + Aardvark.Base.Runtime (>= 5.2.23 < 5.3) + Aardvark.Rendering (5.4) + Aardvark.Rendering.GL (5.4) + Aardvark.SceneGraph (5.4) + FShade.Core (>= 5.4 < 5.5) + FShade.GLSL (>= 5.4) FSharp.Core (>= 5.0.1) Unofficial.OpenTK (>= 3.0.21 < 3.1) Unofficial.OpenVR (>= 1.1 < 1.2) - Aardvark.Application.OpenVR.Vulkan (5.3.3) - Aardvark.Application (5.3.3) - Aardvark.Application.OpenVR (5.3.3) - Aardvark.Base.Essentials (>= 5.2.15 < 5.3) - Aardvark.Base.Incremental (>= 5.2.15 < 5.3) - Aardvark.Base.Runtime (>= 5.2.15 < 5.3) - Aardvark.Rendering (5.3.3) - Aardvark.Rendering.Vulkan (5.3.3) - Aardvark.SceneGraph (5.3.3) - FShade.Core (>= 5.3.3 < 5.4) - FShade.GLSL (>= 5.3.3) + Aardvark.Application.OpenVR.Vulkan (5.4) + Aardvark.Application (5.4) + Aardvark.Application.OpenVR (5.4) + Aardvark.Base.Essentials (>= 5.2.23 < 5.3) + Aardvark.Base.Incremental (>= 5.2.23 < 5.3) + Aardvark.Base.Runtime (>= 5.2.23 < 5.3) + Aardvark.Rendering (5.4) + Aardvark.Rendering.Vulkan (5.4) + Aardvark.SceneGraph (5.4) + FShade.Core (>= 5.4 < 5.5) + FShade.GLSL (>= 5.4) FSharp.Core (>= 5.0.1) Unofficial.OpenVR (>= 1.1 < 1.2) - Aardvark.Application.Slim (5.3.3) - Aardvark.Application (5.3.3) - Aardvark.Base.Essentials (>= 5.2.15 < 5.3) - Aardvark.Base.Incremental (>= 5.2.15 < 5.3) - Aardvark.Base.Runtime (>= 5.2.15 < 5.3) - Aardvark.Rendering (5.3.3) - FShade (>= 5.3.3 < 5.4) + Aardvark.Application.Slim (5.4) + Aardvark.Application (5.4) + Aardvark.Base.Essentials (>= 5.2.23 < 5.3) + Aardvark.Base.Incremental (>= 5.2.23 < 5.3) + Aardvark.Base.Runtime (>= 5.2.23 < 5.3) + Aardvark.Rendering (5.4) + FShade (>= 5.4 < 5.5) FSharp.Core (>= 5.0.1) Silk.NET.GLFW (2.15) Unofficial.OpenTK (>= 3.0.21 < 3.1) - Aardvark.Application.Slim.GL (5.3.3) - Aardvark.Application (5.3.3) - Aardvark.Application.Slim (5.3.3) - Aardvark.Base.Essentials (>= 5.2.15 < 5.3) - Aardvark.Base.Incremental (>= 5.2.15 < 5.3) - Aardvark.Base.Runtime (>= 5.2.15 < 5.3) - Aardvark.Base.Tensors (>= 5.2.15 < 5.3) - Aardvark.Rendering (5.3.3) - Aardvark.Rendering.GL (5.3.3) - FShade (>= 5.3.3 < 5.4) + Aardvark.Application.Slim.GL (5.4) + Aardvark.Application (5.4) + Aardvark.Application.Slim (5.4) + Aardvark.Base.Essentials (>= 5.2.23 < 5.3) + Aardvark.Base.Incremental (>= 5.2.23 < 5.3) + Aardvark.Base.Runtime (>= 5.2.23 < 5.3) + Aardvark.Base.Tensors (>= 5.2.23 < 5.3) + Aardvark.Rendering (5.4) + Aardvark.Rendering.GL (5.4) + FShade (>= 5.4 < 5.5) FSharp.Core (>= 5.0.1) Silk.NET.Core (2.15) Silk.NET.GLFW (2.15) Unofficial.OpenTK (>= 3.0.21 < 3.1) - Aardvark.Application.Slim.Vulkan (5.3.3) - Aardvark.Application (5.3.3) - Aardvark.Application.Slim (5.3.3) - Aardvark.Base.Essentials (>= 5.2.15 < 5.3) - Aardvark.Base.Incremental (>= 5.2.15 < 5.3) - Aardvark.Base.Runtime (>= 5.2.15 < 5.3) - Aardvark.Rendering (5.3.3) - Aardvark.Rendering.Vulkan (5.3.3) - FShade (>= 5.3.3 < 5.4) + Aardvark.Application.Slim.Vulkan (5.4) + Aardvark.Application (5.4) + Aardvark.Application.Slim (5.4) + Aardvark.Base.Essentials (>= 5.2.23 < 5.3) + Aardvark.Base.Incremental (>= 5.2.23 < 5.3) + Aardvark.Base.Runtime (>= 5.2.23 < 5.3) + Aardvark.Rendering (5.4) + Aardvark.Rendering.Vulkan (5.4) + FShade (>= 5.4 < 5.5) FSharp.Core (>= 5.0.1) GLSLangSharp (>= 0.4.14 < 0.5) Silk.NET.GLFW (2.15) Unofficial.OpenTK (>= 3.0.21 < 3.1) - Aardvark.Application.Utilities (5.3.3) - Aardvark.Application (5.3.3) - Aardvark.Application.OpenVR (5.3.3) - Aardvark.Application.OpenVR.GL (5.3.3) - Aardvark.Application.OpenVR.Vulkan (5.3.3) - Aardvark.Application.Slim (5.3.3) - Aardvark.Application.Slim.GL (5.3.3) - Aardvark.Application.Slim.Vulkan (5.3.3) - Aardvark.Base.Essentials (>= 5.2.15 < 5.3) - Aardvark.Base.Incremental (>= 5.2.15 < 5.3) - Aardvark.Base.Runtime (>= 5.2.15 < 5.3) - Aardvark.Rendering (5.3.3) - Aardvark.Rendering.GL (5.3.3) - Aardvark.Rendering.Text (5.3.3) - Aardvark.Rendering.Vulkan (5.3.3) - Aardvark.SceneGraph (5.3.3) - FShade.Core (>= 5.3.3 < 5.4) - FShade.GLSL (>= 5.3.3) + Aardvark.Application.Utilities (5.4) + Aardvark.Application (5.4) + Aardvark.Application.OpenVR (5.4) + Aardvark.Application.OpenVR.GL (5.4) + Aardvark.Application.OpenVR.Vulkan (5.4) + Aardvark.Application.Slim (5.4) + Aardvark.Application.Slim.GL (5.4) + Aardvark.Application.Slim.Vulkan (5.4) + Aardvark.Base.Essentials (>= 5.2.23 < 5.3) + Aardvark.Base.Incremental (>= 5.2.23 < 5.3) + Aardvark.Base.Runtime (>= 5.2.23 < 5.3) + Aardvark.Rendering (5.4) + Aardvark.Rendering.GL (5.4) + Aardvark.Rendering.Text (5.4) + Aardvark.Rendering.Vulkan (5.4) + Aardvark.SceneGraph (5.4) + FShade.Core (>= 5.4 < 5.5) + FShade.GLSL (>= 5.4) FSharp.Core (>= 5.0.1) Unofficial.OpenTK (>= 3.0.21 < 3.1) Unofficial.OpenVR (>= 1.1 < 1.2) - Aardvark.Assembler (0.0.7) + Aardvark.Assembler (0.0.8) Aardvark.Base (>= 5.2.7 < 5.3) Aardvark.Base.Runtime (>= 5.2.7 < 5.3) FSharp.Core (>= 5.0) FSharp.Data.Adaptive (>= 1.2.13 < 1.3) - Aardvark.Base (5.2.18) - Aardvark.Base.Telemetry (5.2.18) + Aardvark.Base (5.2.24) + Aardvark.Base.Telemetry (5.2.24) System.Collections.Immutable (>= 5.0) System.Reflection.Metadata (>= 5.0) - restriction: || (&& (== net6.0) (< netcoreapp3.1)) (== netstandard2.0) System.Text.Json (>= 4.7.2) - Aardvark.Base.Essentials (5.2.18) - Aardvark.Base (5.2.18) + Aardvark.Base.Essentials (5.2.24) + Aardvark.Base (5.2.24) System.Collections.Immutable (>= 5.0) - Aardvark.Base.FSharp (5.2.18) - Aardvark.Base (5.2.18) + Aardvark.Base.FSharp (5.2.24) + Aardvark.Base (5.2.24) Aardvark.Base.TypeProviders (>= 4.5.15 < 4.6) FSharp.Core (>= 5.0) FSharp.Data.Adaptive (>= 1.2 < 1.3) FsPickler (>= 5.3.2 < 5.4) System.Dynamic.Runtime (>= 4.3 < 4.4) - Aardvark.Base.Incremental (5.2.18) - Aardvark.Base (5.2.18) - Aardvark.Base.FSharp (5.2.18) + Aardvark.Base.Incremental (5.2.24) + Aardvark.Base (5.2.24) + Aardvark.Base.FSharp (5.2.24) Aardvark.Base.TypeProviders (>= 4.5.15 < 4.6) FSharp.Core (>= 5.0) FSharp.Data.Adaptive (>= 1.2 < 1.3) FsPickler (>= 5.3.2 < 5.4) - Aardvark.Base.Runtime (5.2.18) - Aardvark.Base.FSharp (5.2.18) - Aardvark.Base.Incremental (5.2.18) + Aardvark.Base.Runtime (5.2.24) + Aardvark.Base.FSharp (5.2.24) + Aardvark.Base.Incremental (5.2.24) Aardvark.Base.TypeProviders (>= 4.5.15 < 4.6) FSharp.Core (>= 5.0) FSharp.Data.Adaptive (>= 1.2 < 1.3) FsPickler (>= 5.3.2 < 5.4) - Aardvark.Base.Telemetry (5.2.18) - Aardvark.Base.Tensors (5.2.18) - Aardvark.Base (5.2.18) - Aardvark.Base.FSharp (5.2.18) + Aardvark.Base.Telemetry (5.2.24) + Aardvark.Base.Tensors (5.2.24) + Aardvark.Base (5.2.24) + Aardvark.Base.FSharp (5.2.24) FSharp.Core (>= 5.0) SixLabors.ImageSharp (>= 2.1.3 < 2.2) Aardvark.Base.TypeProviders (4.5.15) FSharp.Core (>= 4.2.3) Aardvark.Build (1.0.18) - Aardvark.Geometry (5.2.18) - Aardvark.Base (5.2.18) - Aardvark.Base.FSharp (5.2.18) - Aardvark.Base.Tensors (5.2.18) + Aardvark.Geometry (5.2.24) + Aardvark.Base (5.2.24) + Aardvark.Base.FSharp (5.2.24) + Aardvark.Base.Tensors (5.2.24) Aardvark.Base.TypeProviders (>= 4.5.15 < 4.6) FSharp.Core (>= 5.0) FSharp.Data.Adaptive (>= 1.2 < 1.3) FsPickler (>= 5.3.2 < 5.4) Unofficial.LibTessDotNet (>= 2.0.2 < 2.1) - Aardvark.Rendering (5.3.3) - Aardvark.Base.Essentials (>= 5.2.15 < 5.3) - Aardvark.Base.Incremental (>= 5.2.15 < 5.3) - Aardvark.Base.Tensors (>= 5.2.15 < 5.3) - FShade.Core (>= 5.3.3 < 5.4) - FShade.GLSL (>= 5.3.3) + Aardvark.Rendering (5.4) + Aardvark.Base.Essentials (>= 5.2.23 < 5.3) + Aardvark.Base.Incremental (>= 5.2.23 < 5.3) + Aardvark.Base.Tensors (>= 5.2.23 < 5.3) + FShade.Core (>= 5.4 < 5.5) + FShade.GLSL (>= 5.4) FSharp.Core (>= 5.0.1) FSharp.Data.Adaptive (>= 1.2.13 < 1.3) - Aardvark.Rendering.GL (5.3.3) - Aardvark.Assembler (>= 0.0.6 < 0.1) - Aardvark.Base.Essentials (>= 5.2.15 < 5.3) - Aardvark.Base.Incremental (>= 5.2.15 < 5.3) - Aardvark.Base.Runtime (>= 5.2.15 < 5.3) - Aardvark.Base.Tensors (>= 5.2.15 < 5.3) - Aardvark.Geometry (>= 5.2.15 < 5.3) - Aardvark.Rendering (5.3.3) - FShade (>= 5.3.3 < 5.4) + Aardvark.Rendering.GL (5.4) + Aardvark.Assembler (>= 0.0.8 < 0.1) + Aardvark.Base.Essentials (>= 5.2.23 < 5.3) + Aardvark.Base.Incremental (>= 5.2.23 < 5.3) + Aardvark.Base.Runtime (>= 5.2.23 < 5.3) + Aardvark.Base.Tensors (>= 5.2.23 < 5.3) + Aardvark.Geometry (>= 5.2.23 < 5.3) + Aardvark.Rendering (5.4) + FShade (>= 5.4 < 5.5) FSharp.Core (>= 5.0.1) Unofficial.OpenTK (>= 3.0.21 < 3.1) - Aardvark.Rendering.Text (5.3.3) - Aardvark.Base.Incremental (>= 5.2.15 < 5.3) - Aardvark.Rendering (5.3.3) - Aardvark.SceneGraph (5.3.3) + Aardvark.Rendering.Text (5.4) + Aardvark.Base.Incremental (>= 5.2.23 < 5.3) + Aardvark.Rendering (5.4) + Aardvark.SceneGraph (5.4) CommonMark.NET (>= 0.15.1 < 0.16) - FShade.Core (>= 5.3.3 < 5.4) - FShade.GLSL (>= 5.3.3) + FShade.Core (>= 5.4 < 5.5) + FShade.GLSL (>= 5.4) FSharp.Core (>= 5.0.1) Unofficial.LibTessDotNet (>= 2.0.2 < 2.1) Unofficial.Typography (>= 0.1 < 0.2) - Aardvark.Rendering.Vulkan (5.3.3) - Aardvark.Base.FSharp (>= 5.2.15 < 5.3) - Aardvark.Base.Incremental (>= 5.2.15 < 5.3) - Aardvark.Base.Runtime (>= 5.2.15 < 5.3) - Aardvark.Base.Tensors (>= 5.2.15 < 5.3) - Aardvark.Rendering (5.3.3) - FShade (>= 5.3.3 < 5.4) + Aardvark.Rendering.Vulkan (5.4) + Aardvark.Base.FSharp (>= 5.2.23 < 5.3) + Aardvark.Base.Incremental (>= 5.2.23 < 5.3) + Aardvark.Base.Runtime (>= 5.2.23 < 5.3) + Aardvark.Base.Tensors (>= 5.2.23 < 5.3) + Aardvark.Rendering (5.4) + FShade (>= 5.4 < 5.5) FSharp.Core (>= 5.0.1) GLSLangSharp (>= 0.4.14 < 0.5) - Aardvark.SceneGraph (5.3.3) - Aardvark.Base.Incremental (>= 5.2.15 < 5.3) - Aardvark.Rendering (5.3.3) - FShade.Core (>= 5.3.3 < 5.4) - FShade.GLSL (>= 5.3.3) + Aardvark.SceneGraph (5.4) + Aardvark.Base.Incremental (>= 5.2.23 < 5.3) + Aardvark.Rendering (5.4) + FShade.Core (>= 5.4 < 5.5) + FShade.GLSL (>= 5.4) FSharp.Core (>= 5.0.1) BenchmarkDotNet (0.12.1) BenchmarkDotNet.Annotations (>= 0.12.1) @@ -223,44 +223,44 @@ NUGET BenchmarkDotNet.Annotations (0.13.2) CommandLineParser (2.9.1) CommonMark.NET (0.15.1) - CSharp.Data.Adaptive (1.2.13) + CSharp.Data.Adaptive (1.2.14) FSharp.Core (>= 4.7) - FSharp.Data.Adaptive (1.2.13) + FSharp.Data.Adaptive (1.2.14) System.Reflection.Emit.Lightweight (>= 4.6) FsCheck (2.14.6) FSharp.Core (>= 4.2.3) FsCheck.NUnit (2.14.6) FsCheck (2.14.6) NUnit (>= 3.10.1 < 3.13.1) - FShade (5.3.3) - FShade.Core (5.3.3) - FShade.GLSL (5.3.3) - FShade.Imperative (5.3.3) - FShade.SpirV (5.3.3) - FShade.Core (5.3.3) - Aardvark.Base (>= 5.2.13 < 5.3) - Aardvark.Base.FSharp (>= 5.2.13 < 5.3) - FShade.Imperative (5.3.3) + FShade (5.4) + FShade.Core (5.4) + FShade.GLSL (5.4) + FShade.Imperative (5.4) + FShade.SpirV (5.4) + FShade.Core (5.4) + Aardvark.Base (>= 5.2.19 < 5.3) + Aardvark.Base.FSharp (>= 5.2.19 < 5.3) + FShade.Imperative (5.4) FSharp.Core (>= 5.0) - FShade.GLSL (5.3.3) - Aardvark.Base (>= 5.2.13 < 5.3) - Aardvark.Base.FSharp (>= 5.2.13 < 5.3) - FShade.Core (5.3.3) - FShade.Imperative (5.3.3) + FShade.GLSL (5.4) + Aardvark.Base (>= 5.2.19 < 5.3) + Aardvark.Base.FSharp (>= 5.2.19 < 5.3) + FShade.Core (5.4) + FShade.Imperative (5.4) FSharp.Core (>= 5.0) - FShade.Imperative (5.3.3) - Aardvark.Base (>= 5.2.13 < 5.3) - Aardvark.Base.FSharp (>= 5.2.13 < 5.3) + FShade.Imperative (5.4) + Aardvark.Base (>= 5.2.19 < 5.3) + Aardvark.Base.FSharp (>= 5.2.19 < 5.3) FSharp.Core (>= 5.0) FsPickler (>= 5.3.2 < 5.4) - FShade.SpirV (5.3.3) - Aardvark.Base (>= 5.2.13 < 5.3) - Aardvark.Base.FSharp (>= 5.2.13 < 5.3) - FShade.Core (5.3.3) - FShade.Imperative (5.3.3) + FShade.SpirV (5.4) + Aardvark.Base (>= 5.2.19 < 5.3) + Aardvark.Base.FSharp (>= 5.2.19 < 5.3) + FShade.Core (5.4) + FShade.Imperative (5.4) FSharp.Core (>= 5.0) FSharp.Core (5.0.1) - FSharp.Data.Adaptive (1.2.13) + FSharp.Data.Adaptive (1.2.14) FSharp.Core (>= 4.7) System.Reflection.Emit.Lightweight (>= 4.6) FsPickler (5.3.2)