diff --git a/README.md b/README.md index b8fd757e..d6e9e804 100644 --- a/README.md +++ b/README.md @@ -6,34 +6,9 @@ [![license](https://img.shields.io/github/license/aardvark-platform/aardvark.algodat.svg)](https://github.com/aardvark-platform/aardvark.algodat/blob/master/LICENSE) [The Aardvark Platform](https://aardvarkians.com/) | -[Platform Wiki](https://github.com/aardvarkplatform/aardvark.docs/wiki) | -[Gallery](https://github.com/aardvarkplatform/aardvark.docs/wiki/Gallery) | -[Quickstart](https://github.com/aardvarkplatform/aardvark.docs/wiki/Quickstart-Windows) | -[Status](https://github.com/aardvarkplatform/aardvark.docs/wiki/Status) +[Gallery](https://github.com/aardvark-platform/aardvark.docs/wiki/Gallery) | +[Packages&Repositories](https://github.com/aardvark-platform/aardvark.docs/wiki/Packages-and-Repositories) -Aardvark.Algodat is part of the open-source [Aardvark platform](https://github.com/aardvark-platform/aardvark.docs/wiki) for visual computing, real-time graphics and visualization. +Aardvark.Algodat is part of the open-source [Aardvark Platform](https://github.com/aardvark-platform) for visual computing, real-time graphics, and visualization. This repository contains high-performance, production-quality data structures and algorithms for point and mesh data, such as out-of-core point cloud management, n-closest point queries, and intersection tests. Additionally, it includes importers for file formats such as [E57 (ASTM E2807-11)](https://www.astm.org/Standards/E2807.htm), LasZip, Ply. **Aardvark.Data.Photometry** imports [IES (IESNA LM-63)](https://www.ies.org/product/standard-file-format-for-electronic-transfer-of-photometric-data/) and [LDT (EULUMDAT)](https://en.wikipedia.org/wiki/EULUMDAT) data files. **Aardvark.Phsyics.Sky** includes sky models: CIE Standard Genernal Sky, Hosek-Wilkie, Preetham; and Astronomical calcuations for position of Sun, Moon, Planets, Stars. Supported platforms are windows, linux, macOS. -This repository contains high-performance, production-quality data structures and algorithms. - -* **Aardvark.Geometry.BspTree** - in-memory BSP-tree -* **Aardvark.Geometry.Clustering** - efficient clustering of geometric primitives -* **Aardvark.Geometry.Intersection** - in-memory kd-tree for polygon meshes -* **Aardvark.Geometry.PointSet** - out-of-core point cloud data management -* **Aardvark.Geometry.PointTree** - fast n-closest points queries for in-memory point clouds -* **Aardvark.Geometry.PolyMesh** - compact in-memory polygonal mesh data structure, based on [A Mesh Data Structure for Rendering and Subdivision](https://www.researchgate.net/publication/254451624_A_Mesh_Data_Structure_for_Rendering_and_Subdivision) - -Furthermore, there are some importers for file formats. - -* **Aardvark.Data.E57** - importer for [E57 (ASTM E2807-11)](https://www.astm.org/Standards/E2807.htm) laserscan files (compatible with `Aardvark.Geometry.PointSet`) -* **Aardvark.Data.Ascii** - fast and parameterizable importer for text-based laserscan formats, like for example *.pts* (compatible with `Aardvark.Geometry.PointSet`) -* **Aardvark.Data.Photometry** - importer of [IES (IESNA LM-63)](https://www.ies.org/product/standard-file-format-for-electronic-transfer-of-photometric-data/) and [LDT (EULUMDAT)](https://en.wikipedia.org/wiki/EULUMDAT) data files; unified data strcuture for photometric measurement data, calculations, utility functions - -Other: - -* **Aardvark.Phsyics.Sky** - sky models: CIE Standard Genernal Sky, Hosek-Wilkie, Preetham; Astronomical calcuations for position of Sun, Moon, Planets, Stars - -This software repository is made available under the terms of the [GNU Affero General Public License (AGPL)](LICENSE). - -[Point Clouds Documentation](https://github.com/aardvark-platform/aardvark.docs/wiki/Point-Clouds) - -[Aardvark Platform Documentation](https://github.com/aardvark-platform/aardvark.docs/wiki) +You can find demos and code in the Gallery and Packages&Repositories links above. Supplementary documentation is in [this repository's wiki](https://github.com/aardvark-platform/aardvark.algodat/wiki). For more information, please refer to the [aardvark.docs wiki](https://github.com/aardvark-platform/aardvark.docs/wiki). diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index 40d1f615..292c148e 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -49,6 +49,9 @@ ### 5.3.0-prerelease001 - structured point clouds implementation (prerelease, for testing only) +### 5.2.28 +- updated base packages to 5.2.28 (LinearRegression missing method hotfix) + ### 5.2.27 - [LodTreeInstance] intersect view frustum depth range to -1 +1 diff --git a/paket.lock b/paket.lock index 469c51ba..b9f0d295 100644 --- a/paket.lock +++ b/paket.lock @@ -2,109 +2,109 @@ STORAGE: NONE RESTRICTION: || (== net6.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) + Aardvark.Application (5.4.8) + Aardvark.Base.Essentials (>= 5.2.27 < 5.3) + Aardvark.Base.Incremental (>= 5.2.27 < 5.3) + Aardvark.Rendering (5.4.8) + FShade.Core (>= 5.5.3 < 5.6) + FShade.GLSL (>= 5.5.3) FSharp.Core (>= 5.0.1) - Aardvark.Application.OpenVR (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.Tensors (>= 5.2.23 < 5.3) - Aardvark.Rendering (5.4.1) - Aardvark.Rendering.Text (5.4.1) - Aardvark.SceneGraph (5.4.1) - FShade.Core (>= 5.4 < 5.5) - FShade.GLSL (>= 5.4) + Aardvark.Application.OpenVR (5.4.8) + Aardvark.Application (5.4.8) + Aardvark.Base.Essentials (>= 5.2.27 < 5.3) + Aardvark.Base.Incremental (>= 5.2.27 < 5.3) + Aardvark.Base.Tensors (>= 5.2.27 < 5.3) + Aardvark.Rendering (5.4.8) + Aardvark.Rendering.Text (5.4.8) + Aardvark.SceneGraph (5.4.8) + FShade.Core (>= 5.5.3 < 5.6) + FShade.GLSL (>= 5.5.3) FSharp.Core (>= 5.0.1) Unofficial.OpenVR (>= 1.1 < 1.2) - Aardvark.Application.OpenVR.GL (5.4.1) - Aardvark.Application (5.4.1) - Aardvark.Application.OpenVR (5.4.1) - Aardvark.Application.Slim (5.4.1) - Aardvark.Application.Slim.GL (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.GL (5.4.1) - Aardvark.SceneGraph (5.4.1) - FShade.Core (>= 5.4 < 5.5) - FShade.GLSL (>= 5.4) + Aardvark.Application.OpenVR.GL (5.4.8) + Aardvark.Application (5.4.8) + Aardvark.Application.OpenVR (5.4.8) + Aardvark.Application.Slim (5.4.8) + Aardvark.Application.Slim.GL (5.4.8) + Aardvark.Base.Essentials (>= 5.2.27 < 5.3) + Aardvark.Base.Incremental (>= 5.2.27 < 5.3) + Aardvark.Base.Runtime (>= 5.2.27 < 5.3) + Aardvark.Rendering (5.4.8) + Aardvark.Rendering.GL (5.4.8) + Aardvark.SceneGraph (5.4.8) + FShade.Core (>= 5.5.3 < 5.6) + FShade.GLSL (>= 5.5.3) FSharp.Core (>= 5.0.1) Unofficial.OpenTK (>= 3.0.21 < 3.1) Unofficial.OpenVR (>= 1.1 < 1.2) - Aardvark.Application.OpenVR.Vulkan (5.4.1) - Aardvark.Application (5.4.1) - Aardvark.Application.OpenVR (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) - Aardvark.SceneGraph (5.4.1) - FShade.Core (>= 5.4 < 5.5) - FShade.GLSL (>= 5.4) + Aardvark.Application.OpenVR.Vulkan (5.4.8) + Aardvark.Application (5.4.8) + Aardvark.Application.OpenVR (5.4.8) + Aardvark.Base.Essentials (>= 5.2.27 < 5.3) + Aardvark.Base.Incremental (>= 5.2.27 < 5.3) + Aardvark.Base.Runtime (>= 5.2.27 < 5.3) + Aardvark.Rendering (5.4.8) + Aardvark.Rendering.Vulkan (5.4.8) + Aardvark.SceneGraph (5.4.8) + FShade.Core (>= 5.5.3 < 5.6) + FShade.GLSL (>= 5.5.3) FSharp.Core (>= 5.0.1) Unofficial.OpenVR (>= 1.1 < 1.2) - 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) + Aardvark.Application.Slim (5.4.8) + Aardvark.Application (5.4.8) + Aardvark.Base.Essentials (>= 5.2.27 < 5.3) + Aardvark.Base.Incremental (>= 5.2.27 < 5.3) + Aardvark.Base.Runtime (>= 5.2.27 < 5.3) + Aardvark.Rendering (5.4.8) + FShade (>= 5.5.3 < 5.6) FSharp.Core (>= 5.0.1) Silk.NET.GLFW (2.15) Unofficial.OpenTK (>= 3.0.21 < 3.1) - Aardvark.Application.Slim.GL (5.4.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) + Aardvark.Application.Slim.GL (5.4.8) + Aardvark.Application (5.4.8) + Aardvark.Application.Slim (5.4.8) + Aardvark.Base.Essentials (>= 5.2.27 < 5.3) + Aardvark.Base.Incremental (>= 5.2.27 < 5.3) + Aardvark.Base.Runtime (>= 5.2.27 < 5.3) + Aardvark.Base.Tensors (>= 5.2.27 < 5.3) + Aardvark.Rendering (5.4.8) + Aardvark.Rendering.GL (5.4.8) + FShade (>= 5.5.3 < 5.6) FSharp.Core (>= 5.0.1) Silk.NET.Core (2.15) Silk.NET.GLFW (2.15) Unofficial.OpenTK (>= 3.0.21 < 3.1) - Aardvark.Application.Slim.Vulkan (5.4.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) + Aardvark.Application.Slim.Vulkan (5.4.8) + Aardvark.Application (5.4.8) + Aardvark.Application.Slim (5.4.8) + Aardvark.Base.Essentials (>= 5.2.27 < 5.3) + Aardvark.Base.Incremental (>= 5.2.27 < 5.3) + Aardvark.Base.Runtime (>= 5.2.27 < 5.3) + Aardvark.Rendering (5.4.8) + Aardvark.Rendering.Vulkan (5.4.8) + FShade (>= 5.5.3 < 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.Application.Utilities (5.4.1) - Aardvark.Application (5.4.1) - Aardvark.Application.OpenVR (5.4.1) - Aardvark.Application.OpenVR.GL (5.4.1) - Aardvark.Application.OpenVR.Vulkan (5.4.1) - Aardvark.Application.Slim (5.4.1) - Aardvark.Application.Slim.GL (5.4.1) - Aardvark.Application.Slim.Vulkan (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.GL (5.4.1) - Aardvark.Rendering.Text (5.4.1) - Aardvark.Rendering.Vulkan (5.4.1) - Aardvark.SceneGraph (5.4.1) - FShade.Core (>= 5.4 < 5.5) - FShade.GLSL (>= 5.4) + Aardvark.Application.Utilities (5.4.8) + Aardvark.Application (5.4.8) + Aardvark.Application.OpenVR (5.4.8) + Aardvark.Application.OpenVR.GL (5.4.8) + Aardvark.Application.OpenVR.Vulkan (5.4.8) + Aardvark.Application.Slim (5.4.8) + Aardvark.Application.Slim.GL (5.4.8) + Aardvark.Application.Slim.Vulkan (5.4.8) + Aardvark.Base.Essentials (>= 5.2.27 < 5.3) + Aardvark.Base.Incremental (>= 5.2.27 < 5.3) + Aardvark.Base.Runtime (>= 5.2.27 < 5.3) + Aardvark.Rendering (5.4.8) + Aardvark.Rendering.GL (5.4.8) + Aardvark.Rendering.Text (5.4.8) + Aardvark.Rendering.Vulkan (5.4.8) + Aardvark.SceneGraph (5.4.8) + FShade.Core (>= 5.5.3 < 5.6) + FShade.GLSL (>= 5.5.3) FSharp.Core (>= 5.0.1) Unofficial.OpenTK (>= 3.0.21 < 3.1) Unofficial.OpenVR (>= 1.1 < 1.2) @@ -154,7 +154,7 @@ NUGET SixLabors.ImageSharp (>= 2.1.3 < 2.2) Aardvark.Base.TypeProviders (4.5.15) FSharp.Core (>= 4.2.3) - Aardvark.Build (1.0.20) + Aardvark.Build (1.0.21) Aardvark.Data.Durable (0.3.15) Aardvark.Data.Durable.Codec (0.3.15) Aardvark.Base (>= 5.2.25 < 5.3) @@ -168,82 +168,82 @@ NUGET FSharp.Data.Adaptive (>= 1.2 < 1.3) FsPickler (>= 5.3.2 < 5.4) Unofficial.LibTessDotNet (>= 2.0.2 < 2.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) + Aardvark.Rendering (5.4.8) + Aardvark.Base.Essentials (>= 5.2.27 < 5.3) + Aardvark.Base.Incremental (>= 5.2.27 < 5.3) + Aardvark.Base.Tensors (>= 5.2.27 < 5.3) + FShade.Core (>= 5.5.3 < 5.6) + FShade.GLSL (>= 5.5.3) FSharp.Core (>= 5.0.1) FSharp.Data.Adaptive (>= 1.2.13 < 1.3) - Aardvark.Rendering.GL (5.4.1) + Aardvark.Rendering.GL (5.4.8) 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) + Aardvark.Base.Essentials (>= 5.2.27 < 5.3) + Aardvark.Base.Incremental (>= 5.2.27 < 5.3) + Aardvark.Base.Runtime (>= 5.2.27 < 5.3) + Aardvark.Base.Tensors (>= 5.2.27 < 5.3) + Aardvark.Geometry (>= 5.2.27 < 5.3) + Aardvark.Rendering (5.4.8) + FShade (>= 5.5.3 < 5.6) FSharp.Core (>= 5.0.1) 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.4.8) + Aardvark.Base.Incremental (>= 5.2.27 < 5.3) + Aardvark.Rendering (5.4.8) + Aardvark.SceneGraph (5.4.8) CommonMark.NET (>= 0.15.1 < 0.16) - FShade.Core (>= 5.4 < 5.5) - FShade.GLSL (>= 5.4) + FShade.Core (>= 5.5.3 < 5.6) + FShade.GLSL (>= 5.5.3) 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) + Aardvark.Rendering.Vulkan (5.4.8) + Aardvark.Base.FSharp (>= 5.2.27 < 5.3) + Aardvark.Base.Incremental (>= 5.2.27 < 5.3) + Aardvark.Base.Runtime (>= 5.2.27 < 5.3) + Aardvark.Base.Tensors (>= 5.2.27 < 5.3) + Aardvark.Rendering (5.4.8) + FShade (>= 5.5.3 < 5.6) FSharp.Core (>= 5.0.1) 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) + Aardvark.SceneGraph (5.4.8) + Aardvark.Base.Incremental (>= 5.2.27 < 5.3) + Aardvark.Rendering (5.4.8) + FShade.Core (>= 5.5.3 < 5.6) + FShade.GLSL (>= 5.5.3) FSharp.Core (>= 5.0.1) CommonMark.NET (0.15.1) Crc32.NET (1.2) NETStandard.Library (>= 2.0) - FShade (5.4) - FShade.Core (5.4) - FShade.GLSL (5.4) - FShade.Imperative (5.4) - FShade.SpirV (5.4) - FShade.Core (5.4) + FShade (5.5.3) + FShade.Core (5.5.3) + FShade.GLSL (5.5.3) + FShade.Imperative (5.5.3) + FShade.SpirV (5.5.3) + FShade.Core (5.5.3) Aardvark.Base (>= 5.2.19 < 5.3) Aardvark.Base.FSharp (>= 5.2.19 < 5.3) - FShade.Imperative (5.4) + FShade.Imperative (5.5.3) FSharp.Core (>= 5.0) - FShade.GLSL (5.4) + FShade.GLSL (5.5.3) Aardvark.Base (>= 5.2.19 < 5.3) Aardvark.Base.FSharp (>= 5.2.19 < 5.3) - FShade.Core (5.4) - FShade.Imperative (5.4) + FShade.Core (5.5.3) + FShade.Imperative (5.5.3) FSharp.Core (>= 5.0) - FShade.Imperative (5.4) + FShade.Imperative (5.5.3) 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.4) + FShade.SpirV (5.5.3) Aardvark.Base (>= 5.2.19 < 5.3) Aardvark.Base.FSharp (>= 5.2.19 < 5.3) - FShade.Core (5.4) - FShade.Imperative (5.4) + FShade.Core (5.5.3) + FShade.Imperative (5.5.3) FSharp.Core (>= 5.0) FSharp.Core (5.0.1) - FSharp.Data.Adaptive (1.2.13) + FSharp.Data.Adaptive (1.2.14) FSharp.Core (>= 4.7) System.Reflection.Emit.Lightweight (>= 4.6) FsPickler (5.3.2) @@ -251,33 +251,32 @@ NUGET System.Reflection.Emit.Lightweight (>= 4.3) GLSLangSharp (0.4.15) FSharp.Core (>= 5.0) - Microsoft.Bcl.AsyncInterfaces (6.0) - System.Threading.Tasks.Extensions (>= 4.5.4) - restriction: || (&& (== net6.0) (>= net461)) (&& (== net6.0) (< netstandard2.1)) (== netstandard2.0) + Microsoft.Bcl.AsyncInterfaces (8.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.CodeCoverage (17.6) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= net45)) (&& (== netstandard2.0) (>= netcoreapp1.0)) + Microsoft.CodeCoverage (17.8) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= net45)) (&& (== netstandard2.0) (>= netcoreapp1.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.Extensions.DependencyModel (8.0) + System.Buffers (>= 4.5.1) - restriction: || (&& (== net6.0) (>= net462)) (== netstandard2.0) + System.Memory (>= 4.5.5) - restriction: || (&& (== net6.0) (>= net462)) (== netstandard2.0) + System.Text.Encodings.Web (>= 8.0) + System.Text.Json (>= 8.0) Microsoft.NET.Test.Sdk (17.3.3) Microsoft.CodeCoverage (>= 17.3.3) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= net45)) (&& (== netstandard2.0) (>= netcoreapp1.0)) Microsoft.TestPlatform.TestHost (>= 17.3.3) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= netcoreapp1.0)) - Microsoft.NETCore.Platforms (6.0.5) + Microsoft.NETCore.Platforms (7.0.4) Microsoft.NETCore.Targets (5.0) - Microsoft.TestPlatform.ObjectModel (17.6) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= netcoreapp3.1)) - NuGet.Frameworks (>= 5.11) + Microsoft.TestPlatform.ObjectModel (17.8) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= netcoreapp3.1)) + NuGet.Frameworks (>= 6.5) System.Reflection.Metadata (>= 1.6) - Microsoft.TestPlatform.TestHost (17.6) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= netcoreapp1.0)) - Microsoft.TestPlatform.ObjectModel (>= 17.6) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= netcoreapp3.1)) + Microsoft.TestPlatform.TestHost (17.8) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= netcoreapp1.0)) + Microsoft.TestPlatform.ObjectModel (>= 17.8) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= netcoreapp3.1)) Newtonsoft.Json (>= 13.0.1) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= netcoreapp3.1)) NETStandard.Library (2.0.3) Microsoft.NETCore.Platforms (>= 1.1) - Newtonsoft.Json (13.0.1) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= netcoreapp3.1)) - NuGet.Frameworks (6.3) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= netcoreapp3.1)) + Newtonsoft.Json (13.0.3) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= netcoreapp3.1)) + NuGet.Frameworks (6.8) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= netcoreapp3.1)) Nullable (1.3.1) NUnit (3.13.3) NETStandard.Library (>= 2.0) @@ -296,19 +295,19 @@ NUGET Silk.NET.GLFW (2.15) Silk.NET.Core (>= 2.15) Ultz.Native.GLFW (>= 3.3.3.1) - SixLabors.ImageSharp (2.1.3) + SixLabors.ImageSharp (2.1.6) System.Buffers (>= 4.5.1) - restriction: || (&& (== net6.0) (>= net472)) (&& (== net6.0) (< netcoreapp2.1)) (== netstandard2.0) System.Memory (>= 4.5.4) - restriction: || (&& (== net6.0) (>= net472)) (&& (== net6.0) (< netcoreapp2.1)) (== netstandard2.0) System.Numerics.Vectors (>= 4.5) - restriction: || (&& (== net6.0) (>= net472)) (&& (== net6.0) (< netcoreapp2.1)) (== netstandard2.0) System.Runtime.CompilerServices.Unsafe (>= 5.0) System.Text.Encoding.CodePages (>= 5.0) - System.Buffers (4.5.1) + System.Buffers (4.5.1) - restriction: || (&& (== net6.0) (>= net462)) (== 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.Collections.Immutable (8.0) + System.Memory (>= 4.5.5) - restriction: || (&& (== net6.0) (>= net462)) (== netstandard2.0) System.Runtime.CompilerServices.Unsafe (>= 6.0) System.Diagnostics.Debug (4.3) Microsoft.NETCore.Platforms (>= 1.1) @@ -390,8 +389,9 @@ NUGET Microsoft.NETCore.Targets (>= 1.1) System.Reflection (>= 4.3) System.Runtime (>= 4.3) - System.Reflection.Metadata (6.0.1) - System.Collections.Immutable (>= 6.0) + System.Reflection.Metadata (8.0) + System.Collections.Immutable (>= 8.0) + System.Memory (>= 4.5.5) - restriction: || (&& (== net6.0) (>= net462)) (== netstandard2.0) System.Reflection.Primitives (4.3) Microsoft.NETCore.Platforms (>= 1.1) Microsoft.NETCore.Targets (>= 1.1) @@ -415,21 +415,20 @@ NUGET Microsoft.NETCore.Platforms (>= 1.1) Microsoft.NETCore.Targets (>= 1.1) System.Runtime (>= 4.3) - System.Text.Encoding.CodePages (6.0) - System.Memory (>= 4.5.4) - restriction: || (&& (== net6.0) (>= net461)) (&& (== net6.0) (< netcoreapp3.1)) (== netstandard2.0) + System.Text.Encoding.CodePages (8.0) + System.Memory (>= 4.5.5) - restriction: || (&& (== net6.0) (>= net462)) (== 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.Text.Encodings.Web (8.0) + System.Buffers (>= 4.5.1) - restriction: || (&& (== net6.0) (>= net462)) (== netstandard2.0) + System.Memory (>= 4.5.5) - restriction: || (&& (== net6.0) (>= net462)) (== netstandard2.0) System.Runtime.CompilerServices.Unsafe (>= 6.0) - System.Text.Json (6.0.9) - 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.Text.Json (8.0.1) + Microsoft.Bcl.AsyncInterfaces (>= 8.0) - restriction: || (&& (== net6.0) (>= net462)) (== netstandard2.0) + System.Buffers (>= 4.5.1) - restriction: || (&& (== net6.0) (>= net462)) (== netstandard2.0) + System.Memory (>= 4.5.5) - restriction: || (&& (== net6.0) (>= net462)) (== netstandard2.0) System.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.Threading.Tasks.Extensions (>= 4.5.4) - restriction: || (&& (== net6.0) (>= net462)) (== netstandard2.0) System.Threading (4.3) System.Runtime (>= 4.3) System.Threading.Tasks (>= 4.3) @@ -437,14 +436,14 @@ 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.Threading.Tasks.Extensions (4.5.4) - restriction: || (&& (== net6.0) (>= net462)) (== netstandard2.0) System.Runtime.CompilerServices.Unsafe (>= 4.5.3) - restriction: || (&& (== net6.0) (>= net461)) (&& (== net6.0) (< netcoreapp2.1)) (&& (== net6.0) (< netstandard1.0)) (&& (== net6.0) (< netstandard2.0)) (&& (== net6.0) (>= wp8)) (== netstandard2.0) - Ultz.Native.GLFW (3.3.3.1) + Ultz.Native.GLFW (3.3.9.2) Uncodium.Eigensystems (1.1.2) Aardvark.Base (>= 5.1 < 6.0) - Uncodium.SimpleStore (3.0.29) - Microsoft.Bcl.AsyncInterfaces (>= 6.0 < 7.0) - System.Memory (>= 4.5 < 5.0) + Uncodium.SimpleStore (3.0.30) + Microsoft.Bcl.AsyncInterfaces (>= 6.0) + System.Memory (>= 4.5) Unofficial.DotSpatial.Projections (0.0.4) Unofficial.LibTessDotNet (2.0.2) Unofficial.OpenTK (3.0.21) diff --git a/src/Apps/Viewer/Prelude.fs b/src/Apps/Viewer/Prelude.fs index a370b8ca..cf3a673d 100644 --- a/src/Apps/Viewer/Prelude.fs +++ b/src/Apps/Viewer/Prelude.fs @@ -8,7 +8,7 @@ module Prelude = /// Print usage message. let printUsage () = - printfn "usage: hum " + printfn "usage: Viewer.exe " printfn "" printfn " info print point cloud file info" printfn "" @@ -57,6 +57,8 @@ module Prelude = Pts.PtsFormat E57.E57Format Yxh.YxhFormat + Ply.PlyFormat + Laszip.LaszipFormat ] /// Init point cloud file formats. diff --git a/src/Apps/Viewer/Program.fs b/src/Apps/Viewer/Program.fs index 52c0c4ac..cae1e0f9 100644 --- a/src/Apps/Viewer/Program.fs +++ b/src/Apps/Viewer/Program.fs @@ -14,7 +14,7 @@ let main args = //view @"C:\Users\sm\Downloads\C_30DN2.LAZ.store" [File.readAllText @"C:\Users\sm\Downloads\C_30DN2.LAZ.key"] (Args.parse [||]) //view @"C:\Users\sm\Downloads\test.store" ["128330b1-8761-4a07-b160-76bcd7e2f70a"; "ab2f6f76-7eae-47c9-82d1-ad28b816abb9"] (Args.parse [||]) - let store = @"C:\bla\store\lowergetikum\data.bin" + let store = @"E:\e57tests\stores\inference_full.binary.ply\data.uds" let key = Path.combine [System.IO.Path.GetDirectoryName store;"key.txt"] |> File.readAllText view store [key] (Args.parse [||]) diff --git a/src/Apps/Viewer/Properties/launchSettings.json b/src/Apps/Viewer/Properties/launchSettings.json index 26f4d3e9..ceef5bc7 100644 --- a/src/Apps/Viewer/Properties/launchSettings.json +++ b/src/Apps/Viewer/Properties/launchSettings.json @@ -2,7 +2,7 @@ "profiles": { "Viewer": { "commandName": "Project", - "commandLineArgs": "view \\\\heap\\steinlechner\\rmdata\\Data\\stores\\KaunertalStore kaunertal" + "commandLineArgs": "info \"C:\\bla\\pts\\UAV_JBs-Haus.austriaGKeast.ply\"" } } } \ No newline at end of file diff --git a/src/Apps/Viewer/Viewer.fsproj b/src/Apps/Viewer/Viewer.fsproj index a70ec3f3..17b546c4 100644 --- a/src/Apps/Viewer/Viewer.fsproj +++ b/src/Apps/Viewer/Viewer.fsproj @@ -48,6 +48,7 @@ + diff --git a/src/Apps/Viewer/Viewer.fsproj.user b/src/Apps/Viewer/Viewer.fsproj.user index 5df420f5..f3e27abf 100644 --- a/src/Apps/Viewer/Viewer.fsproj.user +++ b/src/Apps/Viewer/Viewer.fsproj.user @@ -2,5 +2,6 @@ false + <_LastSelectedProfileId>C:\repo\aardvark.algodat-master\src\Apps\Viewer\Properties\PublishProfiles\FolderProfile.pubxml \ No newline at end of file