Move deprecated fns to defunct

Author: dmurdoch

NEWS.md

@@ -3,6 +3,7 @@
 * The WebGL code did not handle the case of lit objects
 with no lights properly.  Now they display the emission
 color only.  (Issue #494).
+* Several deprecated functions have been made defunct.
 
 # rgl 1.3.31
 
@@ -18,8 +19,12 @@ has been dropped at the request of CRAN.
 ## Bug fixes
 
 * `arrow3d(type = "extrusion")` was broken by the changes to triangulation in version 1.3.16.
+<<<<<<< Updated upstream
 * Changes last year to `writePLY()` introduced an error
 in some cases (issue #489).
+=======
+* Many deprecated functions have been made defunct.
+>>>>>>> Stashed changes
 
 # rgl 1.3.24
 

R/callbacks.R

@@ -15,11 +15,8 @@ rgl.getWheelCallback <- function(dev = cur3d(), subscene = currentSubscene3d(dev
 
 rgl.setAxisCallback <- function(axis, draw = NULL, dev = cur3d(), subscene = currentSubscene3d(dev)) {
 
-  .Deprecated("setAxisCallbacks")
+  .Defunct("setAxisCallbacks")
 
-  stopifnot(length(axis) == 1, axis %in% 1:3)
-  .Call(rgl_setAxisCallback, draw, as.integer(dev), as.integer(subscene), as.integer(axis - 1))
-  invisible(NULL)
 }
 
 rgl.getAxisCallback <- function(axis, dev = cur3d(), subscene = currentSubscene3d(dev)) {

R/device.R

@@ -28,13 +28,7 @@ rgl.useNULL <- function() {
 
 rgl.open <- function(useNULL = rgl.useNULL()) {
 
-  .Deprecated("open3d")
-  
-  ret <- .C( rgl_dev_open, success=FALSE, useNULL=useNULL,
-             antialias = as.integer(getOption("rgl.antialias", -1L)))
-
-  if (! ret$success)
-    stop("'rgl.open' failed")
+  .Defunct("open3d")
 
 }
 
@@ -45,19 +39,7 @@ rgl.open <- function(useNULL = rgl.useNULL()) {
 ##
 
 rgl.close <- function() {
-
-  .Deprecated("close3d")
-  
-  if (length(hook <- getHook("on.rgl.close"))) {
-    if (is.list(hook)) hook <- hook[[1]]  # test is for compatibility with R < 3.0.0
-    hook()
-  }
-  
-  ret <- .C( rgl_dev_close, success=FALSE )
-
-  if (! ret$success)
-    stop("No device opened")
-
+  .Defunct("close3d")
 }
 
 ## 
@@ -75,18 +57,7 @@ rgl.dev.list <- function()
 ##
 
 rgl.set <- function(which, silent = FALSE) {
-  
-  .Deprecated("set3d")
-
-  idata <- c( as.integer(which), as.integer(silent) )
-
-  ret <- .C( rgl_dev_setcurrent, 
-    success=FALSE, 
-    idata
-  )
-
-  if (! ret$success)
-    stop(gettextf("No device opened with id %s", which), domain = NA)
+  .Defunct("set3d")
 }
 
 

R/material.R

@@ -136,8 +136,7 @@ rgl.material0 <- function(
 }
 
 rgl.material <- function(...) {
-  .Deprecated("material3d")
-  rgl.material0(...)
+  .Defunct("material3d")
 }
 
 rgl.getcolorcount <- function() .C( rgl_getcolorcount, count=integer(1) )$count

R/rglcontroller.R

@@ -201,12 +201,7 @@ par3dinterpControl <- function(fn, from, to, steps, subscene = NULL,
 # imports those into the real scene object.
 
 elementId2Prefix <- function(elementId, prefix = elementId) {
-  .Deprecated("", msg = "This function is not needed if you use rglwidget().")
-  cat(paste0("<script>var ", prefix, "rgl = {};</script>"))
-  playwidget(elementId, structure(list(type = "oldBridge",
-                                       prefix = prefix),
-                                  class = "rglControl"),
-             components = character(0))
+  .Defunct("", msg = "This function is not needed if you use rglwidget().")
 }
 
 # This puts together a custom message for a more extensive change