Handle smooth = FALSE objects by modifying them in convertScene().

DESCRIPTION

@@ -1,5 +1,5 @@
 Package: rgl
-Version: 1.3.13
+Version: 1.3.14
 Title: 3D Visualization Using OpenGL
 Authors@R: c(person("Duncan", "Murdoch", role = c("aut", "cre"),
                      email = "[email protected]"),

NEWS.md

@@ -1,4 +1,4 @@
-# rgl 1.3.13
+# rgl 1.3.14
 
 ## Minor changes
 
@@ -12,6 +12,8 @@ background could create a leak of a background object
 (issue #439).  For back compatibility, these cases
 still increment the object ID number, but don't
 actually create a new object.
+* `rglwidget()` displays didn't support objects with
+`smooth = FALSE`.
 
 # rgl 1.3.12
 

R/convertScene.R

@@ -422,7 +422,8 @@ convertScene <- function(x = scene3d(minimal), width = NULL, height = NULL,
       }
       if (!is.null(obj$material)) # Never use material$color
         obj$material$color <- NULL
-
+      if (!is.null(obj$material) && !is.null(obj$material$smooth) && !obj$material$smooth)
+        obj <- nonSmooth(obj)
     } else if (obj$type == "subscene") {
       obj$par3d$viewport$x <- obj$par3d$viewport$x/fullviewport$width
       obj$par3d$viewport$width <- obj$par3d$viewport$width/fullviewport$width
@@ -502,3 +503,61 @@ convertScene <- function(x = scene3d(minimal), width = NULL, height = NULL,
 
   result
 }
+
+# Modify objects that have smooth = FALSE.  Convert
+# surfaces to triangles, add vertices so that we can
+# set all triangles or quads to solid colours.
+
+nonSmooth <- function(obj) {
+  oldcolors <- obj$colors
+  ncolors <- NROW(oldcolors)
+  if (ncolors > 1) {
+    if (obj$type == "surface") {
+      dim <- obj$dim
+      ul <- rep(2:dim[1], dim[2]-1) + dim[1]*rep(0:(dim[2]-2), each=dim[1]-1) 
+      if (obj$flipped) 
+        indices <- c(rbind(ul-1,
+                           ul, 
+                           ul-1+dim[1],
+                           ul+dim[1],
+                           ul-1+dim[1],
+                           ul
+                           ))
+      else
+        indices <- c(rbind(ul, 
+                           ul-1,
+                           ul-1+dim[1],
+                           ul-1+dim[1],
+                           ul+dim[1],
+                           ul))
+    } else
+      indices <- obj$indices
+
+    if (!is.null(indices)) {
+      obj$vertices <- obj$vertices[indices,]
+      oldcolors <- obj$colors[indices,]
+      obj$normals <- obj$normals[indices,]
+      if (!is.null(obj$texcoords))
+        obj$texcoords <- obj$texcoords[indices,]
+      obj$indices <- NULL
+    }
+    newcolors <- oldcolors
+    i <- seq_len(NROW(newcolors))
+    nverts <- switch(obj$type,
+                    "triangles" = 3,
+                    "quads"     = 4,
+                    "surface"   = 6)
+
+    for (j in seq_len(nverts-1))
+      newcolors[i %% nverts == j] <- newcolors[i %% nverts == 0]
+    obj$colors <- newcolors
+    if (obj$type == "surface") {
+      obj$type <- "triangles"
+      obj$dim <- NULL
+      obj$centers <- (obj$vertices[i %% 3 == 0,] +
+                      obj$vertices[i %% 3 == 1,] +
+                      obj$vertices[i %% 3 == 2,])/3
+    }
+  }
+  obj
+}

man/axes3d.Rd

@@ -131,7 +131,10 @@ objects added to the scene.
 \author{ Duncan Murdoch }
 
 \seealso{Classic graphics functions \code{\link{axis}}, \code{\link{box}},
-\code{\link{title}}, \code{\link{mtext}}, and RGL function \code{\link{bbox3d}}.}
+\code{\link{title}}, \code{\link{mtext}} are related.
+See RGL functions \code{\link{bbox3d}} for drawing the 
+box around the plot, and
+\code{\link{setAxisCallbacks}} for customized axes.}
 
 \examples{
   open3d()