Merge branch 'master' into feat/geointerface-traits

Author: SimonDanisch

Project.toml

@@ -13,16 +13,18 @@ StructArrays = "09ab397b-f2b6-538f-b94a-2f83cf4a842a"
 Tables = "bd369af6-aec1-5ad0-b16a-f7cc5008161c"
 
 [compat]
+EarCut_jll = "2"
 IterTools = "1.3.0"
 StaticArrays = "0.12, 1.0"
 StructArrays = "0.6"
 Tables = "0.2, 1"
 julia = "1.6"
 
 [extras]
+Aqua = "4c88cf16-eb10-579e-8560-4a9242c79595"
 OffsetArrays = "6fe1bfb0-de20-5000-8ca7-80f57d26f881"
 Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 
 [targets]
-test = ["Test", "Random", "OffsetArrays"]
+test = ["Aqua", "Test", "Random", "OffsetArrays"]

src/GeometryBasics.jl

@@ -45,9 +45,9 @@ export PolygonMeta, MultiPointMeta, MultiLineStringMeta, MeshMeta, LineStringMet
 export decompose, coordinates, faces, normals, decompose_uv, decompose_normals,
        texturecoordinates
 export Tesselation, pointmeta, Normal, UV, UVW
-export GLTriangleFace, GLNormalMesh3D, GLPlainTriangleMesh, GLUVMesh3D, GLUVNormalMesh3D
+export GLTriangleFace, GLUVMesh3D
 export AbstractMesh, Mesh, TriangleMesh
-export GLNormalMesh2D, PlainTriangleMesh
+export GLNormalMesh2D
 export MetaT, meta_table
 
 # all the different predefined mesh types
@@ -62,11 +62,11 @@ export NormalUVWMesh, GLNormalUVWMesh, GLNormalUVWMesh2D, GLNormalUVWMesh3D
 export triangle_mesh, triangle_mesh, uv_mesh
 export uv_mesh, normal_mesh, uv_normal_mesh
 
-export height, origin, radius, width, widths, xwidth, yheight
+export height, origin, radius, width, widths
 export HyperSphere, Circle, Sphere
 export Cylinder, Cylinder2, Cylinder3, Pyramid, extremity
 export HyperRectangle, Rect, Rect2, Rect3, Recti, Rect2i, Rect3i, Rectf, Rect2f, Rect3f
-export before, during, isinside, isoutside, meets, overlaps, intersects, finishes
+export before, during, meets, overlaps, intersects, finishes
 export centered, direction, area, volume, update
 export max_dist_dim, max_euclidean, max_euclideansq, min_dist_dim, min_euclidean
 export min_euclideansq, minmax_dist_dim, minmax_euclidean, minmax_euclideansq

src/basic_types.jl

@@ -3,7 +3,7 @@ Abstract Geometry in R{Dim} with Number type T
 """
 abstract type AbstractGeometry{Dim,T<:Number} end
 abstract type GeometryPrimitive{Dim,T} <: AbstractGeometry{Dim,T} end
-Base.ndims(x::AbstractGeometry{Dim}) where {Dim} = Dim
+Base.ndims(::AbstractGeometry{Dim}) where {Dim} = Dim
 
 """
 Geometry made of N connected points. Connected as one flat geometry, it makes a Ngon / Polygon.
@@ -62,9 +62,10 @@ end
 
 const NNgon{N} = Ngon{Dim,T,N,P} where {Dim,T,P}
 
-function (::Type{<:NNgon{N}})(points::Vararg{P,N}) where {P<:AbstractPoint{Dim,T},
-                                                          N} where {Dim,T}
-    return Ngon{Dim,T,N,P}(SVector(points))
+function (::Type{<:NNgon{N1}})(p0::P, points::Vararg{P,N2}) where {P<:AbstractPoint{Dim,T},
+                                                          N1, N2} where {Dim,T}
+    @assert N1 == N2+1
+    return Ngon{Dim,T,N1,P}(SVector(p0, points...))
 end
 Base.show(io::IO, x::NNgon{N}) where {N} = print(io, "Ngon{$N}(", join(x, ", "), ")")
 
@@ -100,12 +101,12 @@ const Triangle{Dim,T} = TriangleP{Dim,T,Point{Dim,T}}
 const Triangle3d{T} = Triangle{3,T}
 
 Base.show(io::IO, x::TriangleP) = print(io, "Triangle(", join(x, ", "), ")")
-Base.summary(io::IO, x::Type{<:TriangleP}) = print(io, "Triangle")
+Base.summary(io::IO, ::Type{<:TriangleP}) = print(io, "Triangle")
 
 const Quadrilateral{Dim,T} = Ngon{Dim,T,4,P} where {P<:AbstractPoint{Dim,T}}
 
 Base.show(io::IO, x::Quadrilateral) = print(io, "Quad(", join(x, ", "), ")")
-Base.summary(io::IO, x::Type{<:Quadrilateral}) = print(io, "Quad")
+Base.summary(io::IO, ::Type{<:Quadrilateral}) = print(io, "Quad")
 
 function coordinates(lines::AbstractArray{LineP{Dim,T,PointType}}) where {Dim,T,PointType}
     return if lines isa Base.ReinterpretArray
@@ -147,9 +148,10 @@ Base.show(io::IO, x::TetrahedronP) = print(io, "Tetrahedron(", join(x, ", "), ")
 
 coordinates(x::Simplex) = x.points
 
-function (::Type{<:NSimplex{N}})(points::Vararg{P,N}) where {P<:AbstractPoint{Dim,T},
-                                                             N} where {Dim,T}
-    return Simplex{Dim,T,N,P}(SVector(points))
+function (::Type{<:NSimplex{N1}})(p0::P, points::Vararg{P,N2}) where {P<:AbstractPoint{Dim,T},
+                                                             N1, N2} where {Dim,T}
+    @assert N1 == N2+1
+    return Simplex{Dim,T,N1,P}(SVector(p0, points...))
 end
 
 # Base Array interface

src/meshes.jl

@@ -206,7 +206,7 @@ end
 Calculate the signed volume of one tetrahedron. Be sure the orientation of your
 surface is right.
 """
-function volume(triangle::Triangle) where {VT,FT}
+function volume(triangle::Triangle)
     v1, v2, v3 = triangle
     sig = sign(orthogonal_vector(v1, v2, v3) ⋅ v1)
     return sig * abs(v1 ⋅ (v2 × v3)) / 6
@@ -218,7 +218,7 @@ end
 Calculate the signed volume of all tetrahedra. Be sure the orientation of your
 surface is right.
 """
-function volume(mesh::Mesh) where {VT,FT}
+function volume(mesh::Mesh)
     return sum(volume, mesh)
 end
 

src/primitives/rectangles.jl

@@ -48,16 +48,16 @@ function Rect(v1::Vec{N,T1}, v2::Vec{N,T2}) where {N,T1,T2}
     return Rect{N,T}(Vec{N,T}(v1), Vec{N,T}(v2))
 end
 
-function RectT{T}(v1::VecTypes{N,T1}, v2::VecTypes{N,T2}) where {N,T,T1,T2}
+function RectT{T}(v1::VecTypes{N}, v2::VecTypes{N}) where {N,T}
     return if T <: Integer
         Rect{N,T}(round.(T, v1), round.(T, v2))
     else
         return Rect{N,T}(Vec{N,T}(v1), Vec{N,T}(v2))
     end
 end
 
-function Rect{N}(v1::VecTypes{N,T1}, v2::VecTypes{N,T2}) where {N,T1,T2}
-    T = promote_type(T1, T2)
+function Rect{N}(v1::VecTypes{N}, v2::VecTypes{N}) where {N}
+    T = promote_type(eltype(v1), eltype(v2))
     return Rect{N,T}(Vec{N,T}(v1), Vec{N,T}(v2))
 end
 
@@ -512,7 +512,7 @@ Base.isequal(b1::Rect, b2::Rect) = b1 == b2
 
 centered(R::Type{Rect{N,T}}) where {N,T} = R(Vec{N,T}(-0.5), Vec{N,T}(1))
 centered(R::Type{Rect{N}}) where {N} = R(Vec{N,Float32}(-0.5), Vec{N,Float32}(1))
-centered(R::Type{Rect}) where {N} = R(Vec{2,Float32}(-0.5), Vec{2,Float32}(1))
+centered(R::Type{Rect}) = R(Vec{2,Float32}(-0.5), Vec{2,Float32}(1))
 
 ##
 # Rect2 decomposition

test/runtests.jl

@@ -720,4 +720,9 @@ end
     include("geointerface.jl")
 end
 
+using Aqua
+# Aqua tests
+# Intervals brings a bunch of ambiquities unfortunately
+Aqua.test_all(GeometryBasics; ambiguities=false)
+
 end  # testset "GeometryBasics"