more tests, more fixes

Author: SimonDanisch

src/GeometryBasics.jl

@@ -29,8 +29,8 @@ module GeometryBasics
     export OffsetInteger, ZeroIndex, OneIndex, GLIndex
     export FaceView, SimpleFaceView
     export AbstractPoint, PointMeta, PointWithUV
-    export decompose, coordinates, faces, normals, decompose_uv, decompose_normals
-    export Tesselation
+    export decompose, coordinates, faces, normals, decompose_uv, decompose_normals, texturecoordinates
+    export Tesselation, pointmeta, Normal, UV, UVW
     export GLTriangleFace, GLNormalMesh3D, GLPlainTriangleMesh, GLUVMesh3D, GLUVNormalMesh3D
     export AbstractMesh, Mesh, TriangleMesh
     export GLNormalMesh2D, PlainTriangleMesh

src/interfaces.jl

@@ -117,7 +117,7 @@ decompose_normals(primitive) = decompose(Normal(), primitive)
 function decompose(NT::Normal{T}, primitive) where T
     n = normals(primitive)
     if n === nothing
-        return decompose(NT, normals(coordinates(primitive), faces(primitive)))
+        return collect_with_eltype(T, normals(coordinates(primitive), faces(primitive)))
     end
     return collect_with_eltype(T, n)
 end

src/meshes.jl

@@ -150,7 +150,11 @@ function mesh(polygon::AbstractVector{P}; pointtype=P, facetype=GLTriangleFace,
     return Mesh(positions, faces)
 end
 
-function triangle_mesh(primitive::Meshable{N}) where {N}
+function triangle_mesh(primitive::Meshable{N}; nvertices=nothing) where {N}
+    if nvertices !== nothing
+        @warn("nvertices argument deprecated. Wrap primitive in `Tesselation(primitive, nvertices)`")
+        primitive = Tesselation(primitive, nvertices)
+    end
     return mesh(primitive; pointtype=Point{N, Float32}, facetype=GLTriangleFace)
 end
 
@@ -172,20 +176,15 @@ function normal_mesh(points::AbstractVector{<:AbstractPoint},
     return Mesh(meta(_points; normals=normals(_points, _faces)), _faces)
 end
 
-function normal_mesh(primitive::Meshable{N}) where {N}
+function normal_mesh(primitive::Meshable{N}; nvertices=nothing) where {N}
+    if nvertices !== nothing
+        @warn("nvertices argument deprecated. Wrap primitive in `Tesselation(primitive, nvertices)`")
+        primitive = Tesselation(primitive, nvertices)
+    end
     return mesh(primitive; pointtype=Point{N, Float32}, normaltype=Vec3f0,
                 facetype=GLTriangleFace)
 end
 
-## Backward compatibility
-function normal_mesh(primitive::GeometryPrimitive; nvertices=30)
-    return normal_mesh(Tesselation(primitive, nvertices))
-end
-
-function triangle_mesh(primitive::GeometryPrimitive; nvertices=30)
-    return triangle_mesh(Tesselation(primitive, nvertices))
-end
-
 """
     volume(triangle)
 
@@ -244,7 +243,7 @@ function pointmeta(mesh::Mesh, uv::UV)
 end
 
 function pointmeta(mesh::Mesh, normal::Normal)
-    return pointmeta(mesh; normal=decompose(normal, mesh))
+    return pointmeta(mesh; normals=decompose(normal, mesh))
 end
 
 """

test/runtests.jl

@@ -284,6 +284,7 @@ end
     mesh = triangle_mesh(primitive)
     @test decompose(Point, mesh) isa Vector{Point3f0}
     @test decompose(Point, primitive) isa Vector{Point3f0}
+
     primitive = Rect2D(0, 0, 1, 1)
     mesh = triangle_mesh(primitive)
 
@@ -294,19 +295,22 @@ end
     triangle_mesh(primitive)
 
     primitive = Sphere(Point3f0(0), 1)
-    normal_mesh(primitive)
+    m_normal = normal_mesh(primitive)
+    @test normals(m_normal) isa Vector{Vec3f0}
     primitive = Rect2D(0, 0, 1, 1)
-    normal_mesh(primitive)
+    m_normal = normal_mesh(primitive)
+    @test normals(m_normal) isa Vector{Vec3f0}
     primitive = Rect3D(0, 0, 0, 1, 1, 1)
-    normal_mesh(primitive)
+    m_normal = normal_mesh(primitive)
+    @test normals(m_normal) isa Vector{Vec3f0}
 
     points = decompose(Point2f0, Circle(Point2f0(0), 1))
-    triangle_mesh(points)
-    @test true # yay no errors so far!
+    tmesh = triangle_mesh(points)
+    @test normals(tmesh) == nothing
 
     m = GeometryBasics.mesh(Sphere(Point3f0(0), 1))
     @test normals(m) == nothing
-    m_normals = pointmeta(m, Normal(Vec3f0))
+    m_normals = pointmeta(m, Normal())
     @test normals(m_normals) isa Vector{Vec3f0}
 
     @test texturecoordinates(m) == nothing
@@ -327,7 +331,7 @@ end
     points = rand(Point3f0, 10)
     m = GeometryBasics.Mesh(meta(points, xx=xx), GLTriangleFace[(1,2,3), (3,4,5)])
     color = rand(10)
-    m = GeometryBasics.pointmeta(m; color=color)
+    m = pointmeta(m; color=color)
 
     @test hasproperty(m, :xx)
     @test hasproperty(m, :color)