diff --git a/paket.dependencies b/paket.dependencies index dab9aae9..eddd9898 100644 --- a/paket.dependencies +++ b/paket.dependencies @@ -10,53 +10,52 @@ nuget Aardvark.Build ~> 1.0.11 nuget FSharp.Core ~> 5.0.2 lowest_matching: true nuget FSharp.Data ~> 3.1.1 -nuget FSharp.Data.Adaptive ~> 1.2.6 +nuget FSharp.Data.Adaptive ~> 1.2.13 -nuget Aardvark.Base ~> 5.2.12 -nuget Aardvark.Base.Incremental ~> 5.2.12 -nuget Aardvark.Base.FSharp ~> 5.2.12 -nuget Aardvark.Geometry ~> 5.2.12 -nuget Aardvark.PixImage.DevIL ~> 5.2.12 +nuget Aardvark.Base ~> 5.2.13 +nuget Aardvark.Base.Incremental ~> 5.2.13 +nuget Aardvark.Base.FSharp ~> 5.2.13 +nuget Aardvark.Geometry ~> 5.2.13 +nuget Aardvark.PixImage.DevIL ~> 5.2.13 -nuget Aardvark.Rendering ~> 5.3.6 -nuget Aardvark.Application.Slim ~> 5.3.6 -nuget Aardvark.Application.Slim.GL ~> 5.3.6 -nuget Aardvark.Application.Slim.Vulkan ~> 5.3.6 -nuget Aardvark.SceneGraph ~> 5.3.6 -nuget Aardvark.SceneGraph.IO ~> 5.3.6 -nuget Aardvark.SceneGraph.Opc ~> 5.3.6 -nuget Aardvark.Rendering.Text ~> 5.3.6 -nuget Aardvark.Rendering.Vulkan ~> 5.3.6 -nuget Aardvark.Rendering.GL ~> 5.3.6 -nuget Aardvark.GPGPU ~> 5.3.6 +nuget Aardvark.Rendering ~> 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.SceneGraph ~> 5.4.0 +nuget Aardvark.SceneGraph.IO ~> 5.4.0 +nuget Aardvark.SceneGraph.Opc ~> 5.4.0 +nuget Aardvark.Rendering.Text ~> 5.4.0 +nuget Aardvark.Rendering.Vulkan ~> 5.4.0 +nuget Aardvark.Rendering.GL ~> 5.4.0 +nuget Aardvark.GPGPU ~> 5.4.0 -nuget Aardvark.Geometry.Intersection ~> 5.2.15 -nuget Aardvark.Geometry.PointTree ~> 5.2.15 -nuget Aardvark.Geometry.PolyMesh ~> 5.2.15 +nuget Aardvark.Geometry.Intersection ~> 5.2.25 +nuget Aardvark.Geometry.PointTree ~> 5.2.25 +nuget Aardvark.Geometry.PolyMesh ~> 5.2.25 -nuget Aardvark.Service ~> 5.3.1 -nuget Aardvark.UI ~> 5.3.1 -nuget Aardvark.UI.Primitives ~> 5.3.1 -nuget Aardvark.Service.Giraffe ~> 5.3.1 +nuget Aardvark.Service ~> 5.4.0 +nuget Aardvark.UI ~> 5.4.0 +nuget Aardvark.UI.Primitives ~> 5.4.0 +nuget Aardvark.Service.Giraffe ~> 5.4.0 -nuget Adaptify.MSBuild ~> 1.1.8 -nuget Adaptify.Core ~> 1.1.8 +nuget Adaptify.MSBuild ~> 1.1.9 +nuget Adaptify.Core ~> 1.1.9 -nuget Aardvark.Data.Wavefront ~> 5.2.5 -nuget Aardvark.GeoSpatial.Opc ~> 5.9.5 +nuget Aardvark.Data.Wavefront ~> 5.2.25 +nuget Aardvark.GeoSpatial.Opc ~> 5.10.1 nuget Aardium ~> 2.0.10-prerelease0007 -nuget OPCViewer.Base ~> 1.2.0 +nuget OPCViewer.Base ~> 1.3.0 nuget Uncodium.Eigensystems ~> 1.1.2 nuget Chiron ~> 6.3.1 nuget RestSharp ~> 106.6.9 nuget Microsoft.Diagnostics.Runtime ~> 2.0.1 - nuget Microsoft.AspNetCore.Authentication.JwtBearer ~> 6.0.10 nuget Giraffe diff --git a/paket.lock b/paket.lock index 6a1cfe68..0f76b90b 100644 --- a/paket.lock +++ b/paket.lock @@ -5,246 +5,263 @@ NUGET Aardium (2.0.10-prerelease0007) FSharp.Core (>= 4.7) FSys (>= 0.0.1 < 0.1) - Aardvark.Application (5.3.6) - Aardvark.Base.Essentials (>= 5.2.19 < 5.3) - Aardvark.Base.Incremental (>= 5.2.19 < 5.3) - Aardvark.Rendering (5.3.6) - FShade.Core (>= 5.3.3 < 5.4) - FShade.GLSL (>= 5.3.3) + Aardvark.Application (5.4.3) + Aardvark.Base.Essentials (>= 5.2.23 < 5.3) + Aardvark.Base.Incremental (>= 5.2.23 < 5.3) + Aardvark.Rendering (5.4.3) + FShade.Core (>= 5.5 < 5.6) + FShade.GLSL (>= 5.5) FSharp.Core (>= 5.0.1) - Aardvark.Application.Slim (5.3.6) - Aardvark.Application (5.3.6) - Aardvark.Base.Essentials (>= 5.2.19 < 5.3) - Aardvark.Base.Incremental (>= 5.2.19 < 5.3) - Aardvark.Base.Runtime (>= 5.2.19 < 5.3) - Aardvark.Rendering (5.3.6) - FShade (>= 5.3.3 < 5.4) + Aardvark.Application.Slim (5.4.3) + Aardvark.Application (5.4.3) + 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.3) + 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.3.6) - Aardvark.Application (5.3.6) - Aardvark.Application.Slim (5.3.6) - Aardvark.Base.Essentials (>= 5.2.19 < 5.3) - Aardvark.Base.Incremental (>= 5.2.19 < 5.3) - Aardvark.Base.Runtime (>= 5.2.19 < 5.3) - Aardvark.Base.Tensors (>= 5.2.19 < 5.3) - Aardvark.Rendering (5.3.6) - Aardvark.Rendering.GL (5.3.6) - FShade (>= 5.3.3 < 5.4) + Aardvark.Application.Slim.GL (5.4.3) + Aardvark.Application (5.4.3) + Aardvark.Application.Slim (5.4.3) + 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.3) + Aardvark.Rendering.GL (5.4.3) + 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.3.6) - Aardvark.Application (5.3.6) - Aardvark.Application.Slim (5.3.6) - Aardvark.Base.Essentials (>= 5.2.19 < 5.3) - Aardvark.Base.Incremental (>= 5.2.19 < 5.3) - Aardvark.Base.Runtime (>= 5.2.19 < 5.3) - Aardvark.Rendering (5.3.6) - Aardvark.Rendering.Vulkan (5.3.6) - FShade (>= 5.3.3 < 5.4) + Aardvark.Application.Slim.Vulkan (5.4.3) + Aardvark.Application (5.4.3) + Aardvark.Application.Slim (5.4.3) + 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.3) + Aardvark.Rendering.Vulkan (5.4.3) + FShade (>= 5.5 < 5.6) FSharp.Core (>= 5.0.1) GLSLangSharp (>= 0.4.14 < 0.5) Silk.NET.GLFW (2.15) Unofficial.OpenTK (>= 3.0.21 < 3.1) - Aardvark.Assembler (0.0.7) + Aardvark.Assembler (0.0.8) Aardvark.Base (>= 5.2.7 < 5.3) Aardvark.Base.Runtime (>= 5.2.7 < 5.3) FSharp.Core (>= 5.0) FSharp.Data.Adaptive (>= 1.2.13 < 1.3) - Aardvark.Base (5.2.19) - Aardvark.Base.Telemetry (5.2.19) + 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.19) - Aardvark.Base (5.2.19) + Aardvark.Base.Essentials (5.2.25) + Aardvark.Base (5.2.25) System.Collections.Immutable (>= 5.0) - Aardvark.Base.FSharp (5.2.19) - Aardvark.Base (5.2.19) + 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.19) - Aardvark.Base (5.2.19) - Aardvark.Base.FSharp (5.2.19) + 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.19) - Aardvark.Base (5.2.19) - Aardvark.Base.Tensors (5.2.19) + 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.19) - Aardvark.Base.FSharp (5.2.19) - Aardvark.Base.Incremental (5.2.19) + 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.19) - Aardvark.Base.Tensors (5.2.19) - Aardvark.Base (5.2.19) - Aardvark.Base.FSharp (5.2.19) + 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.1.3 < 2.2) Aardvark.Base.TypeProviders (4.5.15) FSharp.Core (>= 4.2.3) Aardvark.Build (1.0.18) - Aardvark.Data.Wavefront (5.2.15) - Aardvark.Geometry.PolyMesh (5.2.15) - Aardvark.Geometry (5.2.19) - Aardvark.Base (5.2.19) - Aardvark.Base.FSharp (5.2.19) - Aardvark.Base.Tensors (5.2.19) + Aardvark.Data.Wavefront (5.2.25) + Aardvark.Geometry.PolyMesh (5.2.25) + 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.Clustering (5.2.15) - Aardvark.Base (>= 5.2.14 < 5.3) - Aardvark.Geometry.PointTree (5.2.15) + Aardvark.Geometry.Clustering (5.2.25) + Aardvark.Base (>= 5.2.24 < 5.3) + Aardvark.Geometry.PointTree (5.2.25) FSharp.Core (>= 5.0.1) - Aardvark.Geometry.Intersection (5.2.15) - Aardvark.Base.IO (>= 5.2.14 < 5.3) - Aardvark.Geometry.PointTree (5.2.15) - Aardvark.Base.IO (>= 5.2.14 < 5.3) - Aardvark.Geometry.PolyMesh (5.2.15) - Aardvark.Base (>= 5.2.14 < 5.3) - Aardvark.Geometry.Clustering (5.2.15) - Aardvark.Geometry.Intersection (5.2.15) - Aardvark.Rendering (>= 5.3) - Aardvark.GPGPU (5.3.6) - Aardvark.Base.Incremental (>= 5.2.19 < 5.3) - Aardvark.Rendering (5.3.6) - FShade.Core (>= 5.3.3 < 5.4) - FShade.GLSL (>= 5.3.3) + Aardvark.Geometry.Intersection (5.2.25) + Aardvark.Base.IO (>= 5.2.24 < 5.3) + Aardvark.Geometry.PointTree (5.2.25) + Aardvark.Base.IO (>= 5.2.24 < 5.3) + Aardvark.Geometry.PolyMesh (5.2.25) + Aardvark.Base (>= 5.2.24 < 5.3) + Aardvark.Geometry.Clustering (5.2.25) + Aardvark.Geometry.Intersection (5.2.25) + Aardvark.Rendering (>= 5.4.1) + Aardvark.GeoSpatial.Opc (5.10.1) + Aardvark.Base (>= 5.2.13 < 5.3) + Aardvark.Base.FSharp (>= 5.2.13 < 5.3) + Aardvark.Base.IO (>= 5.2.13 < 5.3) + Aardvark.Geometry.Intersection (>= 5.2.13 < 5.3) + Aardvark.PixImage.DevIL (>= 5.2.25 < 5.3) + Aardvark.PixImage.Pfim (>= 0.9.1 < 0.10) + Aardvark.Rendering (>= 5.4 < 5.5) + Aardvark.Rendering.GL (>= 5.4 < 5.5) + Aardvark.SceneGraph (>= 5.4 < 5.5) + Aardvark.SceneGraph.Opc (>= 5.4 < 5.5) + FSharp.Core (>= 5.0) + FSharp.Data.Adaptive (>= 1.2.13 < 1.3) + Aardvark.GPGPU (5.4.3) + Aardvark.Base.Incremental (>= 5.2.23 < 5.3) + Aardvark.Rendering (5.4.3) + FShade.Core (>= 5.5 < 5.6) + FShade.GLSL (>= 5.5) FSharp.Core (>= 5.0.1) - Aardvark.PixImage.DevIL (5.2.19) - Aardvark.Base (5.2.19) - Aardvark.Base.Tensors (5.2.19) + Aardvark.PixImage.DevIL (5.2.25) + Aardvark.Base (5.2.25) + Aardvark.Base.Tensors (5.2.25) DevILSharp - Aardvark.Rendering (5.3.6) - Aardvark.Base.Essentials (>= 5.2.19 < 5.3) - Aardvark.Base.Incremental (>= 5.2.19 < 5.3) + Aardvark.PixImage.Pfim (0.9.1) Aardvark.Base.Tensors (>= 5.2.19 < 5.3) - FShade.Core (>= 5.3.3 < 5.4) - FShade.GLSL (>= 5.3.3) + FSharp.Core (>= 5.0.1) + Pfim (>= 0.11.2 < 0.12) + Aardvark.Rendering (5.4.3) + 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.3.6) - Aardvark.Assembler (>= 0.0.6 < 0.1) - Aardvark.Base.Essentials (>= 5.2.19 < 5.3) - Aardvark.Base.Incremental (>= 5.2.19 < 5.3) - Aardvark.Base.Runtime (>= 5.2.19 < 5.3) - Aardvark.Base.Tensors (>= 5.2.19 < 5.3) - Aardvark.Geometry (>= 5.2.19 < 5.3) - Aardvark.Rendering (5.3.6) - FShade (>= 5.3.3 < 5.4) + Aardvark.Rendering.GL (5.4.3) + 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.3) + FShade (>= 5.5 < 5.6) FSharp.Core (>= 5.0.1) Unofficial.OpenTK (>= 3.0.21 < 3.1) - Aardvark.Rendering.Text (5.3.6) - Aardvark.Base.Incremental (>= 5.2.19 < 5.3) - Aardvark.Rendering (5.3.6) - Aardvark.SceneGraph (5.3.6) + Aardvark.Rendering.Text (5.4.3) + Aardvark.Base.Incremental (>= 5.2.23 < 5.3) + Aardvark.Rendering (5.4.3) + Aardvark.SceneGraph (5.4.3) CommonMark.NET (>= 0.15.1 < 0.16) - FShade.Core (>= 5.3.3 < 5.4) - FShade.GLSL (>= 5.3.3) + 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.3.6) - Aardvark.Base.FSharp (>= 5.2.19 < 5.3) - Aardvark.Base.Incremental (>= 5.2.19 < 5.3) - Aardvark.Base.Runtime (>= 5.2.19 < 5.3) - Aardvark.Base.Tensors (>= 5.2.19 < 5.3) - Aardvark.Rendering (5.3.6) - FShade (>= 5.3.3 < 5.4) + Aardvark.Rendering.Vulkan (5.4.3) + 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.3) + FShade (>= 5.5 < 5.6) FSharp.Core (>= 5.0.1) GLSLangSharp (>= 0.4.14 < 0.5) - Aardvark.SceneGraph (5.3.6) - Aardvark.Base.Incremental (>= 5.2.19 < 5.3) - Aardvark.Rendering (5.3.6) - FShade.Core (>= 5.3.3 < 5.4) - FShade.GLSL (>= 5.3.3) + Aardvark.SceneGraph (5.4.3) + Aardvark.Base.Incremental (>= 5.2.23 < 5.3) + Aardvark.Rendering (5.4.3) + FShade.Core (>= 5.5 < 5.6) + FShade.GLSL (>= 5.5) FSharp.Core (>= 5.0.1) - Aardvark.SceneGraph.IO (5.3.6) - Aardvark.Base.Incremental (>= 5.2.19 < 5.3) - Aardvark.Base.Tensors (>= 5.2.19 < 5.3) - Aardvark.Rendering (5.3.6) - Aardvark.SceneGraph (5.3.6) + Aardvark.SceneGraph.IO (5.4.3) + Aardvark.Base.Incremental (>= 5.2.23 < 5.3) + Aardvark.Base.Tensors (>= 5.2.23 < 5.3) + Aardvark.Rendering (5.4.3) + Aardvark.SceneGraph (5.4.3) AssimpNet (>= 5.0.0-beta1 < 5.1.0-beta) - FShade.Core (>= 5.3.3 < 5.4) - FShade.GLSL (>= 5.3.3) + FShade.Core (>= 5.5 < 5.6) + FShade.GLSL (>= 5.5) FSharp.Core (>= 5.0.1) - Aardvark.SceneGraph.Opc (5.3.6) - Aardvark.Base.Incremental (>= 5.2.19 < 5.3) - Aardvark.Base.IO (>= 5.2.19 < 5.3) - Aardvark.Rendering (5.3.6) - Aardvark.SceneGraph (5.3.6) + Aardvark.SceneGraph.Opc (5.4.3) + Aardvark.Base.Incremental (>= 5.2.23 < 5.3) + Aardvark.Base.IO (>= 5.2.23 < 5.3) + Aardvark.Rendering (5.4.3) + Aardvark.SceneGraph (5.4.3) FSharp.Core (>= 5.0.1) SharpZipLib (>= 1.4.1 < 1.5) - Aardvark.Service (5.3.5) - Aardvark.Application (>= 5.3) - Aardvark.Base (>= 5.2.13 < 5.3) - Aardvark.Base.FSharp (>= 5.2.13 < 5.3) - Aardvark.GPGPU (>= 5.3 < 5.4) - Aardvark.Rendering (>= 5.3 < 5.4) - Aardvark.Rendering.GL (>= 5.3) - Aardvark.Rendering.Vulkan (>= 5.3 < 5.4) + 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.8 < 1.3) + 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.Service.Giraffe (5.3.5) - Aardvark.Application (>= 5.3) - Aardvark.Base (>= 5.2.13 < 5.3) - Aardvark.Base.FSharp (>= 5.2.13 < 5.3) - Aardvark.GPGPU (>= 5.3 < 5.4) - Aardvark.Rendering (>= 5.3 < 5.4) - Aardvark.Rendering.GL (>= 5.3) - Aardvark.Rendering.Vulkan (>= 5.3 < 5.4) - Aardvark.Service (5.3.5) - Aardvark.UI (5.3.5) + Aardvark.Service.Giraffe (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) + Aardvark.Service (5.4) + Aardvark.UI (5.4) FSharp.Core (>= 5.0.1) - FSharp.Data.Adaptive (>= 1.2.8 < 1.3) + FSharp.Data.Adaptive (>= 1.2.13 < 1.3) FsPickler (>= 5.3.2 < 5.4) FsPickler.Json (>= 5.3.2 < 5.4) Giraffe (>= 5.0 < 5.1) Suave (>= 2.5.6 < 2.6) - Aardvark.UI (5.3.5) - Aardvark.Application (>= 5.3) - Aardvark.Base (>= 5.2.13 < 5.3) - Aardvark.Base.FSharp (>= 5.2.13 < 5.3) - Aardvark.Base.Incremental (>= 5.2.13 < 5.3) - Aardvark.Rendering (>= 5.3 < 5.4) - Aardvark.SceneGraph (>= 5.3 < 5.4) - Aardvark.Service (5.3.5) + 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.8 < 1.3) + 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.3.5) - Aardvark.Application (>= 5.3) - Aardvark.Base (>= 5.2.13 < 5.3) - Aardvark.Base.FSharp (>= 5.2.13 < 5.3) - Aardvark.Base.Incremental (>= 5.2.13 < 5.3) - Aardvark.Rendering (>= 5.3 < 5.4) - Aardvark.SceneGraph (>= 5.3 < 5.4) - Aardvark.Service (5.3.5) - Aardvark.UI (5.3.5) - Adaptify.Core (>= 1.1.8 < 1.2) + 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) Aether (>= 8.3.1 < 8.4) FSharp.Core (>= 5.0.1) - FSharp.Data.Adaptive (>= 1.2.8 < 1.3) + 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) @@ -265,32 +282,32 @@ NUGET Fable.Core (3.7.1) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= net5.0)) FParsec (1.1.1) FSharp.Core (>= 4.3.4) - FShade (5.3.4) - FShade.Core (5.3.4) - FShade.GLSL (5.3.4) - FShade.Imperative (5.3.4) - FShade.SpirV (5.3.4) - FShade.Core (5.3.4) - Aardvark.Base (>= 5.2.13 < 5.3) - Aardvark.Base.FSharp (>= 5.2.13 < 5.3) - FShade.Imperative (5.3.4) + FShade (5.5) + FShade.Core (5.5) + FShade.GLSL (5.5) + FShade.Imperative (5.5) + FShade.SpirV (5.5) + FShade.Core (5.5) + Aardvark.Base (>= 5.2.19 < 5.3) + Aardvark.Base.FSharp (>= 5.2.19 < 5.3) + FShade.Imperative (5.5) FSharp.Core (>= 5.0) - FShade.GLSL (5.3.4) - Aardvark.Base (>= 5.2.13 < 5.3) - Aardvark.Base.FSharp (>= 5.2.13 < 5.3) - FShade.Core (5.3.4) - FShade.Imperative (5.3.4) + FShade.GLSL (5.5) + Aardvark.Base (>= 5.2.19 < 5.3) + Aardvark.Base.FSharp (>= 5.2.19 < 5.3) + FShade.Core (5.5) + FShade.Imperative (5.5) FSharp.Core (>= 5.0) - FShade.Imperative (5.3.4) - Aardvark.Base (>= 5.2.13 < 5.3) - Aardvark.Base.FSharp (>= 5.2.13 < 5.3) + FShade.Imperative (5.5) + Aardvark.Base (>= 5.2.19 < 5.3) + Aardvark.Base.FSharp (>= 5.2.19 < 5.3) FSharp.Core (>= 5.0) FsPickler (>= 5.3.2 < 5.4) - FShade.SpirV (5.3.4) - Aardvark.Base (>= 5.2.13 < 5.3) - Aardvark.Base.FSharp (>= 5.2.13 < 5.3) - FShade.Core (5.3.4) - FShade.Imperative (5.3.4) + FShade.SpirV (5.5) + Aardvark.Base (>= 5.2.19 < 5.3) + Aardvark.Base.FSharp (>= 5.2.19 < 5.3) + FShade.Core (5.5) + FShade.Imperative (5.5) FSharp.Core (>= 5.0) FSharp.Control.Websockets (0.2.2) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= net5.0)) FSharp.Core (>= 4.3.4) @@ -298,7 +315,7 @@ NUGET FSharp.Core (5.0.2) FSharp.Data (3.1.1) FSharp.Core (>= 4.3.4) - FSharp.Data.Adaptive (1.2.13) + FSharp.Data.Adaptive (1.2.14) FSharp.Core (>= 4.7) System.Reflection.Emit.Lightweight (>= 4.6) FsPickler (5.3.2) @@ -392,17 +409,18 @@ NUGET NETStandard.Library (2.0.3) Microsoft.NETCore.Platforms (>= 1.1) Newtonsoft.Json (13.0.2) - OPCViewer.Base (1.2) + OPCViewer.Base (1.3) Aardvark.Base (>= 5.2.14 < 5.3) Aardvark.Base.FSharp (>= 5.2.14 < 5.3) Aardvark.Geometry.Intersection (>= 5.2.13 < 5.3) - Aardvark.Rendering (>= 5.3 < 5.4) - Aardvark.Rendering.Text (>= 5.3 < 5.4) - Aardvark.SceneGraph (>= 5.3 < 5.4) - Aardvark.SceneGraph.Opc (>= 5.3 < 5.4) - Aardvark.UI.Primitives (>= 5.3.4 < 5.4) + Aardvark.Rendering (>= 5.4 < 5.5) + Aardvark.Rendering.Text (>= 5.4 < 5.5) + Aardvark.SceneGraph (>= 5.4 < 5.5) + Aardvark.SceneGraph.Opc (>= 5.4 < 5.5) + Aardvark.UI.Primitives (>= 5.4 < 5.5) FSharp.Core (>= 5.0.1) Uncodium.Eigensystems (>= 1.1.2 < 1.2) + Pfim (0.11.2) Ply (0.3.1) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= net5.0)) FSharp.Core (>= 4.6.2) System.Threading.Tasks.Extensions (>= 4.5.4) @@ -595,18 +613,6 @@ NUGET System.Reflection.Emit.Lightweight (>= 4.3) System.Threading.Tasks.Extensions (>= 4.4) System.ValueTuple (>= 4.4) - remote: https://vrvis.myget.org/F/aardvark_public/api/v3/index.json - Aardvark.GeoSpatial.Opc (5.9.5) - Aardvark.Base (>= 5.2.13 < 5.3) - Aardvark.Base.FSharp (>= 5.2.13 < 5.3) - Aardvark.Base.IO (>= 5.2.13 < 5.3) - Aardvark.Geometry.Intersection (>= 5.2.13 < 5.3) - Aardvark.Rendering (>= 5.3.5 < 5.4) - Aardvark.Rendering.GL (>= 5.3.5 < 5.4) - Aardvark.SceneGraph (>= 5.3.5 < 5.4) - Aardvark.SceneGraph.Opc (>= 5.3.5 < 5.4) - FSharp.Core (>= 5.0) - FSharp.Data.Adaptive (>= 1.2.13 < 1.3) GROUP Build RESTRICTION: == net6.0 diff --git a/src/PRo3D.Core/Drawing/PackedRendering.fs b/src/PRo3D.Core/Drawing/PackedRendering.fs index 43e60d59..5c1e6eb5 100644 --- a/src/PRo3D.Core/Drawing/PackedRendering.fs +++ b/src/PRo3D.Core/Drawing/PackedRendering.fs @@ -138,7 +138,8 @@ module PackedRendering = // since we need special extension feature not provided by fshade we simply import the functionality (standard approach) [] - let drawId () : int = raise <| FShade.Imperative.FShadeOnlyInShaderCodeException "drawId" + let drawId () : int = + onlyInShaderCode "drawId" type UniformScope with member x.MVs : M44d[] = x?StorageBuffer?MVs diff --git a/src/PRo3D.Core/Surface/Surface.Files.fs b/src/PRo3D.Core/Surface/Surface.Files.fs index 97a63e55..cf0b13ab 100644 --- a/src/PRo3D.Core/Surface/Surface.Files.fs +++ b/src/PRo3D.Core/Surface/Surface.Files.fs @@ -52,7 +52,7 @@ module Files = imagesPath.IsSome && patchesPath.IsSome && patchHierarchyXmlPath.IsSome - printfn "[Surface.Files] is opc path: %A" path + printfn "[Surface.Files] is opc path: %A => %b" path isOpcFolder isOpcFolder /// diff --git a/src/PRo3D.Lite/App.fs b/src/PRo3D.Lite/App.fs index ae78d809..b44d5cc6 100644 --- a/src/PRo3D.Lite/App.fs +++ b/src/PRo3D.Lite/App.fs @@ -307,8 +307,8 @@ module App = let dependencies = Html.semui @ [ - { name = "style"; kind = Stylesheet; url = "./style.css"} - { name = "semui-overrides"; kind = Stylesheet; url = "semui-overrides.css"} + { name = "style"; kind = Stylesheet; url = "./resources/style.css"} + { name = "semui-overrides"; kind = Stylesheet; url = "./resources/semui-overrides.css"} ] let view (runner : Load.Runner) (emit : Message -> unit) (model : AdaptiveModel) = diff --git a/src/PRo3D.Viewer/Scene.fs b/src/PRo3D.Viewer/Scene.fs index 41574489..ea416068 100644 --- a/src/PRo3D.Viewer/Scene.fs +++ b/src/PRo3D.Viewer/Scene.fs @@ -110,18 +110,22 @@ module SceneLoader = surfaces |> IndexList.map(fun s -> s, s.importPath |> getOPCxPath) |> IndexList.map(fun(s,p) -> - match (Serialization.fileExists p) with - | Some path-> + let loadOpcX (path : string) = let layers = SurfaceUtils.SurfaceAttributes.read path let textures = layers |> SurfaceProperties.getTextures - + { s with scalarLayers = layers |> SurfaceProperties.getScalarsHmap //SurfaceProperties.getScalars textureLayers = textures selectedTexture = textures |> IndexList.tryFirst } + match Serialization.fileExists p with + | Some path-> + loadOpcX path | None -> - s + match Directory.EnumerateFiles(s.importPath, "*.opcx") |> Seq.toList with + | [singleOpcX] -> loadOpcX singleOpcX + | _ -> s ) let addGeologicSurfaces (m:Model) = diff --git a/src/PRo3D.Viewer/Viewer/Viewer.fs b/src/PRo3D.Viewer/Viewer/Viewer.fs index 7d7769d1..8617937c 100644 --- a/src/PRo3D.Viewer/Viewer/Viewer.fs +++ b/src/PRo3D.Viewer/Viewer/Viewer.fs @@ -1974,11 +1974,11 @@ module ViewerApp = let viewerDependencies = [ { kind = Stylesheet; name = "semui"; url = "https://cdn.jsdelivr.net/semantic-ui/2.2.6/semantic.min.css" } - { kind = Stylesheet; name = "semui-overrides"; url = "semui-overrides.css" } + { kind = Stylesheet; name = "semui-overrides"; url = "./resources/semui-overrides.css" } { kind = Script; name = "semui"; url = "https://cdn.jsdelivr.net/semantic-ui/2.2.6/semantic.min.js" } - { kind = Script; name = "errorReporting"; url = "./errorReporting.js" } - { kind = Script; name = "resize"; url = "./ResizeSensor.js" } - { kind = Script; name = "resizeElem"; url = "./ElementQueries.js" } + { kind = Script; name = "errorReporting"; url = "./resources/errorReporting.js" } + { kind = Script; name = "resize"; url = "./resources/ResizeSensor.js" } + { kind = Script; name = "resizeElem"; url = "./resources/ElementQueries.js" } ] let bodyAttributes : list> =