diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index d829879..de8cd76 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,13 +3,13 @@ "isRoot": true, "tools": { "paket": { - "version": "7.2.1", + "version": "8.0.0", "commands": [ "paket" ] }, "aardpack": { - "version": "1.0.20", + "version": "1.0.25", "commands": [ "aardpack" ] diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 0d5d94c..c4c086b 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -12,9 +12,9 @@ jobs: runs-on: windows-latest steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Install Dotnet - uses: actions/setup-dotnet@v3 + uses: actions/setup-dotnet@v4 with: global-json-file: global.json - name: Restore Tools @@ -29,7 +29,7 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: dotnet aardpack src\OPCViewer.sln --notag - name: Upload Packages - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: packages path: bin\pack diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 45189e5..7409b37 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -14,9 +14,9 @@ jobs: runs-on: windows-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Install Dotnet - uses: actions/setup-dotnet@v3 + uses: actions/setup-dotnet@v4 with: global-json-file: global.json - name: Build diff --git a/global.json b/global.json index c2082dd..19f8dc2 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "6.0.0", + "version": "8.0.0", "rollForward": "latestFeature", "allowPrerelease": false } diff --git a/paket.dependencies b/paket.dependencies index 5b93102..9bddaa7 100644 --- a/paket.dependencies +++ b/paket.dependencies @@ -3,22 +3,22 @@ source https://api.nuget.org/v3/index.json storage: none -nuget FSharp.Core >= 5.0.1 lowest_matching: true -nuget Aardvark.Build ~> 1.0.20 +nuget FSharp.Core >= 8.0.0 lowest_matching: true +nuget Aardvark.Build ~> 1.0.25 -nuget Aardvark.Base ~> 5.2.14 -nuget Aardvark.Base.FSharp ~> 5.2.14 -nuget Aardvark.Geometry ~> 5.2.14 +nuget Aardvark.Base ~> 5.3.2 +nuget Aardvark.Base.FSharp ~> 5.3.2 +nuget Aardvark.Geometry ~> 5.3.2 -nuget Aardvark.Rendering ~> 5.4.0 -nuget Aardvark.SceneGraph ~> 5.4.0 -nuget Aardvark.Scenegraph.OPC ~> 5.4.0 -nuget Aardvark.Rendering.Text ~> 5.4.0 +nuget Aardvark.Data.OPC ~> 0.9.0 -nuget Aardvark.Geometry.Intersection ~> 5.2.13 +nuget Aardvark.Rendering ~> 5.5.0 +nuget Aardvark.Rendering.Text ~> 5.5.0 -nuget Aardvark.UI ~> 5.4.0 -nuget Aardvark.UI.Primitives ~> 5.4.0 +nuget Aardvark.Geometry.Intersection ~> 5.5.0 + +nuget Aardvark.UI ~> 5.5.0 +nuget Aardvark.UI.Primitives ~> 5.5.0 nuget Adaptify.MSBuild ~> 1.1.8 @@ -27,23 +27,23 @@ nuget Uncodium.Eigensystems ~> 1.1.2 group Examples framework: auto-detect source https://api.nuget.org/v3/index.json + storage: none - nuget FSharp.Core >= 5.0.1 lowest_matching: true + nuget FSharp.Core >= 8.0.0 lowest_matching: true nuget FSharp.Data ~> 3.1.1 - nuget Aardvark.PixImage.FreeImage ~> 5.3.4 - nuget Aardvark.PixImage.Pfim ~> 0.9.1 + nuget Aardvark.PixImage.FreeImage ~> 5.3.5 + nuget Aardvark.PixImage.Pfim ~> 0.9.3 - nuget Aardvark.Geometry.PolyMesh ~> 5.2.13 + nuget Aardvark.Geometry.PolyMesh ~> 5.5.0 - nuget Aardvark.SceneGraph.IO ~> 5.4.0 - nuget Aardvark.Application.Slim ~> 5.4.0 - nuget Aardvark.Application.Slim.GL ~> 5.4.0 - nuget Aardvark.Application.Slim.Vulkan ~> 5.4.0 + nuget Aardvark.Application.Slim ~> 5.5.0 + nuget Aardvark.Application.Slim.GL ~> 5.5.0 + nuget Aardvark.Application.Slim.Vulkan ~> 5.5.0 - nuget Aardvark.UI ~> 5.4.0 - nuget Aardvark.UI.Primitives ~> 5.4.0 + nuget Aardvark.UI ~> 5.5.0 + nuget Aardvark.UI.Primitives ~> 5.5.0 nuget Adaptify.MSBuild ~> 1.1.8 @@ -52,4 +52,4 @@ group Examples nuget Aether ~> 8.3.1 - nuget Aardium ~> 2.0.0 \ No newline at end of file + nuget Aardium ~> 2.1.1 \ No newline at end of file diff --git a/paket.lock b/paket.lock index 51e06dc..3239a49 100644 --- a/paket.lock +++ b/paket.lock @@ -1,206 +1,177 @@ STORAGE: NONE -RESTRICTION: || (== net6.0) (== netstandard2.0) +RESTRICTION: || (== net8.0) (== netstandard2.0) NUGET remote: https://api.nuget.org/v3/index.json - Aardvark.Application (5.4.1) - Aardvark.Base.Essentials (>= 5.2.23 < 5.3) - Aardvark.Base.Incremental (>= 5.2.23 < 5.3) - Aardvark.Rendering (5.4.1) - FShade.Core (>= 5.4 < 5.5) - FShade.GLSL (>= 5.4) - FSharp.Core (>= 5.0.1) - Aardvark.Assembler (0.0.8) - Aardvark.Base (>= 5.2.7 < 5.3) - Aardvark.Base.Runtime (>= 5.2.7 < 5.3) - FSharp.Core (>= 5.0) + Aardvark.Application (5.5) + Aardvark.Base.Essentials (>= 5.3 < 5.4) + Aardvark.Base.Incremental (>= 5.3 < 5.4) + Aardvark.Rendering (5.5) + FShade.Core (>= 5.6 < 5.7) + FShade.GLSL (>= 5.6) + FSharp.Core (>= 8.0) + Aardvark.Assembler (0.1) + Aardvark.Base.FSharp (>= 5.3) + FSharp.Core (>= 8.0) FSharp.Data.Adaptive (>= 1.2.13 < 1.3) - 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.24) - Aardvark.Base (5.2.24) - System.Collections.Immutable (>= 5.0) - Aardvark.Base.FSharp (5.2.24) - Aardvark.Base (5.2.24) + Aardvark.Base (5.3.2) + Aardvark.Base.Telemetry (5.3.2) + System.Collections.Immutable (>= 8.0) + System.Reflection.Metadata (>= 8.0) + System.Text.Json (>= 8.0.4) + Aardvark.Base.Essentials (5.3.2) + Aardvark.Base (5.3.2) + System.Collections.Immutable (>= 8.0) + Aardvark.Base.Fonts (5.3.2) + Aardvark.Base.FSharp (5.3.2) + FSharp.Core (>= 8.0) + FuzzySharp (>= 2.0.2 < 2.1) + Unofficial.LibTessDotNet (>= 2.0.2 < 2.1) + Unofficial.Typography (>= 0.1 < 0.2) + Aardvark.Base.FSharp (5.3.2) + Aardvark.Base (5.3.2) Aardvark.Base.TypeProviders (>= 4.5.15 < 4.6) - FSharp.Core (>= 5.0) + FSharp.Core (>= 8.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.24) - Aardvark.Base (5.2.24) - Aardvark.Base.FSharp (5.2.24) + Aardvark.Base.Incremental (5.3.2) + Aardvark.Base (5.3.2) + Aardvark.Base.FSharp (5.3.2) Aardvark.Base.TypeProviders (>= 4.5.15 < 4.6) - FSharp.Core (>= 5.0) + FSharp.Core (>= 8.0) FSharp.Data.Adaptive (>= 1.2 < 1.3) FsPickler (>= 5.3.2 < 5.4) - Aardvark.Base.IO (5.2.24) - Aardvark.Base (5.2.24) - Aardvark.Base.Tensors (5.2.24) + Aardvark.Base.IO (5.3.2) + Aardvark.Base (5.3.2) + Aardvark.Base.Tensors (5.3.2) System.Dynamic.Runtime (>= 4.3 < 4.4) - 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.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.Telemetry (5.3.2) + Aardvark.Base.Tensors (5.3.2) + Aardvark.Base (5.3.2) + Aardvark.Base.FSharp (5.3.2) + FSharp.Core (>= 8.0) Aardvark.Base.TypeProviders (4.5.15) FSharp.Core (>= 4.2.3) - Aardvark.Build (1.0.20) - Aardvark.Geometry (5.2.24) - Aardvark.Base (5.2.24) - Aardvark.Base.FSharp (5.2.24) - Aardvark.Base.Tensors (5.2.24) + Aardvark.Build (1.0.25) + Aardvark.Data.OPC (0.9) + Aardvark.Base.Tensors (>= 5.3.2 < 5.4) + Aardvark.Rendering.Common (>= 5.5) + FSharp.Core (>= 8.0) + SharpZipLib (>= 1.4.1 < 1.5) + Aardvark.FontProvider (0.1) + Aardvark.Base.Fonts (>= 5.3) + FSharp.Core (>= 8.0.100) + Aardvark.Geometry (5.3.2) + Aardvark.Base (5.3.2) + Aardvark.Base.FSharp (5.3.2) + Aardvark.Base.Tensors (5.3.2) Aardvark.Base.TypeProviders (>= 4.5.15 < 4.6) - FSharp.Core (>= 5.0) + FSharp.Core (>= 8.0) FSharp.Data.Adaptive (>= 1.2 < 1.3) FsPickler (>= 5.3.2 < 5.4) Unofficial.LibTessDotNet (>= 2.0.2 < 2.1) - Aardvark.Geometry.Intersection (5.2.23) - Aardvark.Base.IO (>= 5.2.24 < 5.3) - Aardvark.GPGPU (5.4.1) - Aardvark.Base.Incremental (>= 5.2.23 < 5.3) - Aardvark.Rendering (5.4.1) - FShade.Core (>= 5.4 < 5.5) - FShade.GLSL (>= 5.4) - FSharp.Core (>= 5.0.1) - Aardvark.Rendering (5.4.1) - 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) + Aardvark.Geometry.Intersection (5.5.1) + Aardvark.Base.IO (>= 5.3 < 5.4) + Aardvark.GPGPU (5.5) + Aardvark.Base.Incremental (>= 5.3 < 5.4) + Aardvark.Rendering (5.5) + FShade.Core (>= 5.6 < 5.7) + FShade.GLSL (>= 5.6) + FSharp.Core (>= 8.0) + Aardvark.Rendering (5.5) + Aardvark.Base.Essentials (>= 5.3 < 5.4) + Aardvark.Base.Incremental (>= 5.3 < 5.4) + Aardvark.Base.Tensors (>= 5.3 < 5.4) + Aardvark.Rendering.Common (5.5) + FShade.Core (>= 5.6 < 5.7) + FShade.GLSL (>= 5.6) + FSharp.Core (>= 8.0) FSharp.Data.Adaptive (>= 1.2.13 < 1.3) - Aardvark.Rendering.GL (5.4.1) - 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.1) - FShade (>= 5.4 < 5.5) - FSharp.Core (>= 5.0.1) + Aardvark.Rendering.Common (5.5) + Aardvark.Base (>= 5.3) + FSharp.Core (>= 8.0) + System.Reflection.Emit.Lightweight (>= 4.7) + Aardvark.Rendering.GL (5.5) + Aardvark.Assembler (>= 0.1 < 0.2) + Aardvark.Base.Essentials (>= 5.3 < 5.4) + Aardvark.Base.Incremental (>= 5.3 < 5.4) + Aardvark.Base.Tensors (>= 5.3 < 5.4) + Aardvark.Geometry (>= 5.3 < 5.4) + Aardvark.Rendering (5.5) + FShade (>= 5.6 < 5.7) + FSharp.Core (>= 8.0) Unofficial.OpenTK (>= 3.0.21 < 3.1) - Aardvark.Rendering.Text (5.4.1) - Aardvark.Base.Incremental (>= 5.2.23 < 5.3) - Aardvark.Rendering (5.4.1) - Aardvark.SceneGraph (5.4.1) + Aardvark.Rendering.Text (5.5) + Aardvark.FontProvider (>= 0.1 < 0.2) + Aardvark.Rendering (5.5) + Aardvark.SceneGraph (5.5) CommonMark.NET (>= 0.15.1 < 0.16) - 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.4.1) - 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.1) - FShade (>= 5.4 < 5.5) - FSharp.Core (>= 5.0.1) + FSharp.Core (>= 8.0) + Aardvark.Rendering.Vulkan (5.5) + Aardvark.Base.FSharp (>= 5.3 < 5.4) + Aardvark.Base.Incremental (>= 5.3 < 5.4) + Aardvark.Base.Tensors (>= 5.3 < 5.4) + Aardvark.Rendering (5.5) + FShade (>= 5.6 < 5.7) + FSharp.Core (>= 8.0) GLSLangSharp (>= 0.4.14 < 0.5) - Aardvark.SceneGraph (5.4.1) - Aardvark.Base.Incremental (>= 5.2.23 < 5.3) - Aardvark.Rendering (5.4.1) - FShade.Core (>= 5.4 < 5.5) - FShade.GLSL (>= 5.4) - FSharp.Core (>= 5.0.1) - Aardvark.SceneGraph.Opc (5.4.1) - Aardvark.Base.Incremental (>= 5.2.23 < 5.3) - Aardvark.Base.IO (>= 5.2.23 < 5.3) - Aardvark.Rendering (5.4.1) - Aardvark.SceneGraph (5.4.1) - FSharp.Core (>= 5.0.1) - SharpZipLib (>= 1.4.1 < 1.5) - Aardvark.Service (5.4) - Aardvark.Application (>= 5.4.1) - Aardvark.Base (>= 5.2.21 < 5.3) - Aardvark.Base.FSharp (>= 5.2.21 < 5.3) - Aardvark.GPGPU (>= 5.4.1 < 5.5) - Aardvark.Rendering (>= 5.4.1 < 5.5) - Aardvark.Rendering.GL (>= 5.4.1) - Aardvark.Rendering.Vulkan (>= 5.4.1 < 5.5) - FSharp.Core (>= 5.0.1) - FSharp.Data.Adaptive (>= 1.2.13 < 1.3) - FsPickler (>= 5.3.2 < 5.4) + Aardvark.SceneGraph (5.5) + Aardvark.Base.Incremental (>= 5.3 < 5.4) + Aardvark.Rendering (5.5) + FShade.Core (>= 5.6 < 5.7) + FShade.GLSL (>= 5.6) + FSharp.Core (>= 8.0) + Aardvark.Service (5.5) + Aardvark.Application (>= 5.5) + Aardvark.GPGPU (>= 5.5 < 5.6) + Aardvark.Rendering.GL (>= 5.5) + Aardvark.Rendering.Vulkan (>= 5.5 < 5.6) FsPickler.Json (>= 5.3.2 < 5.4) Suave (>= 2.5.6 < 2.6) - Aardvark.UI (5.4) - Aardvark.Application (>= 5.4.1) - Aardvark.Base (>= 5.2.21 < 5.3) - Aardvark.Base.FSharp (>= 5.2.21 < 5.3) - Aardvark.Base.Incremental (>= 5.2.21 < 5.3) - Aardvark.Rendering (>= 5.4.1 < 5.5) - Aardvark.SceneGraph (>= 5.4.1 < 5.5) - Aardvark.Service (5.4) - FSharp.Core (>= 5.0.1) - FSharp.Data.Adaptive (>= 1.2.13 < 1.3) - FsPickler (>= 5.3.2 < 5.4) - FsPickler.Json (>= 5.3.2 < 5.4) - Suave (>= 2.5.6 < 2.6) - Aardvark.UI.Primitives (5.4) - Aardvark.Application (>= 5.4.1) - Aardvark.Base (>= 5.2.21 < 5.3) - Aardvark.Base.FSharp (>= 5.2.21 < 5.3) - Aardvark.Base.Incremental (>= 5.2.21 < 5.3) - Aardvark.Rendering (>= 5.4.1 < 5.5) - Aardvark.SceneGraph (>= 5.4.1 < 5.5) - Aardvark.Service (5.4) - Aardvark.UI (5.4) - Adaptify.Core (>= 1.1.9 < 1.2) + Aardvark.UI (5.5) + Aardvark.SceneGraph (>= 5.5 < 5.6) + Aardvark.Service (5.5) + Aardvark.UI.Primitives (5.5) + Aardvark.Service (5.5) + Aardvark.UI (5.5) + Adaptify.Core (>= 1.1.13 < 1.2) Aether (>= 8.3.1 < 8.4) - FSharp.Core (>= 5.0.1) + Adaptify.Core (1.1.13) FSharp.Data.Adaptive (>= 1.2.13 < 1.3) - FsPickler (>= 5.3.2 < 5.4) - FsPickler.Json (>= 5.3.2 < 5.4) - Adaptify.Core (1.1.9) - FSharp.Data.Adaptive (>= 1.2.13 < 1.3) - Adaptify.MSBuild (1.1.9) - Adaptify.Core (1.1.9) + Adaptify.MSBuild (1.1.13) + Adaptify.Core (1.1.13) Aether (8.3.1) FSharp.Core (>= 4.3.4) CommonMark.NET (0.15.1) - 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.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.4) - Aardvark.Base (>= 5.2.19 < 5.3) - Aardvark.Base.FSharp (>= 5.2.19 < 5.3) - FSharp.Core (>= 5.0) + FShade (5.6) + FShade.Core (5.6) + FShade.GLSL (5.6) + FShade.Imperative (5.6) + FShade.SpirV (5.6) + FShade.Core (5.6) + Aardvark.Base (>= 5.3 < 5.4) + Aardvark.Base.FSharp (>= 5.3 < 5.4) + FShade.Imperative (5.6) + FSharp.Core (>= 8.0) + FShade.GLSL (5.6) + Aardvark.Base (>= 5.3 < 5.4) + Aardvark.Base.FSharp (>= 5.3 < 5.4) + FShade.Core (5.6) + FShade.Imperative (5.6) + FSharp.Core (>= 8.0) + FShade.Imperative (5.6) + Aardvark.Base (>= 5.3 < 5.4) + Aardvark.Base.FSharp (>= 5.3 < 5.4) + FSharp.Core (>= 8.0) FsPickler (>= 5.3.2 < 5.4) - 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) + FShade.SpirV (5.6) + Aardvark.Base (>= 5.3 < 5.4) + Aardvark.Base.FSharp (>= 5.3 < 5.4) + FShade.Core (5.6) + FShade.Imperative (5.6) + FSharp.Core (>= 8.0) + FSharp.Core (8.0.100) + FSharp.Data.Adaptive (1.2.15) FSharp.Core (>= 4.7) System.Reflection.Emit.Lightweight (>= 4.6) FsPickler (5.3.2) @@ -210,32 +181,27 @@ NUGET FSharp.Core (>= 4.3.2) FsPickler (>= 5.3.2) Newtonsoft.Json (>= 10.0.1) - GLSLangSharp (0.4.14) + FuzzySharp (2.0.2) + GLSLangSharp (0.4.15) FSharp.Core (>= 5.0) - Microsoft.Bcl.AsyncInterfaces (6.0) - restriction: || (&& (== net6.0) (>= net461)) (&& (== net6.0) (< netcoreapp3.1)) (== netstandard2.0) - System.Threading.Tasks.Extensions (>= 4.5.4) - restriction: || (&& (== net6.0) (>= net461)) (&& (== net6.0) (< netstandard2.1)) (== netstandard2.0) - Microsoft.NETCore.Platforms (6.0.2) + Microsoft.Bcl.AsyncInterfaces (8.0) - restriction: || (&& (== net8.0) (>= net462)) (&& (== net8.0) (< net6.0)) (== netstandard2.0) + System.Threading.Tasks.Extensions (>= 4.5.4) - restriction: || (&& (== net8.0) (>= net462)) (&& (== net8.0) (< netstandard2.1)) (== netstandard2.0) + Microsoft.NETCore.Platforms (7.0.4) Microsoft.NETCore.Targets (5.0) - Newtonsoft.Json (13.0.1) + Newtonsoft.Json (13.0.3) SharpZipLib (1.4.2) - System.Memory (>= 4.5.4) - restriction: || (&& (== net6.0) (< netstandard2.1)) (== netstandard2.0) - System.Threading.Tasks.Extensions (>= 4.5.2) - restriction: || (&& (== net6.0) (< netstandard2.1)) (== netstandard2.0) - SixLabors.ImageSharp (2.1.3) - 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) - System.Runtime.CompilerServices.Unsafe (>= 5.0) - System.Text.Encoding.CodePages (>= 5.0) + System.Memory (>= 4.5.4) - restriction: || (&& (== net8.0) (< netstandard2.1)) (== netstandard2.0) + System.Threading.Tasks.Extensions (>= 4.5.2) - restriction: || (&& (== net8.0) (< netstandard2.1)) (== netstandard2.0) Suave (2.5.6) FSharp.Core (>= 4.3.4) - System.Buffers (4.5.1) - restriction: || (&& (== net6.0) (>= net461)) (&& (== net6.0) (< netcoreapp3.1)) (== netstandard2.0) + System.Buffers (4.5.1) - restriction: || (&& (== net8.0) (>= net462)) (&& (== net8.0) (< net6.0)) (== netstandard2.0) System.Collections (4.3) Microsoft.NETCore.Platforms (>= 1.1) Microsoft.NETCore.Targets (>= 1.1) System.Runtime (>= 4.3) - System.Collections.Immutable (6.0) - System.Memory (>= 4.5.4) - restriction: || (&& (== net6.0) (>= net461)) (== netstandard2.0) - System.Runtime.CompilerServices.Unsafe (>= 6.0) + System.Collections.Immutable (8.0) + System.Memory (>= 4.5.5) - restriction: || (&& (== net8.0) (>= net462)) (&& (== net8.0) (< net6.0)) (== netstandard2.0) + System.Runtime.CompilerServices.Unsafe (>= 6.0) - restriction: || (&& (== net8.0) (>= net462)) (&& (== net8.0) (< net6.0)) (&& (== net8.0) (< net7.0)) (== netstandard2.0) System.Diagnostics.Debug (4.3) Microsoft.NETCore.Platforms (>= 1.1) Microsoft.NETCore.Targets (>= 1.1) @@ -289,10 +255,10 @@ NUGET System.Runtime (>= 4.3) System.Runtime.Extensions (>= 4.3) System.Threading (>= 4.3) - System.Memory (4.5.4) - restriction: || (&& (== net6.0) (< netstandard2.1)) (== netstandard2.0) - 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) + System.Memory (4.5.5) - restriction: || (&& (== net8.0) (>= net462)) (&& (== net8.0) (< net6.0)) (== netstandard2.0) + System.Buffers (>= 4.5.1) - restriction: || (&& (== net8.0) (>= monotouch)) (&& (== net8.0) (>= net461)) (&& (== net8.0) (< netcoreapp2.0)) (&& (== net8.0) (< netstandard1.1)) (&& (== net8.0) (< netstandard2.0)) (&& (== net8.0) (>= xamarinios)) (&& (== net8.0) (>= xamarinmac)) (&& (== net8.0) (>= xamarintvos)) (&& (== net8.0) (>= xamarinwatchos)) (== netstandard2.0) + System.Numerics.Vectors (>= 4.4) - restriction: || (&& (== net8.0) (< netcoreapp2.0)) (== netstandard2.0) + System.Runtime.CompilerServices.Unsafe (>= 4.5.3) - restriction: || (&& (== net8.0) (>= monotouch)) (&& (== net8.0) (>= net461)) (&& (== net8.0) (< netcoreapp2.0)) (&& (== net8.0) (< netcoreapp2.1)) (&& (== net8.0) (< netstandard1.1)) (&& (== net8.0) (< netstandard2.0)) (&& (== net8.0) (>= uap10.1)) (&& (== net8.0) (>= xamarinios)) (&& (== net8.0) (>= xamarinmac)) (&& (== net8.0) (>= xamarintvos)) (&& (== net8.0) (>= xamarinwatchos)) (== netstandard2.0) System.Numerics.Vectors (4.5) System.ObjectModel (4.3) System.Collections (>= 4.3) @@ -307,17 +273,18 @@ NUGET System.Reflection.Primitives (>= 4.3) System.Runtime (>= 4.3) System.Reflection.Emit (4.7) - System.Reflection.Emit.ILGeneration (>= 4.7) - restriction: || (&& (== net6.0) (< netcoreapp2.0) (< netstandard2.1)) (&& (== net6.0) (< netstandard1.1)) (&& (== net6.0) (< netstandard2.0)) (&& (== net6.0) (>= uap10.1)) (== netstandard2.0) + System.Reflection.Emit.ILGeneration (>= 4.7) - restriction: || (&& (== net8.0) (< netcoreapp2.0) (< netstandard2.1)) (&& (== net8.0) (< netstandard1.1)) (&& (== net8.0) (< netstandard2.0)) (&& (== net8.0) (>= uap10.1)) (== netstandard2.0) System.Reflection.Emit.ILGeneration (4.7) System.Reflection.Emit.Lightweight (4.7) - System.Reflection.Emit.ILGeneration (>= 4.7) - restriction: || (&& (== net6.0) (< netcoreapp2.0) (< netstandard2.1)) (&& (== net6.0) (< netstandard2.0)) (&& (== net6.0) (< portable-net45+wp8)) (&& (== net6.0) (>= uap10.1)) (== netstandard2.0) + System.Reflection.Emit.ILGeneration (>= 4.7) - restriction: || (&& (== net8.0) (< netcoreapp2.0) (< netstandard2.1)) (&& (== net8.0) (< netstandard2.0)) (&& (== net8.0) (< portable-net45+wp8)) (&& (== net8.0) (>= uap10.1)) (== netstandard2.0) System.Reflection.Extensions (4.3) Microsoft.NETCore.Platforms (>= 1.1) Microsoft.NETCore.Targets (>= 1.1) System.Reflection (>= 4.3) System.Runtime (>= 4.3) - System.Reflection.Metadata (6.0.1) - restriction: || (&& (== net6.0) (< netcoreapp3.1)) (== netstandard2.0) - System.Collections.Immutable (>= 6.0) + System.Reflection.Metadata (8.0) + System.Collections.Immutable (>= 8.0) + System.Memory (>= 4.5.5) - restriction: || (&& (== net8.0) (>= net462)) (&& (== net8.0) (< net6.0)) (== netstandard2.0) System.Reflection.Primitives (4.3) Microsoft.NETCore.Platforms (>= 1.1) Microsoft.NETCore.Targets (>= 1.1) @@ -332,7 +299,7 @@ NUGET System.Runtime (4.3.1) Microsoft.NETCore.Platforms (>= 1.1.1) Microsoft.NETCore.Targets (>= 1.1.3) - System.Runtime.CompilerServices.Unsafe (6.0) + System.Runtime.CompilerServices.Unsafe (6.0) - restriction: || (&& (== net8.0) (>= net462)) (&& (== net8.0) (< net6.0)) (&& (== net8.0) (< net7.0)) (== netstandard2.0) System.Runtime.Extensions (4.3.1) Microsoft.NETCore.Platforms (>= 1.1.1) Microsoft.NETCore.Targets (>= 1.1.3) @@ -341,21 +308,17 @@ 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.Runtime.CompilerServices.Unsafe (>= 6.0) - System.Text.Encodings.Web (6.0) - System.Buffers (>= 4.5.1) - restriction: || (&& (== net6.0) (>= net461)) (&& (== net6.0) (< netcoreapp3.1)) (== netstandard2.0) - System.Memory (>= 4.5.4) - restriction: || (&& (== net6.0) (>= net461)) (&& (== net6.0) (< netcoreapp3.1)) (== netstandard2.0) - System.Runtime.CompilerServices.Unsafe (>= 6.0) - System.Text.Json (6.0.2) - Microsoft.Bcl.AsyncInterfaces (>= 6.0) - restriction: || (&& (== net6.0) (>= net461)) (&& (== net6.0) (< netcoreapp3.1)) (== netstandard2.0) - System.Buffers (>= 4.5.1) - restriction: || (&& (== net6.0) (>= net461)) (&& (== net6.0) (< netcoreapp3.1)) (== netstandard2.0) - System.Memory (>= 4.5.4) - restriction: || (&& (== net6.0) (>= net461)) (&& (== net6.0) (< netcoreapp3.1)) (== netstandard2.0) - System.Numerics.Vectors (>= 4.5) - restriction: || (&& (== net6.0) (>= net461)) (&& (== net6.0) (< netcoreapp3.1)) (== netstandard2.0) - System.Runtime.CompilerServices.Unsafe (>= 6.0) - System.Text.Encodings.Web (>= 6.0) - System.Threading.Tasks.Extensions (>= 4.5.4) - restriction: || (&& (== net6.0) (>= net461)) (&& (== net6.0) (< netcoreapp3.1)) (== netstandard2.0) + System.Text.Encodings.Web (8.0) + System.Buffers (>= 4.5.1) - restriction: || (&& (== net8.0) (>= net462)) (&& (== net8.0) (< net6.0)) (== netstandard2.0) + System.Memory (>= 4.5.5) - restriction: || (&& (== net8.0) (>= net462)) (&& (== net8.0) (< net6.0)) (== netstandard2.0) + System.Runtime.CompilerServices.Unsafe (>= 6.0) - restriction: || (&& (== net8.0) (>= net462)) (&& (== net8.0) (< net6.0)) (&& (== net8.0) (< net7.0)) (== netstandard2.0) + System.Text.Json (8.0.4) + Microsoft.Bcl.AsyncInterfaces (>= 8.0) - restriction: || (&& (== net8.0) (>= net462)) (&& (== net8.0) (< net6.0)) (== netstandard2.0) + System.Buffers (>= 4.5.1) - restriction: || (&& (== net8.0) (>= net462)) (&& (== net8.0) (< net6.0)) (== netstandard2.0) + System.Memory (>= 4.5.5) - restriction: || (&& (== net8.0) (>= net462)) (&& (== net8.0) (< net6.0)) (== netstandard2.0) + System.Runtime.CompilerServices.Unsafe (>= 6.0) - restriction: || (&& (== net8.0) (>= net462)) (&& (== net8.0) (< net6.0)) (&& (== net8.0) (< net7.0)) (== netstandard2.0) + System.Text.Encodings.Web (>= 8.0) + System.Threading.Tasks.Extensions (>= 4.5.4) - restriction: || (&& (== net8.0) (>= net462)) (&& (== net8.0) (< net6.0)) (== netstandard2.0) System.Threading (4.3) System.Runtime (>= 4.3) System.Threading.Tasks (>= 4.3) @@ -363,8 +326,8 @@ 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) (< netcoreapp3.1)) (== 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) + System.Threading.Tasks.Extensions (4.5.4) - restriction: || (&& (== net8.0) (>= net462)) (&& (== net8.0) (< net6.0)) (== netstandard2.0) + System.Runtime.CompilerServices.Unsafe (>= 4.5.3) - restriction: || (&& (== net8.0) (>= net461)) (&& (== net8.0) (< netcoreapp2.1)) (&& (== net8.0) (< netstandard1.0)) (&& (== net8.0) (< netstandard2.0)) (&& (== net8.0) (>= wp8)) (== netstandard2.0) Uncodium.Eigensystems (1.1.2) Aardvark.Base (>= 5.1 < 6.0) Unofficial.LibTessDotNet (2.0.2) @@ -374,262 +337,215 @@ NUGET GROUP Examples STORAGE: NONE -RESTRICTION: || (== net6.0) (== netstandard2.0) +RESTRICTION: || (== net8.0) (== netstandard2.0) NUGET remote: https://api.nuget.org/v3/index.json - Aardium (2.0.9) - FSharp.Core (>= 4.7) + Aardium (2.1.1) + Aardvark.Base (>= 5.3 < 5.4) + FSharp.Core (>= 8.0) FSys (>= 0.0.1 < 0.1) - Aardvark.Application (5.4.1) - Aardvark.Base.Essentials (>= 5.2.23 < 5.3) - Aardvark.Base.Incremental (>= 5.2.23 < 5.3) - Aardvark.Rendering (5.4.1) - FShade.Core (>= 5.4 < 5.5) - FShade.GLSL (>= 5.4) - FSharp.Core (>= 5.0.1) - Aardvark.Application.Slim (5.4.1) - Aardvark.Application (5.4.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.Rendering (5.4.1) - FShade (>= 5.4 < 5.5) - FSharp.Core (>= 5.0.1) + Aardvark.Application (5.5) + Aardvark.Base.Essentials (>= 5.3 < 5.4) + Aardvark.Base.Incremental (>= 5.3 < 5.4) + Aardvark.Rendering (5.5) + FShade.Core (>= 5.6 < 5.7) + FShade.GLSL (>= 5.6) + FSharp.Core (>= 8.0) + Aardvark.Application.Slim (5.5) + Aardvark.Application (5.5) + Aardvark.Base.Essentials (>= 5.3 < 5.4) + Aardvark.Base.Incremental (>= 5.3 < 5.4) + Aardvark.Rendering (5.5) + FShade (>= 5.6 < 5.7) + FSharp.Core (>= 8.0) Silk.NET.GLFW (2.15) Unofficial.OpenTK (>= 3.0.21 < 3.1) - Aardvark.Application.Slim.GL (5.4.1) - Aardvark.Application (5.4.1) - Aardvark.Application.Slim (5.4.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.Rendering (5.4.1) - Aardvark.Rendering.GL (5.4.1) - FShade (>= 5.4 < 5.5) - FSharp.Core (>= 5.0.1) + Aardvark.Application.Slim.GL (5.5) + Aardvark.Application (5.5) + Aardvark.Application.Slim (5.5) + Aardvark.Base.Essentials (>= 5.3 < 5.4) + Aardvark.Base.Incremental (>= 5.3 < 5.4) + Aardvark.Base.Tensors (>= 5.3 < 5.4) + Aardvark.Rendering (5.5) + Aardvark.Rendering.GL (5.5) + FShade (>= 5.6 < 5.7) + FSharp.Core (>= 8.0) Silk.NET.Core (2.15) Silk.NET.GLFW (2.15) Unofficial.OpenTK (>= 3.0.21 < 3.1) - Aardvark.Application.Slim.Vulkan (5.4.1) - Aardvark.Application (5.4.1) - Aardvark.Application.Slim (5.4.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.Rendering (5.4.1) - Aardvark.Rendering.Vulkan (5.4.1) - FShade (>= 5.4 < 5.5) - FSharp.Core (>= 5.0.1) + Aardvark.Application.Slim.Vulkan (5.5) + Aardvark.Application (5.5) + Aardvark.Application.Slim (5.5) + Aardvark.Base.Essentials (>= 5.3 < 5.4) + Aardvark.Base.Incremental (>= 5.3 < 5.4) + Aardvark.Rendering (5.5) + Aardvark.Rendering.Vulkan (5.5) + FShade (>= 5.6 < 5.7) + FSharp.Core (>= 8.0) GLSLangSharp (>= 0.4.14 < 0.5) Silk.NET.GLFW (2.15) Unofficial.OpenTK (>= 3.0.21 < 3.1) - Aardvark.Assembler (0.0.8) - Aardvark.Base (>= 5.2.7 < 5.3) - Aardvark.Base.Runtime (>= 5.2.7 < 5.3) - FSharp.Core (>= 5.0) + Aardvark.Assembler (0.1) + Aardvark.Base.FSharp (>= 5.3) + FSharp.Core (>= 8.0) FSharp.Data.Adaptive (>= 1.2.13 < 1.3) - 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.24) - Aardvark.Base (5.2.24) - System.Collections.Immutable (>= 5.0) - Aardvark.Base.FSharp (5.2.24) - Aardvark.Base (5.2.24) + Aardvark.Base (5.3.2) + Aardvark.Base.Telemetry (5.3.2) + System.Collections.Immutable (>= 8.0) + System.Reflection.Metadata (>= 8.0) + System.Text.Json (>= 8.0.4) + Aardvark.Base.Essentials (5.3.2) + Aardvark.Base (5.3.2) + System.Collections.Immutable (>= 8.0) + Aardvark.Base.FSharp (5.3.2) + Aardvark.Base (5.3.2) Aardvark.Base.TypeProviders (>= 4.5.15 < 4.6) - FSharp.Core (>= 5.0) + FSharp.Core (>= 8.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.24) - Aardvark.Base (5.2.24) - Aardvark.Base.FSharp (5.2.24) + Aardvark.Base.Incremental (5.3.2) + Aardvark.Base (5.3.2) + Aardvark.Base.FSharp (5.3.2) Aardvark.Base.TypeProviders (>= 4.5.15 < 4.6) - FSharp.Core (>= 5.0) + FSharp.Core (>= 8.0) FSharp.Data.Adaptive (>= 1.2 < 1.3) FsPickler (>= 5.3.2 < 5.4) - Aardvark.Base.IO (5.2.24) - Aardvark.Base (5.2.24) - Aardvark.Base.Tensors (5.2.24) + Aardvark.Base.IO (5.3.2) + Aardvark.Base (5.3.2) + Aardvark.Base.Tensors (5.3.2) System.Dynamic.Runtime (>= 4.3 < 4.4) - 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.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.Telemetry (5.3.2) + Aardvark.Base.Tensors (5.3.2) + Aardvark.Base (5.3.2) + Aardvark.Base.FSharp (5.3.2) + FSharp.Core (>= 8.0) Aardvark.Base.TypeProviders (4.5.15) FSharp.Core (>= 4.2.3) - Aardvark.Geometry (5.2.24) - Aardvark.Base (5.2.24) - Aardvark.Base.FSharp (5.2.24) - Aardvark.Base.Tensors (5.2.24) + Aardvark.Geometry (5.3.2) + Aardvark.Base (5.3.2) + Aardvark.Base.FSharp (5.3.2) + Aardvark.Base.Tensors (5.3.2) Aardvark.Base.TypeProviders (>= 4.5.15 < 4.6) - FSharp.Core (>= 5.0) + FSharp.Core (>= 8.0) FSharp.Data.Adaptive (>= 1.2 < 1.3) FsPickler (>= 5.3.2 < 5.4) Unofficial.LibTessDotNet (>= 2.0.2 < 2.1) - Aardvark.Geometry.Clustering (5.2.23) - Aardvark.Base (>= 5.2.24 < 5.3) - Aardvark.Geometry.PointTree (5.2.23) - FSharp.Core (>= 5.0.1) - Aardvark.Geometry.Intersection (5.2.23) - Aardvark.Base.IO (>= 5.2.24 < 5.3) - Aardvark.Geometry.PointTree (5.2.23) - Aardvark.Base.IO (>= 5.2.24 < 5.3) - Aardvark.Geometry.PolyMesh (5.2.23) - Aardvark.Base (>= 5.2.24 < 5.3) - Aardvark.Geometry.Clustering (5.2.23) - Aardvark.Geometry.Intersection (5.2.23) - Aardvark.Rendering (>= 5.3.6) - Aardvark.GPGPU (5.4.1) - Aardvark.Base.Incremental (>= 5.2.23 < 5.3) - Aardvark.Rendering (5.4.1) - FShade.Core (>= 5.4 < 5.5) - FShade.GLSL (>= 5.4) - FSharp.Core (>= 5.0.1) - Aardvark.PixImage.FreeImage (5.3.4) - Aardvark.Base.Tensors (>= 5.2.4 < 5.3) - FSharp.Core (>= 5.0) - System.Buffers (>= 4.5.1) - System.Memory (>= 4.5.5) - Aardvark.PixImage.Pfim (0.9.1) - Aardvark.Base.Tensors (>= 5.2.19 < 5.3) - FSharp.Core (>= 5.0.1) + Aardvark.Geometry.Clustering (5.5.1) + Aardvark.Base (>= 5.3 < 5.4) + Aardvark.Geometry.PointTree (5.5.1) + FSharp.Core (>= 8.0) + Aardvark.Geometry.Intersection (5.5.1) + Aardvark.Base.IO (>= 5.3 < 5.4) + Aardvark.Geometry.PointTree (5.5.1) + Aardvark.Base.IO (>= 5.3 < 5.4) + Aardvark.Geometry.PolyMesh (5.5.1) + Aardvark.Base (>= 5.3 < 5.4) + Aardvark.Geometry.Clustering (5.5.1) + Aardvark.Geometry.Intersection (5.5.1) + Aardvark.Rendering.Common (>= 5.5) + Aardvark.GPGPU (5.5) + Aardvark.Base.Incremental (>= 5.3 < 5.4) + Aardvark.Rendering (5.5) + FShade.Core (>= 5.6 < 5.7) + FShade.GLSL (>= 5.6) + FSharp.Core (>= 8.0) + Aardvark.PixImage.FreeImage (5.3.5) + Aardvark.Base.Tensors (>= 5.3 < 5.4) + FSharp.Core (>= 8.0) + Aardvark.PixImage.Pfim (0.9.3) + Aardvark.Base.Tensors (>= 5.3 < 5.4) + FSharp.Core (>= 8.0) Pfim (>= 0.11.2 < 0.12) - Aardvark.Rendering (5.4.1) - 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) + Aardvark.Rendering (5.5) + Aardvark.Base.Essentials (>= 5.3 < 5.4) + Aardvark.Base.Incremental (>= 5.3 < 5.4) + Aardvark.Base.Tensors (>= 5.3 < 5.4) + Aardvark.Rendering.Common (5.5) + FShade.Core (>= 5.6 < 5.7) + FShade.GLSL (>= 5.6) + FSharp.Core (>= 8.0) FSharp.Data.Adaptive (>= 1.2.13 < 1.3) - Aardvark.Rendering.GL (5.4.1) - 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.1) - FShade (>= 5.4 < 5.5) - FSharp.Core (>= 5.0.1) + Aardvark.Rendering.Common (5.5) + Aardvark.Base (>= 5.3) + FSharp.Core (>= 8.0) + System.Reflection.Emit.Lightweight (>= 4.7) + Aardvark.Rendering.GL (5.5) + Aardvark.Assembler (>= 0.1 < 0.2) + Aardvark.Base.Essentials (>= 5.3 < 5.4) + Aardvark.Base.Incremental (>= 5.3 < 5.4) + Aardvark.Base.Tensors (>= 5.3 < 5.4) + Aardvark.Geometry (>= 5.3 < 5.4) + Aardvark.Rendering (5.5) + FShade (>= 5.6 < 5.7) + FSharp.Core (>= 8.0) Unofficial.OpenTK (>= 3.0.21 < 3.1) - Aardvark.Rendering.Vulkan (5.4.1) - 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.1) - FShade (>= 5.4 < 5.5) - FSharp.Core (>= 5.0.1) + Aardvark.Rendering.Vulkan (5.5) + Aardvark.Base.FSharp (>= 5.3 < 5.4) + Aardvark.Base.Incremental (>= 5.3 < 5.4) + Aardvark.Base.Tensors (>= 5.3 < 5.4) + Aardvark.Rendering (5.5) + FShade (>= 5.6 < 5.7) + FSharp.Core (>= 8.0) GLSLangSharp (>= 0.4.14 < 0.5) - Aardvark.SceneGraph (5.4.1) - Aardvark.Base.Incremental (>= 5.2.23 < 5.3) - Aardvark.Rendering (5.4.1) - FShade.Core (>= 5.4 < 5.5) - FShade.GLSL (>= 5.4) - FSharp.Core (>= 5.0.1) - Aardvark.SceneGraph.IO (5.4.1) - Aardvark.Base.Incremental (>= 5.2.23 < 5.3) - Aardvark.Base.Tensors (>= 5.2.23 < 5.3) - Aardvark.Rendering (5.4.1) - Aardvark.SceneGraph (5.4.1) - AssimpNet (>= 5.0.0-beta1 < 5.1.0-beta) - FShade.Core (>= 5.4 < 5.5) - FShade.GLSL (>= 5.4) - FSharp.Core (>= 5.0.1) - Aardvark.Service (5.4) - Aardvark.Application (>= 5.4.1) - Aardvark.Base (>= 5.2.21 < 5.3) - Aardvark.Base.FSharp (>= 5.2.21 < 5.3) - Aardvark.GPGPU (>= 5.4.1 < 5.5) - Aardvark.Rendering (>= 5.4.1 < 5.5) - Aardvark.Rendering.GL (>= 5.4.1) - Aardvark.Rendering.Vulkan (>= 5.4.1 < 5.5) - FSharp.Core (>= 5.0.1) - FSharp.Data.Adaptive (>= 1.2.13 < 1.3) - FsPickler (>= 5.3.2 < 5.4) - FsPickler.Json (>= 5.3.2 < 5.4) - Suave (>= 2.5.6 < 2.6) - Aardvark.UI (5.4) - Aardvark.Application (>= 5.4.1) - Aardvark.Base (>= 5.2.21 < 5.3) - Aardvark.Base.FSharp (>= 5.2.21 < 5.3) - Aardvark.Base.Incremental (>= 5.2.21 < 5.3) - Aardvark.Rendering (>= 5.4.1 < 5.5) - Aardvark.SceneGraph (>= 5.4.1 < 5.5) - Aardvark.Service (5.4) - FSharp.Core (>= 5.0.1) - FSharp.Data.Adaptive (>= 1.2.13 < 1.3) - FsPickler (>= 5.3.2 < 5.4) + Aardvark.SceneGraph (5.5) + Aardvark.Base.Incremental (>= 5.3 < 5.4) + Aardvark.Rendering (5.5) + FShade.Core (>= 5.6 < 5.7) + FShade.GLSL (>= 5.6) + FSharp.Core (>= 8.0) + Aardvark.Service (5.5) + Aardvark.Application (>= 5.5) + Aardvark.GPGPU (>= 5.5 < 5.6) + Aardvark.Rendering.GL (>= 5.5) + Aardvark.Rendering.Vulkan (>= 5.5 < 5.6) FsPickler.Json (>= 5.3.2 < 5.4) Suave (>= 2.5.6 < 2.6) - Aardvark.UI.Primitives (5.4) - Aardvark.Application (>= 5.4.1) - Aardvark.Base (>= 5.2.21 < 5.3) - Aardvark.Base.FSharp (>= 5.2.21 < 5.3) - Aardvark.Base.Incremental (>= 5.2.21 < 5.3) - Aardvark.Rendering (>= 5.4.1 < 5.5) - Aardvark.SceneGraph (>= 5.4.1 < 5.5) - Aardvark.Service (5.4) - Aardvark.UI (5.4) - Adaptify.Core (>= 1.1.9 < 1.2) + Aardvark.UI (5.5) + Aardvark.SceneGraph (>= 5.5 < 5.6) + Aardvark.Service (5.5) + Aardvark.UI.Primitives (5.5) + Aardvark.Service (5.5) + Aardvark.UI (5.5) + Adaptify.Core (>= 1.1.13 < 1.2) Aether (>= 8.3.1 < 8.4) - FSharp.Core (>= 5.0.1) - FSharp.Data.Adaptive (>= 1.2.13 < 1.3) - FsPickler (>= 5.3.2 < 5.4) - FsPickler.Json (>= 5.3.2 < 5.4) - Adaptify.Core (1.1.9) + Adaptify.Core (1.1.13) FSharp.Data.Adaptive (>= 1.2.13 < 1.3) - Adaptify.MSBuild (1.1.9) - Adaptify.Core (1.1.9) + Adaptify.MSBuild (1.1.13) + Adaptify.Core (1.1.13) Aether (8.3.1) FSharp.Core (>= 4.3.4) - AssimpNet (5.0.0-beta1) - NETStandard.Library (>= 1.6.1) - 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.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.4) - Aardvark.Base (>= 5.2.19 < 5.3) - Aardvark.Base.FSharp (>= 5.2.19 < 5.3) - FSharp.Core (>= 5.0) + FShade (5.6) + FShade.Core (5.6) + FShade.GLSL (5.6) + FShade.Imperative (5.6) + FShade.SpirV (5.6) + FShade.Core (5.6) + Aardvark.Base (>= 5.3 < 5.4) + Aardvark.Base.FSharp (>= 5.3 < 5.4) + FShade.Imperative (5.6) + FSharp.Core (>= 8.0) + FShade.GLSL (5.6) + Aardvark.Base (>= 5.3 < 5.4) + Aardvark.Base.FSharp (>= 5.3 < 5.4) + FShade.Core (5.6) + FShade.Imperative (5.6) + FSharp.Core (>= 8.0) + FShade.Imperative (5.6) + Aardvark.Base (>= 5.3 < 5.4) + Aardvark.Base.FSharp (>= 5.3 < 5.4) + FSharp.Core (>= 8.0) FsPickler (>= 5.3.2 < 5.4) - 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 (6.0.6) + FShade.SpirV (5.6) + Aardvark.Base (>= 5.3 < 5.4) + Aardvark.Base.FSharp (>= 5.3 < 5.4) + FShade.Core (5.6) + FShade.Imperative (5.6) + FSharp.Core (>= 8.0) + FSharp.Core (8.0.100) FSharp.Data (3.1.1) FSharp.Core (>= 4.3.4) - FSharp.Data.Adaptive (1.2.13) + FSharp.Data.Adaptive (1.2.15) FSharp.Core (>= 4.7) System.Reflection.Emit.Lightweight (>= 4.6) FsPickler (5.3.2) @@ -643,25 +559,22 @@ NUGET FSharp.Core (>= 4.7) GLSLangSharp (0.4.15) FSharp.Core (>= 5.0) - Microsoft.Bcl.AsyncInterfaces (7.0) - restriction: || (&& (== net6.0) (>= net461)) (&& (== net6.0) (< netcoreapp3.1)) (== 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.Bcl.AsyncInterfaces (8.0) - restriction: || (&& (== net8.0) (>= net462)) (&& (== net8.0) (< net6.0)) (== netstandard2.0) + System.Threading.Tasks.Extensions (>= 4.5.4) - restriction: || (&& (== net8.0) (>= net462)) (&& (== net8.0) (< netstandard2.1)) (== netstandard2.0) + Microsoft.Bcl.HashCode (1.1.1) - restriction: || (&& (== net8.0) (< netstandard2.1)) (== netstandard2.0) Microsoft.CSharp (4.7) Microsoft.DotNet.PlatformAbstractions (3.1.6) - Microsoft.Extensions.DependencyModel (6.0) - System.Buffers (>= 4.5.1) - System.Memory (>= 4.5.4) - System.Runtime.CompilerServices.Unsafe (>= 6.0) - System.Text.Encodings.Web (>= 6.0) - System.Text.Json (>= 6.0) - Microsoft.NETCore.Platforms (6.0.6) + Microsoft.Extensions.DependencyModel (8.0.1) + System.Buffers (>= 4.5.1) - restriction: || (&& (== net8.0) (>= net462)) (&& (== net8.0) (< net6.0)) (== netstandard2.0) + System.Memory (>= 4.5.5) - restriction: || (&& (== net8.0) (>= net462)) (&& (== net8.0) (< net6.0)) (== netstandard2.0) + System.Text.Encodings.Web (>= 8.0) + System.Text.Json (>= 8.0.4) + Microsoft.NETCore.Platforms (7.0.4) Microsoft.NETCore.Targets (5.0) - NETStandard.Library (2.0.3) - Microsoft.NETCore.Platforms (>= 1.1) - Newtonsoft.Json (13.0.1) + Newtonsoft.Json (13.0.3) Pfim (0.11.2) Silk.NET.Core (2.15) - Microsoft.Bcl.HashCode (>= 1.1.1) - restriction: || (&& (== net6.0) (< netstandard2.1)) (== netstandard2.0) + Microsoft.Bcl.HashCode (>= 1.1.1) - restriction: || (&& (== net8.0) (< netstandard2.1)) (== netstandard2.0) Microsoft.CSharp (>= 4.7) Microsoft.DotNet.PlatformAbstractions (>= 3.1.6) Microsoft.Extensions.DependencyModel (>= 5.0) @@ -671,22 +584,16 @@ NUGET Silk.NET.GLFW (2.15) Silk.NET.Core (>= 2.15) Ultz.Native.GLFW (>= 3.3.3.1) - SixLabors.ImageSharp (2.1.3) - 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) - System.Runtime.CompilerServices.Unsafe (>= 5.0) - System.Text.Encoding.CodePages (>= 5.0) Suave (2.5.6) FSharp.Core (>= 4.3.4) - System.Buffers (4.5.1) + System.Buffers (4.5.1) - restriction: || (&& (== net8.0) (>= net462)) (&& (== net8.0) (< net6.0)) (== netstandard2.0) System.Collections (4.3) Microsoft.NETCore.Platforms (>= 1.1) Microsoft.NETCore.Targets (>= 1.1) System.Runtime (>= 4.3) - System.Collections.Immutable (6.0) - System.Memory (>= 4.5.4) - restriction: || (&& (== net6.0) (>= net461)) (== netstandard2.0) - System.Runtime.CompilerServices.Unsafe (>= 6.0) + System.Collections.Immutable (8.0) + System.Memory (>= 4.5.5) - restriction: || (&& (== net8.0) (>= net462)) (&& (== net8.0) (< net6.0)) (== netstandard2.0) + System.Runtime.CompilerServices.Unsafe (>= 6.0) - restriction: || (&& (== net8.0) (>= net462)) (&& (== net8.0) (< net6.0)) (&& (== net8.0) (< net7.0)) (== netstandard2.0) System.Diagnostics.Debug (4.3) Microsoft.NETCore.Platforms (>= 1.1) Microsoft.NETCore.Targets (>= 1.1) @@ -741,9 +648,9 @@ NUGET System.Runtime.Extensions (>= 4.3) System.Threading (>= 4.3) 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) + System.Buffers (>= 4.5.1) - restriction: || (&& (== net8.0) (>= monotouch)) (&& (== net8.0) (>= net461)) (&& (== net8.0) (< netcoreapp2.0)) (&& (== net8.0) (< netstandard1.1)) (&& (== net8.0) (< netstandard2.0)) (&& (== net8.0) (>= xamarinios)) (&& (== net8.0) (>= xamarinmac)) (&& (== net8.0) (>= xamarintvos)) (&& (== net8.0) (>= xamarinwatchos)) (== netstandard2.0) + System.Numerics.Vectors (>= 4.4) - restriction: || (&& (== net8.0) (< netcoreapp2.0)) (== netstandard2.0) + System.Runtime.CompilerServices.Unsafe (>= 4.5.3) - restriction: || (&& (== net8.0) (>= monotouch)) (&& (== net8.0) (>= net461)) (&& (== net8.0) (< netcoreapp2.0)) (&& (== net8.0) (< netcoreapp2.1)) (&& (== net8.0) (< netstandard1.1)) (&& (== net8.0) (< netstandard2.0)) (&& (== net8.0) (>= uap10.1)) (&& (== net8.0) (>= xamarinios)) (&& (== net8.0) (>= xamarinmac)) (&& (== net8.0) (>= xamarintvos)) (&& (== net8.0) (>= xamarinwatchos)) (== netstandard2.0) System.Numerics.Vectors (4.5) System.ObjectModel (4.3) System.Collections (>= 4.3) @@ -758,17 +665,18 @@ NUGET System.Reflection.Primitives (>= 4.3) System.Runtime (>= 4.3) System.Reflection.Emit (4.7) - System.Reflection.Emit.ILGeneration (>= 4.7) - restriction: || (&& (== net6.0) (< netcoreapp2.0) (< netstandard2.1)) (&& (== net6.0) (< netstandard1.1)) (&& (== net6.0) (< netstandard2.0)) (&& (== net6.0) (>= uap10.1)) (== netstandard2.0) + System.Reflection.Emit.ILGeneration (>= 4.7) - restriction: || (&& (== net8.0) (< netcoreapp2.0) (< netstandard2.1)) (&& (== net8.0) (< netstandard1.1)) (&& (== net8.0) (< netstandard2.0)) (&& (== net8.0) (>= uap10.1)) (== netstandard2.0) System.Reflection.Emit.ILGeneration (4.7) System.Reflection.Emit.Lightweight (4.7) - System.Reflection.Emit.ILGeneration (>= 4.7) - restriction: || (&& (== net6.0) (< netcoreapp2.0) (< netstandard2.1)) (&& (== net6.0) (< netstandard2.0)) (&& (== net6.0) (< portable-net45+wp8)) (&& (== net6.0) (>= uap10.1)) (== netstandard2.0) + System.Reflection.Emit.ILGeneration (>= 4.7) - restriction: || (&& (== net8.0) (< netcoreapp2.0) (< netstandard2.1)) (&& (== net8.0) (< netstandard2.0)) (&& (== net8.0) (< portable-net45+wp8)) (&& (== net8.0) (>= uap10.1)) (== netstandard2.0) System.Reflection.Extensions (4.3) Microsoft.NETCore.Platforms (>= 1.1) Microsoft.NETCore.Targets (>= 1.1) System.Reflection (>= 4.3) System.Runtime (>= 4.3) - System.Reflection.Metadata (6.0.1) - restriction: || (&& (== net6.0) (< netcoreapp3.1)) (== netstandard2.0) - System.Collections.Immutable (>= 6.0) + System.Reflection.Metadata (8.0) + System.Collections.Immutable (>= 8.0) + System.Memory (>= 4.5.5) - restriction: || (&& (== net8.0) (>= net462)) (&& (== net8.0) (< net6.0)) (== netstandard2.0) System.Reflection.Primitives (4.3) Microsoft.NETCore.Platforms (>= 1.1) Microsoft.NETCore.Targets (>= 1.1) @@ -792,21 +700,17 @@ 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.Runtime.CompilerServices.Unsafe (>= 6.0) - System.Text.Encodings.Web (6.0) - System.Buffers (>= 4.5.1) - restriction: || (&& (== net6.0) (>= net461)) (&& (== net6.0) (< netcoreapp3.1)) (== netstandard2.0) - System.Memory (>= 4.5.4) - restriction: || (&& (== net6.0) (>= net461)) (&& (== net6.0) (< netcoreapp3.1)) (== netstandard2.0) - System.Runtime.CompilerServices.Unsafe (>= 6.0) - System.Text.Json (6.0.6) - Microsoft.Bcl.AsyncInterfaces (>= 6.0) - restriction: || (&& (== net6.0) (>= net461)) (&& (== net6.0) (< netcoreapp3.1)) (== netstandard2.0) - System.Buffers (>= 4.5.1) - restriction: || (&& (== net6.0) (>= net461)) (&& (== net6.0) (< netcoreapp3.1)) (== netstandard2.0) - System.Memory (>= 4.5.4) - restriction: || (&& (== net6.0) (>= net461)) (&& (== net6.0) (< netcoreapp3.1)) (== netstandard2.0) - System.Numerics.Vectors (>= 4.5) - restriction: || (&& (== net6.0) (>= net461)) (&& (== net6.0) (< netcoreapp3.1)) (== netstandard2.0) - System.Runtime.CompilerServices.Unsafe (>= 6.0) - System.Text.Encodings.Web (>= 6.0) - System.Threading.Tasks.Extensions (>= 4.5.4) - restriction: || (&& (== net6.0) (>= net461)) (&& (== net6.0) (< netcoreapp3.1)) (== netstandard2.0) + System.Text.Encodings.Web (8.0) + System.Buffers (>= 4.5.1) - restriction: || (&& (== net8.0) (>= net462)) (&& (== net8.0) (< net6.0)) (== netstandard2.0) + System.Memory (>= 4.5.5) - restriction: || (&& (== net8.0) (>= net462)) (&& (== net8.0) (< net6.0)) (== netstandard2.0) + System.Runtime.CompilerServices.Unsafe (>= 6.0) - restriction: || (&& (== net8.0) (>= net462)) (&& (== net8.0) (< net6.0)) (&& (== net8.0) (< net7.0)) (== netstandard2.0) + System.Text.Json (8.0.4) + Microsoft.Bcl.AsyncInterfaces (>= 8.0) - restriction: || (&& (== net8.0) (>= net462)) (&& (== net8.0) (< net6.0)) (== netstandard2.0) + System.Buffers (>= 4.5.1) - restriction: || (&& (== net8.0) (>= net462)) (&& (== net8.0) (< net6.0)) (== netstandard2.0) + System.Memory (>= 4.5.5) - restriction: || (&& (== net8.0) (>= net462)) (&& (== net8.0) (< net6.0)) (== netstandard2.0) + System.Runtime.CompilerServices.Unsafe (>= 6.0) - restriction: || (&& (== net8.0) (>= net462)) (&& (== net8.0) (< net6.0)) (&& (== net8.0) (< net7.0)) (== netstandard2.0) + System.Text.Encodings.Web (>= 8.0) + System.Threading.Tasks.Extensions (>= 4.5.4) - restriction: || (&& (== net8.0) (>= net462)) (&& (== net8.0) (< net6.0)) (== netstandard2.0) System.Threading (4.3) System.Runtime (>= 4.3) System.Threading.Tasks (>= 4.3) @@ -814,8 +718,8 @@ 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) (< netcoreapp3.1)) (== 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) + System.Threading.Tasks.Extensions (4.5.4) - restriction: || (&& (== net8.0) (>= net462)) (&& (== net8.0) (< net6.0)) (== netstandard2.0) + System.Runtime.CompilerServices.Unsafe (>= 4.5.3) - restriction: || (&& (== net8.0) (>= net461)) (&& (== net8.0) (< netcoreapp2.1)) (&& (== net8.0) (< netstandard1.0)) (&& (== net8.0) (< netstandard2.0)) (&& (== net8.0) (>= wp8)) (== netstandard2.0) + Ultz.Native.GLFW (3.4) Unofficial.LibTessDotNet (2.0.2) Unofficial.OpenTK (3.0.21) diff --git a/src/2D3DLinking/2D3DLinking.fsproj b/src/2D3DLinking/2D3DLinking.fsproj index 2d1ca3f..752de58 100644 --- a/src/2D3DLinking/2D3DLinking.fsproj +++ b/src/2D3DLinking/2D3DLinking.fsproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 _2D3DLinking diff --git a/src/2D3DLinking/App.fs b/src/2D3DLinking/App.fs index e49534d..43d69aa 100644 --- a/src/2D3DLinking/App.fs +++ b/src/2D3DLinking/App.fs @@ -9,7 +9,7 @@ open Aardvark.Rendering open Aardvark.Rendering.Text open Aardvark.SceneGraph -open Aardvark.SceneGraph.Opc +open Aardvark.Data.Opc open FShade open Aardvark.Application diff --git a/src/2D3DLinking/Model.fs b/src/2D3DLinking/Model.fs index ec72f69..f8e85af 100644 --- a/src/2D3DLinking/Model.fs +++ b/src/2D3DLinking/Model.fs @@ -5,7 +5,7 @@ open Linking open Aardvark.Base open Aardvark.Rendering open FSharp.Data.Adaptive -open Aardvark.SceneGraph.Opc +open Aardvark.Data.Opc open Aardvark.UI.Primitives open Aardvark.Application diff --git a/src/2D3DLinking/Products/App.fs b/src/2D3DLinking/Products/App.fs index e93cb0f..fe54a77 100644 --- a/src/2D3DLinking/Products/App.fs +++ b/src/2D3DLinking/Products/App.fs @@ -8,6 +8,7 @@ open Aardvark.Rendering open Aardvark.SceneGraph open Aardvark.UI +open Aardvark.UI.Primitives open KdTreeHelper open FSharp.Data.Adaptive diff --git a/src/2D3DLinking/Products/Model.fs b/src/2D3DLinking/Products/Model.fs index 7cec046..574d810 100644 --- a/src/2D3DLinking/Products/Model.fs +++ b/src/2D3DLinking/Products/Model.fs @@ -4,6 +4,7 @@ open System open Aardvark.Base open FSharp.Data.Adaptive open Aardvark.UI +open Aardvark.UI.Primitives open Aardvark.Geometry @@ -171,7 +172,7 @@ type InstrumentColor = { mastcamL : C4b chemLib : C4b chemRmi : C4b - color : ColorInput + color : C4b } [] diff --git a/src/2D3DLinking/Products/Utilities.fs b/src/2D3DLinking/Products/Utilities.fs index 348a938..01ca797 100644 --- a/src/2D3DLinking/Products/Utilities.fs +++ b/src/2D3DLinking/Products/Utilities.fs @@ -4,6 +4,7 @@ open System //open Aardvark.GeoSpatial.Opc open Aardvark.Base +open Aardvark.Base.Fonts open Aardvark.Rendering open Aardvark.Rendering.Text open FSharp.Data.Adaptive diff --git a/src/3DGis/3DGis.fsproj b/src/3DGis/3DGis.fsproj index c417504..8c8f78a 100644 --- a/src/3DGis/3DGis.fsproj +++ b/src/3DGis/3DGis.fsproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 _3DGis diff --git a/src/3DGis/App.fs b/src/3DGis/App.fs index e48a308..07d6744 100644 --- a/src/3DGis/App.fs +++ b/src/3DGis/App.fs @@ -10,7 +10,7 @@ open FSharp.Data.Adaptive open Aardvark.Rendering open Aardvark.SceneGraph open Aardvark.SceneGraph.Semantics -open Aardvark.SceneGraph.Opc +open Aardvark.Data.Opc open Aardvark.SceneGraph.SgPrimitives open Aardvark.Rendering.Text open Aardvark.UI.Primitives @@ -135,8 +135,8 @@ module App = { DrawingModel.initial.style with thickness = 0.0 - primary = { c = C4b(50,208,255) } - secondary = { c = C4b(132,226,255) } + primary = C4b(50,208,255) + secondary = C4b(132,226,255) } } @@ -365,8 +365,8 @@ module App = style = { drawingModel.style with thickness = 2.0; - primary = { c = C4b(50,208,255) } - secondary = { c = C4b(132,226,255) } + primary = C4b(50,208,255) + secondary = C4b(132,226,255) } } @@ -767,8 +767,8 @@ module App = div[style "color:white; margin: 5px 15px 5px 5px"] [ Html.SemUi.accordion "Camera" "camera" true [ div [ clazz "item" ] [ - dropdownUnclearable [ clazz "ui simple inverted selection dropdown" ] dropDownValues m.currentOption SetProjection - ] + Dropdown.dropdown SetProjection false None m.currentOption [ clazz "ui simple inverted selection dropdown" ] dropDownValues + ] ] br[] br[] diff --git a/src/3DGis/Model.fs b/src/3DGis/Model.fs index 2e33bf4..bd7feac 100644 --- a/src/3DGis/Model.fs +++ b/src/3DGis/Model.fs @@ -3,7 +3,7 @@ namespace ElevationProfileViewer open Aardvark.Base open Aardvark.Rendering open FSharp.Data.Adaptive -open Aardvark.SceneGraph.Opc +open Aardvark.Data.Opc open Aardvark.UI open Aardvark.UI.Primitives open Aardvark.Application diff --git a/src/3DGis/SurfaceSampling.fs b/src/3DGis/SurfaceSampling.fs index ba6fc4e..c51553f 100644 --- a/src/3DGis/SurfaceSampling.fs +++ b/src/3DGis/SurfaceSampling.fs @@ -174,8 +174,8 @@ module SurfaceSampling = style = { DrawingModel.initial.style with thickness = 1.0 - primary = { c = C4b(255,255,255) } - secondary = { c = C4b(205,243,255) } + primary = C4b(255,255,255) + secondary = C4b(205,243,255) } } else diff --git a/src/OPCViewer.Base/Aara.fs b/src/OPCViewer.Base/Aara.fs deleted file mode 100644 index 7f7c5a9..0000000 --- a/src/OPCViewer.Base/Aara.fs +++ /dev/null @@ -1,335 +0,0 @@ -#nowarn "9" -#if INTERACTIVE -#r "../../bin/Debug/Aardvark.Base.dll" -#r "../../bin/Debug/Aardvark.Base.TypeProviders.dll" -#r "../../bin/Debug/Aardvark.Base.FSharp.dll" -#r "System.Xml.Linq.dll" -#else -namespace OpcViewer.Base.Aara -#endif - -open System -open System.IO -open System.Runtime.InteropServices - -open Aardvark.Base -open Aardvark.Prinziple -open FSharp.Data.Adaptive - -[] -module Aara2 = - - let readerChars2String (f : Stream) = - let cnt = f.ReadByte() - - let target = Array.zeroCreate cnt - let read = f.Read(target,0,cnt) - if cnt <> read then failwith "" - System.Text.Encoding.Default.GetString target - - let loadRaw<'a when 'a : (new : unit -> 'a) and 'a : struct and 'a :> ValueType> (elementCount : int) (f : Stream) = - let result = Array.zeroCreate<'a> elementCount - let buffer = Array.zeroCreate (1 <<< 22) - - let gc = GCHandle.Alloc(result, GCHandleType.Pinned) - try - let mutable ptr = gc.AddrOfPinnedObject() - let mutable remaining = sizeof<'a> * result.Length - while remaining > 0 do - let s = f.Read(buffer, 0, buffer.Length) - Marshal.Copy(buffer, 0, ptr, s) - ptr <- ptr + nativeint s - remaining <- remaining - s - finally - gc.Free() - result - - let loadRaw2<'a when 'a : unmanaged> (elementCount : int) (f : Stream) : 'a[] = - let target = Array.zeroCreate elementCount - target.UnsafeCoercedApply(fun arr -> - let r = f.Read(arr, 0, arr.Length) - if r <> arr.Length then failwith "asdfj2" - ) - target - - let loadFromStream<'a when 'a : unmanaged> (f : Stream) = - let binaryReader = new BinaryReader(f,Text.Encoding.ASCII, true) - let typeName = readerChars2String f - let dimensions = f.ReadByte() |> int - let sizes = [| for d in 0 .. dimensions - 1 do yield binaryReader.ReadInt32() |] - - let elementCount = sizes |> Array.fold ((*)) 1 - - let result = - if typeof<'a>.Name = typeName then - loadRaw2<'a> elementCount f - else - match typeName with - | "V3d" -> f |> loadRaw elementCount |> PrimitiveValueConverter.arrayConverter typeof - | "V3f" -> f |> loadRaw elementCount |> PrimitiveValueConverter.arrayConverter typeof - | "V2d" -> f |> loadRaw elementCount |> PrimitiveValueConverter.arrayConverter typeof - | "double" -> f |> loadRaw elementCount |> PrimitiveValueConverter.arrayConverter typeof - | "float" -> f |> loadRaw elementCount |> PrimitiveValueConverter.arrayConverter typeof - | _ -> failwith ("Aara.fs: No support for loading type " + typeName) - - let dim = - match sizes with - | [| x |] -> V3i(x,1,1) - | [| x; y |] -> V3i(x,y,1) - | [| x; y; z |] -> V3i(x,y,z) - | _ -> failwith "" - - Volume<'a>(result, dim) - - let fromFile<'a when 'a : unmanaged and 'a : (new : unit -> 'a) and 'a : struct and 'a :> ValueType> (s : string) = - use fs = Prinziple.openRead s - loadFromStream<'a> fs - - let inline isNan (v : V3f) = - v.X.IsNaN() || v.Y.IsNaN() || v.Z.IsNaN() - - let createIndex (vi : Matrix) = - let dx = vi.Info.DX - let dy = vi.Info.DY - let dxy = dx + dy - let mutable arr = Array.zeroCreate (int (vi.SX - 1L) * int (vi.SY - 1L) * 6) - let mutable cnt = 0 - - vi.SubMatrix(V2l.Zero,vi.Size-V2l.II).ForeachXYIndex(fun x y index -> - let i00 = index - let i10 = index + dy - let i01 = index + dx - let i11 = index + dxy - - arr.[cnt + 0] <- (int i00) - arr.[cnt + 1] <- (int i10) - arr.[cnt + 2] <- (int i11) - arr.[cnt + 3] <- (int i00) - arr.[cnt + 4] <- (int i11) - arr.[cnt + 5] <- (int i01) - cnt <- cnt + 6 - ) - Array.Resize(&arr, cnt) - arr - - let createIndex2 (vi : Matrix) (invalids : int64[])= - - let invalids = invalids |> Array.map (fun x -> (x, x)) |> HashMap.ofArray - - let dx = vi.Info.DX - let dy = vi.Info.DY - let dxy = dx + dy - let mutable arr = Array.zeroCreate (int (vi.SX - 1L) * int (vi.SY - 1L) * 6) - let mutable cnt = 0 - - vi.SubMatrix(V2l.Zero,vi.Size-V2l.II).ForeachXYIndex(fun x y index -> - - let inv = invalids |> HashMap.tryFind index - - match inv with - | Some _ -> - arr.[cnt + 0] <- 0 - arr.[cnt + 1] <- 0 - arr.[cnt + 2] <- 0 - arr.[cnt + 3] <- 0 - arr.[cnt + 4] <- 0 - arr.[cnt + 5] <- 0 - cnt <- cnt + 6 - | None -> - let i00 = index - let i10 = index + dy - let i01 = index + dx - let i11 = index + dxy - - arr.[cnt + 0] <- (int i00) - arr.[cnt + 1] <- (int i10) - arr.[cnt + 2] <- (int i11) - arr.[cnt + 3] <- (int i00) - arr.[cnt + 4] <- (int i11) - arr.[cnt + 5] <- (int i01) - cnt <- cnt + 6 - ) - Array.Resize(&arr, cnt) - arr - - // Patch Size to index array (faces with invalid points will be degenerated or skipped) - let computeIndexArray (size : V2i) (degenerateInvalids : bool) (invalidPoints : int Set) = - // vertex x/y to point index of face - let getFaceIndices y x sizeX = - let pntA = y * sizeX + x - let pntB = (y + 1) * sizeX + x - let pntC = pntA + 1 - let pntD = pntB + 1 - - [| pntA; pntB; pntC; - pntC; pntB; pntD |] - - // replace invalid faces with another array (invalidReplacement) - let getFaceIndicesWReplacedInvalids invalidReplacement y x sizeX = - let faceIndices = getFaceIndices y x sizeX - if faceIndices |> Array.exists (fun i -> Set.contains i invalidPoints) then - invalidReplacement - else - faceIndices - - // choose function to use - let f = - match (invalidPoints.IsEmptyOrNull(), degenerateInvalids) with - | (true, _) -> getFaceIndices - // skip faces with invalid points - | (false, false) -> getFaceIndicesWReplacedInvalids Array.empty - // replace invalid faces with degenerated face - | (false, true) -> - // find first valid point - let p = [| 0..(size.X * size.Y - 1) |] |> Array.find (fun i -> not (Set.contains i invalidPoints)) - getFaceIndicesWReplacedInvalids [| p; p; p; p; p; p |] - - // step through all vertices to get index-array per face - let indexArray = - [| - for y in [| 0..(size.Y-2) |] do - for x in [| 0..(size.X-2) |] do - yield f y x size.X - |] - - let invalidFaceCount = indexArray |> Array.filter (fun a -> a.IsEmpty()) |> Array.length - if invalidFaceCount > 0 then - Report.Line(5, "Invalid faces found: " + invalidFaceCount.ToString()) - - indexArray |> Array.concat - - let getInvalidIndices (positions : V3d[]) = - positions |> Array.mapi (fun i x -> if x.AnyNaN then Some i else None) |> Array.choose id - - let getInvalidIndices3f (positions : V3f[]) = - positions |> Array.mapi (fun i x -> if x.AnyNaN then Some i else None) |> Array.choose id - - // load triangles from aaraFile and transform them with matrix - let loadTrianglesFromFile' (aaraFile : string)(indexComputation : V2i -> int[] -> int[]) (matrix : M44d) = - let positions = aaraFile |> fromFile - - let data = - positions.Data |> Array.map (fun x -> x.ToV3d() |> matrix.TransformPos) - - let invalidIndices = getInvalidIndices data - let index = indexComputation (positions.Size.XY.ToV2i()) invalidIndices //computeIndexArray (positions.Size.XY.ToV2i()) false (Set.ofArray invalidIndices) - - let triangles = - index - |> Seq.map(fun x -> data.[x]) - |> Seq.chunkBySize 3 - |> Seq.map(fun x -> Triangle3d(x)) - |> Seq.toArray - - triangles - - // load triangles from aaraFile and transform them with matrix - let loadTrianglesFromFile (aaraFile : string) (matrix : M44d) = - loadTrianglesFromFile' aaraFile (fun size invalids -> computeIndexArray size false (Set.ofArray invalids)) matrix - - module Offset = - - let loadRawWithOffset<'a when 'a : (new : unit -> 'a) and 'a : struct and 'a :> ValueType> (offset : int) (elementCount : int) (f : Stream) = - let result = Array.zeroCreate<'a> elementCount - let buffer = Array.zeroCreate (1 <<< 22) - - let gc = GCHandle.Alloc(result, GCHandleType.Pinned) - try - let mutable ptr = gc.AddrOfPinnedObject() - let mutable remaining = sizeof<'a> * result.Length - while remaining > 0 do - let s = f.Read(buffer, offset, buffer.Length) - Marshal.Copy(buffer, 0, ptr, s) - ptr <- ptr + nativeint s - remaining <- remaining - s - finally - gc.Free() - result - - let loadRawColumnWithOffset<'a when 'a : (new : unit -> 'a) and 'a : struct and 'a :> ValueType> (offset : int) (elementCount : int) (f : Stream) = - let result = Array.zeroCreate<'a> elementCount - let buffer = Array.zeroCreate sizeof<'a> - let startPos = f.Position - let mutable counter = 1 - let byteOffset = offset*sizeof<'a> - - let gc = GCHandle.Alloc(result, GCHandleType.Pinned) - try - let mutable ptr = gc.AddrOfPinnedObject() - while counter <= elementCount do - f.Seek((startPos + (int64(byteOffset * counter))), SeekOrigin.Begin) |> ignore - let s = f.Read(buffer, 0, buffer.Length) - Marshal.Copy(buffer, 0, ptr, s) - ptr <- ptr + nativeint s - counter <- counter+1 - finally - gc.Free() - result - - let loadFromStreamWithOffset<'a when 'a : unmanaged> (offset : int) (size : int) (f : Stream) : 'a[]= - let binaryReader = new BinaryReader(f,Text.Encoding.ASCII, true) - let typeName = readerChars2String f - let dimensions = f.ReadByte() |> int - let sizes = [| for d in 0 .. dimensions - 1 do yield binaryReader.ReadInt32() |] - - let elementCount = sizes |> Array.fold ((*)) 1 - - let result = - match typeName with - | "V3d" -> f |> loadRawWithOffset offset elementCount |> PrimitiveValueConverter.arrayConverter typeof - | "V3f" -> f |> loadRawWithOffset offset elementCount |> PrimitiveValueConverter.arrayConverter typeof - | "V2d" -> f |> loadRawWithOffset offset elementCount |> PrimitiveValueConverter.arrayConverter typeof - | "double" -> f |> loadRawWithOffset offset elementCount |> PrimitiveValueConverter.arrayConverter typeof - | "float" -> f |> loadRawWithOffset offset elementCount |> PrimitiveValueConverter.arrayConverter typeof - | _ -> failwith ("Aara.fs: No support for loading type " + typeName) - - result - - let loadFromStreamWithOffset'<'a when 'a : unmanaged> (offset : int) (size : int) (f : Stream) : 'a[]= - let binaryReader = new BinaryReader(f,Text.Encoding.ASCII, true) - let typeName = readerChars2String f - let dimensions = f.ReadByte() |> int - let sizes = [| for d in 0 .. dimensions - 1 do yield binaryReader.ReadInt32() |] - - //let elementCount = sizes |> Array.fold ((*)) 1 - - let result = - match typeName with - | "V3d" -> f |> loadRawWithOffset offset size |> PrimitiveValueConverter.arrayConverter typeof - | "V3f" -> f |> loadRawWithOffset offset size |> PrimitiveValueConverter.arrayConverter typeof - | "V2d" -> f |> loadRawWithOffset offset size |> PrimitiveValueConverter.arrayConverter typeof - | "double" -> f |> loadRawWithOffset offset size |> PrimitiveValueConverter.arrayConverter typeof - | "float" -> f |> loadRawWithOffset offset size |> PrimitiveValueConverter.arrayConverter typeof - | _ -> failwith ("Aara.fs: No support for loading type " + typeName) - - result - - let loadFromStreamColumnsWithOffset<'a when 'a : unmanaged> (offset : int) (size : int) (f : Stream) : 'a[]= - f.Seek ((int64 0), SeekOrigin.Begin) |> ignore - - let binaryReader = new BinaryReader(f,Text.Encoding.ASCII, true) - let typeName = readerChars2String f - let dimensions = f.ReadByte() |> int - let sizes = [| for d in 0 .. dimensions - 1 do yield binaryReader.ReadInt32() |] - - let elementCount = sizes |> Array.fold ((*)) 1 - - let result = - match typeName with - | "V3d" -> f |> loadRawColumnWithOffset offset sizes.[1] |> PrimitiveValueConverter.arrayConverter typeof - | "V3f" -> f |> loadRawColumnWithOffset offset sizes.[1] |> PrimitiveValueConverter.arrayConverter typeof - | "V2d" -> f |> loadRawColumnWithOffset offset sizes.[1] |> PrimitiveValueConverter.arrayConverter typeof - | "double" -> f |> loadRawColumnWithOffset offset sizes.[1] |> PrimitiveValueConverter.arrayConverter typeof - | "float" -> f |> loadRawColumnWithOffset offset sizes.[1] |> PrimitiveValueConverter.arrayConverter typeof - | _ -> failwith ("Aara.fs: No support for loading type " + typeName) - - - result - - let fromFileWithOffsetAndSize<'a when 'a : unmanaged and 'a : (new : unit -> 'a) and 'a : struct and 'a :> ValueType> (offset : int) (size : int) (fileName : string) = - let stream = Prinziple.openRead fileName - loadFromStreamWithOffset<'a> offset size stream - - let fromFileColumnsWithOffsetAndSize<'a when 'a : unmanaged and 'a : (new : unit -> 'a) and 'a : struct and 'a :> ValueType> (offset : int) (size : int) (fileName : string) = - let stream = Prinziple.openRead fileName - loadFromStreamColumnsWithOffset<'a> offset size stream \ No newline at end of file diff --git a/src/OPCViewer.Base/FalseColorLegend-Model.fs b/src/OPCViewer.Base/FalseColorLegend-Model.fs index 23114f2..8d9eaa0 100644 --- a/src/OPCViewer.Base/FalseColorLegend-Model.fs +++ b/src/OPCViewer.Base/FalseColorLegend-Model.fs @@ -3,6 +3,7 @@ namespace OpcViewer.Base.FalseColors open Aardvark.Base open FSharp.Data.Adaptive open Aardvark.UI +open Aardvark.UI.Primitives open Adaptify @@ -13,8 +14,8 @@ type FalseColorsModel = { upperBound : NumericInput interval : NumericInput invertMapping : bool - lowerColor : ColorInput - upperColor : ColorInput + lowerColor : C4b + upperColor : C4b showColors : bool } @@ -47,8 +48,8 @@ module FalseColorsModel = upperBound = initub range interval = scalarsInterv invertMapping = false - lowerColor = { c = C4b.Blue } - upperColor = { c = C4b.Red } + lowerColor = C4b.Blue + upperColor = C4b.Red showColors = true } diff --git a/src/OPCViewer.Base/FalseColorLegendApp.fs b/src/OPCViewer.Base/FalseColorLegendApp.fs index 964fcfc..38d1cdc 100644 --- a/src/OPCViewer.Base/FalseColorLegendApp.fs +++ b/src/OPCViewer.Base/FalseColorLegendApp.fs @@ -20,8 +20,8 @@ module FalseColorLegendApp = | SetUpperBound of Numeric.Action | SetInterval of Numeric.Action | InvertMapping - | SetLowerColor of ColorPicker.Action //C4b - | SetUpperColor of ColorPicker.Action //C4b + | SetLowerColor of C4b + | SetUpperColor of C4b | ShowColors let bindOption (m : aval>) (defaultValue : 'b) (project : 'a -> aval<'b>) : aval<'b> = @@ -42,9 +42,9 @@ module FalseColorLegendApp = | InvertMapping -> { model with invertMapping = not model.invertMapping } | SetLowerColor lc -> - { model with lowerColor = ColorPicker.update model.lowerColor lc } + { model with lowerColor = lc } | SetUpperColor uc -> - { model with upperColor = ColorPicker.update model.upperColor uc } + { model with upperColor = uc } | ShowColors -> { model with showColors = (not model.showColors) } @@ -96,8 +96,8 @@ module FalseColorLegendApp = Html.row "upper bound:" [Numeric.view' [InputBox] model.upperBound |> UI.map SetUpperBound ] Html.row "lower bound:" [Numeric.view' [InputBox] model.lowerBound |> UI.map SetLowerBound ] Html.row "interval:" [Numeric.view' [InputBox] model.interval |> UI.map SetInterval ] - Html.row "upper color:" [ColorPicker.view model.upperColor |> UI.map SetUpperColor ] - Html.row "lower color:" [ColorPicker.view model.lowerColor |> UI.map SetLowerColor ] + Html.row "upper color:" [ColorPicker.view ColorPicker.Config.Default SetUpperColor model.upperColor ] + Html.row "lower color:" [ColorPicker.view ColorPicker.Config.Default SetLowerColor model.lowerColor ] Html.row "invert mapping:" [iconCheckBox model.invertMapping InvertMapping ] Html.row "show colors:" [iconCheckBox model.showColors ShowColors ] ] @@ -168,8 +168,8 @@ module FalseColorLegendApp = let! fcUpperBound = falseColor.upperBound.value let! fcLowerBound = falseColor.lowerBound.value let! fcInterval = falseColor.interval.value - let! startColor = falseColor.upperColor.c - let! endColor = falseColor.lowerColor.c + let! startColor = falseColor.upperColor + let! endColor = falseColor.lowerColor let! invertMapping = falseColor.invertMapping diff --git a/src/OPCViewer.Base/KdTrees.fs b/src/OPCViewer.Base/KdTrees.fs index 1976631..c4d71c8 100644 --- a/src/OPCViewer.Base/KdTrees.fs +++ b/src/OPCViewer.Base/KdTrees.fs @@ -6,7 +6,7 @@ open System.IO open Aardvark.Geometry open Aardvark.Base open Aardvark.Base.Coder -open Aardvark.SceneGraph.Opc +open Aardvark.Data.Opc open MBrace.FsPickler open MBrace.FsPickler.Combinators open FSharp.Data.Adaptive @@ -257,8 +257,8 @@ module KdTrees = let dir = h.opcPaths.Patches_DirAbsPath +/ info.Name let pos = match mode with - | XYZ -> info.Positions - | SvBR -> info.Positions2d.Value + | ViewerModality.XYZ -> info.Positions + | ViewerModality.SvBR -> info.Positions2d.Value let objectSetPath = dir +/ pos let trafo = mode |> ViewerModality.matchy info.Local2Global info.Local2Global2d diff --git a/src/OPCViewer.Base/OpcAttributes.fs b/src/OPCViewer.Base/OpcAttributes.fs index 6abf8f2..c55b861 100644 --- a/src/OPCViewer.Base/OpcAttributes.fs +++ b/src/OPCViewer.Base/OpcAttributes.fs @@ -11,7 +11,7 @@ open FShade open Aardvark.UI open Aardvark.UI.Operators open Aardvark.UI.Trafos -open Aardvark.SceneGraph.Opc +open Aardvark.Data.Opc open OpcViewer.Base.FalseColors //OpcSelectionViewer.Picking diff --git a/src/OPCViewer.Base/Picking/IntersectionController.fs b/src/OPCViewer.Base/Picking/IntersectionController.fs index 7dd887b..fe095ae 100644 --- a/src/OPCViewer.Base/Picking/IntersectionController.fs +++ b/src/OPCViewer.Base/Picking/IntersectionController.fs @@ -8,7 +8,7 @@ open Aardvark.Base.Geometry open Aardvark.Application open Aardvark.UI open Aardvark.Geometry -open Aardvark.SceneGraph.Opc +open Aardvark.Data.Opc open Aardvark.VRVis.Opc open Aardvark.VRVis.Opc.KdTrees open OpcViewer.Base @@ -17,12 +17,12 @@ open FSharp.Data.Adaptive module IntersectionController = let loadTrianglesFromFileWithIndices (aaraFile : string) (matrix : M44d) = - let positions = aaraFile |> fromFile + let positions = aaraFile |> Aara.fromFile let data = positions.Data |> Array.map (fun x -> x.ToV3d() |> matrix.TransformPos) - let invalidIndices = getInvalidIndices data + let invalidIndices = Aara.getInvalidIndices data let index = IndexHelper.computeIndexArray (positions.Size.XY.ToV2i()) invalidIndices let triangleIndices = @@ -47,7 +47,7 @@ module IntersectionController = let loadTriangles (kd : LazyKdTree) = let indexing = (fun size invalidIndices -> IndexHelper.computeIndexArray size invalidIndices) - loadTrianglesFromFile' kd.objectSetPath indexing kd.affine.Forward + Aara.loadTrianglesFromFile' kd.objectSetPath indexing kd.affine.Forward let loadTriangleSet (kd : LazyKdTree) = kd |> loadTriangles |> TriangleSet @@ -93,7 +93,7 @@ module IntersectionController = Log.line "barycentricCoords: u: %f, v: %f, w: %f" baryCentricCoords.X baryCentricCoords.Y baryCentricCoords.Z - let coordinates = kdTree.coordinatesPath |> fromFile + let coordinates = kdTree.coordinatesPath |> Aara.fromFile let coordinateIndices = triangleIndices.[index] diff --git a/src/OPCViewer.Base/Picking/Picking-Model.fs b/src/OPCViewer.Base/Picking/Picking-Model.fs index f86cd5d..ff07154 100644 --- a/src/OPCViewer.Base/Picking/Picking-Model.fs +++ b/src/OPCViewer.Base/Picking/Picking-Model.fs @@ -4,7 +4,7 @@ open Aardvark.UI open Aardvark.Base open FSharp.Data.Adaptive open Aardvark.VRVis.Opc.KdTrees -open Aardvark.SceneGraph.Opc +open Aardvark.Data.Opc open Adaptify diff --git a/src/OPCViewer.Base/Sg.fs b/src/OPCViewer.Base/Sg.fs index 86d3258..9501a8a 100644 --- a/src/OPCViewer.Base/Sg.fs +++ b/src/OPCViewer.Base/Sg.fs @@ -2,6 +2,7 @@ namespace OpcViewer.Base open System open Aardvark.Base +open Aardvark.Base.Fonts open FSharp.Data.Adaptive open Aardvark.Rendering open Aardvark.SceneGraph @@ -9,7 +10,7 @@ open Aardvark.Rendering.Text open FShade open Aardvark.UI.``F# Sg`` open Aardvark.UI.Trafos -open Aardvark.SceneGraph.Opc +open Aardvark.Data.Opc open Adaptify.FSharp.Core @@ -26,15 +27,15 @@ module Patch = | ViewerModality.SvBR, Some p2 -> p2 | _ -> p.Positions - let positions = patch_DirAbsPath +/ pos |> fromFile - let coordinates = patch_DirAbsPath +/ (List.head p.Coordinates) |> fromFile + let positions = patch_DirAbsPath +/ pos |> Aara.fromFile + let coordinates = patch_DirAbsPath +/ (List.head p.Coordinates) |> Aara.fromFile let scl = let x = p.Attributes |> List.tryFind( fun x -> x = (selAttribute + ".aara")) match x with | Some name -> let data = - let a = Path.combine [patch_DirAbsPath; name] |> fromFile + let a = Path.combine [patch_DirAbsPath; name] |> Aara.fromFile a.Data |> Array.map (fun a -> float32 a) data :> Array @@ -44,7 +45,7 @@ module Patch = let coordinates = coordinates.Data |> Array.map (fun v -> V2f(v.X, 1.0f-v.Y)) - let index = createIndex (positions.AsMatrix()) + let index = Aara.createIndex (positions.AsMatrix()) let a : float = 0.0 @@ -134,7 +135,7 @@ module Sg = |> AVal.bind (fun x -> match x with | Some (s : AdaptiveScalarLayer) -> - s.colorLegend.upperColor.c + s.colorLegend.upperColor |> AVal.map(fun x -> let t = x.ToC3f() let t1 = HSVf.FromC3f(t) @@ -147,7 +148,7 @@ module Sg = |> AVal.bind ( fun x -> match x with | Some s -> - s.colorLegend.lowerColor.c + s.colorLegend.lowerColor |> AVal.map(fun x -> ((float)(HSVf.FromC3f (x.ToC3f())).H)) | _ -> AVal.constant(0.0) ) @@ -256,6 +257,8 @@ module Sg = return screenAligned v.Forward v.Up modelt } + + // TODO: Don't use system font, use a font provider Sg.text (Font.create "Consolas" FontStyle.Regular) C4b.White text |> Sg.noEvents |> Sg.effect [ diff --git a/src/OPCViewer.Base/paket.references b/src/OPCViewer.Base/paket.references index 0d7b573..cdfd85d 100644 --- a/src/OPCViewer.Base/paket.references +++ b/src/OPCViewer.Base/paket.references @@ -1,16 +1,11 @@ +FSharp.Core Aardvark.Build -Aardvark.Base -Aardvark.Base.FSharp -Aardvark.Rendering Aardvark.Rendering.Text Aardvark.UI.Primitives -Aardvark.SceneGraph -Aardvark.SceneGraph.Opc +Aardvark.Data.Opc Aardvark.Geometry.Intersection Adaptify.MSBuild -Uncodium.Eigensystems - -FSharp.Core \ No newline at end of file +Uncodium.Eigensystems \ No newline at end of file diff --git a/src/Rabbyte/Annotation/AnnotationApp.fs b/src/Rabbyte/Annotation/AnnotationApp.fs index a7474e1..17f49b0 100644 --- a/src/Rabbyte/Annotation/AnnotationApp.fs +++ b/src/Rabbyte/Annotation/AnnotationApp.fs @@ -24,7 +24,7 @@ module AnnotationApp = match drawingModel.primitiveType with | Polygon -> model.annotationsGrouped - |> HashMap.alter annotation.style.primary.c (fun x -> + |> HashMap.alter annotation.style.primary (fun x -> match x with | Some y -> Some (y |> IndexList.prepend annotation) | None -> Some (IndexList.single annotation)) diff --git a/src/Rabbyte/Annotation/AnnotationSg.fs b/src/Rabbyte/Annotation/AnnotationSg.fs index 7f4a4d7..fe2fb4d 100644 --- a/src/Rabbyte/Annotation/AnnotationSg.fs +++ b/src/Rabbyte/Annotation/AnnotationSg.fs @@ -317,7 +317,7 @@ module AnnotationSg = let sg = model.annotations |> AList.map (fun x -> - let colorAlpha = SgUtilities.colorAlpha x.style.primary.c (AVal.constant 0.5) + let colorAlpha = SgUtilities.colorAlpha x.style.primary (AVal.constant 0.5) let sg = clippingVolume colorAlpha model.extrusionOffset x.clippingVolume x.points |> Sg.effect [ diff --git a/src/Rabbyte/Drawing/DrawingApp.fs b/src/Rabbyte/Drawing/DrawingApp.fs index 5435c87..6ab0dac 100644 --- a/src/Rabbyte/Drawing/DrawingApp.fs +++ b/src/Rabbyte/Drawing/DrawingApp.fs @@ -28,13 +28,11 @@ module DrawingApp = let rec update (model: DrawingModel) (act: DrawingAction) = match act with | ChangeColorPrimary c1 -> - { model with style = { model.style with primary = ColorPicker.update model.style.primary c1 }} + { model with style = { model.style with primary = c1 }} | ChangeColorSecondary c2 -> - { model with style = { model.style with secondary = ColorPicker.update model.style.secondary c2 }} - | ChangeColorAuto c -> - let primary = ColorPicker.update model.style.primary c - let secCol = (SgUtilities.createSecondaryColor primary.c) - let secondary = ColorPicker.update model.style.secondary (ColorPicker.Action.SetColor { c = secCol }) + { model with style = { model.style with secondary = c2 }} + | ChangeColorAuto primary -> + let secondary = (SgUtilities.createSecondaryColor primary) { model with style = { model.style with primary = primary; secondary = secondary}} | ChangeThickness th -> { model with style = { model.style with thickness = th }} @@ -44,11 +42,11 @@ module DrawingApp = { model with style = { model.style with lineStyle = l }} | ChangeAreaStyle a -> { model with style = { model.style with areaStyle = a }} - | Undo _ -> + | Undo -> match model.past with | None -> model | Some p -> { p with future = Some model } - | Redo _ -> + | Redo -> match model.future with | None -> model | Some f -> f @@ -198,23 +196,23 @@ module DrawingApp = let pointsSg = points - |> SgUtilities.drawPointList style.primary.c pointSize depthOffset near far + |> SgUtilities.drawPointList style.primary pointSize depthOffset near far let pointsInnerSg = segments |> AList.map (fun x -> x.innerPoints |> AList.ofIndexList) |> AList.collect id - |> SgUtilities.drawPointList (style.primary.c |> AVal.map (fun c -> SgUtilities.createSecondaryColor c)) (pointSize |> AVal.map (fun x -> x * 0.8)) depthOffset near far + |> SgUtilities.drawPointList (style.primary |> AVal.map (fun c -> SgUtilities.createSecondaryColor c)) (pointSize |> AVal.map (fun x -> x * 0.8)) depthOffset near far let edgesSg = let lineWidth = style.thickness |> AVal.map (fun x -> x * 1.1) let sPoints = allSegmentPoints segments sPoints - |> SgUtilities.lines' (depthOffset|> AVal.map (fun x -> x / 1.9)) style.secondary.c lineWidth near far + |> SgUtilities.lines' (depthOffset|> AVal.map (fun x -> x / 1.9)) style.secondary lineWidth near far let edgesDirectSg = points - |> SgUtilities.lines' (depthOffset|> AVal.map (fun x -> x / 2.0)) style.primary.c style.thickness near far + |> SgUtilities.lines' (depthOffset|> AVal.map (fun x -> x / 2.0)) style.primary style.thickness near far // drawing order does not fix overlappings (offset in worldspace could fix this...) //let edgesSg = [edges; edgesDirect] |> Sg.group |> Sg.noEvents |> Sg.pass RenderPass.main @@ -237,9 +235,9 @@ module DrawingApp = let style' = "color: white; font-family:Consolas;" table [clazz "item"] [ - tr[][ - td[style style'][text "Type:"] - td[style style'][ + tr [] [ + td [style style'] [text "Type:"] + td [style style'] [ Incremental.text (model.primitiveType |> AVal.map (fun x -> match x with | PrimitiveType.Empty -> "Empty" @@ -249,30 +247,30 @@ module DrawingApp = | PrimitiveType.Polygon -> "Polygon" ))] ] - tr[][ - td[style style'][text "Thickness:"] - td[style style'][numeric { min = 1.0; max = 8.0; smallStep = 0.5; largeStep= 1.0 } [clazz "ui inverted input"] (model.style.thickness) ChangeThickness] + tr [] [ + td [style style'] [text "Thickness:"] + td [style style'] [numeric { min = 1.0; max = 8.0; smallStep = 0.5; largeStep= 1.0 } [clazz "ui inverted input"] (model.style.thickness) ChangeThickness] //td[style style'][slider { min = 1.0; max = 8.0; step = 1.0 } [clazz "ui inverted red slider"] (model.style.thickness) ChangeThickness] ] - tr[][ - td[style style'][text "SamplingRate:"] - td[style style'][numeric { min = 0.02; max = 10.0; smallStep = 0.02; largeStep= 0.2 } [clazz "ui inverted input"] (model.style.samplingRate) ChangeSamplingRate] + tr [] [ + td [style style'] [text "SamplingRate:"] + td [style style'] [numeric { min = 0.02; max = 10.0; smallStep = 0.02; largeStep= 0.2 } [clazz "ui inverted input"] (model.style.samplingRate) ChangeSamplingRate] //td[style style'][slider { min = 0.02; max = 10.0; step = 0.2 } [clazz "ui inverted red slider"] (model.style.samplingRate) ChangeSamplingRate] ] - tr[][ - td[style style'][text "AreaStyle:"] - td[style style'][dropdownUnclearable [ clazz "ui inverted selection dropdown" ] (model.areaStyleNames |> AMap.map (fun k v -> text v)) (model.style.areaStyle) ChangeAreaStyle] + tr [] [ + td [style style'] [text "AreaStyle:"] + td [style style'] [Dropdown.dropdown ChangeAreaStyle false None model.style.areaStyle [ clazz "ui inverted selection dropdown" ] (model.areaStyleNames |> AMap.map (fun k v -> text v))] ] - tr[][ - td[style style'][text "LineStyle:"] - td[style style'][dropdownUnclearable [ clazz "ui inverted selection dropdown" ] (model.lineStyleNames |> AMap.map (fun k v -> text v)) (model.style.lineStyle) ChangeLineStyle] + tr [] [ + td [style style'] [text "LineStyle:"] + td [style style'] [Dropdown.dropdown ChangeLineStyle false None model.style.lineStyle [ clazz "ui inverted selection dropdown" ] (model.lineStyleNames |> AMap.map (fun k v -> text v)) ] ] - tr[][ - td[style style'][text "PrimaryColor:"] - td[style style'][ColorPicker.view (model.style.primary) |> UI.map ChangeColorPrimary] + tr [] [ + td [style style'] [text "PrimaryColor:"] + td [style style'] [ColorPicker.view ColorPicker.Config.Default ChangeColorPrimary model.style.primary] ] - tr[][ - td[style style'][text "SecondaryColor:"] - td[style style'][ColorPicker.view (model.style.secondary) |> UI.map ChangeColorSecondary] + tr [] [ + td [style style'] [text "SecondaryColor:"] + td [style style'] [ColorPicker.view ColorPicker.Config.Default ChangeColorSecondary model.style.secondary] ] ] \ No newline at end of file diff --git a/src/Rabbyte/Drawing/DrawingModel.fs b/src/Rabbyte/Drawing/DrawingModel.fs index 4035eaf..f9cb8f4 100644 --- a/src/Rabbyte/Drawing/DrawingModel.fs +++ b/src/Rabbyte/Drawing/DrawingModel.fs @@ -32,8 +32,8 @@ type SegmentCreation = [] type BrushStyle = { - primary : ColorInput - secondary : ColorInput + primary : C4b + secondary : C4b lineStyle : LineStyle areaStyle : AreaStyle thickness : float @@ -64,9 +64,9 @@ type DrawingModel = } type DrawingAction = - | ChangeColorPrimary of ColorPicker.Action - | ChangeColorSecondary of ColorPicker.Action - | ChangeColorAuto of ColorPicker.Action + | ChangeColorPrimary of C4b + | ChangeColorSecondary of C4b + | ChangeColorAuto of C4b | ChangeThickness of float | ChangeSamplingRate of float | ChangeLineStyle of LineStyle @@ -85,8 +85,8 @@ module DrawingModel = let defaultStyle = { - primary = { c = C4b.VRVisGreen } - secondary = { c = C4b.Yellow } + primary = C4b.VRVisGreen + secondary = C4b.Yellow lineStyle = Solid areaStyle = Filled thickness = 3.0 diff --git a/src/RabbyteExample/RabbyteExample.fsproj b/src/RabbyteExample/RabbyteExample.fsproj index 5c84a2a..8a47e14 100644 --- a/src/RabbyteExample/RabbyteExample.fsproj +++ b/src/RabbyteExample/RabbyteExample.fsproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 ..\..\bin\Debug\ diff --git a/src/ViewPlannerDSS/App.fs b/src/ViewPlannerDSS/App.fs index f94ba8e..4db8362 100644 --- a/src/ViewPlannerDSS/App.fs +++ b/src/ViewPlannerDSS/App.fs @@ -9,7 +9,7 @@ open Aardvark.Rendering open Aardvark.Rendering.Text open Aardvark.SceneGraph -open Aardvark.SceneGraph.Opc +open Aardvark.Data.Opc open FShade open Aardvark.Application diff --git a/src/ViewPlannerDSS/Model.fs b/src/ViewPlannerDSS/Model.fs index ac635cc..9579a6c 100644 --- a/src/ViewPlannerDSS/Model.fs +++ b/src/ViewPlannerDSS/Model.fs @@ -3,7 +3,7 @@ namespace ViewPlanner open Aardvark.Base open Aardvark.Rendering open FSharp.Data.Adaptive -open Aardvark.SceneGraph.Opc +open Aardvark.Data.Opc open Aardvark.UI.Primitives open Aardvark.Application diff --git a/src/ViewPlannerDSS/ViewPlannerDSS.fsproj b/src/ViewPlannerDSS/ViewPlannerDSS.fsproj index 72b6778..d63c2ae 100644 --- a/src/ViewPlannerDSS/ViewPlannerDSS.fsproj +++ b/src/ViewPlannerDSS/ViewPlannerDSS.fsproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 ..\..\bin\Debug\ diff --git a/src/ViewerMain/App.fs b/src/ViewerMain/App.fs index 9ff300b..6335209 100644 --- a/src/ViewerMain/App.fs +++ b/src/ViewerMain/App.fs @@ -9,7 +9,7 @@ open FSharp.Data.Adaptive open Aardvark.Rendering open Aardvark.SceneGraph open Aardvark.SceneGraph.Semantics -open Aardvark.SceneGraph.Opc +open Aardvark.Data.Opc open Aardvark.SceneGraph.SgPrimitives open Aardvark.Rendering.Text open Aardvark.UI.Primitives diff --git a/src/ViewerMain/Model.fs b/src/ViewerMain/Model.fs index db509d6..eb5a0dd 100644 --- a/src/ViewerMain/Model.fs +++ b/src/ViewerMain/Model.fs @@ -4,7 +4,7 @@ open Aardvark.Base open Aardvark.Rendering open FSharp.Data.Adaptive open Aardvark.Base.Geometry -open Aardvark.SceneGraph.Opc +open Aardvark.Data.Opc open Aardvark.Geometry open Aardvark.UI open Aardvark.UI.Primitives diff --git a/src/ViewerMain/Neighbouring.fs b/src/ViewerMain/Neighbouring.fs index f0caa08..f7e549b 100644 --- a/src/ViewerMain/Neighbouring.fs +++ b/src/ViewerMain/Neighbouring.fs @@ -1,7 +1,7 @@ namespace OpcSelectionViewer open Aardvark.Base -open Aardvark.SceneGraph.Opc +open Aardvark.Data.Opc open OpcViewer.Base.Picking open FSharp.Data.Adaptive diff --git a/src/ViewerMain/Opc.fs b/src/ViewerMain/Opc.fs index 3af11aa..1cca05e 100644 --- a/src/ViewerMain/Opc.fs +++ b/src/ViewerMain/Opc.fs @@ -4,7 +4,7 @@ open Aardvark.Base open Aardvark.Base.Geometry open FSharp.Data.Adaptive open Aardvark.SceneGraph -open Aardvark.SceneGraph.Opc +open Aardvark.Data.Opc open Aardvark.Rendering module Opc = diff --git a/src/ViewerMain/Outline/OutlineApp.fs b/src/ViewerMain/Outline/OutlineApp.fs index d4b1f0a..d6a5511 100644 --- a/src/ViewerMain/Outline/OutlineApp.fs +++ b/src/ViewerMain/Outline/OutlineApp.fs @@ -9,7 +9,7 @@ open FSharp.Data.Adaptive open Aardvark.Rendering open Aardvark.SceneGraph open Aardvark.SceneGraph.Semantics -open Aardvark.SceneGraph.Opc +open Aardvark.Data.Opc open Aardvark.SceneGraph.SgPrimitives open Aardvark.Rendering.Text open Aardvark.UI.Primitives diff --git a/src/ViewerMain/Outline/OutlineModel.fs b/src/ViewerMain/Outline/OutlineModel.fs index dbbfe91..cfe3a66 100644 --- a/src/ViewerMain/Outline/OutlineModel.fs +++ b/src/ViewerMain/Outline/OutlineModel.fs @@ -4,7 +4,7 @@ open Aardvark.Base open Aardvark.Rendering open FSharp.Data.Adaptive open Aardvark.Base.Geometry -open Aardvark.SceneGraph.Opc +open Aardvark.Data.Opc open Aardvark.Geometry open Aardvark.UI open Aardvark.UI.Primitives diff --git a/src/ViewerMain/Outline/OutlineSg.fs b/src/ViewerMain/Outline/OutlineSg.fs index 8ccf4dd..8256042 100644 --- a/src/ViewerMain/Outline/OutlineSg.fs +++ b/src/ViewerMain/Outline/OutlineSg.fs @@ -8,7 +8,7 @@ open Aardvark.Rendering.Text open FShade open Aardvark.Rendering open Aardvark.UI.Trafos -open Aardvark.SceneGraph.Opc +open Aardvark.Data.Opc open Aardvark.UI open OpcViewer.Base @@ -52,7 +52,7 @@ module OutlineSg = let config = { wantMipMaps = true; wantSrgb = false; wantCompressed = false } leaves - |> List.map(fun (dir,patch) -> (Aardvark.SceneGraph.Opc.Patch.load (OpcPaths dir) ViewerModality.XYZ patch.info,dir, patch.info)) + |> List.map(fun (dir,patch) -> (Aardvark.Data.Opc.Patch.load (OpcPaths dir) ViewerModality.XYZ patch.info,dir, patch.info)) |> List.map(fun ((a,_),c,d) -> (a,c,d)) |> List.map (fun (g,dir,info) -> diff --git a/src/ViewerMain/Properties/launchSettings.json b/src/ViewerMain/Properties/launchSettings.json index 8ea0cf5..f15fe19 100644 --- a/src/ViewerMain/Properties/launchSettings.json +++ b/src/ViewerMain/Properties/launchSettings.json @@ -2,7 +2,7 @@ "profiles": { "OpcViewer": { "commandName": "Project", - "commandLineArgs": "opc=\"F:\\pro3d\\data\\20200220_DinosaurQuarry2\\Dinosaur_Quarry_2\"" + "commandLineArgs": "opc=\"D:\\_WORK\\OPC\\VictoriaCrater\\HiRISE_VictoriaCrater\" -rotate" } } } \ No newline at end of file diff --git a/src/ViewerMain/ViewerMain.fsproj b/src/ViewerMain/ViewerMain.fsproj index 123b729..f4946d3 100644 --- a/src/ViewerMain/ViewerMain.fsproj +++ b/src/ViewerMain/ViewerMain.fsproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 true