From 360ad58da5d7bf72a10e6b3f1c789f24b62c5456 Mon Sep 17 00:00:00 2001 From: aszabo314 Date: Thu, 7 Sep 2023 13:59:33 +0200 Subject: [PATCH] 0.2.1 updated dependencies --- RELEASE_NOTES.md | 3 + paket.dependencies | 18 +- paket.lock | 527 ++++++++++++++++++++++++-------------------- src/Test/Program.fs | 8 +- 4 files changed, 302 insertions(+), 254 deletions(-) diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index 043d81d..b8195bb 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -1,3 +1,6 @@ +### 0.2.1 +* updated dependencies (rendering) + ### 0.2.0 * brown distortion model diff --git a/paket.dependencies b/paket.dependencies index c79952f..09db0b1 100644 --- a/paket.dependencies +++ b/paket.dependencies @@ -9,19 +9,17 @@ nuget Aardvark.Base.FSharp ~> 5.2.2 nuget Aardvark.Base.Tensors ~> 5.2.2 -nuget Aardvark.SceneGraph ~> 5.2.1 -nuget Aardvark.SceneGraph.IO ~> 5.2.1 -nuget Aardvark.Application.Slim ~> 5.2.1 -nuget Aardvark.Application.Slim.GL ~> 5.2.1 -nuget Aardvark.Application.Slim.Vulkan ~> 5.2.1 -nuget Aardvark.Application.Utilities ~> 5.2.1 -nuget Aardvark.Rendering.Text ~> 5.2.1 +nuget Aardvark.SceneGraph ~> 5.4.5 +nuget Aardvark.SceneGraph.IO ~> 5.4.5 +nuget Aardvark.Application.Slim ~> 5.4.5 +nuget Aardvark.Application.Slim.GL ~> 5.4.5 +nuget Aardvark.Application.Slim.Vulkan ~> 5.4.5 +nuget Aardvark.Application.Utilities ~> 5.4.5 +nuget Aardvark.Rendering.Text ~> 5.4.5 nuget FSharp.Data.Adaptive ~> 1.2.8 -nuget FShade ~> 5.2.8 - -nuget Silk.NET.Core ~> 2.12.0 +nuget FShade ~> 5.5.2 nuget MiniCV ~> 1.1.8 nuget FSharp.Data diff --git a/paket.lock b/paket.lock index 463ff4c..988210b 100644 --- a/paket.lock +++ b/paket.lock @@ -1,216 +1,223 @@ RESTRICTION: || (== net6.0) (== netstandard2.0) NUGET remote: https://api.nuget.org/v3/index.json - Aardvark.Application (5.2.1) - Aardvark.Base.Essentials (>= 5.2.2 < 5.3) - Aardvark.Base.Incremental (>= 5.2.2 < 5.3) - Aardvark.Rendering (5.2.1) - FShade.Core (>= 5.2.8 < 5.3) - FShade.GLSL (>= 5.2.8) - FSharp.Core (>= 5.0) - Aardvark.Application.OpenVR (5.2.1) - Aardvark.Application (5.2.1) - Aardvark.Base.Essentials (>= 5.2.2 < 5.3) - Aardvark.Base.Incremental (>= 5.2.2 < 5.3) - Aardvark.Base.Tensors (>= 5.2.2 < 5.3) - Aardvark.Rendering (5.2.1) - Aardvark.Rendering.Text (5.2.1) - Aardvark.SceneGraph (5.2.1) - FShade.Core (>= 5.2.8 < 5.3) - FShade.GLSL (>= 5.2.8) - FSharp.Core (>= 5.0) + Aardvark.Application (5.4.5) + Aardvark.Base.Essentials (>= 5.2.23 < 5.3) + Aardvark.Base.Incremental (>= 5.2.23 < 5.3) + Aardvark.Rendering (5.4.5) + FShade.Core (>= 5.5 < 5.6) + FShade.GLSL (>= 5.5) + FSharp.Core (>= 5.0.1) + Aardvark.Application.OpenVR (5.4.5) + Aardvark.Application (5.4.5) + 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.5) + Aardvark.Rendering.Text (5.4.5) + Aardvark.SceneGraph (5.4.5) + FShade.Core (>= 5.5 < 5.6) + FShade.GLSL (>= 5.5) + FSharp.Core (>= 5.0.1) Unofficial.OpenVR (>= 1.1 < 1.2) - Aardvark.Application.OpenVR.GL (5.2.1) - Aardvark.Application (5.2.1) - Aardvark.Application.OpenVR (5.2.1) - Aardvark.Application.Slim (5.2.1) - Aardvark.Application.Slim.GL (5.2.1) - Aardvark.Base.Essentials (>= 5.2.2 < 5.3) - Aardvark.Base.Incremental (>= 5.2.2 < 5.3) - Aardvark.Base.Runtime (>= 5.2.2 < 5.3) - Aardvark.Rendering (5.2.1) - Aardvark.Rendering.GL (5.2.1) - Aardvark.SceneGraph (5.2.1) - FShade.Core (>= 5.2.8 < 5.3) - FShade.GLSL (>= 5.2.8) - FSharp.Core (>= 5.0) - Unofficial.OpenTK (>= 3.0.19 < 3.1) + Aardvark.Application.OpenVR.GL (5.4.5) + Aardvark.Application (5.4.5) + Aardvark.Application.OpenVR (5.4.5) + Aardvark.Application.Slim (5.4.5) + Aardvark.Application.Slim.GL (5.4.5) + 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.5) + Aardvark.Rendering.GL (5.4.5) + Aardvark.SceneGraph (5.4.5) + FShade.Core (>= 5.5 < 5.6) + FShade.GLSL (>= 5.5) + FSharp.Core (>= 5.0.1) + Unofficial.OpenTK (>= 3.0.21 < 3.1) Unofficial.OpenVR (>= 1.1 < 1.2) - Aardvark.Application.OpenVR.Vulkan (5.2.1) - Aardvark.Application (5.2.1) - Aardvark.Application.OpenVR (5.2.1) - Aardvark.Base.Essentials (>= 5.2.2 < 5.3) - Aardvark.Base.Incremental (>= 5.2.2 < 5.3) - Aardvark.Base.Runtime (>= 5.2.2 < 5.3) - Aardvark.Rendering (5.2.1) - Aardvark.Rendering.Vulkan (5.2.1) - Aardvark.SceneGraph (5.2.1) - FShade.Core (>= 5.2.8 < 5.3) - FShade.GLSL (>= 5.2.8) - FSharp.Core (>= 5.0) + Aardvark.Application.OpenVR.Vulkan (5.4.5) + Aardvark.Application (5.4.5) + Aardvark.Application.OpenVR (5.4.5) + 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.5) + Aardvark.Rendering.Vulkan (5.4.5) + Aardvark.SceneGraph (5.4.5) + FShade.Core (>= 5.5 < 5.6) + FShade.GLSL (>= 5.5) + FSharp.Core (>= 5.0.1) Unofficial.OpenVR (>= 1.1 < 1.2) - Aardvark.Application.Slim (5.2.1) - Aardvark.Application (5.2.1) - Aardvark.Base.Essentials (>= 5.2.2 < 5.3) - Aardvark.Base.Incremental (>= 5.2.2 < 5.3) - Aardvark.Base.Runtime (>= 5.2.2 < 5.3) - Aardvark.Rendering (5.2.1) - FShade (>= 5.2.8 < 5.3) - FSharp.Core (>= 5.0) - Silk.NET.GLFW (2.12) - Unofficial.OpenTK (>= 3.0.19 < 3.1) - Aardvark.Application.Slim.GL (5.2.1) - Aardvark.Application (5.2.1) - Aardvark.Application.Slim (5.2.1) - Aardvark.Base.Essentials (>= 5.2.2 < 5.3) - Aardvark.Base.Incremental (>= 5.2.2 < 5.3) - Aardvark.Base.Runtime (>= 5.2.2 < 5.3) - Aardvark.Base.Tensors (>= 5.2.2 < 5.3) - Aardvark.Rendering (5.2.1) - Aardvark.Rendering.GL (5.2.1) - FShade (>= 5.2.8 < 5.3) - FSharp.Core (>= 5.0) - Silk.NET.Core (2.12) - Silk.NET.GLFW (2.12) - Unofficial.OpenTK (>= 3.0.19 < 3.1) - Aardvark.Application.Slim.Vulkan (5.2.1) - Aardvark.Application (5.2.1) - Aardvark.Application.Slim (5.2.1) - Aardvark.Base.Essentials (>= 5.2.2 < 5.3) - Aardvark.Base.Incremental (>= 5.2.2 < 5.3) - Aardvark.Base.Runtime (>= 5.2.2 < 5.3) - Aardvark.Rendering (5.2.1) - Aardvark.Rendering.Vulkan (5.2.1) - FShade (>= 5.2.8 < 5.3) - FSharp.Core (>= 5.0) + Aardvark.Application.Slim (5.4.5) + Aardvark.Application (5.4.5) + 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.5) + FShade (>= 5.5 < 5.6) + FSharp.Core (>= 5.0.1) + Silk.NET.GLFW (2.15) + Unofficial.OpenTK (>= 3.0.21 < 3.1) + Aardvark.Application.Slim.GL (5.4.5) + Aardvark.Application (5.4.5) + Aardvark.Application.Slim (5.4.5) + 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.5) + Aardvark.Rendering.GL (5.4.5) + FShade (>= 5.5 < 5.6) + 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.4.5) + Aardvark.Application (5.4.5) + Aardvark.Application.Slim (5.4.5) + 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.5) + Aardvark.Rendering.Vulkan (5.4.5) + FShade (>= 5.5 < 5.6) + FSharp.Core (>= 5.0.1) GLSLangSharp (>= 0.4.14 < 0.5) - Silk.NET.GLFW (2.12) - Unofficial.OpenTK (>= 3.0.19 < 3.1) - Aardvark.Application.Utilities (5.2.1) - Aardvark.Application (5.2.1) - Aardvark.Application.OpenVR (5.2.1) - Aardvark.Application.OpenVR.GL (5.2.1) - Aardvark.Application.OpenVR.Vulkan (5.2.1) - Aardvark.Application.Slim (5.2.1) - Aardvark.Application.Slim.GL (5.2.1) - Aardvark.Application.Slim.Vulkan (5.2.1) - Aardvark.Base.Essentials (>= 5.2.2 < 5.3) - Aardvark.Base.Incremental (>= 5.2.2 < 5.3) - Aardvark.Base.Runtime (>= 5.2.2 < 5.3) - Aardvark.Rendering (5.2.1) - Aardvark.Rendering.GL (5.2.1) - Aardvark.Rendering.Text (5.2.1) - Aardvark.Rendering.Vulkan (5.2.1) - Aardvark.SceneGraph (5.2.1) - FShade.Core (>= 5.2.8 < 5.3) - FShade.GLSL (>= 5.2.8) - FSharp.Core (>= 5.0) - Unofficial.OpenTK (>= 3.0.19 < 3.1) + Silk.NET.GLFW (2.15) + Unofficial.OpenTK (>= 3.0.21 < 3.1) + Aardvark.Application.Utilities (5.4.5) + Aardvark.Application (5.4.5) + Aardvark.Application.OpenVR (5.4.5) + Aardvark.Application.OpenVR.GL (5.4.5) + Aardvark.Application.OpenVR.Vulkan (5.4.5) + Aardvark.Application.Slim (5.4.5) + Aardvark.Application.Slim.GL (5.4.5) + Aardvark.Application.Slim.Vulkan (5.4.5) + 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.5) + Aardvark.Rendering.GL (5.4.5) + Aardvark.Rendering.Text (5.4.5) + Aardvark.Rendering.Vulkan (5.4.5) + Aardvark.SceneGraph (5.4.5) + FShade.Core (>= 5.5 < 5.6) + FShade.GLSL (>= 5.5) + FSharp.Core (>= 5.0.1) + Unofficial.OpenTK (>= 3.0.21 < 3.1) Unofficial.OpenVR (>= 1.1 < 1.2) - Aardvark.Base (5.2.2) - Aardvark.Base.Telemetry (5.2.2) - System.Collections.Immutable (>= 1.7) - System.Reflection.Metadata (>= 1.8) - restriction: || (&& (== net6.0) (< netcoreapp3.1)) (== netstandard2.0) + 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.25) + Aardvark.Base.Telemetry (5.2.25) + 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.2) - Aardvark.Base (5.2.2) - System.Collections.Immutable (>= 1.7) - Aardvark.Base.FSharp (5.2.2) - Aardvark.Base (5.2.2) + Aardvark.Base.Essentials (5.2.25) + Aardvark.Base (5.2.25) + System.Collections.Immutable (>= 5.0) + Aardvark.Base.FSharp (5.2.25) + Aardvark.Base (5.2.25) 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.2) - Aardvark.Base (5.2.2) - Aardvark.Base.FSharp (5.2.2) + Aardvark.Base.Incremental (5.2.25) + Aardvark.Base (5.2.25) + Aardvark.Base.FSharp (5.2.25) 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.IO (5.2.2) - Aardvark.Base (5.2.2) - Aardvark.Base.Tensors (5.2.2) + Aardvark.Base.IO (5.2.25) + Aardvark.Base (5.2.25) + Aardvark.Base.Tensors (5.2.25) System.Dynamic.Runtime (>= 4.3 < 4.4) - Aardvark.Base.Runtime (5.2.2) - Aardvark.Base.FSharp (5.2.2) - Aardvark.Base.Incremental (5.2.2) + Aardvark.Base.Runtime (5.2.25) + Aardvark.Base.FSharp (5.2.25) + Aardvark.Base.Incremental (5.2.25) 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.2) - Aardvark.Base.Tensors (5.2.2) - Aardvark.Base (5.2.2) - Aardvark.Base.FSharp (5.2.2) + Aardvark.Base.Telemetry (5.2.25) + Aardvark.Base.Tensors (5.2.25) + Aardvark.Base (5.2.25) + Aardvark.Base.FSharp (5.2.25) FSharp.Core (>= 5.0) - SixLabors.ImageSharp (>= 2.0 < 2.1) + SixLabors.ImageSharp (>= 2.1.3 < 2.2) Aardvark.Base.TypeProviders (4.5.15) FSharp.Core (>= 4.2.3) - Aardvark.Build (1.0.11) - Aardvark.Geometry (5.2.2) - Aardvark.Base (5.2.2) - Aardvark.Base.FSharp (5.2.2) - Aardvark.Base.Tensors (5.2.2) + Aardvark.Build (1.0.20) + Aardvark.Geometry (5.2.25) + Aardvark.Base (5.2.25) + Aardvark.Base.FSharp (5.2.25) + Aardvark.Base.Tensors (5.2.25) 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.Geometry.PointTree (5.2) - Aardvark.Base.IO (>= 5.2.2 < 5.3) - Aardvark.Rendering (5.2.1) - Aardvark.Base.Essentials (>= 5.2.2 < 5.3) - Aardvark.Base.Incremental (>= 5.2.2 < 5.3) - Aardvark.Base.Tensors (>= 5.2.2 < 5.3) - FShade.Core (>= 5.2.8 < 5.3) - FShade.GLSL (>= 5.2.8) - FSharp.Core (>= 5.0) - FSharp.Data.Adaptive (>= 1.2.6 < 1.3) - Aardvark.Rendering.GL (5.2.1) - Aardvark.Base.Essentials (>= 5.2.2 < 5.3) - Aardvark.Base.Incremental (>= 5.2.2 < 5.3) - Aardvark.Base.Runtime (>= 5.2.2 < 5.3) - Aardvark.Base.Tensors (>= 5.2.2 < 5.3) - Aardvark.Geometry (>= 5.2.2 < 5.3) - Aardvark.Rendering (5.2.1) - FShade (>= 5.2.8 < 5.3) - FSharp.Core (>= 5.0) - Unofficial.OpenTK (>= 3.0.19 < 3.1) - Aardvark.Rendering.Text (5.2.1) - Aardvark.Base.Incremental (>= 5.2.2 < 5.3) - Aardvark.Rendering (5.2.1) - Aardvark.SceneGraph (5.2.1) + Aardvark.Geometry.PointTree (5.2.25) + Aardvark.Base.IO (>= 5.2.24 < 5.3) + Aardvark.Rendering (5.4.5) + 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.5 < 5.6) + FShade.GLSL (>= 5.5) + FSharp.Core (>= 5.0.1) + FSharp.Data.Adaptive (>= 1.2.13 < 1.3) + Aardvark.Rendering.GL (5.4.5) + 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.5) + FShade (>= 5.5 < 5.6) + FSharp.Core (>= 5.0.1) + Unofficial.OpenTK (>= 3.0.21 < 3.1) + Aardvark.Rendering.Text (5.4.5) + Aardvark.Base.Incremental (>= 5.2.23 < 5.3) + Aardvark.Rendering (5.4.5) + Aardvark.SceneGraph (5.4.5) CommonMark.NET (>= 0.15.1 < 0.16) - FShade.Core (>= 5.2.8 < 5.3) - FShade.GLSL (>= 5.2.8) - FSharp.Core (>= 5.0) + FShade.Core (>= 5.5 < 5.6) + FShade.GLSL (>= 5.5) + FSharp.Core (>= 5.0.1) Unofficial.LibTessDotNet (>= 2.0.2 < 2.1) Unofficial.Typography (>= 0.1 < 0.2) - Aardvark.Rendering.Vulkan (5.2.1) - Aardvark.Base.Incremental (>= 5.2.2 < 5.3) - Aardvark.Base.Runtime (>= 5.2.2 < 5.3) - Aardvark.Base.Tensors (>= 5.2.2 < 5.3) - Aardvark.Rendering (5.2.1) - FShade (>= 5.2.8 < 5.3) - FSharp.Core (>= 5.0) + Aardvark.Rendering.Vulkan (5.4.5) + 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.5) + FShade (>= 5.5 < 5.6) + FSharp.Core (>= 5.0.1) GLSLangSharp (>= 0.4.14 < 0.5) - Aardvark.SceneGraph (5.2.1) - Aardvark.Base.Incremental (>= 5.2.2 < 5.3) - Aardvark.Rendering (5.2.1) - FShade.Core (>= 5.2.8 < 5.3) - FShade.GLSL (>= 5.2.8) - FSharp.Core (>= 5.0) - Aardvark.SceneGraph.IO (5.2.1) - Aardvark.Base.Incremental (>= 5.2.2 < 5.3) - Aardvark.Base.Tensors (>= 5.2.2 < 5.3) - Aardvark.Rendering (5.2.1) - Aardvark.SceneGraph (5.2.1) + Aardvark.SceneGraph (5.4.5) + Aardvark.Base.Incremental (>= 5.2.23 < 5.3) + Aardvark.Rendering (5.4.5) + FShade.Core (>= 5.5 < 5.6) + FShade.GLSL (>= 5.5) + FSharp.Core (>= 5.0.1) + Aardvark.SceneGraph.IO (5.4.5) + Aardvark.Base.Incremental (>= 5.2.23 < 5.3) + Aardvark.Base.Tensors (>= 5.2.23 < 5.3) + Aardvark.Rendering (5.4.5) + Aardvark.SceneGraph (5.4.5) AssimpNet (>= 5.0.0-beta1 < 5.1.0-beta) - FShade.Core (>= 5.2.8 < 5.3) - FShade.GLSL (>= 5.2.8) - FSharp.Core (>= 5.0) + FShade.Core (>= 5.5 < 5.6) + FShade.GLSL (>= 5.5) + FSharp.Core (>= 5.0.1) AssimpNet (5.0.0-beta1) NETStandard.Library (>= 1.6.1) CommonMark.NET (0.15.1) @@ -222,76 +229,112 @@ NUGET FsCheck (>= 2.14) FsCheck (2.14) FSharp.Core (>= 4.2.3) - FShade (5.2.8) - FShade.Core (5.2.8) - FShade.GLSL (5.2.8) - FShade.Imperative (5.2.8) - FShade.SpirV (5.2.8) - FShade.Core (5.2.8) - Aardvark.Base (>= 5.2 < 5.3) - Aardvark.Base.FSharp (>= 5.2 < 5.3) - FShade.Imperative (5.2.8) + FShade (5.5.2) + FShade.Core (5.5.2) + FShade.GLSL (5.5.2) + FShade.Imperative (5.5.2) + FShade.SpirV (5.5.2) + FShade.Core (5.5.2) + Aardvark.Base (>= 5.2.19 < 5.3) + Aardvark.Base.FSharp (>= 5.2.19 < 5.3) + FShade.Imperative (5.5.2) FSharp.Core (>= 5.0) - FShade.GLSL (5.2.8) - Aardvark.Base (>= 5.2 < 5.3) - Aardvark.Base.FSharp (>= 5.2 < 5.3) - FShade.Core (5.2.8) - FShade.Imperative (5.2.8) + FShade.GLSL (5.5.2) + Aardvark.Base (>= 5.2.19 < 5.3) + Aardvark.Base.FSharp (>= 5.2.19 < 5.3) + FShade.Core (5.5.2) + FShade.Imperative (5.5.2) FSharp.Core (>= 5.0) - FShade.Imperative (5.2.8) - Aardvark.Base (>= 5.2 < 5.3) - Aardvark.Base.FSharp (>= 5.2 < 5.3) + FShade.Imperative (5.5.2) + 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.2.8) - Aardvark.Base (>= 5.2 < 5.3) - Aardvark.Base.FSharp (>= 5.2 < 5.3) - FShade.Core (5.2.8) - FShade.Imperative (5.2.8) + FShade.SpirV (5.5.2) + Aardvark.Base (>= 5.2.19 < 5.3) + Aardvark.Base.FSharp (>= 5.2.19 < 5.3) + FShade.Core (5.5.2) + FShade.Imperative (5.5.2) FSharp.Core (>= 5.0) - FSharp.Core (5.0) - FSharp.Data (4.2.8) - FSharp.Core (>= 4.7.2) - FSharp.Data.Adaptive (1.2.8) + FSharp.Core (5.0.1) + FSharp.Data (6.3) + FSharp.Core (>= 5.0.1) + FSharp.Data.Csv.Core (>= 6.3) + FSharp.Data.Html.Core (>= 6.3) + FSharp.Data.Http (>= 6.3) + FSharp.Data.Json.Core (>= 6.3) + FSharp.Data.Runtime.Utilities (>= 6.3) + FSharp.Data.WorldBank.Core (>= 6.3) + FSharp.Data.Xml.Core (>= 6.3) + FSharp.Data.Adaptive (1.2.14) FSharp.Core (>= 4.7) System.Reflection.Emit.Lightweight (>= 4.6) + FSharp.Data.Csv.Core (6.3) + FSharp.Core (>= 5.0.1) + FSharp.Data.Runtime.Utilities (>= 6.3) + FSharp.Data.Html.Core (6.3) + FSharp.Core (>= 5.0.1) + FSharp.Data.Csv.Core (>= 6.3) + FSharp.Data.Runtime.Utilities (>= 6.3) + FSharp.Data.Http (6.3) + FSharp.Core (>= 5.0.1) + FSharp.Data.Json.Core (6.3) + FSharp.Core (>= 5.0.1) + FSharp.Data.Http (>= 6.3) + FSharp.Data.Runtime.Utilities (>= 6.3) + FSharp.Data.Runtime.Utilities (6.3) + FSharp.Core (>= 5.0.1) + FSharp.Data.Http (>= 6.3) + FSharp.Data.WorldBank.Core (6.3) + FSharp.Core (>= 5.0.1) + FSharp.Data.Http (>= 6.3) + FSharp.Data.Json.Core (>= 6.3) + FSharp.Data.Runtime.Utilities (>= 6.3) + FSharp.Data.Xml.Core (6.3) + FSharp.Core (>= 5.0.1) + FSharp.Data.Http (>= 6.3) + FSharp.Data.Json.Core (>= 6.3) + FSharp.Data.Runtime.Utilities (>= 6.3) FsPickler (5.3.2) FSharp.Core (>= 4.3.2) System.Reflection.Emit.Lightweight (>= 4.3) - GLSLangSharp (0.4.14) + GLSLangSharp (0.4.15) FSharp.Core (>= 5.0) - MetadataExtractor (2.7.1) + MetadataExtractor (2.8.1) System.Text.Encoding.CodePages (>= 4.5.1) XmpCore (>= 6.1.10.1) - Microsoft.Bcl.AsyncInterfaces (1.1.1) - restriction: || (&& (== net6.0) (>= monoandroid) (< netstandard2.0)) (&& (== net6.0) (>= monotouch)) (&& (== net6.0) (>= net461)) (&& (== net6.0) (< netcoreapp2.0)) (&& (== net6.0) (< netcoreapp2.1)) (&& (== net6.0) (< netcoreapp3.0)) (&& (== net6.0) (>= uap10.1)) (&& (== net6.0) (>= xamarinios)) (&& (== net6.0) (>= xamarinmac)) (&& (== net6.0) (>= xamarintvos)) (&& (== net6.0) (>= xamarinwatchos)) (== netstandard2.0) - System.Threading.Tasks.Extensions (>= 4.5.4) - restriction: || (&& (== net6.0) (>= net461)) (&& (== net6.0) (< netcoreapp2.1)) (== netstandard2.0) + Microsoft.Bcl.AsyncInterfaces (7.0) - restriction: || (&& (== net6.0) (>= net462)) (== netstandard2.0) + System.Threading.Tasks.Extensions (>= 4.5.4) - restriction: || (&& (== net6.0) (>= net462)) (&& (== net6.0) (< netstandard2.1)) (== netstandard2.0) Microsoft.Bcl.HashCode (1.1.1) - restriction: || (&& (== net6.0) (< netstandard2.1)) (== netstandard2.0) Microsoft.CSharp (4.7) Microsoft.DotNet.PlatformAbstractions (3.1.6) - Microsoft.Extensions.DependencyModel (3.1.4) - System.Text.Json (>= 4.7.2) - Microsoft.NETCore.Platforms (3.1.1) - Microsoft.NETCore.Targets (3.1) - MiniCV (1.1.8) + Microsoft.Extensions.DependencyModel (7.0) + System.Buffers (>= 4.5.1) - restriction: || (&& (== net6.0) (>= net462)) (== netstandard2.0) + System.Memory (>= 4.5.5) - restriction: || (&& (== net6.0) (>= net462)) (== netstandard2.0) + System.Text.Encodings.Web (>= 7.0) + System.Text.Json (>= 7.0) + Microsoft.NETCore.Platforms (7.0.4) + Microsoft.NETCore.Targets (5.0) + MiniCV (1.1.14) Aardvark.Base (>= 5.2 < 5.3) Aardvark.Base.FSharp (>= 5.2 < 5.3) Aardvark.Base.Tensors (>= 5.2 < 5.3) FSharp.Core (>= 5.0) - Mono.Cecil (0.11.2) + Mono.Cecil (0.11.5) NETStandard.Library (2.0.3) Microsoft.NETCore.Platforms (>= 1.1) - Silk.NET.Core (2.12) - Microsoft.Bcl.HashCode (>= 1.1) - restriction: || (&& (== net6.0) (< netstandard2.1)) (== netstandard2.0) + Silk.NET.Core (2.15) + Microsoft.Bcl.HashCode (>= 1.1.1) - restriction: || (&& (== net6.0) (< netstandard2.1)) (== netstandard2.0) Microsoft.CSharp (>= 4.7) Microsoft.DotNet.PlatformAbstractions (>= 3.1.6) - Microsoft.Extensions.DependencyModel (>= 3.1.1) + Microsoft.Extensions.DependencyModel (>= 5.0) System.Memory (>= 4.5.4) System.Numerics.Vectors (>= 4.5) - System.Runtime.CompilerServices.Unsafe (>= 4.7) - Silk.NET.GLFW (2.12) - Silk.NET.Core (>= 2.12) + System.Runtime.CompilerServices.Unsafe (>= 6.0) + Silk.NET.GLFW (2.15) + Silk.NET.Core (>= 2.15) Ultz.Native.GLFW (>= 3.3.3.1) - SixLabors.ImageSharp (2.0) + SixLabors.ImageSharp (2.1.6) System.Buffers (>= 4.5.1) - restriction: || (&& (== net6.0) (>= net472)) (&& (== net6.0) (< netcoreapp2.1)) (== netstandard2.0) System.Memory (>= 4.5.4) - restriction: || (&& (== net6.0) (>= net472)) (&& (== net6.0) (< netcoreapp2.1)) (== netstandard2.0) System.Numerics.Vectors (>= 4.5) - restriction: || (&& (== net6.0) (>= net472)) (&& (== net6.0) (< netcoreapp2.1)) (== netstandard2.0) @@ -302,8 +345,9 @@ NUGET Microsoft.NETCore.Platforms (>= 1.1) Microsoft.NETCore.Targets (>= 1.1) System.Runtime (>= 4.3) - System.Collections.Immutable (1.7.1) - System.Memory (>= 4.5.4) - restriction: || (&& (== net6.0) (>= net461)) (&& (== net6.0) (< netcoreapp2.1)) (&& (== net6.0) (< netstandard2.0)) (&& (== net6.0) (>= uap10.1)) (== netstandard2.0) + System.Collections.Immutable (7.0) + System.Memory (>= 4.5.5) - restriction: || (&& (== net6.0) (>= net462)) (== netstandard2.0) + System.Runtime.CompilerServices.Unsafe (>= 6.0) System.Diagnostics.Debug (4.3) Microsoft.NETCore.Platforms (>= 1.1) Microsoft.NETCore.Targets (>= 1.1) @@ -357,7 +401,7 @@ NUGET System.Runtime (>= 4.3) System.Runtime.Extensions (>= 4.3) System.Threading (>= 4.3) - System.Memory (4.5.4) + System.Memory (4.5.5) System.Buffers (>= 4.5.1) - restriction: || (&& (== net6.0) (>= monotouch)) (&& (== net6.0) (>= net461)) (&& (== net6.0) (< netcoreapp2.0)) (&& (== net6.0) (< netstandard1.1)) (&& (== net6.0) (< netstandard2.0)) (&& (== net6.0) (>= xamarinios)) (&& (== net6.0) (>= xamarinmac)) (&& (== net6.0) (>= xamarintvos)) (&& (== net6.0) (>= xamarinwatchos)) (== netstandard2.0) System.Numerics.Vectors (>= 4.4) - restriction: || (&& (== net6.0) (< netcoreapp2.0)) (== netstandard2.0) System.Runtime.CompilerServices.Unsafe (>= 4.5.3) - restriction: || (&& (== net6.0) (>= monotouch)) (&& (== net6.0) (>= net461)) (&& (== net6.0) (< netcoreapp2.0)) (&& (== net6.0) (< netcoreapp2.1)) (&& (== net6.0) (< netstandard1.1)) (&& (== net6.0) (< netstandard2.0)) (&& (== net6.0) (>= uap10.1)) (&& (== net6.0) (>= xamarinios)) (&& (== net6.0) (>= xamarinmac)) (&& (== net6.0) (>= xamarintvos)) (&& (== net6.0) (>= xamarinwatchos)) (== netstandard2.0) @@ -384,8 +428,9 @@ NUGET Microsoft.NETCore.Targets (>= 1.1) System.Reflection (>= 4.3) System.Runtime (>= 4.3) - System.Reflection.Metadata (1.8.1) - restriction: || (&& (== net6.0) (< netcoreapp3.1)) (== netstandard2.0) - System.Collections.Immutable (>= 1.7.1) - restriction: || (&& (== net6.0) (>= net461)) (&& (== net6.0) (< netcoreapp3.1)) (&& (== net6.0) (< netstandard1.1)) (&& (== net6.0) (< netstandard2.0)) (== netstandard2.0) + System.Reflection.Metadata (7.0.2) - restriction: || (&& (== net6.0) (< netcoreapp3.1)) (== netstandard2.0) + System.Collections.Immutable (>= 7.0) + System.Memory (>= 4.5.5) - restriction: || (&& (== net6.0) (>= net462)) (== netstandard2.0) System.Reflection.Primitives (4.3) Microsoft.NETCore.Platforms (>= 1.1) Microsoft.NETCore.Targets (>= 1.1) @@ -409,19 +454,21 @@ NUGET Microsoft.NETCore.Platforms (>= 1.1) Microsoft.NETCore.Targets (>= 1.1) System.Runtime (>= 4.3) - System.Text.Encoding.CodePages (6.0) - System.Memory (>= 4.5.4) - restriction: || (&& (== net6.0) (>= net461)) (&& (== net6.0) (< netcoreapp3.1)) (== netstandard2.0) + System.Text.Encoding.CodePages (7.0) + System.Memory (>= 4.5.5) - restriction: || (&& (== net6.0) (>= net462)) (== netstandard2.0) + System.Runtime.CompilerServices.Unsafe (>= 6.0) + System.Text.Encodings.Web (7.0) + System.Buffers (>= 4.5.1) - restriction: || (&& (== net6.0) (>= net462)) (== netstandard2.0) + System.Memory (>= 4.5.5) - restriction: || (&& (== net6.0) (>= net462)) (== netstandard2.0) + System.Runtime.CompilerServices.Unsafe (>= 6.0) + System.Text.Json (7.0.3) + Microsoft.Bcl.AsyncInterfaces (>= 7.0) - restriction: || (&& (== net6.0) (>= net462)) (== netstandard2.0) + System.Buffers (>= 4.5.1) - restriction: || (&& (== net6.0) (>= net462)) (== netstandard2.0) + System.Memory (>= 4.5.5) - restriction: || (&& (== net6.0) (>= net462)) (== netstandard2.0) + System.Numerics.Vectors (>= 4.5) - restriction: || (&& (== net6.0) (>= net462)) (== netstandard2.0) System.Runtime.CompilerServices.Unsafe (>= 6.0) - System.Text.Encodings.Web (4.7.1) - restriction: || (&& (== net6.0) (>= monoandroid) (< netstandard2.0)) (&& (== net6.0) (>= monotouch)) (&& (== net6.0) (>= net461)) (&& (== net6.0) (< netcoreapp2.0)) (&& (== net6.0) (< netcoreapp2.1)) (&& (== net6.0) (< netcoreapp3.0)) (&& (== net6.0) (< netcoreapp3.1)) (&& (== net6.0) (>= uap10.1)) (&& (== net6.0) (>= xamarinios)) (&& (== net6.0) (>= xamarinmac)) (&& (== net6.0) (>= xamarintvos)) (&& (== net6.0) (>= xamarinwatchos)) (== netstandard2.0) - System.Memory (>= 4.5.4) - restriction: || (&& (== net6.0) (>= net461)) (&& (== net6.0) (< netcoreapp2.1) (< netstandard2.1)) (&& (== net6.0) (>= uap10.1)) (== netstandard2.0) - System.Text.Json (4.7.2) - Microsoft.Bcl.AsyncInterfaces (>= 1.1) - restriction: || (&& (== net6.0) (>= monoandroid) (< netstandard2.0)) (&& (== net6.0) (>= monotouch)) (&& (== net6.0) (>= net461)) (&& (== net6.0) (< netcoreapp2.0)) (&& (== net6.0) (< netcoreapp2.1)) (&& (== net6.0) (< netcoreapp3.0)) (&& (== net6.0) (>= uap10.1)) (&& (== net6.0) (>= xamarinios)) (&& (== net6.0) (>= xamarinmac)) (&& (== net6.0) (>= xamarintvos)) (&& (== net6.0) (>= xamarinwatchos)) (== netstandard2.0) - System.Buffers (>= 4.5.1) - restriction: || (&& (== net6.0) (>= monoandroid) (< netstandard2.0)) (&& (== net6.0) (>= monotouch)) (&& (== net6.0) (>= net461)) (&& (== net6.0) (< netcoreapp2.0)) (&& (== net6.0) (>= xamarinios)) (&& (== net6.0) (>= xamarinmac)) (&& (== net6.0) (>= xamarintvos)) (&& (== net6.0) (>= xamarinwatchos)) (== netstandard2.0) - System.Memory (>= 4.5.4) - restriction: || (&& (== net6.0) (>= net461)) (&& (== net6.0) (< netcoreapp2.0)) (&& (== net6.0) (< netcoreapp2.1)) (&& (== net6.0) (>= uap10.1)) (== netstandard2.0) - System.Numerics.Vectors (>= 4.5) - restriction: || (&& (== net6.0) (>= net461)) (&& (== net6.0) (< netcoreapp2.0)) (== netstandard2.0) - System.Runtime.CompilerServices.Unsafe (>= 4.7.1) - restriction: || (&& (== net6.0) (>= monoandroid) (< netstandard2.0)) (&& (== net6.0) (>= monotouch)) (&& (== net6.0) (>= net461)) (&& (== net6.0) (< netcoreapp2.0)) (&& (== net6.0) (< netcoreapp2.1)) (&& (== net6.0) (< netcoreapp3.0)) (&& (== net6.0) (< netcoreapp3.1)) (&& (== net6.0) (>= uap10.1)) (&& (== net6.0) (>= xamarinios)) (&& (== net6.0) (>= xamarinmac)) (&& (== net6.0) (>= xamarintvos)) (&& (== net6.0) (>= xamarinwatchos)) (== netstandard2.0) - System.Text.Encodings.Web (>= 4.7.1) - restriction: || (&& (== net6.0) (>= monoandroid) (< netstandard2.0)) (&& (== net6.0) (>= monotouch)) (&& (== net6.0) (>= net461)) (&& (== net6.0) (< netcoreapp2.0)) (&& (== net6.0) (< netcoreapp2.1)) (&& (== net6.0) (< netcoreapp3.0)) (&& (== net6.0) (< netcoreapp3.1)) (&& (== net6.0) (>= uap10.1)) (&& (== net6.0) (>= xamarinios)) (&& (== net6.0) (>= xamarinmac)) (&& (== net6.0) (>= xamarintvos)) (&& (== net6.0) (>= xamarinwatchos)) (== netstandard2.0) - System.Threading.Tasks.Extensions (>= 4.5.4) - restriction: || (&& (== net6.0) (>= net461)) (&& (== net6.0) (< netcoreapp2.0)) (&& (== net6.0) (< netcoreapp2.1)) (&& (== net6.0) (>= uap10.1)) (== netstandard2.0) + System.Text.Encodings.Web (>= 7.0) + System.Threading.Tasks.Extensions (>= 4.5.4) - restriction: || (&& (== net6.0) (>= net462)) (== netstandard2.0) System.Threading (4.3) System.Runtime (>= 4.3) System.Threading.Tasks (>= 4.3) @@ -429,11 +476,11 @@ NUGET Microsoft.NETCore.Platforms (>= 1.1) Microsoft.NETCore.Targets (>= 1.1) System.Runtime (>= 4.3) - System.Threading.Tasks.Extensions (4.5.4) - restriction: || (&& (== net6.0) (>= net461)) (&& (== net6.0) (< netcoreapp2.0)) (&& (== net6.0) (< netcoreapp2.1)) (&& (== net6.0) (>= uap10.1)) (== netstandard2.0) + System.Threading.Tasks.Extensions (4.5.4) - restriction: || (&& (== net6.0) (>= net462)) (== netstandard2.0) System.Runtime.CompilerServices.Unsafe (>= 4.5.3) - restriction: || (&& (== net6.0) (>= net461)) (&& (== net6.0) (< netcoreapp2.1)) (&& (== net6.0) (< netstandard1.0)) (&& (== net6.0) (< netstandard2.0)) (&& (== net6.0) (>= wp8)) (== netstandard2.0) - Ultz.Native.GLFW (3.3.3.1) + Ultz.Native.GLFW (3.3.9.1) Unofficial.LibTessDotNet (2.0.2) - Unofficial.OpenTK (3.0.20) + Unofficial.OpenTK (3.0.21) Unofficial.OpenVR (1.1) Unofficial.Typography (0.1) System.Numerics.Vectors (>= 4.5) diff --git a/src/Test/Program.fs b/src/Test/Program.fs index 6e2076a..3885f21 100644 --- a/src/Test/Program.fs +++ b/src/Test/Program.fs @@ -78,13 +78,13 @@ let main args = let lf = @"/Users/atti/bla/DJI_Befliegung/Kopteraufnahmen/DJI_0753.JPG" let rf = @"/Users/atti/bla/DJI_Befliegung/Kopteraufnahmen/DJI_0754.JPG" - let limg = (PixImage.Create lf).ToPixImage() - let rimg = (PixImage.Create rf).ToPixImage() + let limg = (PixImage.Load lf).ToPixImage() + let rimg = (PixImage.Load rf).ToPixImage() Log.startTimed "Akaze" - let lftrs = OpenCV.detectFeatures OpenCV.DetectorMode.Akaze limg - let rftrs = OpenCV.detectFeatures OpenCV.DetectorMode.Akaze rimg + let lftrs = OpenCV.detectFeatures DetectorMode.Akaze limg + let rftrs = OpenCV.detectFeatures DetectorMode.Akaze rimg Log.stop() Log.line "L = %A" limg.Size Log.line "LFtrs = %d" lftrs.points.Length