version 0.100.54

Author: dmurdoch

DESCRIPTION

@@ -1,8 +1,8 @@
 Package: rgl
-Version: 0.100.50
+Version: 0.100.54
 Title: 3D Visualization Using OpenGL
-Author: Daniel Adler <dadler@uni-goettingen.de>, Duncan Murdoch <murdoch@stats.uwo.ca>, and others (see README)
-Maintainer: Duncan Murdoch <murdoch@stats.uwo.ca>
+Author: Daniel Adler <dadler@uni-goettingen.de>, Duncan Murdoch <murdoch.duncan@gmail.com>, and others (see README)
+Maintainer: Duncan Murdoch <murdoch.duncan@gmail.com>
 Depends: R (>= 3.2.0)
 Suggests: MASS, rmarkdown, deldir, orientlib, lattice, misc3d,
         rstudioapi, magick, plotrix (>= 3.7-3), tripack, interp,
@@ -23,6 +23,6 @@ SystemRequirements: OpenGL, GLU Library, XQuartz (on OSX), zlib
 BugReports: https://r-forge.r-project.org/projects/rgl/
 VignetteBuilder: knitr
 NeedsCompilation: yes
-Packaged: 2020-02-21 09:22:13 UTC; murdoch
+Packaged: 2020-04-14 13:23:23 UTC; murdoch
 Repository: CRAN
-Date/Publication: 2020-02-21 13:50:02 UTC
+Date/Publication: 2020-04-14 14:40:02 UTC

MD5

@@ -1,5 +1,5 @@
 e73499cb89e0d6e97b8ba271c46739fd *COPYING
-9e86faeda908a1a5357b718d2f467878 *DESCRIPTION
+af8c8487138ec20511552e7de0b046c5 *DESCRIPTION
 c67b12a9c9dbfc6590657d9c4ddd81bb *NAMESPACE
 8d6709606696359548d94a4bf71ce78d *R/Sweave_knitr.R
 3c20a30ef6a398649341d9b1f227cb7d *R/addNormals.mesh3d.R
@@ -12,17 +12,17 @@ e137c0c0a50d2845895cae06ba0f2100 *R/as.mesh3d.default.R
 853ac34ab3568c44d0326e6f89ccd68d *R/aspect3d.R
 944fce42bd08fa6c43e549dc324b7569 *R/asy.R
 af2817585e3d1db7bd4adbba29992ec1 *R/axes.R
-0d177811e81da6e611f6046344030c78 *R/bgplot3d.R
+5165afd45dfd2e9162999cd94c7b3693 *R/bgplot3d.R
 4b36f1447badb49dd32d3283e52f95e5 *R/callbacks.R
 8f3f5be7d7a1a66d929896b09a0cafd3 *R/clipMesh3d.R
 149f8a63713267831727369515a66e8c *R/conversions.R
-07d75142c05fc20372291be26d870889 *R/convertScene.R
+4400a38371b2ba6ca4fc15af11508696 *R/convertScene.R
 be6d6da7d96a3b4812139e0301df398d *R/cylinder3d.R
 ffb8448189e3630ac18504eb6674ef01 *R/device.R
 5e855bf30c385ae3c1b662a862d3bb5a *R/ellipse3d.R
 12d5ff40654540e28cc4a37e6129cdaf *R/enum.R
 ab542483bf671cb977c1680b2ad4568a *R/fonts.R
-97a6f25edd1b190eb679fea8b268ac36 *R/getscene.R
+2d1803eb45cfb38ecfa30038aca98bfc *R/getscene.R
 0c40436b76d2257a47a2d1b514f76d90 *R/grid3d.R
 70f4f248a876dde16a5dc1117ec6208c *R/hooks.R
 ecdeca7d0766658fcb1189ce421c507d *R/identify3d.R
@@ -40,28 +40,29 @@ bf0b85110de1587de80fd3eeceabea10 *R/persp3d.R
 ab72f9571814ef8c44de6f2343b547c1 *R/plotmath3d.R
 5db8162592367d6c81d18719b1ae3154 *R/plugin.R
 7c156818e20bab511277a1851b4d09c4 *R/ply.R
-aa5c099d0ea7a9a13de77afd10efa0aa *R/r3d.rgl.R
+88caed86c240468e5f2147befd553326 *R/r3d.rgl.R
 a82494d493925454323cd8102200995d *R/rgl.bringtotop.R
 16799b9a7f5ee8eb00c2059ee948d261 *R/rglMouse.R
-d1ea9aafe532dda4dee6b213b90b18f8 *R/rglcontroller.R
-b66396283520cbf4f9b3e5368dba697b *R/rglwidget.R
+e1209a2537d66db12daf7fcef2bbade3 *R/rglcontroller.R
+a56c1219a826fdd541ce6dc0c5f063a4 *R/rglwidget.R
 970ef611998a8ce5edc8ee13e61b2ba7 *R/scene.R
 06ca697fc07bde9e5d06d936bb4ad5e9 *R/selectpoints3d.R
-a92f06f33fc88700e73e7928ccec18ef *R/setUserShaders.R
+f19648fe361d1d7fb42a19c502685dce *R/setUserShaders.R
 87acc66c9ed05a5d53e620047c16dfbf *R/shapelist3d.R
 b8fcaff709d438c64fe31c712b04a30a *R/solids3d.R
 8dc214a6b3f270d593edfe45fe98f8b4 *R/stl.R
 8e6fc28639afd562efd50974058160ac *R/subdivision.mesh3d.R
-a1f7b5422a13c64dbf75d3215f57b2c1 *R/subscenes.R
+1e5f958e21310fe2983145fc5440f9f9 *R/subscenes.R
 3c030acca34f88270334c69e511a240f *R/thigmophobe3d.R
 37c4cfffd93840992a9feaf0cd0f7684 *R/tkpar3dsave.R
 dd70ae5d2dba8758e2c694b30b2248d7 *R/tkspin3d.R
 5bd916f84d651ec3c477700ea73ade49 *R/triangulate.R
 3447eb732f99d8015c8575c9a4e5077e *R/turn3d.R
 0510e98135fa6b5d756250ca24195514 *R/webGL.R
 19a59bb1f17af961b763722f93b8d9f4 *R/webGLcontrols.R
+ca81064baf24c0194a77bda03a36c709 *R/withPrivateSeed.R
 310fc8eea3ab8fe74cf72adc7885a400 *R/zzz.R
-df2624d49e00f56c06ce339040b035ca *README
+d8c740550168979501357c12d85582c1 *README
 4cad81b9b1a4447c0f0743d8d8bef481 *build/vignette.rds
 a6a183397bea52041e6eebb1e2609eb2 *cleanup
 0d50480168b64d978c9e8fd97eb3bd5d *configure
@@ -85,19 +86,19 @@ df244a7d325a77c36f2312f2fde095f2 *demo/shapes3d.R
 a8cbd8dd339ba65adf23a165a8dfeef6 *demo/simpleShinyRgl.R
 c8c00de09de689b87c63a76eea76411e *demo/stereo.R
 dcc5831ad42188371b50ee2ae5f64f9c *demo/subdivision.r
-1396f95395b2eb2878012bc4a56cee4f *inst/NEWS
+220693c0f3055738ac59ece9faf1f4a1 *inst/NEWS
 8c5d291e3f47c3395fff092f09f599b9 *inst/WebGL/template.html
 5bac46c36b13eac1302260ee06b16c0f *inst/demodata/population.dat
 5544dce93555cfaced50ee41283e9e58 *inst/demodata/region.dat
 c40cc4e10cb5dd80db13f19928d94432 *inst/doc/WebGL.R
 19e0a2a03dcbf4352326d218cd921f76 *inst/doc/WebGL.Rmd
-1b51a442297f4e2c830f832dec4223ae *inst/doc/WebGL.html
+c770f928b2773f39238a8d44de156ae6 *inst/doc/WebGL.html
 d1211c7d09cac42687b895ea891260df *inst/doc/legacyWebGL.R
 aab81d9a5de33a179945af7343f02079 *inst/doc/legacyWebGL.Rmd
-51466eb814344bbdb4f30a53d3088736 *inst/doc/legacyWebGL.html
+4db4cab73d52c0223fc3fc815f71bd9a *inst/doc/legacyWebGL.html
 2dc1020285c498f2c851d1f94ddb29fc *inst/doc/rgl.R
 a80221c67a85e2195f92ea482c301a01 *inst/doc/rgl.Rmd
-2f4636e80c4a31c6f93fa36469231bea *inst/doc/rgl.html
+dab0384c8971ba592a46b0f3c022157e *inst/doc/rgl.html
 b4ef592c88333c7c509dd74fcd1912d9 *inst/fonts/FreeMono.ttf
 867469f13ff81dec9adf2ae2f6ea2899 *inst/fonts/FreeSans.ttf
 dc0004a804503e126bc99998c7a1c677 *inst/fonts/FreeSerif.ttf
@@ -139,7 +140,7 @@ e54c3b2accf9b373c879cb8ff3e32527 *man/attributes.Rd
 0cf6103623fa50a9279cc22d95c58a82 *man/axes3d.Rd
 550ac2cbf490eca10620e32be4ed5702 *man/bbox.Rd
 9002b792cbe9361484072d5924b0011d *man/bg.Rd
-ae6be20ca75075f5d1d23383df9efd9b *man/bgplot3d.Rd
+ab08a8ddcbe41cdb138988ed7f729f4e *man/bgplot3d.Rd
 9be53c0e1daf5032ebdf924003576672 *man/callbacks.Rd
 dd065d7a4231b33a55488a3a4535bf7f *man/check3d.Rd
 0f08f21288ba272b1b3e27347fb688ec *man/clipMesh3d.Rd
@@ -158,7 +159,7 @@ a64a9cfdee0b69302eca9e8e10b69f40 *man/material.Rd
 7d57f553532670c6fb7e3dcc70afc75e *man/matrices.Rd
 8e17034b1326086ed51e16515be6728c *man/mergeVertices.Rd
 a80d344c65109139002e39b215c4d167 *man/mesh3d.Rd
-84507e788d68dc3738ddffa546095892 *man/mfrow3d.Rd
+64c713af1c944575f4abc0bcbc205fec *man/mfrow3d.Rd
 e70a34e3f2998e17d21caf686134d595 *man/observer3d.Rd
 5c3741a728df6fe539cea0b63848f89a *man/par3d.Rd
 1d6b064fded56df155d97bf4d92a3feb *man/par3dinterp.Rd
@@ -197,13 +198,13 @@ e6f44aec1d7445b52e71166d0e7f1e82 *man/rgl.user2window.Rd
 436d7a5147e7b9fea1c673c921912e88 *man/rglMouse.Rd
 859320e005b22dea7bb1c15dbcc6b4a6 *man/rglShared.Rd
 44b047e65d61f01c07be6515ea267d20 *man/rglToLattice.Rd
-22f381c5b03ff4f9df7b3e3501ebb1f7 *man/rglwidget.Rd
+6236a853e7c6fe79d3d2b502968ebbee *man/rglwidget.Rd
 2b1ff289f36ce3eeee989d15d233bf72 *man/scene.Rd
-60cff8998acc2306f4ec9174b9234b19 *man/scene3d.Rd
-6a3bd7a3272edd2796fd5a886f510363 *man/sceneChange.Rd
+c49941a4125939003e54ba30b5cdf92a *man/scene3d.Rd
+ef63bae9826deb1a816b27d241fd4e39 *man/sceneChange.Rd
 f0626af98629e62356fdec378731e240 *man/select3d.Rd
 aa00aee06c005e7cab45e5d213a1ac49 *man/selectpoints3d.Rd
-1f682db573b5f218956b8fa097bac9c8 *man/setUserShaders.Rd
+2e666f241a03e35cf75ce0476011a44c *man/setUserShaders.Rd
 d71689c55996c3f624c5005eef65f77f *man/shapelist3d.Rd
 3732f36a9aef0c534d44b69b05a0de7c *man/shiny.Rd
 0e2d61d0d0431eed5d54a9ffa65cd427 *man/shinyGetPar3d.Rd
@@ -230,7 +231,7 @@ fb8c99c331048bfeb6d0f41efa19304a *man/vertexControl.Rd
 ddfd766c2131b58e6e3d9306bccfecd9 *man/viewpoint.Rd
 dbcfb845f505ec79e07cfdeabd904b65 *man/webGLcontrols.Rd
 384a5804c8811439edce2f47ff3a7a0f *man/writeASY.Rd
-f9ad730e504485e70f473223bcf96a42 *man/writeOBJ.Rd
+10ad186b1938429176769368fbdb053d *man/writeOBJ.Rd
 61f8fceba1d4a260ffd078fb6bdd95e3 *man/writePLY.Rd
 ad3e80be430d66229eb4b4b6a4a4a15a *man/writeWebGL.Rd
 d8fa5bf811ae1d9584054ed1a367a6be *po/R-rgl.pot
@@ -261,8 +262,8 @@ acad6cffd4dac8a0e2897f68d48295ea *src/Material.h
 cb057244e58014e2d998da89dfad98c6 *src/PlaneSet.cpp
 1b510976127456879201e4e737a6fcb4 *src/PlaneSet.h
 63cabba14319bcaf9e15b9c65703ad4e *src/PointSet.cpp
-b504726b3617de06edb294403bfdd4f9 *src/PrimitiveSet.cpp
-6c7d45ab782bea849c42fae7353b3570 *src/PrimitiveSet.h
+8d6aba19a3ac8a83166dea80b0b6d719 *src/PrimitiveSet.cpp
+872eac40e4c0ebbf1bbe6db983d631a1 *src/PrimitiveSet.h
 a690ee6caf929116ca61fd2a97cd328e *src/R.h
 9dd4aa8ad74533c5cd129a03d93c81df *src/RenderContext.cpp
 2397bb9b330dc081bc2a8db7e8a6abcb *src/RenderContext.h
@@ -422,8 +423,8 @@ b985cdd20012077c984305a975113264 *src/pixmap.cpp
 0f3cbcc107a805669552e140ede08ed7 *src/pragma.h
 92ea7a1b8a4633f4d0b1dfb3dfb60179 *src/pretty.c
 28ba9504069a992227eec0a430d4803e *src/pretty.h
-07d0048dff2eb0bd011ca3614a3132ec *src/render.cpp
-9682d9ed2f09de4c1e42f7be501190e7 *src/render.h
+6b80357033a35398a70c9ee4e0a89f27 *src/render.cpp
+bf2cba6c9ed0e3321cd48c702f3f1b67 *src/render.h
 d140e13b2a81bf64aca893a3de84c40f *src/rgl-win.def
 8e13be35eb1fd484abf6cf04137fb814 *src/rglmath.cpp
 ee0226c488b0e1e5ed19cc86879865ba *src/rglmath.h
@@ -445,4 +446,4 @@ bb033aaefa628fb5e2c2eb0628db269c *src/x11lib.cpp
 19e0a2a03dcbf4352326d218cd921f76 *vignettes/WebGL.Rmd
 aab81d9a5de33a179945af7343f02079 *vignettes/legacyWebGL.Rmd
 a80221c67a85e2195f92ea482c301a01 *vignettes/rgl.Rmd
-e9a24591721d9f4f142087bae6936a9e *vignettes/setup.R
+f460ceccdba22e6026d718bc8b175f6c *vignettes/setup.R

R/bgplot3d.R

@@ -1,6 +1,6 @@
 legend3d <- function(...) {
   args <- list(...)
-  idx <- which(names(args) %in% c("sphere", "fogtype"))
+  idx <- which(names(args) %in% c("sphere", "fogtype", "bg.color"))
   if (length(idx)) {
     bgargs <- args[idx]
     args <- args[-idx]
@@ -13,19 +13,21 @@ legend3d <- function(...) {
   })), bgargs))
 }
 
-bgplot3d <- function(expression, ...) {
+bgplot3d <- function(expression, bg.color = getr3dDefaults()$bg$color, 
+                     ...) {
   viewport <- par3d("viewport")
   width <- viewport["width"]
   height <- viewport["height"]
   if (width > 0 && height > 0) {
     filename <- tempfile(fileext = ".png")
-    png(filename = filename, width=width, height=height)
+    png(filename = filename, width = width, height = height,
+        bg = bg.color)
     value <- try(expression)  
     dev.off()
-    result <- bg3d(texture=filename, col="white", lit = FALSE, ...)
+    result <- bg3d(texture = filename, col = "white", lit = FALSE, ...)
   } else {
     value <- NULL
-    result <- bg3d(col="white", ...)
+    result <- bg3d(col = bg.color, ...)
   }
   lowlevel(structure(result, value = value))
 }

R/convertScene.R

@@ -1,6 +1,7 @@
 
-convertScene <- function(x = scene3d(), width = NULL, height = NULL, reuse = NULL,
-                         snapshot = FALSE, elementId = NULL) {
+convertScene <- function(x = scene3d(minimal), width = NULL, height = NULL, reuse = NULL,
+                         snapshot = FALSE, elementId = NULL,
+                         minimal = TRUE) {
 
   # Lots of utility functions and constants defined first; execution starts way down there...
 
@@ -361,7 +362,7 @@ convertScene <- function(x = scene3d(), width = NULL, height = NULL, reuse = NUL
     open3d()
     ids <- convertBBoxes(result$rootSubscene)
     origIds <- attr(ids, "origIds")
-    scene <- scene3d()
+    scene <- scene3d(minimal)
     temp <- lapply(as.character(ids),
              function(id) {
                x <- scene$objects[[id]]
@@ -384,7 +385,7 @@ convertScene <- function(x = scene3d(), width = NULL, height = NULL, reuse = NUL
     open3d()
     result$brushId <- brushId <- createBrush()
     brush <- as.character(result$brushId)
-    scene <- scene3d()
+    scene <- scene3d(minimal)
     result$objects[[brush]] <- scene$objects[[brush]]
     rgl.close()
     if (dev)

R/getscene.R

@@ -1,4 +1,4 @@
-scene3d <- function() {
+scene3d <- function(minimal = TRUE) {
 
   saveSubscene <- currentSubscene3d()
   on.exit(useSubscene3d(saveSubscene))
@@ -16,13 +16,19 @@ scene3d <- function() {
   getObject <- function(id, type) {
     result <- list(id=id, type=type)
 
-    if (!(type %in% c("light", "clipplanes")))
-      result$material <- matdiff(rgl.getmaterial(id=id))
+    if (!(type %in% c("light", "clipplanes"))) {
+      mat <- rgl.getmaterial(id=id)
+      lit <- mat$lit
+      result$material <- matdiff(mat)
+    } else
+      lit <- FALSE
 
-    attribs <- c("vertices", "normals", "colors", "texcoords", "dim",
+    attribs <- c("vertices", "colors", "texcoords", "dim",
           "texts", "cex", "adj", "radii", "ids",
           "usermatrix", "types", "offsets", "centers",
           "family", "font", "pos")
+    if (lit || !minimal || type %in% c("light", "clipplanes"))
+      attribs <- c(attribs, "normals")
     for (a in attribs) 
       if (rgl.attrib.count(id, a))
         result[[a]] <- rgl.attrib(id, a)
@@ -212,8 +218,8 @@ plot3d.rglsubscene <- function(x, objects, root = TRUE, ...) {
 			    newviewport = x$par3d$viewport,
 			    copyLights = FALSE)
 
-  if (!is.null(x$par3d$listeners))
-    par3d(listeners = x$par3d$listeners, subscene = subscene) 
+  listeners <- list(x$par3d$listeners) # list contains old ids
+  names(listeners) <- subscene         # names are new ids
 
   results <- subscene
   names(results) <- paste0("subscene", as.character(x$id))
@@ -230,21 +236,22 @@ plot3d.rglsubscene <- function(x, objects, root = TRUE, ...) {
     useSubscene3d(subscene)
     res <- plot3d(x$subscenes[[i]], objects, root=FALSE, ...)
     results <- c(results, res$results)
+    listeners <- c(listeners, res$listeners)
     objects <- res$objects
   }
   if (root) {
     # Translate all the listener values
     dotranslations <- function(id) {
       info <- subsceneInfo(id = id)
-      oldlisteners <- par3d("listeners", subscene = id)
+      oldlisteners <- listeners[[as.character(id)]]
       par3d(listeners = results[paste0("subscene", oldlisteners)], subscene = id)
       for (child in info$children)
         dotranslations(child)
     }
     dotranslations(subscene)
     return(results)
   } else
-    return(list(results=results, objects=objects))
+    return(list(results=results, objects=objects, listeners=listeners))
 }
 
 plot3d.rglobject <- function(x, ...) {

R/r3d.rgl.R

@@ -4,9 +4,19 @@
 
 # Node Management
 
-getr3dDefaults <- function() 
-    tryCatch(get("r3dDefaults", envir=.GlobalEnv),
-	     error = function(e) r3dDefaults)
+getr3dDefaults <- function() {
+  result <- r3dDefaults
+  if (exists("r3dDefaults", envir = globalenv())) {
+    user <- get("r3dDefaults", envir=.GlobalEnv)
+    for (n in names(user)) {
+      if (is.list(result[[n]]))
+        result[[n]][names(user[[n]])] <- user[[n]]
+      else
+        result[[n]] <- user[[n]]
+    }
+  }
+  result
+}
 
 clear3d     <- function(type = c("shapes", "bboxdeco", "material"), 
                         defaults=getr3dDefaults(),

R/rglcontroller.R

@@ -210,10 +210,11 @@ elementId2Prefix <- function(elementId, prefix = elementId) {
 
 # This puts together a custom message for a more extensive change
 
-sceneChange <- function(elementId, x = scene3d(),
+sceneChange <- function(elementId, x = scene3d(minimal),
                         delete = NULL, add = NULL, replace = NULL,
                         material = FALSE, rootSubscene = FALSE,
-                        delfromSubscenes = NULL, skipRedraw = FALSE) {
+                        delfromSubscenes = NULL, skipRedraw = FALSE,
+                        minimal = TRUE) {
   allSubscenes <- function() {
     result <- numeric()
     for (obj in scene$objects)

R/rglwidget.R

@@ -226,17 +226,18 @@ asRow <- function(..., last = NA, height = NULL, colsize = 1) {
 }
 
 newElementId <- function(prefix)
-  paste0(prefix, sample(100000, 1))
+  paste0(prefix, p_sample(100000, 1))
 
 rglwidget <- local({
   reuseDF <- NULL
 
-  function(x = scene3d(), width = figWidth(), height = figHeight(),
+  function(x = scene3d(minimal), width = figWidth(), height = figHeight(),
            controllers = NULL, snapshot = FALSE,
            elementId = NULL,
            reuse = !interactive(),
            webGLoptions = list(preserveDrawingBuffer = TRUE), 
-  	   shared = NULL, ...) {
+  	       shared = NULL, 
+           minimal = TRUE, ...) {
   force(shared) # It might plot something...
 
   if (is.na(reuse))

R/setUserShaders.R

@@ -1,6 +1,7 @@
 setUserShaders <- function(ids, vertexShader = NULL, fragmentShader = NULL,
 			   attributes = NULL, uniforms = NULL,
-			   scene = scene3d()) {
+			   scene = scene3d(minimal),
+			   minimal = TRUE) {
   stopifnot(inherits(scene, "rglscene"))
   for (i in ids) {
     id <- as.character(i)