Skip to content

Commit

Permalink
full port
Browse files Browse the repository at this point in the history
  • Loading branch information
thomasp85 committed Jan 29, 2024
1 parent f1cbb31 commit e5e533f
Show file tree
Hide file tree
Showing 14 changed files with 509 additions and 414 deletions.
6 changes: 3 additions & 3 deletions DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ Depends:
ggplot2 (>= 3.3.6),
R (>= 3.3.0)
Imports:
Rcpp (>= 0.12.2),
grid,
scales,
MASS,
Expand All @@ -41,7 +40,8 @@ Imports:
cli,
vctrs,
systemfonts
LinkingTo: Rcpp, RcppEigen
LinkingTo:
cpp11
RoxygenNote: 7.2.3
Suggests:
sessioninfo,
Expand All @@ -51,7 +51,6 @@ Suggests:
units (>= 0.8.0),
covr
Collate:
'RcppExports.R'
'aaa.R'
'shape.R'
'arc_bar.R'
Expand All @@ -64,6 +63,7 @@ Collate:
'bspline_closed.R'
'circle.R'
'concaveman.R'
'cpp11.R'
'diagonal.R'
'diagonal_wide.R'
'ellipse.R'
Expand Down
2 changes: 1 addition & 1 deletion NAMESPACE
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,6 @@ import(ggplot2)
import(rlang)
import(vctrs)
importFrom(MASS,fractions)
importFrom(Rcpp,sourceCpp)
importFrom(ggplot2,label_parsed)
importFrom(ggplot2,layer)
importFrom(grDevices,chull)
Expand Down Expand Up @@ -241,3 +240,4 @@ importFrom(tweenr,tween_t)
importFrom(utils,packageVersion)
importFrom(withr,with_seed)
useDynLib(ggforce)
useDynLib(ggforce, .registration = TRUE)
35 changes: 0 additions & 35 deletions R/RcppExports.R

This file was deleted.

33 changes: 33 additions & 0 deletions R/cpp11.R
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
# Generated by cpp11: do not edit by hand

splinePath <- function(x, y, degree, knots, detail, type) {
.Call(`_ggforce_splinePath`, x, y, degree, knots, detail, type)
}

getSplines <- function(x, y, id, detail, type) {
.Call(`_ggforce_getSplines`, x, y, id, detail, type)
}

bezierPath <- function(x, y, detail) {
.Call(`_ggforce_bezierPath`, x, y, detail)
}

getBeziers <- function(x, y, id, detail) {
.Call(`_ggforce_getBeziers`, x, y, id, detail)
}

concaveman_c <- function(p, h, concavity, threshold) {
.Call(`_ggforce_concaveman_c`, p, h, concavity, threshold)
}

enclose_ellip_points <- function(x, y, id, tol) {
.Call(`_ggforce_enclose_ellip_points`, x, y, id, tol)
}

enclose_points <- function(x, y, id) {
.Call(`_ggforce_enclose_points`, x, y, id)
}

points_to_path <- function(pos, path, close) {
.Call(`_ggforce_points_to_path`, pos, path, close)
}
4 changes: 2 additions & 2 deletions R/ggforce-package.R
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#' @useDynLib ggforce
#' @import ggplot2
#' @importFrom Rcpp sourceCpp
#'
#' @examples
#' rocketData <- data.frame(
Expand Down Expand Up @@ -57,8 +56,9 @@
"_PACKAGE"

## usethis namespace: start
#' @importFrom lifecycle deprecated
#' @import rlang
#' @import vctrs
#' @importFrom lifecycle deprecated
#' @useDynLib ggforce, .registration = TRUE
## usethis namespace: end
NULL
142 changes: 0 additions & 142 deletions src/RcppExports.cpp

This file was deleted.

Loading

0 comments on commit e5e533f

Please sign in to comment.