get rid of 'randomcoloR' package

DESCRIPTION

@@ -1,6 +1,6 @@
 Package: sphereTessellation
 Title: Delaunay and Voronoï Tessellations on the Sphere
-Version: 1.1.0
+Version: 1.1.0.9000
 Authors@R: 
     person("Stéphane", "Laurent", , "laurent_step@outlook.fr", role = c("aut", "cre"))
 Description: Performs Delaunay and Voronoï tessellations on spheres and
@@ -10,8 +10,9 @@ License: GPL-3
 URL: https://github.com/stla/sphereTessellation
 BugReports: https://github.com/stla/sphereTessellation/issues
 Imports: 
+    colorsGen,
     grDevices,
-    randomcoloR,
+    Polychrome,
     Rcpp,
     rgl
 LinkingTo: 
@@ -22,6 +23,7 @@ LinkingTo:
 Suggests: 
     cooltools,
     uniformly
+Remotes: stla/RcppCGAL
 SystemRequirements: C++ 17, gmp, mpfr
 Encoding: UTF-8
 RoxygenNote: 7.2.3

NAMESPACE

@@ -5,12 +5,12 @@ export(VoronoiOnSphere)
 export(icosphereMesh)
 export(plotDelaunayOnSphere)
 export(plotVoronoiOnSphere)
+importFrom(Polychrome,createPalette)
 importFrom(Rcpp,evalCpp)
+importFrom(colorsGen,randomColor)
 importFrom(grDevices,colorRamp)
 importFrom(grDevices,hcl.colors)
 importFrom(grDevices,rgb)
-importFrom(randomcoloR,distinctColorPalette)
-importFrom(randomcoloR,randomColor)
 importFrom(rgl,arc3d)
 importFrom(rgl,icosahedron3d)
 importFrom(rgl,shade3d)

NEWS.md

@@ -1,3 +1,9 @@
+# sphereTessellation 1.1.0.9000
+
+The package does no longer depend on the 'randomcoloR' package. Instead, it 
+now depends on the 'colorsGen' and 'Polychrome' packages.
+
+
 # sphereTessellation 1.1.0
 
 - Now the package does not depend on the s2 package.

R/colors.R

@@ -0,0 +1,16 @@
+#' @importFrom Polychrome createPalette
+#' @noRd
+distinctColors <- function(n, argsList) {
+  f <- function(...) {
+    createPalette(n, ...)
+  }
+  do.call(f, argsList)
+}
+
+#' @importFrom colorsGen randomColor
+rcolors <- function(n, argsList) {
+  f <- function(...) {
+    randomColor(n, ...)
+  }
+  do.call(f, argsList)
+}

R/delaunay.R

@@ -99,13 +99,15 @@ plotDelaunayEdges <- function(vertices, radius, center, color, lwd) {
 #' @param del an output of \code{\link{DelaunayOnSphere}}
 #' @param colors controls the filling colors of the triangles, either
 #'   \code{NA} for no color, or a single color, or \code{"random"} to get
-#'   multiple colors with \code{\link[randomcoloR]{randomColor}}, or
+#'   multiple colors with \code{\link[colorsGen]{randomColor}}, or
 #'   \code{"distinct"} to get multiple colors with
-#'   \code{\link[randomcoloR]{distinctColorPalette}}
+#'   \code{\link[Polychrome]{createPalette}}
+#' @param distinctArgs if \code{colors = "distinct"}, a list of arguments
+#'   passed to \code{\link[Polychrome]{createPalette}}
+#' @param randomArgs if \code{colors = "random"}, a list of arguments passed
+#'   to \code{\link[colorsGen]{randomColor}}
 #' @param edges Boolean, whether to plot the edges
 #' @param vertices Boolean, whether to plot the vertices
-#' @param hue,luminosity if \code{colors = "random"}, these arguments are
-#'   passed to \code{\link[randomcoloR]{randomColor}}
 #' @param ecolor a color for the edges
 #' @param lwd line width for the edges, if they are plotted
 #' @param vcolor a color for the vertices
@@ -116,7 +118,6 @@ plotDelaunayEdges <- function(vertices, radius, center, color, lwd) {
 #'
 #' @return No value is returned.
 #' @export
-#' @importFrom randomcoloR randomColor distinctColorPalette
 #' @importFrom rgl spheres3d
 #'
 #' @examples
@@ -129,7 +130,10 @@ plotDelaunayEdges <- function(vertices, radius, center, color, lwd) {
 #' open3d(windowRect = 50 + c(0, 0, 512, 512), zoom = 0.8)
 #' plotDelaunayOnSphere(del)
 plotDelaunayOnSphere <- function(
-    del, colors = "random", edges = FALSE, vertices = FALSE,
+    del, colors = "random",
+    distinctArgs = list(seedcolors = c("#ff0000", "#00ff00", "#0000ff")),
+    randomArgs = list(hue = "random", luminosity = "bright"),
+    edges = FALSE, vertices = FALSE,
     hue = "random", luminosity = "bright", ecolor = "black", lwd = 3,
     vcolor = "black", vradius = NA, ...
 ) {
@@ -143,9 +147,9 @@ plotDelaunayOnSphere <- function(
   Faces      <- del[["faces"]][solidFaces, ]
   if(isString(colors)) {
     if(colors == "random") {
-      colors <- randomColor(length(Meshes), hue = hue, luminosity = luminosity)
+      colors <- rcolors(length(Meshes), randomArgs)
     } else if(colors == "distinct") {
-      colors <- distinctColorPalette(length(Meshes))
+      colors <- distinctColors(length(Meshes), distinctArgs)
     } else{
       colors <- rep(colors, length(Meshes))
     }

R/voronoi.R

@@ -117,9 +117,13 @@ plotVoronoiEdges <- function(cell, radius, center, color, lwd) {
 #' @param vor an output of \code{\link{VoronoiOnSphere}}
 #' @param colors controls the filling colors of the triangles, either
 #'   \code{NA} for no color, or a single color, or \code{"random"} to get
-#'   multiple colors with \code{\link[randomcoloR]{randomColor}}, or
+#'   multiple colors with \code{\link[colorsGen]{randomColor}}, or
 #'   \code{"distinct"} to get multiple colors with
-#'   \code{\link[randomcoloR]{distinctColorPalette}}
+#'   \code{\link[Polychrome]{createPalette}}, or \code{"gradient"}
+#' @param distinctArgs if \code{colors = "distinct"}, a list of arguments
+#'   passed to \code{\link[Polychrome]{createPalette}}
+#' @param randomArgs if \code{colors = "random"}, a list of arguments passed
+#'   to \code{\link[colorsGen]{randomColor}}
 #' @param palette this argument is used only when \code{colors="gradient"}; it
 #'   can be either a character vector of colors, or the name of a palette
 #'   which will be passed to the \code{palette} argument of the function
@@ -143,7 +147,6 @@ plotVoronoiEdges <- function(cell, radius, center, color, lwd) {
 #'
 #' @importFrom rgl spheres3d
 #' @importFrom grDevices hcl.colors
-#' @importFrom randomcoloR randomColor distinctColorPalette
 #'
 #' @export
 #'
@@ -170,9 +173,11 @@ plotVoronoiEdges <- function(cell, radius, center, color, lwd) {
 #' next3d()
 #' plotVoronoiOnSphere(vor, palette = "Viridis", bias = 1.1)}
 plotVoronoiOnSphere <- function(
-    vor, colors = "gradient", palette = "Rocket", bias = 1,
+    vor, colors = "gradient",
+    distinctArgs = list(seedcolors = c("#ff0000", "#00ff00", "#0000ff")),
+    randomArgs = list(hue = "random", luminosity = "bright"),
+    palette = "Rocket", bias = 1,
     edges = FALSE, sites = FALSE,
-    hue = "random", luminosity = "bright",
     ecolor = "black", lwd = 3,
     scolor = "black", sradius = NA, ...
 ) {
@@ -187,9 +192,9 @@ plotVoronoiOnSphere <- function(
         palette <- hcl.colors(255L, palette = palette)
       }
     } else if(colors == "random") {
-      colors <- randomColor(length(vor), hue = hue, luminosity = luminosity)
+      colors <- rcolors(length(vor), randomArgs)
     } else if(colors == "distinct") {
-      colors <- distinctColorPalette(length(vor))
+      colors <- distinctColors(length(vor), distinctArgs)
     } else {
       colors <- rep(colors, length(vor))
     }