Merge branch 'parts' into 20231126_experiment

aardvark-platform · Dec 1, 2023 · 34cea22 · 34cea22
2 parents 7860a11 + e044112
commit 34cea22
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 10 deletions.
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -1,5 +1,5 @@
-### 5.3.0-debug001
-- do not use (experimental, debug)
+### 5.3.0-prerelease009
+- structured point clouds rendering (prerelease, for testing only)
 
 ### 5.3.0-prerelease008
 - fix part index handling in JoinNonOverlappingTrees (prerelease, for testing only)

diff --git a/src/Aardvark.Geometry.PointSet/Octrees/InMemoryPointSet.cs b/src/Aardvark.Geometry.PointSet/Octrees/InMemoryPointSet.cs
@@ -262,9 +262,6 @@ void copy(Def def)
                         $"Invariant 42656f92-f5ac-43ca-a1b7-c7ec95fe9cb3."
                         );
 
-
-                    if (!PartIndexUtils.HasValidPartIndexData(resultData)) Debugger.Break(); // TODO "PARTINDICES" remove
-
                     // create and store result
                     var result = new PointSetNode(resultData, storage, writeToStore: true);
                     if (storage.GetPointCloudNode(result.Id) == null) throw new InvalidOperationException("Invariant 9e863bc5-e9f4-4d39-bd53-3d81e12af6b1.");
@@ -311,8 +308,6 @@ void copy(Def def)
                         }
                     }
 
-                    if (!resultData.ContainsKey(Octree.PartIndexRange)) Debugger.Break(); // TODO "PARTINDICES" remove
-
                     // create and store result
                     var result = new PointSetNode(resultData, storage, writeToStore: true);
                     if (storage.GetPointCloudNode(result.Id) == null) throw new InvalidOperationException("Invariant 7b09eccb-b6a0-4b99-be7a-eeff53b6a98b.");

diff --git a/src/Aardvark.Geometry.PointSet/Octrees/PointSetNode.cs b/src/Aardvark.Geometry.PointSet/Octrees/PointSetNode.cs
@@ -102,8 +102,6 @@ public PointSetNode(
             Storage = storage;
             Data = data;
 
-            if (!IsTemporaryImportNode && !PartIndexUtils.HasValidPartIndexData(data)) Debugger.Break(); // TODO "PARTINDICES" remove
-
             //Report.Line($"{this.Id} {this.Cell}");
             //if (Id == Guid.Empty) Debugger.Break();
             //if (IsLeaf && !HasClassifications) Debugger.Break();

diff --git a/src/Aardvark.Geometry.PointSet/Utils/EnumerableExtensions.cs b/src/Aardvark.Geometry.PointSet/Utils/EnumerableExtensions.cs
@@ -137,7 +137,6 @@ public static T MapReduceParallel<T>(this IEnumerable<T> xs,
                     try
                     {
                         var r = reduce(a, b, ct);
-                        if (r == null) Debugger.Break();
                         CheckCancellationOrException();
                         lock (queue) queue.Enqueue(r);
                     }