enable interop with other software

- moved IPointCloudNode to Aardvark.Data.Points.Base - moved PersistentRef to Aardvark.Data.Points.Base (dependency) - aligned Aardvark.Geometry.PointTree license to Aardvark.Data.Points.Base license (AGPL -> Apache2.0)
aardvark-platform · Jan 14, 2024 · c57c482 · c57c482
1 parent 4baff43
commit c57c482
Show file tree

Hide file tree

Showing 22 changed files with 292 additions and 73 deletions.
diff --git a/src/Aardvark.Algodat.Tests/ImportTests.cs b/src/Aardvark.Algodat.Tests/ImportTests.cs
@@ -262,9 +262,6 @@ public void CanImport_Empty()
             var reloaded = config.Storage.GetPointSet("test");
             Assert.IsTrue(reloaded.Id == "test");
             Assert.IsTrue(reloaded.PointCount == 0);
-            Assert.IsFalse(reloaded.HasPartIndices);
-            Assert.IsFalse(reloaded.HasPartIndexRange);
-            Assert.IsNull(reloaded.PartIndexRange);
         }
 
         #endregion

diff --git a/src/Aardvark.Algodat.Tests/ViewsTests/ViewsFilterTests.cs b/src/Aardvark.Algodat.Tests/ViewsTests/ViewsFilterTests.cs
@@ -56,6 +56,7 @@ private static IPointCloudNode CreateNode(Storage storage, V3f[] psGlobal, int[]
                 .Add(Durable.Octree.PositionsLocal3fReference, psLocalId)
                 .Add(Durable.Octree.PointRkdTreeFDataReference, kdLocalId)
                 .Add(Durable.Octree.PerCellPartIndex1i, 42)
+                .Add(Durable.Octree.PartIndexRange, new Range1i(42, 42))
                 ;
 
             if (intensities != null)

diff --git a/src/Aardvark.Data.Points.Base/Aardvark.Data.Points.Base.csproj b/src/Aardvark.Data.Points.Base/Aardvark.Data.Points.Base.csproj
@@ -15,4 +15,7 @@
     <DocumentationFile>..\..\bin\Debug\netstandard2.0\Aardvark.Data.Points.Import.xml</DocumentationFile>
   </PropertyGroup>
   <Import Project="..\..\.paket\Paket.Restore.targets" />
+  <ItemGroup>
+    <ProjectReference Include="..\Aardvark.Geometry.PointTree\Aardvark.Geometry.PointTree.csproj" />
+  </ItemGroup>
 </Project>
diff --git a/src/Aardvark.Data.Points.Base/Chunk.cs b/src/Aardvark.Data.Points.Base/Chunk.cs
@@ -1,6 +1,6 @@
 /*
    Aardvark Platform
-   Copyright (C) 2006-2023  Aardvark Platform Team
+   Copyright (C) 2006-2024  Aardvark Platform Team
    https://aardvark.graphics
 
    Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/src/Aardvark.Data.Points.Base/EnumerableExtensions.cs b/src/Aardvark.Data.Points.Base/EnumerableExtensions.cs
@@ -1,6 +1,6 @@
 /*
    Aardvark Platform
-   Copyright (C) 2006-2023  Aardvark Platform Team
+   Copyright (C) 2006-2024  Aardvark Platform Team
    https://aardvark.graphics
 
    Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/src/Aardvark.Data.Points.Base/GenericChunk.cs b/src/Aardvark.Data.Points.Base/GenericChunk.cs
@@ -1,6 +1,6 @@
 /*
    Aardvark Platform
-   Copyright (C) 2006-2023  Aardvark Platform Team
+   Copyright (C) 2006-2024  Aardvark Platform Team
    https://aardvark.graphics
 
    Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/...metry.PointSet/Octrees/IPointCloudNode.cs → ...dvark.Data.Points.Base/IPointCloudNode.cs b/...metry.PointSet/Octrees/IPointCloudNode.cs → ...dvark.Data.Points.Base/IPointCloudNode.cs
@@ -1,15 +1,19 @@
 /*
-    Copyright (C) 2006-2023. Aardvark Platform Team. http://github.com/aardvark-platform.
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-    You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+   Aardvark Platform
+   Copyright (C) 2006-2024  Aardvark Platform Team
+   https://aardvark.graphics
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 */
 using Aardvark.Base;
 using Aardvark.Data;
@@ -51,6 +55,8 @@ public interface IPointCloudNode
         /// </summary>
         IPointCloudNode WriteToStore();
 
+        /// <summary>
+        /// </summary>
         byte[] Encode();
 
         /// <summary>
@@ -178,6 +184,8 @@ public interface IPointCloudNode
 
         #endregion
 
+        /// <summary>
+        /// </summary>
         Box3d BoundingBoxApproximate { get; }
 
         #region KdTree

diff --git a/src/Aardvark.Data.Points.Base/KeepAliveCache.cs b/src/Aardvark.Data.Points.Base/KeepAliveCache.cs
@@ -1,6 +1,6 @@
 /*
    Aardvark Platform
-   Copyright (C) 2006-2023  Aardvark Platform Team
+   Copyright (C) 2006-2024  Aardvark Platform Team
    https://aardvark.graphics
 
    Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/src/Aardvark.Data.Points.Base/LruDictionary.cs b/src/Aardvark.Data.Points.Base/LruDictionary.cs
@@ -1,6 +1,6 @@
 /*
    Aardvark Platform
-   Copyright (C) 2006-2023  Aardvark Platform Team
+   Copyright (C) 2006-2024  Aardvark Platform Team
    https://aardvark.graphics
 
    Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/src/Aardvark.Data.Points.Base/ParseConfig.cs b/src/Aardvark.Data.Points.Base/ParseConfig.cs
@@ -1,6 +1,6 @@
 /*
    Aardvark Platform
-   Copyright (C) 2006-2023  Aardvark Platform Team
+   Copyright (C) 2006-2024  Aardvark Platform Team
    https://aardvark.graphics
 
    Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/src/Aardvark.Data.Points.Base/ParsingStats.cs b/src/Aardvark.Data.Points.Base/ParsingStats.cs
@@ -1,6 +1,6 @@
 /*
    Aardvark Platform
-   Copyright (C) 2006-2023  Aardvark Platform Team
+   Copyright (C) 2006-2024  Aardvark Platform Team
    https://aardvark.graphics
 
    Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/src/Aardvark.Data.Points.Base/PartIndexUtils.cs b/src/Aardvark.Data.Points.Base/PartIndexUtils.cs
@@ -1,6 +1,6 @@
 /*
    Aardvark Platform
-   Copyright (C) 2006-2023  Aardvark Platform Team
+   Copyright (C) 2006-2024  Aardvark Platform Team
    https://aardvark.graphics
 
    Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/....Geometry.PointSet/Utils/PersistentRef.cs → ...ardvark.Data.Points.Base/PersistentRef.cs b/....Geometry.PointSet/Utils/PersistentRef.cs → ...ardvark.Data.Points.Base/PersistentRef.cs
@@ -1,23 +1,25 @@
 /*
-    Copyright (C) 2006-2023. Aardvark Platform Team. http://github.com/aardvark-platform.
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-    You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
+   Aardvark Platform
+   Copyright (C) 2006-2024  Aardvark Platform Team
+   https://aardvark.graphics
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
 
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+*/
 using System;
 using System.Diagnostics.CodeAnalysis;
 
 namespace Aardvark.Geometry.Points;
 
-
 /// <summary>
 /// </summary>
 public class PersistentRef<T> 
@@ -26,6 +28,8 @@ public class PersistentRef<T>
     private readonly Func<string, T> f_get;
     private readonly TryGetFunc f_tryGetFromCache;
 
+    /// <summary>
+    /// </summary>
     public delegate bool TryGetFunc(string key, [NotNullWhen(true)] out T? result);
 
     /// <summary>

diff --git a/src/Aardvark.Data.Points.Base/PointCloudFileFormat.cs b/src/Aardvark.Data.Points.Base/PointCloudFileFormat.cs
@@ -1,6 +1,6 @@
 /*
    Aardvark Platform
-   Copyright (C) 2006-2023  Aardvark Platform Team
+   Copyright (C) 2006-2024  Aardvark Platform Team
    https://aardvark.graphics
 
    Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/src/Aardvark.Data.Points.Base/PointFileInfo.cs b/src/Aardvark.Data.Points.Base/PointFileInfo.cs
@@ -1,6 +1,6 @@
 /*
    Aardvark Platform
-   Copyright (C) 2006-2023  Aardvark Platform Team
+   Copyright (C) 2006-2024  Aardvark Platform Team
    https://aardvark.graphics
 
    Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/src/Aardvark.Data.Points.Base/Storage.cs b/src/Aardvark.Data.Points.Base/Storage.cs
@@ -1,6 +1,6 @@
 /*
    Aardvark Platform
-   Copyright (C) 2006-2023  Aardvark Platform Team
+   Copyright (C) 2006-2024  Aardvark Platform Team
    https://aardvark.graphics
 
    Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/src/Aardvark.Data.Points.Base/Unmix.cs b/src/Aardvark.Data.Points.Base/Unmix.cs
@@ -1,6 +1,6 @@
 /*
    Aardvark Platform
-   Copyright (C) 2006-2023  Aardvark Platform Team
+   Copyright (C) 2006-2024  Aardvark Platform Team
    https://aardvark.graphics
 
    Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/src/Aardvark.Data.Points.Base/Utils.cs b/src/Aardvark.Data.Points.Base/Utils.cs
@@ -1,6 +1,6 @@
 /*
    Aardvark Platform
-   Copyright (C) 2006-2023  Aardvark Platform Team
+   Copyright (C) 2006-2024  Aardvark Platform Team
    https://aardvark.graphics
 
    Licensed under the Apache License, Version 2.0 (the "License");