Skip to content

Commit e5e533f

Browse files
committed
full port
1 parent f1cbb31 commit e5e533f

14 files changed

+509
-414
lines changed

DESCRIPTION

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ Depends:
2424
ggplot2 (>= 3.3.6),
2525
R (>= 3.3.0)
2626
Imports:
27-
Rcpp (>= 0.12.2),
2827
grid,
2928
scales,
3029
MASS,
@@ -41,7 +40,8 @@ Imports:
4140
cli,
4241
vctrs,
4342
systemfonts
44-
LinkingTo: Rcpp, RcppEigen
43+
LinkingTo:
44+
cpp11
4545
RoxygenNote: 7.2.3
4646
Suggests:
4747
sessioninfo,
@@ -51,7 +51,6 @@ Suggests:
5151
units (>= 0.8.0),
5252
covr
5353
Collate:
54-
'RcppExports.R'
5554
'aaa.R'
5655
'shape.R'
5756
'arc_bar.R'
@@ -64,6 +63,7 @@ Collate:
6463
'bspline_closed.R'
6564
'circle.R'
6665
'concaveman.R'
66+
'cpp11.R'
6767
'diagonal.R'
6868
'diagonal_wide.R'
6969
'ellipse.R'

NAMESPACE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,6 @@ import(ggplot2)
161161
import(rlang)
162162
import(vctrs)
163163
importFrom(MASS,fractions)
164-
importFrom(Rcpp,sourceCpp)
165164
importFrom(ggplot2,label_parsed)
166165
importFrom(ggplot2,layer)
167166
importFrom(grDevices,chull)
@@ -241,3 +240,4 @@ importFrom(tweenr,tween_t)
241240
importFrom(utils,packageVersion)
242241
importFrom(withr,with_seed)
243242
useDynLib(ggforce)
243+
useDynLib(ggforce, .registration = TRUE)

R/RcppExports.R

Lines changed: 0 additions & 35 deletions
This file was deleted.

R/cpp11.R

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
# Generated by cpp11: do not edit by hand
2+
3+
splinePath <- function(x, y, degree, knots, detail, type) {
4+
.Call(`_ggforce_splinePath`, x, y, degree, knots, detail, type)
5+
}
6+
7+
getSplines <- function(x, y, id, detail, type) {
8+
.Call(`_ggforce_getSplines`, x, y, id, detail, type)
9+
}
10+
11+
bezierPath <- function(x, y, detail) {
12+
.Call(`_ggforce_bezierPath`, x, y, detail)
13+
}
14+
15+
getBeziers <- function(x, y, id, detail) {
16+
.Call(`_ggforce_getBeziers`, x, y, id, detail)
17+
}
18+
19+
concaveman_c <- function(p, h, concavity, threshold) {
20+
.Call(`_ggforce_concaveman_c`, p, h, concavity, threshold)
21+
}
22+
23+
enclose_ellip_points <- function(x, y, id, tol) {
24+
.Call(`_ggforce_enclose_ellip_points`, x, y, id, tol)
25+
}
26+
27+
enclose_points <- function(x, y, id) {
28+
.Call(`_ggforce_enclose_points`, x, y, id)
29+
}
30+
31+
points_to_path <- function(pos, path, close) {
32+
.Call(`_ggforce_points_to_path`, pos, path, close)
33+
}

R/ggforce-package.R

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
#' @useDynLib ggforce
22
#' @import ggplot2
3-
#' @importFrom Rcpp sourceCpp
43
#'
54
#' @examples
65
#' rocketData <- data.frame(
@@ -57,8 +56,9 @@
5756
"_PACKAGE"
5857

5958
## usethis namespace: start
60-
#' @importFrom lifecycle deprecated
6159
#' @import rlang
6260
#' @import vctrs
61+
#' @importFrom lifecycle deprecated
62+
#' @useDynLib ggforce, .registration = TRUE
6363
## usethis namespace: end
6464
NULL

src/RcppExports.cpp

Lines changed: 0 additions & 142 deletions
This file was deleted.

0 commit comments

Comments
 (0)