close #65

SymbolixAU · Apr 24, 2020 · 28208a5 · 28208a5
1 parent e480d06
commit 28208a5
Show file tree

Hide file tree

Showing 12 changed files with 1,027 additions and 37 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,7 +1,7 @@
 Package: colourvalues
 Type: Package
 Title: Assigns Colours to Values
-Version: 0.3.4001
+Version: 0.3.4002
 Date: 2020-03-17
 Authors@R: c(
     person("David", "Cooley", ,"[email protected]", role = c("aut", "cre"))

diff --git a/NEWS.md b/NEWS.md
@@ -1,4 +1,8 @@
 
+# v0.3.5
+
+* return interleaved vectors (C++ only)
+
 # v0.3.4
 
 * removed Boost dates

diff --git a/R/RcppExports.R b/R/RcppExports.R
@@ -9,6 +9,10 @@ rcpp_colour_values_rgb <- function(x, palette, alpha, na_colour = "#808080", inc
     .Call(`_colourvalues_rcpp_colour_values_rgb`, x, palette, alpha, na_colour, include_alpha, format, digits, summary, n_summaries)
 }
 
+rcpp_colour_values_rgb_interleaved <- function(x, palette, alpha, repeats, total_colours, na_colour = "#808080", include_alpha = TRUE, format = FALSE, digits = 2L, summary = FALSE, n_summaries = 0L) {
+    .Call(`_colourvalues_rcpp_colour_values_rgb_interleaved`, x, palette, alpha, repeats, total_colours, na_colour, include_alpha, format, digits, summary, n_summaries)
+}
+
 rcpp_convert_hex_to_rgb <- function(hex_strings) {
     .Call(`_colourvalues_rcpp_convert_hex_to_rgb`, hex_strings)
 }

diff --git a/inst/include/colourvalues/api/api.hpp b/inst/include/colourvalues/api/api.hpp
@@ -5,5 +5,6 @@
 
 #include "colourvalues/api/api_hex.hpp"
 #include "colourvalues/api/api_rgb.hpp"
+#include "colourvalues/api/api_rgb_interleaved.hpp"
 
 #endif