Add showsegments support for vizgridfallback!

ext/geometryset.jl

@@ -2,32 +2,7 @@
 # Licensed under the MIT License. See LICENSE in the project root.
 # ------------------------------------------------------------------
 
-function Makie.plot!(plot::Viz{<:Tuple{GeometrySet}})
-  gset = plot[:object]
-  color = plot[:color]
-  alpha = plot[:alpha]
-  colormap = plot[:colormap]
-  colorrange = plot[:colorrange]
-
-  # process color spec into colorant
-  colorant = Makie.@lift process($color, $colormap, $colorrange, $alpha)
-
-  # get geometries
-  geoms = Makie.@lift parent($gset)
-
-  # get geometry types
-  types = Makie.@lift unique(typeof.($geoms))
-
-  for G in types[]
-    inds = Makie.@lift findall(g -> g isa G, $geoms)
-    gvec = Makie.@lift collect(G, $geoms[$inds])
-    colors = Makie.@lift $colorant isa AbstractVector ? $colorant[$inds] : $colorant
-    M = Makie.@lift manifold(first($gvec))
-    pdim = Makie.@lift paramdim(first($gvec))
-    edim = Makie.@lift embeddim(first($gvec))
-    vizgset!(plot, M[], Val(pdim[]), Val(edim[]), gvec, colors)
-  end
-end
+Makie.plot!(plot::Viz{<:Tuple{GeometrySet}}) = vizgeoms!(plot)
 
 const ObservableVector{T} = Makie.Observable{<:AbstractVector{T}}
 
@@ -52,14 +27,20 @@
 end
 
 function vizgset!(plot, ::Type{<:𝔼}, ::Val{1}, ::Val, geoms, colorant)
+  showpoints = plot[:showpoints]
+
   meshes = Makie.@lift discretize.($geoms)
   vizmany!(plot, meshes, colorant)
-  showfacets1D!(plot, geoms)
+
+  if showpoints[]
+    vizfacets!(plot, geoms)
+  end
 end
 
 function vizgset!(plot, ::Type{<:𝔼}, ::Val{1}, ::Val, geoms::ObservableVector{<:Ray}, colorant)
   rset = plot[:object]
   segmentsize = plot[:segmentsize]
+  showpoints = plot[:showpoints]
 
   Dim = embeddim(rset[])
 
@@ -71,13 +52,20 @@
   size = Makie.@lift 0.1 * $segmentsize
   Makie.arrows!(plot, orig, dirs, color=colorant, arrowsize=size)
 
-  showfacets1D!(plot, geoms)
+  if showpoints[]
+    vizfacets!(plot, geoms)
+  end
 end
 
 function vizgset!(plot, ::Type{<:𝔼}, ::Val{2}, ::Val, geoms, colorant)
+  showsegments = plot[:showsegments]
+
   meshes = Makie.@lift discretize.($geoms)
   vizmany!(plot, meshes, colorant)
-  showfacets2D!(plot, geoms)
+
+  if showsegments[]
+    vizfacets!(plot, geoms)
+  end
 end
 
 const PolygonLike = Union{Polygon,MultiPolygon}
@@ -104,29 +92,63 @@
   vizmany!(plot, meshes, colorant)
 end
 
-function showfacets1D!(plot, geoms)
-  showpoints = plot[:showpoints]
+vizfacets!(plot::Viz{<:Tuple{GeometrySet}}) = vizgeoms!(plot, facets=false)
+
+function vizfacets!(plot::Viz{<:Tuple{GeometrySet}}, geoms)
+  M = Makie.@lift manifold(first($geoms))
+  pdim = Makie.@lift paramdim(first($geoms))
+  edim = Makie.@lift embeddim(first($geoms))
+  vizgsetfacets!(plot, M[], Val(pdim[]), Val(edim[]), geoms)
+end
+
+function vizgsetfacets!(plot, ::Type, ::Val{1}, ::Val, geoms)
   pointmarker = plot[:pointmarker]
   pointcolor = plot[:pointcolor]
   pointsize = plot[:pointsize]
 
-  if showpoints[]
-    # all boundaries are points or multipoints
-    points = Makie.@lift filter(!isnothing, boundary.($geoms))
-    pset = Makie.@lift GeometrySet($points)
-    viz!(plot, pset, color=pointcolor, pointmarker=pointmarker, pointsize=pointsize)
-  end
+  # all boundaries are points or multipoints
+  points = Makie.@lift filter(!isnothing, boundary.($geoms))
+  pset = Makie.@lift GeometrySet($points)
+  viz!(plot, pset, color=pointcolor, pointmarker=pointmarker, pointsize=pointsize)
 end
 
-function showfacets2D!(plot, geoms)
-  showsegments = plot[:showsegments]
+function vizgsetfacets!(plot, ::Type, ::Val{2}, ::Val, geoms)
   segmentcolor = plot[:segmentcolor]
   segmentsize = plot[:segmentsize]
 
-  if showsegments[]
-    # all boundaries are 1D geometries
-    bounds = Makie.@lift filter(!isnothing, boundary.($geoms))
-    bset = Makie.@lift GeometrySet($bounds)
-    viz!(plot, bset, color=segmentcolor, segmentsize=segmentsize)
+  # all boundaries are 1D geometries
+  bounds = Makie.@lift filter(!isnothing, boundary.($geoms))
+  bset = Makie.@lift GeometrySet($bounds)
+  viz!(plot, bset, color=segmentcolor, segmentsize=segmentsize)
+end
+
+function vizgeoms!(plot; facets=false)
+  gset = plot[:object]
+  color = plot[:color]
+  alpha = plot[:alpha]
+  colormap = plot[:colormap]
+  colorrange = plot[:colorrange]
+
+  # process color spec into colorant
+  colorant = facets ? nothing : Makie.@lift(process($color, $colormap, $colorrange, $alpha))
+
+  # get geometries
+  geoms = Makie.@lift parent($gset)
+
+  # get geometry types
+  types = Makie.@lift unique(typeof.($geoms))
+
+  for G in types[]
+    inds = Makie.@lift findall(g -> g isa G, $geoms)
+    gvec = Makie.@lift collect(G, $geoms[$inds])
+    M = Makie.@lift manifold(first($gvec))
+    pdim = Makie.@lift paramdim(first($gvec))
+    edim = Makie.@lift embeddim(first($gvec))
+    if facets
+      vizgsetfacets!(plot, M[], Val(pdim[]), Val(edim[]), gvec)
+    else
+      cvec = Makie.@lift $colorant isa AbstractVector ? $colorant[$inds] : $colorant
+      vizgset!(plot, M[], Val(pdim[]), Val(edim[]), gvec, cvec)
+    end
   end
 end

ext/grid.jl

@@ -16,6 +16,16 @@
 
 vizgrid!(plot, M::Type{<:𝔼}, pdim::Val, edim::Val) = vizgridfallback!(plot, M, pdim, edim)
 
+function vizfacets!(plot::Viz{<:Tuple{Grid}})
+  grid = plot[:object]
+  M = Makie.@lift manifold($grid)
+  pdim = Makie.@lift paramdim($grid)
+  edim = Makie.@lift embeddim($grid)
+  vizgridfacets!(plot, M[], Val(pdim[]), Val(edim[]))
+end
+
+vizgridfacets!(plot, M::Type, pdim::Val, edim::Val) = vizmeshfacets!(plot, M, pdim, edim)
+
 # ----------------
 # SPECIALIZATIONS
 # ----------------
@@ -35,6 +45,7 @@
   alpha = plot[:alpha]
   colormap = plot[:colormap]
   colorrange = plot[:colorrange]
+  showsegments = plot[:showsegments]
 
   if pdim == Val(2) # visualize quadrangle mesh with texture using uv coords
     # decide whether or not to reverse connectivity list
@@ -50,23 +61,28 @@
     ncolor = Makie.@lift $colorant isa AbstractVector ? length($colorant) : 1
 
     dims = Makie.@lift size($grid)
+    vdims = Makie.@lift Meshes.vsize($grid)
     texture = if ncolor[] == 1
       Makie.@lift fill($colorant, $dims)
     elseif ncolor[] == nquads[]
       Makie.@lift reshape($colorant, $dims)
     elseif ncolor[] == nverts[]
-      Makie.@lift reshape($colorant, $dims .+ 1)
+      Makie.@lift reshape($colorant, $vdims)
     else
       throw(ArgumentError("invalid number of colors"))
     end
 
-    uv = Makie.@lift [Makie.Vec2f(v, 1 - u) for v in range(0, 1, $dims[2] + 1) for u in range(0, 1, $dims[1] + 1)]
+    uv = Makie.@lift [Makie.Vec2f(v, 1 - u) for v in range(0, 1, $vdims[2]) for u in range(0, 1, $vdims[1])]
 
     mesh = Makie.@lift GB.Mesh(Makie.meta($verts, uv=$uv), $quads)
 
     shading = edim == Val(3) ? Makie.FastShading : Makie.NoShading
 
     Makie.mesh!(plot, mesh, color=texture, shading=shading)
+
+    if showsegments[]
+      vizfacets!(plot)
+    end
   else # fallback to triangle mesh visualization
     vizmesh!(plot, M, pdim, edim)
   end

ext/grid/cartesian.jl

@@ -31,10 +31,7 @@
     viz!(plot, bbox, color=colorant)
 
     if showsegments[]
-      xyz = Makie.@lift map(x -> ustrip.(x), Meshes.xyz($grid))
-      tup = Makie.@lift xysegments($xyz...)
-      x, y = Makie.@lift($tup[1]), Makie.@lift($tup[2])
-      Makie.lines!(plot, x, y, color=segmentcolor, linewidth=segmentsize)
+      vizfacets!(plot)
     end
   else
     if nc[] == nv[]
@@ -48,9 +45,7 @@
     end
 
     if showsegments[]
-      tup = Makie.@lift xysegments(0:$sz[1], 0:$sz[2])
-      x, y = Makie.@lift($tup[1]), Makie.@lift($tup[2])
-      Makie.lines!(plot, x, y, color=segmentcolor, linewidth=segmentsize)
+      vizfacets!(plot)
     end
 
     # adjust spacing and origin
@@ -69,8 +64,6 @@
   colormap = plot[:colormap]
   colorrange = plot[:colorrange]
   showsegments = plot[:showsegments]
-  segmentcolor = plot[:segmentcolor]
-  segmentsize = plot[:segmentsize]
 
   # process color spec into colorant
   colorant = Makie.@lift process($color, $colormap, $colorrange, $alpha)
@@ -103,8 +96,28 @@
   end
 
   if showsegments[]
-    tup = Makie.@lift xyzsegments($xyz...)
-    x, y, z = Makie.@lift($tup[1]), Makie.@lift($tup[2]), Makie.@lift($tup[3])
-    Makie.lines!(plot, x, y, z, color=segmentcolor, linewidth=segmentsize)
+    vizfacets!(plot)
   end
 end
+
+function vizgridfacets!(plot::Viz{<:Tuple{CartesianGrid}}, ::Type{<:𝔼}, ::Val{2}, ::Val{2})
+  grid = plot[:object]
+  segmentcolor = plot[:segmentcolor]
+  segmentsize = plot[:segmentsize]
+
+  xyz = Makie.@lift map(x -> ustrip.(x), Meshes.xyz($grid))
+  tup = Makie.@lift xysegments($xyz...)
+  x, y = Makie.@lift($tup[1]), Makie.@lift($tup[2])
+  Makie.lines!(plot, x, y, color=segmentcolor, linewidth=segmentsize)
+end
+
+function vizgridfacets!(plot::Viz{<:Tuple{CartesianGrid}}, ::Type{<:𝔼}, ::Val{3}, ::Val{3})
+  grid = plot[:object]
+  segmentcolor = plot[:segmentcolor]
+  segmentsize = plot[:segmentsize]
+
+  xyz = Makie.@lift map(x -> ustrip.(x), Meshes.xyz($grid))
+  tup = Makie.@lift xyzsegments($xyz...)
+  x, y, z = Makie.@lift($tup[1]), Makie.@lift($tup[2]), Makie.@lift($tup[3])
+  Makie.lines!(plot, x, y, z, color=segmentcolor, linewidth=segmentsize)
+end

ext/grid/rectilinear.jl

@@ -44,11 +44,20 @@
     end
 
     if showsegments[]
-      tup = Makie.@lift xysegments($xs, $ys)
-      x, y = Makie.@lift($tup[1]), Makie.@lift($tup[2])
-      Makie.lines!(plot, x, y, color=segmentcolor, linewidth=segmentsize)
+      vizfacets!(plot)
     end
   else
     vizgridfallback!(plot, M, pdim, edim)
   end
 end
+
+function vizgridfacets!(plot::Viz{<:Tuple{RectilinearGrid}}, ::Type{<:𝔼}, ::Val{2}, ::Val{2})
+  grid = plot[:object]
+  segmentcolor = plot[:segmentcolor]
+  segmentsize = plot[:segmentsize]
+
+  xyz = Makie.@lift map(x -> ustrip.(x), Meshes.xyz($grid))
+  tup = Makie.@lift xysegments($xyz...)
+  x, y = Makie.@lift($tup[1]), Makie.@lift($tup[2])
+  Makie.lines!(plot, x, y, color=segmentcolor, linewidth=segmentsize)
+end

ext/grid/structured.jl

@@ -32,9 +32,7 @@
       Makie.surface!(plot, X, Y, color=C)
 
       if showsegments[]
-        tup = Makie.@lift structuredsegments($grid)
-        x, y = Makie.@lift($tup[1]), Makie.@lift($tup[2])
-        Makie.lines!(plot, x, y, color=segmentcolor, linewidth=segmentsize)
+        vizfacets!(plot)
       end
     else
       vizmesh!(plot, M, pdim, edim)
@@ -44,6 +42,16 @@
   end
 end
 
+function vizgridfacets!(plot::Viz{<:Tuple{StructuredGrid}}, ::Type{<:𝔼}, ::Val{2}, ::Val{2})
+  grid = plot[:object]
+  segmentcolor = plot[:segmentcolor]
+  segmentsize = plot[:segmentsize]
+
+  tup = Makie.@lift structuredsegments($grid)
+  x, y = Makie.@lift($tup[1]), Makie.@lift($tup[2])
+  Makie.lines!(plot, x, y, color=segmentcolor, linewidth=segmentsize)
+end
+
 function structuredsegments(grid)
   cinds = CartesianIndices(size(grid) .+ 1)
   coords = []