Merge branch 'master' into ifc/xbim-dev-v6

aardvark-platform · Aug 8, 2024 · 5a66249 · 5a66249
2 parents fada9a2 + 3d9f3a5
commit 5a66249
Show file tree

Hide file tree

Showing 199 changed files with 47,966 additions and 83 deletions.
diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
@@ -9,7 +9,7 @@
       ]
     },
     "aardpack": {
-      "version": "1.0.24",
+      "version": "1.0.25",
       "commands": [
         "aardpack"
       ]

diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
@@ -15,9 +15,9 @@ jobs:
     runs-on: ubuntu-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: Add Paket credentials

diff --git a/.github/workflows/mac.yml b/.github/workflows/mac.yml
@@ -15,9 +15,9 @@ jobs:
     runs-on: macos-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: Add Paket credentials

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -13,9 +13,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
@@ -34,7 +34,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: dotnet aardpack src\Aardvark.Data.sln --per-project --skip-build
       - 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
@@ -15,9 +15,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: Add Paket credentials

diff --git a/README.md b/README.md
@@ -0,0 +1,12 @@
+# Aardvark.Data
+
+![Windows](https://github.com/aardvark-platform/aardvark.data/workflows/Windows/badge.svg)
+![MacOS](https://github.com/aardvark-platform/aardvark.data/workflows/MacOS/badge.svg)
+![Linux](https://github.com/aardvark-platform/aardvark.data/workflows/Linux/badge.svg)
+![Publish](https://github.com/aardvark-platform/aardvark.data/workflows/Publish/badge.svg)
+
+[The Aardvark Platform](https://aardvarkians.com/) |
+[Gallery](https://github.com/aardvark-platform/aardvark.docs/wiki/Gallery) | 
+[Packages & Repositories](https://github.com/aardvark-platform/aardvark.docs/wiki/Packages-and-Repositories)
+
+Collection of data loaders, importers, and encoders for the Aardvark platform. 
diff --git a/lib/Native/Aardvark.PixImage.FreeImage/linux/AMD64/libFreeImage.so b/lib/Native/Aardvark.PixImage.FreeImage/linux/AMD64/libFreeImage.so
diff --git a/lib/Native/Aardvark.PixImage.FreeImage/windows/AMD64/FreeImage.dll b/lib/Native/Aardvark.PixImage.FreeImage/windows/AMD64/FreeImage.dll
diff --git a/paket.dependencies b/paket.dependencies
@@ -4,24 +4,26 @@ source https://api.nuget.org/v3/index.json
 source https://www.myget.org/F/xbim-develop/api/v3/index.json
 source https://nuget.pkg.github.com/aardvark-platform/index.json
 
-nuget Aardvark.Build                                        ~> 1.0.24
+nuget Aardvark.Build                                        ~> 1.0.25
 nuget FSharp.Core                                           >= 8.0.0 lowest_matching: true
 
 // Aardvark Base
-nuget Aardvark.Base                                         ~> 5.3.0-prerelease0004
-nuget Aardvark.Base.Tensors                                 ~> 5.3.0-prerelease0004
+nuget Aardvark.Base                                         ~> 5.3.0
+nuget Aardvark.Base.Tensors                                 ~> 5.3.0
 
 // Aardvark Rendering
-nuget Aardvark.Rendering.Common                             ~> 5.5.0-prerelease0001
+nuget Aardvark.Rendering.Common                             >= 5.5.0 lowest_matching: true
 
 // Aardvark Algodat
-nuget Aardvark.Geometry.PolyMesh                            ~> 5.5.0-prerelease0001
+nuget Aardvark.Geometry.PolyMesh                            ~> 5.5.0
 
 nuget DevILSharp                                            ~> 0.2.20
-nuget SixLabors.ImageSharp                                  ~> 2.1.8
+nuget SixLabors.ImageSharp                                  ~> 2.1.9
 nuget Pfim                                                  ~> 0.11.2
 nuget System.Drawing.Common                                 >= 8.0.0 lowest_matching: true
 
+nuget glTF2Loader                                           ~> 1.1.4-alpha
+
 // XBim does not have proper version constraints so we declare and reference everything explicitly
 nuget Xbim.Ifc                                              ~> 6.0.0
 nuget Xbim.Ifc2x3                                           ~> 6.0.0

diff --git a/paket.lock b/paket.lock
diff --git a/src/Aardvark.Data.Collada/README.md b/src/Aardvark.Data.Collada/README.md
@@ -0,0 +1,4 @@
+# Aardvark.Data.Collada
+
+[![NuGet](https://badgen.net/nuget/v/Aardvark.Data.Collada)](https://www.nuget.org/packages/Aardvark.Data.Collada/)
+[![NuGet](https://badgen.net/nuget/dt/Aardvark.Data.Collada)](https://www.nuget.org/packages/Aardvark.Data.Collada/)
diff --git a/src/Aardvark.Data.Collada/RELEASE_NOTES.md b/src/Aardvark.Data.Collada/RELEASE_NOTES.md
@@ -1,3 +1,9 @@
+### 5.2.9
+- Updated to NET 8 and Aardvark.Base 5.3
+- 
+### 5.2.9-prerelease0001
+- Updated to NET 8 and Aardvark.Base 5.3 (prerelease)
+
 ### 5.2.8
 - Moved from Aardvark.Internal repository
 - Removed UnsafeCoerce() usage
diff --git a/src/Aardvark.Data.DGM/README.md b/src/Aardvark.Data.DGM/README.md
@@ -0,0 +1,4 @@
+# Aardvark.Data.Dgm
+
+[![NuGet](https://badgen.net/nuget/v/Aardvark.Data.Dgm)](https://www.nuget.org/packages/Aardvark.Data.Dgm/)
+[![NuGet](https://badgen.net/nuget/dt/Aardvark.Data.Dgm)](https://www.nuget.org/packages/Aardvark.Data.Dgm/)
diff --git a/src/Aardvark.Data.DGM/RELEASE_NOTES.md b/src/Aardvark.Data.DGM/RELEASE_NOTES.md
@@ -1,3 +1,9 @@
+### 5.2.9
+- Updated to NET 8 and Aardvark.Base 5.3
+
+### 5.2.9-prerelease0001
+- Updated to NET 8 and Aardvark.Base 5.3 (prerelease)
+
 ### 5.2.8
 - Fixed erroneous "skipping empty mesh" warnings in case of line geometries
 - Moved from Aardvark.Internal repository
diff --git a/src/Aardvark.Data.GLTF/Aardvark.Data.GLTF.fsproj b/src/Aardvark.Data.GLTF/Aardvark.Data.GLTF.fsproj
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
+    <OutputPath>..\..\bin\$(Configuration)</OutputPath>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="Scene.fs" />
+    <Compile Include="GLTF.fs" />
+    <None Include="paket.references" />
+    <None Include="paket.template" />
+  </ItemGroup>
+  <Import Project="..\..\.paket\Paket.Restore.targets" />
+</Project>