Refactor vizmesh! (#1008)

* Refactor 'vizmesh!'

* Apply suggestions

* Update 'asmakie'

* Apply suggestions

* Adjust comments

---------

Co-authored-by: Júlio Hoffimann <[email protected]>

Author: eliascarv

ext/MeshesMakieExt.jl

@@ -15,6 +15,7 @@ using Colorfy
 using CoordRefSystems: Projected
 
 import TransformsBase as TB
+import Makie.GeometryBasics as GB
 
 import Meshes: viz, viz!
 import Makie

ext/geometryset.jl

@@ -128,22 +128,3 @@ function showfacets2D!(plot, geoms)
     viz!(plot, bset, color=segmentcolor, segmentsize=segmentsize)
   end
 end
-
-asmakie(geoms::AbstractVector{<:Geometry}) = asmakie.(geoms)
-
-asmakie(multis::AbstractVector{<:Multi}) = mapreduce(m -> asmakie.(parent(m)), vcat, multis)
-
-function asmakie(poly::Polygon)
-  rs = rings(poly)
-  outer = [asmakie(p) for p in vertices(first(rs))]
-  if hasholes(poly)
-    inners = map(i -> [asmakie(p) for p in vertices(rs[i])], 2:length(rs))
-    Makie.Polygon(outer, inners)
-  else
-    Makie.Polygon(outer)
-  end
-end
-
-asmakie(p::Point) = Makie.Point(ustrip.(Tuple(to(p))))
-
-asmakie(v::Vec) = Makie.Vec(ustrip.(Tuple(v)))

ext/mesh.jl

@@ -71,36 +71,39 @@ function vizmesh!(plot, ::Type{<:𝔼}, ::Val{2}, ::Val)
     elems = elements(topo)
 
     # coordinates of vertices
-    coords = map(p -> ustrip.(to(p)), verts)
+    coords = map(asmakie, verts)
 
     # fan triangulation (assume convexity)
-    tris4elem = map(elems) do elem
+    ntris = sum(e -> nvertices(pltype(e)) - 2, elems)
+    tris = Vector{GB.TriangleFace{Int}}(undef, ntris)
+    tind = 0
+    for elem in elems
       I = indices(elem)
-      [[I[1], I[i], I[i + 1]] for i in 2:(length(I) - 1)]
+      for i in 2:(length(I) - 1)
+        tind += 1
+        tris[tind] = GB.TriangleFace(I[1], I[i], I[i + 1])
+      end
     end
 
-    # flatten vector of triangles
-    tris = [tri for tris in tris4elem for tri in tris]
-
     # element vs. vertex coloring
     if $colorant isa AbstractVector
       ncolor = length($colorant)
       if ncolor == nelem # element coloring
         # duplicate vertices and adjust
         # connectivities to avoid linear
         # interpolation of colors
-        nt = 0
+        tind = 0
         elem4tri = Dict{Int,Int}()
-        for e in 1:nelem
-          Δs = tris4elem[e]
-          for _ in 1:length(Δs)
-            nt += 1
-            elem4tri[nt] = e
+        sizehint!(elem4tri, ntris)
+        for (eind, e) in enumerate(elems)
+          for _ in 1:(nvertices(pltype(e)) - 2)
+            tind += 1
+            elem4tri[tind] = eind
           end
         end
-        nv = 3nt
+        nv = 3ntris
         tcoords = [coords[i] for tri in tris for i in tri]
-        tconnec = [collect(I) for I in Iterators.partition(1:nv, 3)]
+        tconnec = [GB.TriangleFace(i, i + 1, i + 2) for i in range(start=1, step=3, length=ntris)]
         tcolors = map(1:nv) do i
           t = ceil(Int, i / 3)
           e = elem4tri[t]
@@ -126,22 +129,23 @@ function vizmesh!(plot, ::Type{<:𝔼}, ::Val{2}, ::Val)
       tcolors = $colorant
     end
 
-    # convert connectivities to matrix format
-    tmatrix = reduce(hcat, tconnec) |> transpose
-
     # enable shading in 3D
     tshading = dim == 3 ? Makie.FastShading : Makie.NoShading
 
-    tcoords, tmatrix, tcolors, tshading
+    tcoords, tconnec, tcolors, tshading
   end
 
   # unpack observable of parameters
   tcoords = Makie.@lift $tparams[1]
-  tmatrix = Makie.@lift $tparams[2]
+  tconnec = Makie.@lift $tparams[2]
   tcolors = Makie.@lift $tparams[3]
   tshading = Makie.@lift $tparams[4]
 
-  Makie.mesh!(plot, tcoords, tmatrix, color=tcolors, shading=tshading)
+  # Makie's triangle mesh
+  mkemesh = Makie.@lift GB.Mesh($tcoords, $tconnec)
+
+  # main visualization
+  Makie.mesh!(plot, mkemesh, color=tcolors, shading=tshading)
 
   if showsegments[]
     # retrieve coordinates parameters

ext/utils.jl

@@ -27,3 +27,22 @@ function vizmany!(plot, objs, color)
 
   viz!(plot, object, color=colors, alpha=alphas, colormap=colormap, pointsize=pointsize, segmentsize=segmentsize)
 end
+
+asmakie(geoms::AbstractVector{<:Geometry}) = asmakie.(geoms)
+
+asmakie(multis::AbstractVector{<:Multi}) = mapreduce(m -> asmakie.(parent(m)), vcat, multis)
+
+function asmakie(poly::Polygon)
+  rs = rings(poly)
+  outer = [asmakie(p) for p in vertices(first(rs))]
+  if hasholes(poly)
+    inners = map(i -> [asmakie(p) for p in vertices(rs[i])], 2:length(rs))
+    Makie.Polygon(outer, inners)
+  else
+    Makie.Polygon(outer)
+  end
+end
+
+asmakie(p::Point) = Makie.Point{embeddim(p),Float32}(ustrip.(Tuple(to(p))))
+
+asmakie(v::Vec) = Makie.Vec{length(v),Float32}(ustrip.(Tuple(v)))