improve meshes.jl coverage

Author: ffreyer

src/GeometryBasics.jl

@@ -41,7 +41,7 @@ export AbstractFace, TriangleFace, QuadFace, GLTriangleFace
 export OffsetInteger, ZeroIndex, OneIndex, GLIndex
 export decompose, coordinates, faces, normals, decompose_uv, decompose_normals,
        texturecoordinates, vertex_attributes
-export expand_faceviews
+export expand_faceviews, split_mesh, remove_duplicates
 export face_normals
 export Tessellation, Normal, UV, UVW
 export AbstractMesh, Mesh, MetaMesh, FaceView

src/meshes.jl

@@ -390,17 +390,6 @@ function expand_faceviews(mesh::Mesh)
     end
 end
 
-function merge_vertex_indices(
-        faces::AbstractVector{FT}, args...
-    ) where {N, T, FT <: AbstractFace{N, T}}
-    if args[end] isa Integer
-        fs = tuple(faces, args[1:end-1]...)
-        return merge_vertex_indices(fs, args[end])
-    else
-        return merge_vertex_indices(tuple(faces, args...))
-    end
-end
-
 function merge_vertex_indices(
         faces::NTuple{N_Attrib, <: AbstractVector{FT}},
         vertex_index_counter::Integer = T(1)
@@ -486,13 +475,13 @@ end
 
 
 function map_coordinates(f, mesh::Mesh)
-    result = copy(mesh)
+    result = deepcopy(mesh)
     map_coordinates!(f, result)
     return result
 end
 
 function map_coordinates(f, mesh::MetaMesh)
-    result = copy(Mesh(mesh))
+    result = deepcopy(Mesh(mesh))
     map_coordinates!(f, result)
     return MetaMesh(result, meta(mesh))
 end

test/meshes.jl

@@ -54,7 +54,18 @@ end
     @test isempty(m2.views)
 end
 
-@testset "complex merge" begin
+@testset "Duplicate face removal" begin
+    fs = GLTriangleFace[(1,2,3), (2,3,4), (3,4,5), (1,2,3), (1,4,5)]
+    fs = [fs; fs]
+    new_fs = remove_duplicates(fs)
+    @test all(f -> f in GLTriangleFace[(1,2,3), (2,3,4), (3,4,5), (1,4,5)], new_fs)
+
+    fs = rand(QuadFace{Int32}, 4)
+    new_fs = remove_duplicates([fs; fs])
+    @test all(in(fs), new_fs)
+end
+
+@testset "complex merge + split" begin
     rects = [Rect3f(Point3f(x, y, z), Vec3f(0.5)) for x in -1:1 for y in -1:1 for z in -1:1]
     direct_meshes = map(rects) do r
         GeometryBasics.Mesh(coordinates(r), faces(r), normal = normals(r))
@@ -264,6 +275,8 @@ end
         @test faces(m) isa Vector{GLTriangleFace}
         @test length(faces(m)) == 12
         @test GeometryBasics.facetype(m) == GLTriangleFace
+
+        @test normal_mesh(coordinates(m), faces(m)) == m
     end
 
     @testset "normal_uv_mesh()" begin
@@ -372,4 +385,21 @@ end
         @test length(faces(m2)) == 12
 
     end
+end
+
+@testset "map_coordinates" begin
+    m = GeometryBasics.mesh(Rect3f(0,0,0,1,1,1))
+    m2 = GeometryBasics.map_coordinates(p -> 2 * p, m)
+    @test m !== m2
+    @test 2 * coordinates(m) == coordinates(m2)
+
+    m3 = GeometryBasics.map_coordinates!(p -> 0.5 * p, m2)
+    @test m3 === m2
+    @test coordinates(m) == coordinates(m3)
+
+    m = MetaMesh(GeometryBasics.mesh(Rect3f(0,0,0,1,1,1)), meta = "test")
+    m2 = GeometryBasics.map_coordinates(p -> 2 * p, m)
+    @test m !== m2
+    @test 2 * coordinates(m) == coordinates(m2)
+    @test GeometryBasics.meta(m) == GeometryBasics.meta(m2)
 end