Skip to content

Commit 6ffd173

Browse files
committed
Merge branch 'sd/simple-mesh' into ff/refactor
2 parents 9dd6d2f + 15eb932 commit 6ffd173

File tree

1 file changed

+3
-11
lines changed

1 file changed

+3
-11
lines changed

src/meshes.jl

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,9 @@ function mesh(polygon::AbstractVector{P}; pointtype=P, facetype=GLTriangleFace)
6161
return mesh(Polygon(polygon); pointtype=pointtype, facetype=facetype)
6262
end
6363

64-
# function triangle_mesh(primitive::Union{AbstractGeometry{N}, AbstractVector{<: Point{2}}})::TriangleMesh{N} where {N}
65-
# return mesh(primitive; pointtype=Point{N, Float32})
66-
# end
64+
function triangle_mesh(primitive::Union{AbstractGeometry{N}, AbstractVector{<: Point{N}}})::TriangleMesh{N} where {N}
65+
return mesh(primitive; pointtype=Point{N, Float32})
66+
end
6767

6868

6969
pointtype(x::Mesh) = eltype(decompose(Point, x))
@@ -78,14 +78,6 @@ function triangle_mesh(primitive::Mesh{N}) where {N}
7878
end
7979
end
8080

81-
function triangle_mesh(primitive::Union{AbstractGeometry{N}, AbstractVector{<: Point{N}}}; nvertices = nothing)::SimpleTriangleMesh{N} where {N}
82-
if nvertices !== nothing
83-
@warn("nvertices argument deprecated. Wrap primitive in `Tesselation(primitive, nvertices)`")
84-
primitive = Tesselation(primitive, nvertices)
85-
end
86-
return mesh(primitive; pointtype=Point{N,Float32}, facetype=GLTriangleFace)
87-
end
88-
8981
function uv_mesh(primitive::AbstractGeometry{N,T}) where {N,T}
9082
return mesh(primitive, uv = decompose_uv(primitive), pointtype=Point{N,Float32}, facetype=GLTriangleFace)
9183
end

0 commit comments

Comments
 (0)