Merge pull request #483 from dmurdoch/offset

Add polygon_offset arg.

Author: dmurdoch

DESCRIPTION

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

NEWS.md

@@ -1,11 +1,11 @@
-# rgl 1.3.27
+# rgl 1.3.28
 
 * Support for classes defined in the `tripack` package
 has been dropped at the request of CRAN.
 * Added the `latex3d()` function to draw LaTeX text using the
 `xdvir` package.
 * Both `plotmath3d()` and `latex3d()` now use default
-`cex = par3d("cex")`.
+`cex = par3d("cex")`, and have new argument `polygon_offset`.
 
 # rgl 1.3.24
 

R/latex3d.R

@@ -5,6 +5,7 @@ latex3d <- function(x, y = NULL, z = NULL,
 		       fixedSize = TRUE,
 		       startsize = 480, initCex = 5, 
 		       margin = "", floating = FALSE, tag = "",
+		       polygon_offset = material3d("polygon_offset"),
 		       verbose = FALSE,
 		       ...) {
   if (!requireNamespace("xdvir"))
@@ -72,7 +73,8 @@ latex3d <- function(x, y = NULL, z = NULL,
             col = "white", lit = FALSE, radius = cex[i]*size/initCex/20,
             adj = adj, pos = posi, offset = offseti,
             fixedSize = fixedSize,
-            margin = margin, floating = floating, tag = tag))
+            margin = margin, floating = floating, tag = tag,
+            polygon_offset = polygon_offset))
   }
   lowlevel(result)
 }

R/plotmath3d.R

@@ -5,6 +5,7 @@ plotmath3d <- function(x, y = NULL, z = NULL,
 		       fixedSize = TRUE,
 		       startsize = 480, initCex = 5, 
 		       margin = "", floating = FALSE, tag = "",
+		       polygon_offset = material3d("polygon_offset"),
 		       ...) {
   xyz <- xyz.coords(x, y, z, recycle = TRUE)
   n <- length(xyz$x)
@@ -52,7 +53,8 @@ plotmath3d <- function(x, y = NULL, z = NULL,
             col = "white", lit = FALSE, radius = cex[i]*size/initCex/20,
             adj = adj, pos = posi, offset = offseti,
             fixedSize = fixedSize,
-            margin = margin, floating = floating, tag = tag))
+            margin = margin, floating = floating, tag = tag,
+            polygon_offset = polygon_offset))
   }
   lowlevel(result)
 }

man/plotmath3d.Rd

@@ -15,11 +15,13 @@ the same approach to display it in \pkg{rgl}.
 plotmath3d(x, y = NULL, z = NULL, text, cex = par3d("cex"),
            adj = 0.5, pos = NULL, offset = 0.5,
            fixedSize = TRUE, startsize = 480, initCex = 5, 
-           margin = "", floating = FALSE, tag = "", ...)
+           margin = "", floating = FALSE, tag = "",
+           polygon_offset = material3d("polygon_offset"), ...)
 latex3d(x, y = NULL, z = NULL, text, cex = par3d("cex"), 
            adj = 0.5, pos = NULL, offset = 0.5,
            fixedSize = TRUE, startsize = 480, initCex = 5, 
-           margin = "", floating = FALSE, tag = "", 
+           margin = "", floating = FALSE, tag = "",
+           polygon_offset = material3d("polygon_offset"), 
            verbose = FALSE, ...)
 }
 \arguments{
@@ -51,7 +53,7 @@ are cut off.  \code{initCex} is the size of text used
 to form the bitmap.  Increase this if letters look too blurry
 at the desired size.
 }
-  \item{margin, floating, tag}{
+  \item{margin, floating, tag, polygon_offset}{
 \code{\link{material3d}} properties for the sprites.
   }
   \item{verbose}{If \code{TRUE}, \code{latex3d} will print
@@ -89,14 +91,15 @@ open3d()
 plotmath3d(1:3, 1:3, 1:3, expression(x[1] == 1, x[2] == 2, x[3] == 3))
 # This lets the text resize with the plot
 text3d(4, 4, 4, "resizeable text", usePlotmath = TRUE, fixedSize = FALSE)
-
+\donttest{
 if (requireNamespace("xdvir")) {
 
-# Do the same plot using latex3d()
+# Do the same plot using latex3d(). This example runs slowly!
 
   open3d()
   latex3d(1:3, 1:3, 1:3, c("$x_1 = 1$", "$x_2 = 2$", "$x_3 = 3$"))
   latex3d(4, 4, 4, "resizeable text", fixedSize = FALSE)
 
 }
 }
+}