version 0.107.10

Author: dmurdoch

DESCRIPTION

@@ -1,5 +1,5 @@
 Package: rgl
-Version: 0.106.8
+Version: 0.107.10
 Title: 3D Visualization Using OpenGL
 Authors@R: c(person("Duncan", "Murdoch", role = c("aut", "cre"),
                      email = "murdoch.duncan@gmail.com"),
@@ -22,33 +22,33 @@ Authors@R: c(person("Duncan", "Murdoch", role = c("aut", "cre"),
               person("Joshua", "Ulrich", role = "ctb"),
               person("Xavier", "Fernandez i Marin", role = "ctb"),
               person("George", "Helffrich", role = "ctb"),
-              person("Ivan", "Krylov", role = "ctb"))
+              person("Ivan", "Krylov", role = "ctb"),
+              person("Michael", "Sumner", role = "ctb"))
 Depends: R (>= 3.3.0)
-Suggests: MASS, rmarkdown, deldir, orientlib, lattice, misc3d,
-        rstudioapi, magick, plotrix (>= 3.7-3), tripack, interp,
-        alphashape3d, tcltk, js (>= 1.2), akima, webshot2, downlit,
-        pkgdown, extrafont
+Suggests: MASS, rmarkdown, deldir, orientlib, lattice, misc3d, magick,
+        plotrix (>= 3.7-3), tripack, interp, alphashape3d, tcltk, js
+        (>= 1.2), akima, webshot2, downlit, pkgdown, extrafont, shiny,
+        manipulateWidget (>= 0.9.0), testthat, markdown
 Imports: graphics, grDevices, stats, utils, htmlwidgets, htmltools,
-        knitr, jsonlite (>= 0.9.20), shiny, magrittr, crosstalk,
-        manipulateWidget (>= 0.9.0)
+        knitr (>= 1.33), jsonlite (>= 0.9.20), magrittr, crosstalk
 Enhances: waldo
 Description: Provides medium to high level functions for 3D interactive graphics, including
     functions modelled on base graphics (plot3d(), etc.) as well as functions for
     constructing representations of geometric objects (cube3d(), etc.).  Output
     may be on screen using OpenGL, or to various standard 3D file formats including
     WebGL, PLY, OBJ, STL as well as 2D image formats, including PNG, Postscript, SVG, PGF.
 License: GPL
-URL: https://github.com/dmurdoch/rgl,
-        https://dmurdoch.github.io/rgl/dev/
+URL: https://github.com/dmurdoch/rgl, https://dmurdoch.github.io/rgl/
 SystemRequirements: OpenGL, GLU Library, XQuartz (on OSX), zlib
         (optional), libpng (>=1.2.9, optional), FreeType (optional),
-        pandoc (>=1.14, needed for vignettes)
+        pandoc (>=1.14, needed for vignettes; if not present, markdown
+        package will be used)
 BugReports: https://github.com/dmurdoch/rgl/issues
 VignetteBuilder: knitr
 Biarch: true
 Additional_repositories: https://dmurdoch.github.io/drat
 NeedsCompilation: yes
-Packaged: 2021-04-21 16:29:06 UTC; murdoch
+Packaged: 2021-07-21 13:32:27 UTC; murdoch
 Author: Duncan Murdoch [aut, cre],
   Daniel Adler [aut],
   Oleg Nenadic [ctb],
@@ -68,7 +68,8 @@ Author: Duncan Murdoch [aut, cre],
   Joshua Ulrich [ctb],
   Xavier Fernandez i Marin [ctb],
   George Helffrich [ctb],
-  Ivan Krylov [ctb]
+  Ivan Krylov [ctb],
+  Michael Sumner [ctb]
 Maintainer: Duncan Murdoch <murdoch.duncan@gmail.com>
 Repository: CRAN
-Date/Publication: 2021-04-23 09:50:02 UTC
+Date/Publication: 2021-07-22 08:20:02 UTC

MD5

@@ -1,6 +1,6 @@
 export(.check3d, 
   abclines3d, addNormals, addToSubscene3d, arc3d,
-  arrow3d, as.mesh3d, as.triangles3d, asRow,
+  arrow3d, as.mesh3d, as.tmesh3d, as.triangles3d, asRow,
   ageSetter, asEuclidean, asEuclidean2, asHomogeneous, asHomogeneous2,
   aspect3d, axes3d, axis3d, box3d,
   bbox3d, bg3d, bgplot3d, 
@@ -9,7 +9,8 @@ export(.check3d,
   contourLines3d,
 	cube3d, cuboctahedron3d, cur3d, 
   currentSubscene3d, cylinder3d,
-  decorate3d, deform.mesh3d, delFromSubscene3d, divide.mesh3d, dodecahedron3d, dot3d, drape3d, ellipse3d, extrude3d,
+  decorate3d, deform.mesh3d, delFromSubscene3d, divide.mesh3d, dodecahedron3d, dot3d, drape3d, ellipse3d, 
+  expect_known_scene, extrude3d,
 	facing3d, figWidth, figHeight, filledContour3d,
 	gc3d, getr3dDefaults, getWidgetId, GramSchmidt, grid3d, 
 	highlevel, hook_rgl, hook_webgl,
@@ -23,7 +24,7 @@ export(.check3d,
   play3d, plot3d, plotmath3d, points3d, 
 	polygon3d, pop3d, projectDown, propertySetter, propertySlider,
 	qmesh3d, quads3d, readOBJ, readSTL, rgl.abclines, rgl.bbox, rgl.bg, rgl.bringtotop, rgl.clear,
-	rgl.getMouseCallbacks, rgl.getWheelCallback,
+	rgl.getAxisCallback, rgl.getMouseCallbacks, rgl.getWheelCallback, 
 	rgl.close, rgl.cur, rgl.ids, rgl.init, rgl.light, rgl.lines, rgl.linestrips,
 	rgl.clipplanes, rgl.material, rgl.open, rgl.pixels, rgl.planes, rgl.points, rgl.pop, rgl.postscript,
 	rgl.primitive, rgl.projection, rgl.quads, rgl.quit, rgl.Sweave, rgl.Sweave.off,
@@ -35,8 +36,9 @@ export(.check3d,
   r3dDefaults, rotate3d, rotationMatrix,
 	scale3d, scaleMatrix, scene3d, segments3d, 
 	select3d, selectionFunction3d, selectpoints3d,
-	rgl.setMouseCallbacks, rgl.setWheelCallback, set3d, 
-	setGraphicsDelay, setupKnitr, setUserShaders, shade3d, shadow3d,
+	rgl.setAxisCallback, rgl.setMouseCallbacks, rgl.setWheelCallback,
+  set3d, setAxisCallbacks, setGraphicsDelay, setupKnitr, 
+  setUserCallbacks, setUserShaders, shade3d, shadow3d,
 	shapelist3d, shinyGetPar3d, shinySetPar3d, shinyResetBrush, 
 	show2d, snapshot3d, 
 	spheres3d, spin3d, sprites3d, subdivision3d, 
@@ -72,6 +74,7 @@ export(.check3d,
  S3method(plot3d, mesh3d)
 
  S3method(all.equal, mesh3d)
+ S3method(all.equal, rglscene)
 
  S3method(as.mesh3d, deldir)
  S3method(as.mesh3d, tri)
@@ -81,6 +84,9 @@ export(.check3d,
  S3method(as.mesh3d, rglobject)
  S3method(as.mesh3d, default)
 
+ S3method(as.tmesh3d, mesh3d)
+ S3method(as.tmesh3d, default)
+ 
  S3method(as.triangles3d, mesh3d)
  S3method(as.triangles3d, rglId)
 
@@ -140,6 +146,9 @@ export(.check3d,
  S3method(filledContour3d, rglId)
  S3method(filledContour3d, mesh3d)
 
+ S3method(sew, rglRecordedplot)
+ S3method(is_low_change, rglRecordedplot)
+ 
  if(.Platform$OS.type == "windows") {
    importFrom(utils, getWindowsHandle)
  }
@@ -168,10 +177,9 @@ importFrom(htmltools, css, HTML, htmlDependency, img,
            includeScript, tags, tagAppendAttributes,
 	   tagHasAttribute, tagList, browsable, resolveDependencies)
 importFrom(jsonlite, toJSON, base64_dec)
-importFrom(knitr, asis_output, fig_path, hook_plot_custom, image_uri, include_graphics, knit_hooks, 
-           knit_meta_add, knit_print, opts_current, opts_hooks, opts_knit)
-importFrom(shiny, getDefaultReactiveDomain, markRenderFunction, 
-					 registerInputHandler, removeInputHandler)
+importFrom(knitr, asis_output, fig_path, hook_plot_custom, image_uri, include_graphics, 
+					 is_low_change, knit_hooks, 
+           knit_meta_add, knit_print, opts_current, opts_hooks, opts_knit, 
+					 pandoc_to, sew)
 importFrom(magrittr, "%>%")
-importFrom(manipulateWidget, combineWidgets)
 importFrom(stats, coef, predict, residuals)

NAMESPACE

@@ -1,18 +1,73 @@
 
-# rgl  0.106.8
+# rgl  0.107.10
+
+## Major changes
+
+* Added `expect_known_scene()` function to work with 
+  `testthat`.
+* Added some `testthat` tests.
+* Prepend a 5th entry to `par3d("mouseMode")`, corresponding
+  to actions to take when no button is pressed.
+* Allowed any of the mouse modes to be applied to 
+the mouse wheel.
+* Added the `setUserCallbacks()` function to allow
+user-specified mouse callbacks in WebGL code.
+* Added Javascript code for support of movable 
+  axis labels in `bboxdeco` objects.
+* Most drawing functions can now draw in the margins
+  using new material properties `margin` and `floating`,
+  with objects that move as the bounding box changes.
+  See `?mtext3d` for details.
+* The `mtext3d()` argument order has changed.
+* Added the `setAxisCallbacks()` function to allow
+user-specified axis drawing routines.
+* Exposed (and generalized) the `as.tmesh3d()` function.
 
 ## Minor changes
 
-* Support for FreeType has been dropped in the experimental
-  Windows Unicode (UCRT) build.
-  
+* The `shiny` and `manipulateWidget` packages have been changed from imports
+  that are always loaded to suggested packages that
+  will only be loaded if needed.  This will reduce the 
+  "footprint" of `rgl` for users who don't use them.
+* The NULL device can now specify `par3d("useFreeType")`
+  and the result is saved.
+* Code to work with pre-1.33 versions of `knitr` has now
+  been removed.
+* Added documentation of Javascript to web page.
+* The handling of the `RGL_DEBUGGING` environment variable
+  has changed:  now it must look like `TRUE` to trigger
+  Javascript debugging mode.
+* Argument `webshot = TRUE` has been added to `movie3d` (issue #113).
+* The assert() macro is now always defined.
+* In Windows, the `WM_PAINT` handler should be more tolerant
+  of code called while painting.
+* `as.mesh3d.default()` can create segments.  (Contributed
+  by Michael Sumner.)
+* `compare_proxy.mesh3d()` has been modified to be
+  compatible with both current and upcoming versions of
+  `waldo`.
+
+## Bug fixes
+
+* The bug workaround in 0.105.22 for issue #27 triggered a bug
+  in RStudio, resulting in two RStudio processes showing up
+  when `rgl` was loaded.  The workaround is now skipped when
+  RStudio is detected.  Use `options(startQuartz = TRUE)`
+  in RStudio before loading `rgl` to run it,
+  or `options(startQuartz = FALSE)` to suppress it.
+* In some cases, snapshots in `rmarkdown` documents
+  were produced at the wrong size.
+* Controls failed to modify sphere colors (e.g. as in `example(playwidget)`, issue #102)
+
+# rgl  0.106.8
+
 ## Bug fixes 
 
 * Some of the changes related to avoiding `testthat` errors
   in other files accidentally introduced a new error 
   in coloring meshes in `rgl`:  now fixed.
-* readOBJ() was broken by the 0.106.x changes.
-* merge.mesh3d() failed for meshes containing points or
+* `readOBJ()` was broken by the 0.106.x changes.
+* `merge.mesh3d()` failed for meshes containing points or
   segments.
 
 # rgl  0.106.6

NEWS.md

@@ -172,7 +172,8 @@ play3d <- function(f, duration = Inf, dev = cur3d(), ..., startTime = 0) {
 movie3d <- function(f, duration, dev = cur3d(), ..., fps=10, 
                     movie = "movie", frames = movie, dir = tempdir(), 
                     convert = NULL, clean = TRUE, verbose=TRUE,
-                    top = !rgl.useNULL(), type = "gif", startTime = 0) {
+                    top = !rgl.useNULL(), type = "gif", startTime = 0,
+                    webshot = TRUE) {
 
   olddir <- setwd(dir)
   on.exit(setwd(olddir))
@@ -196,7 +197,7 @@ movie3d <- function(f, duration, dev = cur3d(), ..., fps=10,
     }
     if (top)
       rgl.bringtotop()
-    snapshot3d(filename=filename)
+    snapshot3d(filename = filename, webshot = webshot)
   }	
   cat("\n")
   if (.Platform$OS.type == "windows") system <- shell  # nolint

R/animate.R

@@ -1,5 +1,5 @@
 as.mesh3d.default <- function(x, y = NULL, z = NULL,
-                              type = c("triangles", "quads", "points"),
+                              type = c("triangles", "quads", "segments", "points"),
                               smooth = FALSE, 
                               tolerance = sqrt(.Machine$double.eps),
                               notEqual = NULL,
@@ -24,7 +24,7 @@ as.mesh3d.default <- function(x, y = NULL, z = NULL,
     }
   }
   type <- match.arg(type, several.ok = TRUE)
-  pcs <- c(triangles = 3, quads = 4, points = 1)
+  pcs <- c(triangles = 3, quads = 4, segments = 2, points = 1)
   nvert <- length(x)
   okay <- FALSE
   for (i in seq_along(type)) {
@@ -69,6 +69,7 @@ as.mesh3d.default <- function(x, y = NULL, z = NULL,
   mesh <- mesh3d(vertices = rbind(verts[,keep, drop = FALSE], 1), points = if (type == "points") indices, 
                   triangles = if (type == "triangles") indices,
                   quads = if (type == "quads") indices,
+                  segments = if (type == "segments") indices,
                   material = list(...))
   if (smooth && type != "points")
     mesh <- addNormals(mesh)