Skip to content

Commit f613484

Browse files
authored
Merge pull request #48 from nrennie/add-network-art
Add network art
2 parents 8d91485 + 61737df commit f613484

12 files changed

+219
-76
lines changed

DESCRIPTION

+39-39
Original file line numberDiff line numberDiff line change
@@ -1,54 +1,54 @@
11
Package: aRt
22
Title: Generative Art with R
3-
Version: 1.4.5
3+
Version: 1.4.6
44
Authors@R:
55
person("Nicola", "Rennie", , "[email protected]", role = c("aut", "cre"))
66
Description: Creates generative art using R.
77
License: Apache License (>= 2)
88
URL: https://nrennie.github.io/aRt/
99
Depends:
10-
R (>= 4.1)
10+
R (>= 4.1)
1111
Imports:
12-
ape,
13-
cowplot,
14-
dplyr,
15-
ggforce,
16-
ggfx,
17-
ggpattern,
18-
ggplot2 (>= 3.4.0),
19-
ggraph,
20-
ggvoronoi,
21-
grDevices,
22-
igraph,
23-
lwgeom,
24-
magick,
25-
patchwork,
26-
purrr,
27-
sf,
28-
stats,
29-
stringr,
30-
terra,
31-
tibble,
32-
tidygraph,
33-
tidyr,
34-
tidyterra,
35-
treemapify
12+
ape,
13+
cowplot,
14+
dplyr,
15+
ggforce,
16+
ggfx,
17+
ggpattern,
18+
ggplot2 (>= 3.4.0),
19+
ggraph,
20+
ggvoronoi,
21+
grDevices,
22+
igraph,
23+
lwgeom,
24+
magick,
25+
patchwork,
26+
purrr,
27+
sf,
28+
stats,
29+
stringr,
30+
terra,
31+
tibble,
32+
tidygraph,
33+
tidyr,
34+
tidyterra,
35+
treemapify
3636
Suggests:
37-
ambient,
38-
deldir,
39-
elevatr,
40-
ggstream,
41-
MetBrewer,
42-
particles,
43-
PrettyCols,
44-
rayshader,
45-
rcartocolor,
46-
RColorBrewer
37+
ambient,
38+
deldir,
39+
elevatr,
40+
ggstream,
41+
MetBrewer,
42+
particles,
43+
PrettyCols,
44+
rayshader,
45+
rcartocolor,
46+
RColorBrewer
4747
Remotes:
48-
thomasp85/ggfx,
49-
nrennie/ggvoronoi
48+
thomasp85/ggfx,
49+
nrennie/ggvoronoi
5050
Config/Needs/website: nrennie/nrenniepkgdown
5151
Encoding: UTF-8
5252
LazyData: true
5353
Roxygen: list(markdown = TRUE)
54-
RoxygenNote: 7.2.3
54+
RoxygenNote: 7.3.1

NAMESPACE

+1
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ export(mirrored)
2929
export(moire)
3030
export(mosaic)
3131
export(mosaic_sketch)
32+
export(network)
3233
export(perpendicular)
3334
export(polygons)
3435
export(puzzles)

NEWS.md

+34-30
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,12 @@
1-
## aRt 1.4.5
1+
# aRt 1.4.6
2+
3+
* Add `network()`
4+
5+
# aRt 1.4.5
26

37
* Use remote dependency for {ggvoronoi}
48

5-
## aRt 1.4.4
9+
# aRt 1.4.4
610

711
* Add `riso_circles()`
812
* Add `crosshatch()`
@@ -19,26 +23,26 @@
1923
* Add {terra} and {tidyterra} to Imports
2024
* Update linting
2125

22-
## aRt 1.4.3
26+
# aRt 1.4.3
2327

2428
* Add `random_tessellation()`
2529
* Add `sunsets()`
2630
* Add `spiro()`
2731
* Rename `windows()` to `window_boxes()`
2832
* Rename `lines()` to `perpendicular()`
2933

30-
## aRt 1.4.2
34+
# aRt 1.4.2
3135

3236
* Add `gradients()`
3337
* Move {ambient} to Suggests
3438

35-
## aRt 1.4.1
39+
# aRt 1.4.1
3640

3741
* Fix: bug introduced in `divide()` when switching to native pipe
3842
* Fix: change to using `after_stat()`
3943
* Fix: use `quietly = TRUE` when checking packages
4044

41-
## aRt 1.4.0
45+
# aRt 1.4.0
4246

4347
* Add `shatter()`
4448
* Fix missing namespace in `polygons()`
@@ -48,21 +52,21 @@
4852
* Remove {magrittr} from Imports and use native pipe
4953
* Bump R version in Depends to 4.1
5054

51-
## aRt 1.3.3
55+
# aRt 1.3.3
5256

5357
* Add `windows()`
5458

55-
## aRt 1.3.2
59+
# aRt 1.3.2
5660

5761
* Fix bug in `flow_fields()`
5862
* Update `mosaic_sketch()` to use `linewidth`
5963
* Minimum ggplot2 version 3.4.0
6064

61-
## aRt 1.3.1
65+
# aRt 1.3.1
6266

6367
* Fix spelling of `granularity` in `flow_fields()`
6468

65-
## aRt 1.3.0
69+
# aRt 1.3.0
6670

6771
* add {lwgeom}, {cowplot}, {sf}, {grdevices} to Imports
6872
* add `divide()` function
@@ -72,100 +76,100 @@
7276
* add `lines()` function
7377
* add `moire()` function
7478

75-
## aRt 1.2.9
79+
# aRt 1.2.9
7680

7781
* add `contours()` function
7882
* add `stacked()` function
7983
* add {metR}, {elevatr}, {raster}, and {rayshader} dependencies
8084
* Minor bug fix to `tiles()`
8185

82-
## aRt 1.2.8
86+
# aRt 1.2.8
8387

8488
* add `puzzles()` function
8589

86-
## aRt 1.2.7
90+
# aRt 1.2.7
8791

8892
* add `black_hole()` function
8993
* move internal functions to different files
9094

91-
## aRt 1.2.6
95+
# aRt 1.2.6
9296

9397
* add `abacus()` function
9498
* add `mosaic_sketch()` function
9599

96-
## aRt 1.2.5
100+
# aRt 1.2.5
97101

98102
* add `mosaic()` function
99103

100-
## aRt 1.2.4
104+
# aRt 1.2.4
101105

102106
* add `squares()` function
103107
* fix linting
104108

105-
## aRt 1.2.3
109+
# aRt 1.2.3
106110

107111
* add `fractals()` function
108112

109-
## aRt 1.2.2
113+
# aRt 1.2.2
110114

111115
* update pkgdown website
112116

113-
## aRt 1.2.1
117+
# aRt 1.2.1
114118

115119
* update `waves()` to use vector of colours
116120

117-
## aRt 1.2.0
121+
# aRt 1.2.0
118122

119123
* add `streams()` function
120124
* Move {MetBrewer} to Suggests
121125
* Move {RColorBrewer} to Suggests
122126
* Functions take colour vectors instead of palette names as inputs
123127

124-
## aRt 1.1.9
128+
# aRt 1.1.9
125129

126130
* update license
127131

128-
## aRt 1.1.8
132+
# aRt 1.1.8
129133

130134
* add `sunbursts()` function
131135
* add panel function
132136
* add {pkgdown website}
133137

134-
## aRt 1.1.7
138+
# aRt 1.1.7
135139

136140
* add GitHub actions
137141
* fix CI
138142

139-
## aRt 1.1.6
143+
# aRt 1.1.6
140144

141145
* Fix issues with `flow_fields()` rendering
142146
* Add custom `ggplot2` theme
143147
* add aRtData dependency
144148
* add `blending()` function
145149

146-
## aRt 1.1.5
150+
# aRt 1.1.5
147151

148152
* Switch `flow_fields()` to cartesian coords
149153

150-
## aRt 1.1.4
154+
# aRt 1.1.4
151155

152156
* Add `flow_fields()`
153157
* Fix missing `ggplot2::` in circles
154158
* Fix `no visible binding for global variable "new_group"`
155159

156-
## aRt 1.1.3
160+
# aRt 1.1.3
157161

158162
* Installation bug fix
159163

160-
## aRt 1.1.2
164+
# aRt 1.1.2
161165

162166
* `bubbles()` function fixed
163167

164-
## aRt 1.1.1
168+
# aRt 1.1.1
165169

166170
* `bubbles()` has been added.
167171

168-
## aRt 1.1.0
172+
# aRt 1.1.0
169173

170174
* `rectangles()` has been added.
171175
* News.md file now included.

R/divide.R

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#' @param num_lines Number of intersecting lines. Default `30`.
66
#' @param col_palette Vector of colours. Default `PrettyCols::prettycols("TangerineBlues")`.
77
#' @param rayshade Boolean determining whether the returned plot should be converted to
8-
#' three dimensional using rayshader. If `TRUE`, {rayshader} is required to be installed.
8+
#' three dimensional using rayshader. If `TRUE`, `{rayshader}` is required to be installed.
99
#' Default `FALSE`.
1010
#' @param s Seed value. Default `1234`.
1111
#' @return A ggplot object.

0 commit comments

Comments
 (0)