fix tests

Author: SimonDanisch

src/basic_types.jl

@@ -352,11 +352,22 @@ end
 Tables.schema(mesh::Mesh) = Tables.schema(getfield(mesh, :simplices))
 
 function Base.getproperty(mesh::Mesh, name::Symbol)
-    return getproperty(getfield(mesh, :simplices), name)
+    if name === :position
+        # a mesh always has position defined by coordinates...
+        return coordinates(mesh)
+    else
+        return getproperty(getfield(mesh, :simplices), name)
+    end
 end
 
 function Base.propertynames(mesh::Mesh)
-    return propertynames(getfield(mesh, :simplices))
+    names = propertynames(getfield(mesh, :simplices))
+    if :positions in names
+        return names
+    else
+        # a mesh always has positions!
+        return (names..., :position)
+    end
 end
 
 function Base.summary(io::IO, ::Mesh{Dim, T, Element}) where {Dim, T, Element}

src/geometry_primitives.jl

@@ -98,9 +98,7 @@ function decompose(::Type{P}, primitive, args...) where {P<:AbstractPoint}
     return collect_with_eltype(P, coordinates(primitive, args...))
 end
 
-
-
-function decompose(::Type{Point}, primitive::GeometryPrimitive{Dim}, args...) where {Dim}
+function decompose(::Type{Point}, primitive::Union{GeometryPrimitive{Dim}, Mesh{Dim}}, args...) where {Dim}
     return collect_with_eltype(Point{Dim, Float32}, coordinates(primitive, args...))
 end
 

test/runtests.jl

@@ -279,9 +279,15 @@ end
 
 @testset "decompose/triangulation" begin
     primitive = Sphere(Point3f0(0), 1)
-    triangle_mesh(primitive)
+    mesh = triangle_mesh(primitive)
+    @test decompose(Point, mesh) isa Vector{Point3f0}
+    @test decompose(Point, primitive) isa Vector{Point3f0}
     primitive = Rect2D(0, 0, 1, 1)
-    triangle_mesh(primitive)
+    mesh = triangle_mesh(primitive)
+
+    @test decompose(Point, mesh) isa Vector{Point2f0}
+    @test decompose(Point, primitive) isa Vector{Point2f0}
+
     primitive = Rect3D(0, 0, 0, 1, 1, 1)
     triangle_mesh(primitive)
 
@@ -295,8 +301,8 @@ end
     points = decompose(Point2f0, Circle(Point2f0(0), 1))
     triangle_mesh(points)
     @test true # yay no errors so far!
-end
 
+end
 
 @testset "Tests from GeometryTypes" begin
     include("geometrytypes.jl")
@@ -317,10 +323,11 @@ end
 
     m, colpopt = GeometryBasics.pop_pointmeta(m, :color)
     m, xxpopt = GeometryBasics.pop_pointmeta(m, :xx)
+
     @test propertynames(m) == (:position,)
     @test colpopt === color
     @test xxpopt === xx
-    
+
     @testset "creating meta" begin
         x = Point3f0[(1,3,4)]
         # no meta gets added, so should stay the same