version 0.105.22

Author: dmurdoch

DESCRIPTION

@@ -1,5 +1,5 @@
 Package: rgl
-Version: 0.105.13
+Version: 0.105.22
 Title: 3D Visualization Using OpenGL
 Author: Daniel Adler <dadler@uni-goettingen.de>, Duncan Murdoch <murdoch.duncan@gmail.com>, and others (see README)
 Maintainer: Duncan Murdoch <murdoch.duncan@gmail.com>
@@ -22,8 +22,9 @@ SystemRequirements: OpenGL, GLU Library, XQuartz (on OSX), zlib
         pandoc (>=1.14, needed for vignettes)
 BugReports: https://github.com/dmurdoch/rgl/issues
 VignetteBuilder: knitr
+Biarch: true
 Additional_repositories: https://dmurdoch.github.io/drat
 NeedsCompilation: yes
-Packaged: 2021-02-15 14:55:17 UTC; murdoch
+Packaged: 2021-03-04 15:53:40 UTC; murdoch
 Repository: CRAN
-Date/Publication: 2021-02-15 16:10:02 UTC
+Date/Publication: 2021-03-04 23:10:09 UTC

MD5

@@ -1,6 +1,6 @@
 e73499cb89e0d6e97b8ba271c46739fd *COPYING
-0cd4b1ef4aaf05faf932e081c2534399 *DESCRIPTION
-4e0bac383d7e404c88a0c10d77ac3e70 *NAMESPACE
+e4222a48136e9114a0e8923fffcf3036 *DESCRIPTION
+68ed657846311f6f4c812d07baa88178 *NAMESPACE
 664118a44d0cbf5e0754bf2b3fcce21b *R/Sweave.R
 67e457f4a3ecfa12f8b911faf11e7ab6 *R/addNormals.mesh3d.R
 37ee0d5829608839096c18670eac3cce *R/animate.R
@@ -17,14 +17,14 @@ c9a4d8f2a5c25ba335e07224a47f731a *R/axes.R
 cd2346f0dda10c4eee7c223e91580c52 *R/clipMesh3d.R
 f84082194ec14e7ce9ecac1412ba38ba *R/contourLines3d.R
 149f8a63713267831727369515a66e8c *R/conversions.R
-738c68554da049c88ab4aaf1689da504 *R/convertScene.R
+675d8fdba454ab04d2d2ad1bf1f346c4 *R/convertScene.R
 e02c0b99986d8439fc3cfebf2c7f0ac2 *R/cylinder3d.R
 ee008f2ca2afcec2ddc69cdb501a5622 *R/device.R
 3b7a562a2087834ac77c58be27e22574 *R/ellipse3d.R
 0f5823cce9e9ed435a06d8d887f70386 *R/enum.R
 e94a9e7b2777277f4ddb891b53ad4c64 *R/filledContour3d.R
 ab542483bf671cb977c1680b2ad4568a *R/fonts.R
-50a8c3f0270568cd5621f9ea8b9e0833 *R/getscene.R
+422c26744b7f8fba192a032e75f087db *R/getscene.R
 878f2258edc9e9958e09aad1939575d9 *R/grid3d.R
 30e958a2ea6839292dd3472079007439 *R/hooks.R
 0db39cbfb3fe01c3cd5ac549cbb61d2d *R/identify3d.R
@@ -45,7 +45,7 @@ bbf577f06d7ff609796b0300a470b0be *R/playwidget.R
 172328f612e2414de217db24b0e91f1b *R/plotmath3d.R
 6c65179fb5627597f264c331297dbe74 *R/plugin.R
 512d796009f564b91c47ff284ba9867a *R/ply.R
-84a562abfa17c139c9d9ea89cef4f731 *R/r3d.rgl.R
+860e8460ca7d26c76106a607978a13c4 *R/r3d.rgl.R
 a82494d493925454323cd8102200995d *R/rgl.bringtotop.R
 345a339edc1448b2702eb614b3108a57 *R/rglMouse.R
 b7cc9c529a2c44b063562909aaca6e2e *R/rglcontroller.R
@@ -66,8 +66,8 @@ c3c69ccb1aa9033c78d8b9667c91e71c *R/tkspin3d.R
 3447eb732f99d8015c8575c9a4e5077e *R/turn3d.R
 347f2085eadb6613740fde045e54c55b *R/webGL.R
 3f3ec6108c694f57c77e23dbf0063e9b *R/webGLcontrols.R
-f32a0ea3e26476f31b5e08e24ac11b2b *R/zzz.R
-432645047267467060677d5975ba2369 *README.md
+dbc512b4b83cbfb0517bd836f6485647 *R/zzz.R
+35bc47fdfa958618ce62efde01075c82 *README.md
 819c0166990a1b579fcfd46b34693ee6 *build/vignette.rds
 10e89b551cff8c2453ea69fde1b97493 *cleanup
 184807702286196ea6e4d4833ed4736b *configure
@@ -93,27 +93,27 @@ dbc013d5d4e50f2120e2cf524427d529 *demo/shinyMouse.R
 0047d90960eb9af45c4ae63780a10473 *demo/simpleShinyRgl.R
 009f222b0a5cd9e48ebcc9e9ea227a99 *demo/stereo.R
 680b2e3bdfd450f60f8ebdfa8d5bfc09 *demo/subdivision.r
-8508bacdfda47ce9835e4635cef3b2d8 *inst/NEWS
-330251b29f85cc1ffe5bdad929d47230 *inst/WORDLIST
+ce0726cb2a8f611b306064f70b83c372 *inst/NEWS
+6a52f3b26bdf4aebffe4daa1bc110974 *inst/WORDLIST
 8c5d291e3f47c3395fff092f09f599b9 *inst/WebGL/template.html
 5bac46c36b13eac1302260ee06b16c0f *inst/demodata/population.dat
 5544dce93555cfaced50ee41283e9e58 *inst/demodata/region.dat
 736ad37b7a65f9ca945e58530199cc37 *inst/doc/WebGL.R
 e745c22dc2d4d6197c369651c7a2b3a8 *inst/doc/WebGL.Rmd
-b1a609deb93afd92af81fd9d8601c3c9 *inst/doc/WebGL.html
+f92238d7d739e29d0bbfaf24b5813de1 *inst/doc/WebGL.html
 f99aac24de4ff50cdbf669f6c13844a6 *inst/doc/rgl.R
 02ccacb374bb2ccaa4df122486d2a155 *inst/doc/rgl.Rmd
-8cbe461b6f18f62b9f4e3a441d67f26b *inst/doc/rgl.html
-1304ffa6515f831168733a70e41bda2a *inst/doc/transparency.R
-821a4e7cbed6d4d36a46a8880e928c62 *inst/doc/transparency.Rmd
-56e362bccb578dea8348f7b94206afa2 *inst/doc/transparency.html
+eec836654844c2782f94ac54f011167d *inst/doc/rgl.html
+5fec02670bfe5e4fe0340b0f9bc46696 *inst/doc/transparency.R
+fb5b7f2c23447d89e3a20ecf1e8621a3 *inst/doc/transparency.Rmd
+59e36faa70dd458c6e4258d5874b76f1 *inst/doc/transparency.html
 b4ef592c88333c7c509dd74fcd1912d9 *inst/fonts/FreeMono.ttf
 867469f13ff81dec9adf2ae2f6ea2899 *inst/fonts/FreeSans.ttf
 dc0004a804503e126bc99998c7a1c677 *inst/fonts/FreeSerif.ttf
 ec09b6201dbd3edeb21417d212d4564b *inst/htmlwidgets/lib/CanvasMatrix/CanvasMatrix.src.js
 a6727b677a818db5f5af2bf0b726152f *inst/htmlwidgets/lib/rglClass/controls.src.js
-4ed24680f1ded131fa3aa9fc22ad7e25 *inst/htmlwidgets/lib/rglClass/draw.src.js
-5398c9c80f134a5953866200bf1345a7 *inst/htmlwidgets/lib/rglClass/init.src.js
+05d7ce2b2e67906ab2e22232f2f3d8bb *inst/htmlwidgets/lib/rglClass/draw.src.js
+f393bc1847ce6887617568a5333f782d *inst/htmlwidgets/lib/rglClass/init.src.js
 6ce7e3ba3f67aa51f5e57080e7f13f48 *inst/htmlwidgets/lib/rglClass/mouse.src.js
 47017b0c0b3da192f793972ef765bd09 *inst/htmlwidgets/lib/rglClass/pieces.src.js
 c75ecbb54a7cc5c43e5191367ae28fa7 *inst/htmlwidgets/lib/rglClass/projection.src.js
@@ -230,7 +230,7 @@ d71689c55996c3f624c5005eef65f77f *man/shapelist3d.Rd
 ae44587adf142df45043c8a4b3a28755 *man/shiny.Rd
 d1c25579801f37978a0cb07f7d57ffda *man/shinyGetPar3d.Rd
 eef32e5f19320f9ee9af2cd0517054d9 *man/show2d.Rd
-4bcff0780012d07da932f3bf08b49a8f *man/snapshot.Rd
+3015e9cc819f5c47172cdb0eb102d917 *man/snapshot.Rd
 f6b0d9667089be0a5214e046f2a6775d *man/spheres.Rd
 e0fa5e808fdd8da7c265ef539eb86fca *man/spin3d.Rd
 75d387c6c89cea0af5edd98fb533346d *man/sprites.Rd
@@ -274,7 +274,7 @@ b128eb378abdd8e63ea8287e7f9f6254 *src/Disposable.h
 b03e2ab2e386594cd527d3cbad2b9f3a *src/Light.h
 70a705fe2978bd44a7a3db0a4c23dac5 *src/LineSet.cpp
 952ee5f775d740bd9719db38229a61c7 *src/LineStripSet.cpp
-cb8c1deecce7df00d727948f94a1935d *src/Makevars.in
+602fdf62bb0fcc464f38d06fe8407234 *src/Makevars.in
 ef228a6534671e41750e62671def621d *src/Makevars.win
 d166702d0a968805882d8d42c1c4f191 *src/Material.cpp
 334339682edb8edae85fb1e3c1672a87 *src/Material.h
@@ -318,7 +318,7 @@ ea7a5a3a84c7ccf3fd8e3451fe77d3b2 *src/build/autoconf/config.sub
 a9d5b47ed83098987478e3083d55aad7 *src/callbacks.cpp
 eaf77259ad89bde780fe9b73fcd66d1b *src/config.h
 f40e9029ea940c760eb8780a2c001e56 *src/device.cpp
-443cf7a71eef0b3ac0cf7c22a388c035 *src/devicemanager.cpp
+cdcb77e66b08ada7fdbf689ba436dfe8 *src/devicemanager.cpp
 c83c1ea7f7c9b201cdcf087fa83d10ff *src/ext/GLsdk/GL/gl.h
 b3a541f71a25364db3f2128ecceb23cb *src/ext/GLsdk/GL/glext.h
 1d9b87c0753867872bde78597c327011 *src/ext/GLsdk/GL/glprocs.c
@@ -430,7 +430,7 @@ f98a5fba15e844bd7696aff31d2cb65c *src/gl2ps.h
 01922e999eff711b7d11e7bf67e01dbc *src/glErrors.cpp
 888c581ff741adb928006e9294092a0a *src/glgui.cpp
 f5ca32aa314f4b26aa1730390a31af29 *src/glgui.h
-d04478c5aed359c3833cf8d2ff048689 *src/gui.cpp
+6cd7eb1c069376f557d02a2f0054fe65 *src/gui.cpp
 a0c2119f8a1db1a385ec0121d7d505cf *src/gui.h
 ebfc9f298280d5bf458d9d6e260fb781 *src/init.cpp
 190208962b2847c69e26112f22078f92 *src/init.h
@@ -459,16 +459,16 @@ fac235696a7454133d287870ac5a1237 *src/scene.h
 d9c0b1fdea4ccd844d78df1bd8ecb8b6 *src/subscene.cpp
 285b44a7aa19fc57c96e98527f9a8c5a *src/subscene.h
 85a2bf4ffefd0d62fb061e7fc5db0a0d *src/types.h
-0870e06ae1a10e67c338601cc661d035 *src/useNULL/Makevars
-4b5fbf7880302f8193ca1da478a0689e *src/useNULL/Makevars.in
+b2be2ae826114fb41cfd9edbca9eb739 *src/useNULL/Makevars
+6d0bcb7db30efa347d8e4a434ba284aa *src/useNULL/Makevars.in
 c9005faeb90ea5c47f1cce3af44cde88 *src/win32gui.cpp
 305ea9cb6c67ba53cd2e719ceb614479 *src/win32gui.h
 ab0397501390c9e91b1f4718fac66419 *src/win32lib.cpp
-d084c06f864328fe238e1349832c764d *src/x11gui.cpp
+0851d2e1141d1610f56d45f87b44792c *src/x11gui.cpp
 59c4054e9def01595d86f02e515c2d37 *src/x11gui.h
 bb033aaefa628fb5e2c2eb0628db269c *src/x11lib.cpp
 a7fa1d2be854209389accfa66ff7febb *tools/winlibs.R
 e745c22dc2d4d6197c369651c7a2b3a8 *vignettes/WebGL.Rmd
 02ccacb374bb2ccaa4df122486d2a155 *vignettes/rgl.Rmd
 68a10c00ee9ecd268ff080cce2cba6a4 *vignettes/setup.R
-821a4e7cbed6d4d36a46a8880e928c62 *vignettes/transparency.Rmd
+fb5b7f2c23447d89e3a20ecf1e8621a3 *vignettes/transparency.Rmd

NAMESPACE

@@ -140,8 +140,8 @@ export(.check3d,
 
  importFrom(graphics, legend, par, plot, plot.new, polygon,
  	    strwidth, strheight)
- importFrom(grDevices, col2rgb, colorRamp, dev.cur, dev.off, png, 
- 	    postscript, rgb, xy.coords, xyz.coords)
+ importFrom(grDevices, col2rgb, colorRamp, dev.cur, dev.new, 
+ 			dev.off, png, postscript, rgb, xy.coords, xyz.coords)
  importFrom(stats, approxfun, get_all_vars, model.frame, 
       qchisq, qf, splinefun, terms, var)
  importFrom(utils, capture.output, count.fields, file_test, 

R/convertScene.R

@@ -99,6 +99,10 @@ convertScene <- function(x = scene3d(minimal), width = NULL, height = NULL, reus
   getFlags <- function(id) {
 
     obj <- getObj(id)
+    if (is.null(obj)) {
+      warning("object", id, " not found.")
+      return(structure(rep(FALSE, length(flagnames)), names = flagnames))
+    }
     type <- obj$type
 
     if (type == "subscene")

R/getscene.R

@@ -27,7 +27,7 @@ scene3d <- function(minimal = TRUE) {
           "texts", "cex", "adj", "radii", "ids",
           "usermatrix", "types", "offsets", "centers",
           "family", "font", "pos")
-    if (lit || !minimal || type %in% c("light", "clipplanes"))
+    if (lit || !minimal || type %in% c("light", "clipplanes", "planes"))
       attribs <- c(attribs, "normals")
     for (a in attribs) 
       if (rgl.attrib.count(id, a))
@@ -56,7 +56,7 @@ scene3d <- function(minimal = TRUE) {
                         else if (flags["exp_fog", 1]) "exp"
 			else if (flags["exp2_fog", 1]) "exp2"
 			else "none"
-      result$fogscale <- rgl.attrib(id, "fogscale")
+      result$fogscale <- as.numeric(rgl.attrib(id, "fogscale"))
     } else if (type == "bboxdeco") {
       flags <- rgl.attrib(id, "flags")
       result$draw_front <- flags["draw_front", 1]

R/r3d.rgl.R

@@ -370,7 +370,7 @@ requireWebshot2 <- function() {
 }
 
 snapshot3d <- function(filename = tempfile(fileext = ".png"), 
-                       ..., scene, width = NULL, height = NULL,
+                       fmt = "png", top = TRUE, ..., scene, width = NULL, height = NULL,
                        webshot = TRUE) {
   force(filename)
 
@@ -442,5 +442,5 @@ snapshot3d <- function(filename = tempfile(fileext = ".png"),
                    type = "message")
     invisible(filename)
   } else
-    rgl.snapshot(filename, ...)
+    rgl.snapshot(filename, fmt, top)
 }

R/zzz.R

@@ -80,7 +80,23 @@
   }
 
   .rglEnv$subsceneList <- NULL
-	 
+
+  # Workaround for incompatibility with quartz device
+  # By default only run this if we'll be using the X11 display on macOS
+  # and we're not on R.app.  options("rgl.startQuartz") can 
+  # override this.
+  # Then we need to start quartz() before starting rgl.
+  # See https://github.com/dmurdoch/rgl/issues/27
+  if (getOption("rgl.startQuartz", 
+         !onlyNULL && 
+         unixos == "Darwin" && 
+         .Platform$GUI != "AQUA") &&
+         interactive() && 
+         exists("quartz", getNamespace("grDevices"))) {
+    grDevices::quartz()
+    dev.off()
+  }
+  
   ret <- rgl.init(initValue, onlyNULL)
 
   if (!ret) {

README.md

@@ -51,92 +51,82 @@ versions for pre-R-4.0.0)
 
 ## REQUIREMENTS
 
-For OpenGL display:
+**For OpenGL display:**
 
-Windowing System (unix/x11 or win32) OpenGL Library OpenGL Utility
-Library (GLU)
+Windowing System (unix/x11 or Windows)  
+OpenGL Library  
+OpenGL Utility Library (GLU)
 
-For WebGL display:
+**For WebGL display:**
 
-Browser with WebGL enabled.
+A browser with WebGL enabled. See <https://get.webgl.org>.
 
-## Installation on Debian:
-
-To install OpenGL support:
+## Installing OpenGL support
 
+**Debian:**  
 aptitude install libgl1-mesa-dev libglu1-mesa-dev
 
-## OPTIONS
-
-libpng library version 1.2.9 or newer (pixmap import/export support)
-freetype library (optional on Unix for resizable anti-aliased fonts),
-required on Windows
-
-## BUILDING/INSTALLING FROM SOURCE PACKAGE
-
-The R build tool is the primary tool to build the RGL package.
-
-## BUILDING ON MICROSOFT WINDOWS
-
-Install Rtools40 or newer.
-
-An Internet connection will be needed, as FreeType is automatically
-downloaded from <https://github.com/rwinlib>.
-
-## BUILDING ON UNIX-STYLE OS (macOS, Linux, FreeBSD, … )
-
-The build is controlled by an autoconf configure script. You provide the
-options through the R CMD build/INSTALL command
-
-e.g.  $ R CMD INSTALL –configure-args=“&lt;configure args…&gt;” rgl
+**Fedora:**  
+yum install mesa-libGL-devel mesa-libGLU-devel libpng-devel
 
-COMMON UNIX-STYLE OS OPTIONS —————————-
+**macOS:**  
+Install XQuartz.  
+`rgl` should work with either XQuartz 2.7.11 or 2.8.0, but it will
+probably need rebuilding if the XQuartz version changes. XQuartz
+normally needs re-installation whenever the macOS version changes.
 
-–with-gl-includes=<path> GL C header files include path
+**Windows:**  
+Windows normally includes OpenGL support, but to get the appropriate
+include files etc., you will need the appropriate version of
+[Rtools](https://cran.r-project.org/bin/windows/Rtools) matched to your
+R version.
 
-–with-gl-libraries=<path> GL library linkage path
+## Options
 
-–with-gl-prefix=<libprefix> GL library prefix (e.g. Mesa)
+The **libpng** library version 1.2.9 or newer is needed for pixmap
+import/export support.
 
-–disable-libpng disable libpng support
+The **freetype** library is needed for resizable anti-aliased fonts. On
+Windows, it will be downloaded from <https://github.com/rwinlib> during
+the install.
 
-–with-libpng-prefix=<install location> force LibPNG library install
-prefix (e.g. /usr/local)
+## BUILDING/INSTALLING
 
-–disable-libpng-config explicitly disable libpng-config
+Binary builds of `rgl` are available for some platforms on CRAN.
 
-–disable-libpng-dynamic use static libpng library
+For source builds, install the prerequisites as described above,
+download the tarball and at the command line run
 
-–disable-opengl disable all OpenGL displays; WebGL is still available
+    R CMD INSTALL rgl_0.105.22.tar.gz
 
-You may find that your distro doesn’t have all necessary development
-libraries installed: read the error messages for hints! This line has
-been reported to be sufficient on FC 5 or 6:
+(with the appropriate version of the tarball). The build uses an
+`autoconf` configure script; to see the options, expand the tarball and
+run `./configure --help`.
 
-yum install mesa-libGL-devel mesa-libGLU-devel libpng-devel
+Alternatively, in R run
 
-X11 WINDOWING SYSTEM OPTIONS —————————-
+    install.packages("rgl")
 
-The X11 windowing system is needed for OpenGL display in macOS and
-Unix-alikes.
+to install from CRAN, or
 
-–x-includes=<path> X11 C header files include path
+    remotes::install_github("dmurdoch/rgl")
 
-–x-libraries=<path> X11 library linkage path
+to install the development version from Github.
 
-BUILDING WITHOUT OPENGL ———————–
+## BUILDING WITHOUT OPENGL
 
 As of version 0.104.1, it is possible to build the package without
 OpenGL support on Unix-alikes (including macOS) with the configure
 option –disable-opengl For example,
 
-R CMD INSTALL –configure-args=“–disable-opengl” rgl\_0.104.1.tar.gz
+    R CMD INSTALL --configure-args="--disable-opengl" rgl_0.105.22.tar.gz 
 
 On Windows, OpenGL support cannot currently be disabled.
 
-## DEMOS: LOADING AND RUNNING DEMONSTRATIONS
+## DOCUMENTATION and DEMOS:
 
     library(rgl)
+    browseVignettes("rgl")
     demo(rgl)
 
 ## CREDITS
@@ -156,7 +146,8 @@ Dirk Eddelbuettel <edd@debian.org>
 The authors of Shiny for their private RNG code.  
 Jeroen Ooms for Rtools40 and FreeType help.  
 Yohann Demont for Shiny code, suggestions, and testing.  
-Joshua Ulrich for a lot of help with the Github migration.
+Joshua Ulrich for a lot of help with the Github migration.  
+Xavier Fernandez i Marin for help debugging the build.
 
 ## WEBSITE