Use eachvertex in more places (#1137)

juliohm · web-flow · commit d1d8ebec22db · 2024-11-19T14:24:22.000-03:00
diff --git a/ext/grid.jl b/ext/grid.jl
@@ -63,7 +63,7 @@ function vizgridfallback!(plot, M, pdim, edim)
     # decide whether or not to reverse connectivity list
     rfunc = Makie.@lift _reverse($grid)
 
-    verts = Makie.@lift map(asmakie, vertices($grid))
+    verts = Makie.@lift map(asmakie, eachvertex($grid))
     quads = Makie.@lift [GB.QuadFace($rfunc(indices(e))) for e in elements(topology($grid))]
 
     dims = Makie.@lift size($grid)
diff --git a/ext/mesh.jl b/ext/mesh.jl
@@ -64,7 +64,7 @@ function vizmesh!(plot, ::Type{<:𝔼}, ::Val{2}, ::Val)
     dim = embeddim($mesh)
     nvert = nvertices($mesh)
     nelem = nelements($mesh)
-    verts = vertices($mesh)
+    verts = eachvertex($mesh)
     topo = topology($mesh)
     elems = elements(topo)
 
diff --git a/ext/utils.jl b/ext/utils.jl
@@ -34,9 +34,9 @@ asmakie(multis::AbstractVector{<:Multi}) = mapreduce(m -> asmakie.(parent(m)), v
 
 function asmakie(poly::Polygon)
   rs = rings(poly)
-  outer = [asmakie(p) for p in vertices(first(rs))]
+  outer = map(asmakie, eachvertex(rs[1]))
   if hasholes(poly)
-    inners = map(i -> [asmakie(p) for p in vertices(rs[i])], 2:length(rs))
+    inners = map(i -> map(asmakie, eachvertex(rs[i])), 2:length(rs))
     Makie.Polygon(outer, inners)
   else
     Makie.Polygon(outer)
diff --git a/src/boundingboxes.jl b/src/boundingboxes.jl
@@ -13,7 +13,7 @@ function boundingbox end
 # FALLBACKS
 # ----------
 
-boundingbox(p::Polytope) = _pboxes(vertices(p))
+boundingbox(p::Polytope) = _pboxes(eachvertex(p))
 
 boundingbox(p::Primitive) = boundingbox(boundary(p))
 
@@ -78,7 +78,7 @@ boundingbox(g::TransformedGrid{<:Any,<:Any,<:OrthoRegularGrid}) = boundingbox(pa
 boundingbox(g::TransformedGrid{<:Any,<:Any,<:OrthoRectilinearGrid}) =
   boundingbox(parent(g)) |> transform(g) |> boundingbox
 
-boundingbox(m::Mesh) = _pboxes(vertices(m))
+boundingbox(m::Mesh) = _pboxes(eachvertex(m))
 
 # ----------------
 # IMPLEMENTATIONS
diff --git a/src/discretization.jl b/src/discretization.jl
@@ -105,8 +105,7 @@ function discretize(polygon::Polygon, method::BoundaryTriangulationMethod)
 
   # handle degenerate polygons
   if nvertices(cpoly) == 1
-    v = first(vertices(cpoly))
-    points = [v, v, v]
+    points = fill(vertex(cpoly, 1), 3)
     connec = [connect((1, 2, 3))]
     return SimpleMesh(points, connec)
   end
diff --git a/src/domains/meshes.jl b/src/domains/meshes.jl
@@ -227,8 +227,9 @@ function Base.getindex(g::Grid, I::CartesianIndices)
   odims = size(g)
   cinds = first(I):CartesianIndex(Tuple(last(I)) .+ 1)
   inds = vec(LinearIndices(odims .+ 1)[cinds])
+  points = [vertex(g, ind) for ind in inds]
   periodic = isperiodic(topology(g)) .&& dims .== odims
-  SimpleMesh(vertices(g)[inds], GridTopology(dims, periodic))
+  SimpleMesh(points, GridTopology(dims, periodic))
 end
 
 _asrange(::Int, r::UnitRange{Int}) = r
diff --git a/src/domains/meshes/transformedmesh.jl b/src/domains/meshes/transformedmesh.jl
@@ -18,7 +18,7 @@ struct TransformedMesh{M<:Manifold,C<:CRS,TP<:Topology,MS<:Mesh,TR<:Transform} <
 end
 
 function TransformedMesh(m::Mesh, t::Transform)
-  p = t(first(vertices(m)))
+  p = t(vertex(m, 1))
   TransformedMesh{manifold(p),crs(p)}(m, t)
 end
 
diff --git a/src/hulls.jl b/src/hulls.jl
@@ -38,7 +38,7 @@ function convexhull end
 # FALLBACKS
 # ----------
 
-convexhull(p::Polytope) = _pconvexhull(vertices(p))
+convexhull(p::Polytope) = _pconvexhull(eachvertex(p))
 
 convexhull(p::Primitive) = convexhull(boundary(p))
 
@@ -62,7 +62,7 @@ convexhull(t::Triangle) = t
 
 convexhull(g::Grid) = Box(extrema(g)...)
 
-convexhull(m::Mesh) = _pconvexhull(vertices(m))
+convexhull(m::Mesh) = _pconvexhull(eachvertex(m))
 
 # ----------------
 # IMPLEMENTATIONS
diff --git a/src/pointification.jl b/src/pointification.jl
@@ -16,7 +16,7 @@ function pointify end
 
 pointify(p::Primitive) = pointify(boundary(p))
 
-pointify(p::Polytope) = collect(vertices(p))
+pointify(p::Polytope) = collect(eachvertex(p))
 
 pointify(m::Multi) = pointify(parent(m))
 
diff --git a/src/predicates/intersects.jl b/src/predicates/intersects.jl
@@ -61,7 +61,7 @@ intersects(s::Segment, c::Chain) = intersects(c, s)
 
 intersects(c₁::Chain, c₂::Chain) = intersects(segments(c₁), segments(c₂))
 
-intersects(c::Chain, g::Geometry) = any(∈(g), vertices(c)) || intersects(c, boundary(g))
+intersects(c::Chain, g::Geometry) = any(∈(g), eachvertex(c)) || intersects(c, boundary(g))
 
 intersects(g::Geometry, c::Chain) = intersects(c, g)
 
diff --git a/src/predicates/isconvex.jl b/src/predicates/isconvex.jl
@@ -60,7 +60,7 @@ isconvex(::Tetrahedron) = true
 
 isconvex(p::Polygon) = _isconvex(p, Val(embeddim(p)))
 
-_isconvex(p::Polygon, ::Val{2}) = Set(vertices(convexhull(p))) == Set(vertices(p))
+_isconvex(p::Polygon, ::Val{2}) = Set(eachvertex(convexhull(p))) == Set(eachvertex(p))
 
 _isconvex(p::Polygon, ::Val{3}) = isconvex(proj2D(p))
 
@@ -71,8 +71,8 @@ isconvex(m::Multi) = isapproxequal(measure(convexhull(m)), measure(m))
 # --------------
 
 function isconvex(q::Quadrangle)
-  v = vertices(q)
-  d1 = Segment(v[1], v[3])
-  d2 = Segment(v[2], v[4])
+  A, B, C, D = vertices(q)
+  d1 = Segment(A, C)
+  d2 = Segment(B, D)
   intersects(d1, d2)
 end
diff --git a/src/transforms/repair.jl b/src/transforms/repair.jl
@@ -63,7 +63,7 @@ function apply(::Repair{1}, mesh::Mesh)
     ntuple(i -> inds[elem[i]], length(elem))
   end
 
-  points = vertices(mesh)[seen]
+  points = [vertex(mesh, ind) for ind in seen]
 
   connec = connect.(elems)
 
diff --git a/src/transforms/smoothing.jl b/src/transforms/smoothing.jl
@@ -44,7 +44,7 @@ _laplacian(mesh) = laplacematrix(mesh, kind=:uniform)
 
 function _smooth(mesh, L, n, λ, μ; revert=false)
   # retrieve vertices
-  points = vertices(mesh)
+  points = eachvertex(mesh)
 
   # matrix with coordinates (nvertices x ndims)
   X = reduce(hcat, to.(points)) |> transpose
