version 1.2.8

Author: dmurdoch

DESCRIPTION

@@ -1,5 +1,5 @@
 Package: rgl
-Version: 1.2.1
+Version: 1.2.8
 Title: 3D Visualization Using OpenGL
 Authors@R: c(person("Duncan", "Murdoch", role = c("aut", "cre"),
                      email = "murdoch.duncan@gmail.com"),
@@ -53,7 +53,7 @@ VignetteBuilder: knitr, rmarkdown
 Biarch: true
 RoxygenNote: 7.2.2.9000
 NeedsCompilation: yes
-Packaged: 2023-07-04 13:17:31 UTC; murdoch
+Packaged: 2023-11-28 20:45:53 UTC; murdoch
 Author: Duncan Murdoch [aut, cre],
   Daniel Adler [aut],
   Oleg Nenadic [ctb],
@@ -78,4 +78,4 @@ Author: Duncan Murdoch [aut, cre],
   Mike Stein [ctb]
 Maintainer: Duncan Murdoch <murdoch.duncan@gmail.com>
 Repository: CRAN
-Date/Publication: 2023-07-06 00:10:42 UTC
+Date/Publication: 2023-11-29 00:10:02 UTC

MD5

@@ -1,7 +1,7 @@
 e73499cb89e0d6e97b8ba271c46739fd *COPYING
-e8bc0dbd1fe504327730562b9e4debbb *DESCRIPTION
-132b49539cf579eefe9be929d62dd65e *NAMESPACE
-f746aceb9cb4bff53c5d2be502175a02 *NEWS.md
+62377aa6b56ab2ff86d7a0f04e6d2d40 *DESCRIPTION
+853030f2297cc511e40b6722284a5639 *NAMESPACE
+d6c8f9c2202f69e6a241503cf8caffe5 *NEWS.md
 664118a44d0cbf5e0754bf2b3fcce21b *R/Sweave.R
 488aa117a50a2759259e34bb73705935 *R/addNormals.mesh3d.R
 d62767b6f3a51c93f666e30e437e5556 *R/animate.R
@@ -13,7 +13,7 @@ d62767b6f3a51c93f666e30e437e5556 *R/animate.R
 011c20203b9c8fa8663b21664ab6d555 *R/aspect3d.R
 29db2c9e83228ef7ccac4194e00acd5b *R/asy.R
 8d49afe0396a1e1c5510226c3ac26c7c *R/axes.R
-c18f99b589f2e3b990dbfadbeecdfc2b *R/bgplot3d.R
+44813d2e561df1618546736d261ed134 *R/bgplot3d.R
 3a722c07c1c3113fa89a32a0bf91f09d *R/buffer.R
 3e3efa920cd8e9de560177e7860e44f2 *R/callbacks.R
 2179470e4c58ed4fb8bb3f4f20353feb *R/clipMesh3d.R
@@ -51,14 +51,14 @@ fdd04f8889702ca3ffd4e2a46e1be2c5 *R/pkgchecks.R
 8a71f9a4807839a5a573442ab0ab7293 *R/pkgdown.R
 676f1c5ce2e20ae8387acb8a936d77df *R/playwidget.R
 ae7ca13011a8a6ca0956f684ceaee5da *R/plot3d.R
-005dcaa4e7ac7697fb9b8c64c8dacfec *R/plotmath3d.R
+2e0496fdbd878a17593d2ea5a927614e *R/plotmath3d.R
 6c65179fb5627597f264c331297dbe74 *R/plugin.R
 01de808d8c97b32aea562c674939e19a *R/ply.R
-89526da4bdb32ad6e3bc14018bdfdbfb *R/r3d.rgl.R
+1b487430bbfb664edc61e8a777ced79f *R/r3d.rgl.R
 a82494d493925454323cd8102200995d *R/rgl.bringtotop.R
 90d938b7a5e25ba1696d438518f9a2cc *R/rglMouse.R
 da053234d673ee26ad3a4034b143014f *R/rglcontroller.R
-231b2132b421068c10ed1f183fcd177e *R/rglwidget.R
+f33698f6a0ca0b17fe0823565578309a *R/rglwidget.R
 50efd82368dd3b4df9c217b8280cfda5 *R/saveURI.R
 00f2ba1a79e15c4bfa0d44fa398af5cf *R/scene.R
 173f11ad48795145a85e59406d434f9e *R/selectpoints3d.R
@@ -75,12 +75,12 @@ cafb08b2f8a5fc5ad72623e3b493b590 *R/testthat.R
 b3dd6af59f03c97611ad8f6632896fb5 *R/thigmophobe3d.R
 2e72fce267427a1271402c20b0133fa6 *R/tkpar3dsave.R
 045ea58eb2d624a009c89851a247fa80 *R/tkspin3d.R
-f7b793db8486245845eb168e63511e63 *R/triangulate.R
+b91d5a633bc9cd56dcc6716515582028 *R/triangulate.R
 c20ba1ca95350a9dd167a9b0f3ffae40 *R/turn3d.R
 df8eb36c57e8c90c13f55d69d6308609 *R/webGL.R
 a311022208404beca8c3e139ff0eb27c *R/webGLcontrols.R
 bf49a233d31d1b3db72726d570ee0918 *R/windows/noOpenGL.R
-5eb50684afb59cac746cdef46c82f720 *R/zzz.R
+87a9646f46fb8232406ee22c08dd760b *R/zzz.R
 e611f2bbfc42648e81876d566810acce *README.md
 da3414641fca13863970946266abd081 *build/vignette.rds
 10e89b551cff8c2453ea69fde1b97493 *cleanup
@@ -103,19 +103,19 @@ c56a043aa14d19271d1943429565d957 *demo/simpleShinyRgl.R
 5544dce93555cfaced50ee41283e9e58 *inst/demodata/region.dat
 6291532f8471d92e3d7b808fce8d74f0 *inst/doc/WebGL.R
 04a912c316f6e933c30c92008a06cb87 *inst/doc/WebGL.Rmd
-23a70bd1d7011efd4904e11bb7621514 *inst/doc/WebGL.html
+a8690c5de1525f5ced116296cab0adbf *inst/doc/WebGL.html
 1a39d184195d8300e4ffd8f057216269 *inst/doc/demos.R
 27512c3d7fc198808e91e11d1ef1ccbe *inst/doc/demos.Rmd
-516a0c968ab62bacd0fb54d0739228fd *inst/doc/demos.html
+5934fc9bc1217e43dd1c2a46cfb12485 *inst/doc/demos.html
 46750e778a5cdb4d65c347f8e43df623 *inst/doc/deprecation.R
 1bff15d0eb2a0059f739c6d9020c48cd *inst/doc/deprecation.Rmd
-7bec36c5bb2a107ff133a0500c8a6761 *inst/doc/deprecation.html
+6f7ff2b39548fb7a4dbe15b8d693bfa7 *inst/doc/deprecation.html
 d7cbcf7446607268da24a6ddf0c448a6 *inst/doc/pkgdown.R
 6227ee792d7fba32627b3fa51c882dd4 *inst/doc/pkgdown.Rmd
 e32351e94a1f1435d17fe4b5c27dfd90 *inst/doc/pkgdown.html
-86d3274f6f4412601fda1288f20ef492 *inst/doc/rgl.R
-6fdfbdf15a72e1643485f63b1773e0d9 *inst/doc/rgl.Rmd
-b786d57355523f3bb633a71c994ada0e *inst/doc/rgl.html
+16b66d3f0df6dec38f71d1c7327848d4 *inst/doc/rgl.R
+6c4c20e75dbdd36f3d913b0a1b73d835 *inst/doc/rgl.Rmd
+539f9fdd94f8d9f854abf760ce178a5e *inst/doc/rgl.html
 9cc7fbabd59616c69724412ddf87d9e3 *inst/doc/transparency.R
 002b07c7e555fada70d405ea390aacd2 *inst/doc/transparency.Rmd
 ed3d0ce551d81ba16c032574574949d9 *inst/doc/transparency.html
@@ -130,7 +130,7 @@ ad3b153c62394e7c510ec7ce6315378d *inst/htmlwidgets/lib/rglClass/JSDoc.json
 30830466b9fbdc4e59cd3219e357e6d6 *inst/htmlwidgets/lib/rglClass/buffer.src.js
 1135e5d04e71ff918b4248025fe555d9 *inst/htmlwidgets/lib/rglClass/controls.src.js
 34312535a858b5c5adb3fa5b578dd8cf *inst/htmlwidgets/lib/rglClass/draw.src.js
-a8d4d2b876215897f0da9e9cab7d418c *inst/htmlwidgets/lib/rglClass/init.src.js
+5626e807063a1ec1e3cea6b63a604c00 *inst/htmlwidgets/lib/rglClass/init.src.js
 b21d7ef4f3c0060e1cd7e264db2cdb4b *inst/htmlwidgets/lib/rglClass/mouse.src.js
 0144a563d14d284cf6092d408397d569 *inst/htmlwidgets/lib/rglClass/pieces.src.js
 f4fe316e7edf6f15d154c6e6e9300471 *inst/htmlwidgets/lib/rglClass/pretty.src.js
@@ -244,7 +244,7 @@ e8f9c80075f962f0ef737fef69a8acbf *man/rgl-duplicated.Rd
 2b5816560188e336594a47d3b0c55c51 *man/rgl.Sweave.Rd
 b5e10c72208b0f5ea350e16a41125d19 *man/rgl.attrib.info.Rd
 1ff53f1bd578f50f34371de05a52336e *man/rgl.bringtotop.Rd
-722e7a6a88dfb38bc66f82ab2e6680c4 *man/rgl.fns.Rd
+08a731b68340e8776762f278fa1ead9d *man/rgl.fns.Rd
 5dfa9e3fa93988f51ed6b48ee054f5f4 *man/rgl.getAxisCallback.Rd
 092c268370800d54d950953057bfb073 *man/rgl.init.Rd
 37ed09923795b7aaf6a603e0420f3d86 *man/rgl.pixels.Rd
@@ -258,6 +258,7 @@ e6d5c64583e9f07f55c3252ce6671b46 *man/rglExtrafonts.Rd
 61b93363555358915ea557e51f081d68 *man/rglShared.Rd
 de4e070d8d76b0f5820c6b0f8c4ce7f3 *man/rglToLattice.Rd
 e6c857b60936b561ebeb5f88fee24dda *man/rglwidget.Rd
+6079cba354e60254b3948332cb314c07 *man/safe.dev.off.Rd
 f19f7a5bc1765edc268c277838d898c6 *man/scene.Rd
 b1b940fb69f79f07b79e0978a4500165 *man/scene3d.Rd
 ef63bae9826deb1a816b27d241fd4e39 *man/sceneChange.Rd
@@ -492,7 +493,7 @@ fd582c1a065bcc399d386e66c8e1ef82 *src/subscene.cpp
 f8c8c445081c434c2c11e9389ebd540a *src/win32gui.cpp
 305ea9cb6c67ba53cd2e719ceb614479 *src/win32gui.h
 a93f7b56f763cabe646ff97b6bdf2aea *src/win32lib.cpp
-93b88e6e2bc06dd0cb1b18e2206103fe *src/x11gui.cpp
+57d1b620137708b19acc05abe9a334b2 *src/x11gui.cpp
 5a31996f072a8e64d3fd4a4b31879d0c *src/x11gui.h
 a3721c12b29d48604b94a7f31c8598e1 *src/x11lib.cpp
 c1cfc4a2398fb865c5cb4da26b1c5c8c *tests/bbox3dtests.R
@@ -526,6 +527,6 @@ a7fa1d2be854209389accfa66ff7febb *tools/winlibs.R
 27512c3d7fc198808e91e11d1ef1ccbe *vignettes/demos.Rmd
 1bff15d0eb2a0059f739c6d9020c48cd *vignettes/deprecation.Rmd
 6227ee792d7fba32627b3fa51c882dd4 *vignettes/pkgdown.Rmd
-6fdfbdf15a72e1643485f63b1773e0d9 *vignettes/rgl.Rmd
+6c4c20e75dbdd36f3d913b0a1b73d835 *vignettes/rgl.Rmd
 fcccffec89f4caa7d5cc5b2d21079d3c *vignettes/setup.R
 002b07c7e555fada70d405ea390aacd2 *vignettes/transparency.Rmd

NAMESPACE

@@ -45,6 +45,7 @@ export(.check3d,
   scale3d, scaleMatrix, scene3d, segments3d, 
   select3d, selectionFunction3d, selectpoints3d,
   rgl.setAxisCallback, rgl.setMouseCallbacks, rgl.setWheelCallback,
+  safe.dev.off,
   set3d, setAxisCallbacks, setGraphicsDelay, setupKnitr, 
   setUserCallbacks, setUserShaders, shade3d, shadow3d,
 
@@ -167,8 +168,8 @@ export(.check3d,
 
  importFrom(graphics, legend, par, plot, plot.new, polygon,
        strwidth, strheight)
- importFrom(grDevices, as.raster, col2rgb, colorRamp, dev.cur, dev.new, 
-       dev.off, png, postscript, rgb, xy.coords, xyz.coords)
+ importFrom(grDevices, as.raster, col2rgb, colorRamp, dev.cur, dev.list, dev.new,
+       dev.off, dev.prev, dev.set, png, postscript, rgb, xy.coords, xyz.coords)
  importFrom(stats, approxfun, get_all_vars, model.frame, 
       qchisq, qf, splinefun, terms, var)
  importFrom(tools, file_ext)

NEWS.md

@@ -1,3 +1,21 @@
+# rgl 1.2.8
+
+## Minor changes
+
+* ARIA support now declares `rgl` scenes with `role = "img"`.
+
+## Bug fixes
+
+* The ARIA support caused `htmlwidgets::saveWidget()` to fail when
+run in a Shiny session.
+* `text3d()` and `mtext3d()` did not pass the `cex` argument to 
+`plotmath3d()` (pull request #384).
+* `polygon3d()` failed when given exactly 3 points (issue #388).
+* `snapshot3d()` failed on Windows with some versions of `webshot2` (issue #391).
+* Fixed issues caused by misuse of `dev.off()` using new function
+`safe.dev.off()`.
+* Fixed issue with `warning()` call reported by CRAN.
+
 # rgl 1.2.1
 
 ## Major changes

R/bgplot3d.R

@@ -1,3 +1,16 @@
+safe.dev.off  <- function(which = dev.cur(), prev = dev.prev()) {
+  if (which != 1) {
+    force(prev)
+    grDevices::dev.off(which)
+  }
+  if (length(dev.list()))
+    dev.set(prev)
+  else
+    c("null device" = 1)
+}
+
+dev.off <- function(...) stop("Use safe.dev.off() instead!")
+  
 legend3d <- function(...) {
   args <- list(...)
   bgargs <- setdiff(names(formals(bgplot3d)),
@@ -26,7 +39,7 @@ bgplot3d <- function(expression, bg.color = getr3dDefaults("bg", "color"),
         bg = bg.color)
     grDevices::devAskNewPage(FALSE)
     value <- try(expression)  
-    dev.off()
+    safe.dev.off()
     result <- bg3d(texture = filename, col = "white", lit = FALSE, ...)
   } else {
     value <- NULL
@@ -61,7 +74,7 @@ show2d <- function(expression,
     filename <- tempfile(fileext = ".png")
     png(filename = filename, width=width, height=height)
     value <- try(expression)  
-    dev.off()
+    safe.dev.off()
   } else
     value <- filename
   face <- c(strsplit(face, '')[[1]], '-')[1:2]

R/plotmath3d.R

@@ -33,7 +33,7 @@ plotmath3d <- function(x, y = NULL, z = NULL,
     w <- strwidth(thistext, cex = initCex, ...)
     w1 <- strwidth("m", cex = initCex, ...)
     h <- strheight(thistext, cex = initCex, ...)
-    dev.off()
+    safe.dev.off()
 
     # Now make a smaller bitmap
     expand <- 1.5
@@ -44,7 +44,7 @@ plotmath3d <- function(x, y = NULL, z = NULL,
         usr = c(0, 1, 0, 1))
     plot.new()
     text(0.5, 0.5, thistext, adj = c(0.5,0.5), cex = initCex, ...)
-    dev.off()
+    safe.dev.off()
     # The 0.4 tries to match the text3d offset
     offseti <- 0.4*offset*h/w
     posi <- if (is.null(pos)) NULL else pos[i]

R/r3d.rgl.R

@@ -496,7 +496,7 @@ text3d      <- function(x, y = NULL, z = NULL,
 			...) {
   if (usePlotmath) 
     return(plotmath3d(x = x, y = y, z = z, text = texts, adj = adj, 
-                      pos = pos, offset = offset, ...))
+                      pos = pos, offset = offset, cex = cex, ...))
   .check3d(); save <- material3d(); on.exit(material3d(save))
   do.call("rgl.material0", .fixMaterialArgs(..., Params = save))
   # Force evaluation
@@ -1070,6 +1070,8 @@ snapshot3d <- function(filename = tempfile(fileext = ".png"),
       scene <- scene3d()
     rect <- par3d("windowRect")
     f1 <- tempfile(fileext = ".html")
+    # Work around path issue in webshot2:
+    f1 <- normalizePath(f1, winslash = "/", mustWork = FALSE)
     on.exit(unlink(f1), add = TRUE)
     width <- rect[3] - rect[1]
     height <- rect[4] - rect[2]

R/rglwidget.R

@@ -402,8 +402,14 @@ ariaLabelId <- function(id)
   paste0(id, "-aria")
 
 widget_html.rglWebGL <- function(id, style, class, ...){
-  tags$div(id = id, style = style, class = class, 
+  result <- tags$div(id = id, style = style, class = class, role = "img",
            "aria-labelledby" = ariaLabelId(id))
+  # In shiny, we need to write the alt text label.
+  if (inShiny())
+    result <- tags$div(tags$p("3D plot 1", id = ariaLabelId(id),
+                                                 hidden = NA),
+                       result)
+  result
 }
 
 print.rglMouseSelection <- function(x, verbose = FALSE, ...) {

R/triangulate.R

@@ -43,6 +43,7 @@ triangulateSimple <- function(x,y, random=TRUE, plot=FALSE, partial=NA) {
 
   it <- matrix(NA_integer_, nrow=3, ncol=n-2)
   verts <- seq_len(n)
+  good <- TRUE  # 3 vertices are always good PR#388
   while((m <- length(verts)) > 3) {
     i1 <- 1:m
     i2 <- i1 %% m + 1

R/zzz.R

@@ -22,17 +22,17 @@
 
   getDir <- function(useNULL) {
     if (in_pkgload_loadall()) {
-      dir <- if (useNULL) "inst/useNULL" else "src"
+      dir <- if (useNULL) file.path("inst", "useNULL") else "src"
     } else {
       dir <- if (useNULL) "useNULL" else "libs"
       if (nchar(.Platform$r_arch))
-        dir <- paste0(dir, "/", .Platform$r_arch)
+        dir <- file.path(dir, .Platform$r_arch)
     }
     dir
   }
 
   getDynlib <- function(dir)
-    system.file(paste0(dir, "/rgl", .Platform$dynlib.ext), 
+    system.file(dir, paste0("rgl", .Platform$dynlib.ext), 
                 package = pkg, lib.loc = lib,
                 mustWork = TRUE)
 
@@ -83,10 +83,10 @@
   if (onlyNULL) {
     rglFonts(serif = rep("serif", 4), sans = rep("sans", 4), mono = rep("mono", 4), symbol = rep("symbol", 4))
   } else {
-    rglFonts(serif = rep(system.file("fonts/FreeSerif.ttf", package="rgl"), 4),
-             sans  = rep(system.file("fonts/FreeSans.ttf", package="rgl"), 4),
-             mono  = rep(system.file("fonts/FreeMono.ttf", package="rgl"), 4),
-             symbol = rep(system.file("fonts/FreeSerif.ttf", package="rgl"), 4))
+    rglFonts(serif = rep(system.file("fonts", "FreeSerif.ttf", package="rgl"), 4),
+             sans  = rep(system.file("fonts", "FreeSans.ttf", package="rgl"), 4),
+             mono  = rep(system.file("fonts", "FreeMono.ttf", package="rgl"), 4),
+             symbol = rep(system.file("fonts", "FreeSerif.ttf", package="rgl"), 4))
     if (requireNamespace("extrafont", quietly = TRUE))
       suppressWarnings(
         rglExtrafonts(sans = c("Helvetica", "Arial"), 
@@ -115,7 +115,7 @@
            !(.Platform$GUI %in% c("AQUA", "RStudio"))) &&
          exists("quartz", getNamespace("grDevices"))) {
     grDevices::quartz()
-    dev.off()
+    safe.dev.off()
   }
 
   ret <- rgl.init(initValue, onlyNULL)

inst/doc/WebGL.html

@@ -12,7 +12,7 @@
 
 <meta name="author" content="Duncan Murdoch" />
 
-<meta name="date" content="2023-07-04" />
+<meta name="date" content="2023-11-28" />
 
 <title>Deprecating the rgl.* interface</title>
 
@@ -341,7 +341,7 @@
 <h1 class="title toc-ignore">Deprecating the <code>rgl.*</code>
 interface</h1>
 <h4 class="author">Duncan Murdoch</h4>
-<h4 class="date">2023-07-04</h4>
+<h4 class="date">2023-11-28</h4>
 
 
 <div id="TOC">

inst/doc/demos.html

@@ -40,7 +40,7 @@ decorate3d()
 bg3d("lightgray")
 aspect3d(1,1,1)
 
-## ---- eval = FALSE------------------------------------------------------------
+## ----eval = FALSE-------------------------------------------------------------
 #  myview <- par3d("userMatrix")
 #  # ... later ...
 #  par3d(userMatrix = myview)
@@ -49,7 +49,7 @@ aspect3d(1,1,1)
 filename <- tempfile(fileext = ".png")
 png(filename = filename)
 plot(rnorm(1000), rnorm(1000))
-dev.off()
+safe.dev.off()
 open3d()
 xyz <- cbind(c(0,1,1,0), 0, c(0,0,1,1))
 quads3d(xyz, texture = filename, texcoords = xyz[,c(1, 3)]*2, 

inst/doc/deprecation.html

@@ -374,7 +374,7 @@ because the texture coordinates run from 0 to 2 in both
 filename <- tempfile(fileext = ".png")
 png(filename = filename)
 plot(rnorm(1000), rnorm(1000))
-dev.off()
+safe.dev.off()
 open3d()
 xyz <- cbind(c(0,1,1,0), 0, c(0,0,1,1))
 quads3d(xyz, texture = filename, texcoords = xyz[,c(1, 3)]*2,