Skip to content

Commit 23dc601

Browse files
dmurdochcran-robot
authored andcommitted
version 1.0.1
1 parent aa1c841 commit 23dc601

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

70 files changed

+1764
-2423
lines changed

DESCRIPTION

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Package: rgl
2-
Version: 0.111.6
2+
Version: 1.0.1
33
Title: 3D Visualization Using OpenGL
44
Authors@R: c(person("Duncan", "Murdoch", role = c("aut", "cre"),
55
email = "murdoch.duncan@gmail.com"),
@@ -53,7 +53,7 @@ VignetteBuilder: knitr, rmarkdown
5353
Biarch: true
5454
RoxygenNote: 7.2.2.9000
5555
NeedsCompilation: yes
56-
Packaged: 2023-01-06 20:24:39 UTC; murdoch
56+
Packaged: 2023-01-18 15:52:06 UTC; murdoch
5757
Author: Duncan Murdoch [aut, cre],
5858
Daniel Adler [aut],
5959
Oleg Nenadic [ctb],
@@ -78,4 +78,4 @@ Author: Duncan Murdoch [aut, cre],
7878
Mike Stein [ctb]
7979
Maintainer: Duncan Murdoch <murdoch.duncan@gmail.com>
8080
Repository: CRAN
81-
Date/Publication: 2023-01-07 15:00:02 UTC
81+
Date/Publication: 2023-01-18 21:50:02 UTC

MD5

+58-63
Large diffs are not rendered by default.

NAMESPACE

+11-9
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
export(.check3d,
22
abclines3d, addNormals, addToSubscene3d, arc3d,
33
arrow3d, as.mesh3d, as.rglscene, as.tmesh3d, as.triangles3d, asRow,
4-
ageSetter, asEuclidean, asEuclidean2, asHomogeneous, asHomogeneous2,
4+
asEuclidean, asEuclidean2, asHomogeneous, asHomogeneous2,
55
aspect3d, axes3d, axis3d, box3d,
66
bbox3d, bg3d, bgplot3d,
77
Buffer,
88
checkDeldir,
9-
clear3d, clearSubsceneList, clipplanes3d, clipplaneSlider,
9+
10+
clear3d, clearSubsceneList, clipplanes3d,
1011
clipMesh3d, clipObj3d, close3d, compare_proxy.mesh3d,
1112
contourLines3d,
1213
cube3d, cuboctahedron3d, cur3d,
@@ -17,16 +18,17 @@ export(.check3d,
1718
gc3d, getBoundary3d,
1819
getr3dDefaults, getShaders, getWidgetId, gltfTypes,
1920
GramSchmidt, grid3d,
21+
2022
highlevel, hook_rgl, hook_webgl,
2123
icosahedron3d, identify3d, identityMatrix, ids3d,
2224
in_pkgdown_example,
2325
layout3d, legend3d, light3d, lines3d, lowlevel, makeDependency, material3d,
24-
matrixSetter, mergeVertices, mesh3d, mfrow3d, movie3d, mtext3d,
26+
mergeVertices, mesh3d, mfrow3d, movie3d, mtext3d,
2527
newSubscene3d, next3d, normalize.mesh3d, observer3d, octahedron3d, oh3d, open3d,
26-
par3d, par3dinterp, par3dinterpControl, par3dinterpSetter,
28+
par3d, par3dinterp, par3dinterpControl,
2729
particles3d, pch3d, persp3d, planes3d,
2830
play3d, plot3d, plotmath3d, points3d,
29-
polygon3d, pop3d, projectDown, propertySetter, propertySlider,
31+
polygon3d, pop3d, projectDown,
3032
qmesh3d, quads3d, readOBJ, readSTL, rgl.abclines, rgl.bbox, rgl.bg, rgl.bringtotop, rgl.clear,
3133
rgl.getAxisCallback, rgl.getMouseCallbacks, rgl.getWheelCallback,
3234
rgl.close, rgl.cur, rgl.ids, rgl.init, rgl.light, rgl.lines, rgl.linestrips,
@@ -46,17 +48,18 @@ export(.check3d,
4648
rgl.setAxisCallback, rgl.setMouseCallbacks, rgl.setWheelCallback,
4749
set3d, setAxisCallbacks, setGraphicsDelay, setupKnitr,
4850
setUserCallbacks, setUserShaders, shade3d, shadow3d,
51+
4952
shapelist3d, shinyGetPar3d, shinySetPar3d, shinyResetBrush,
5053
show2d, snapshot3d,
5154
spheres3d, spin3d, sprites3d, subdivision3d,
52-
subsceneInfo, subsceneList, subsetSetter, subsetSlider, Sweave.snapshot,
55+
subsceneInfo, subsceneList, Sweave.snapshot,
5356
surface3d, tagged3d, terrain3d,
5457
tetrahedron3d, text3d, texts3d,
5558
thigmophobe3d, title3d,
5659
tkpar3dsave, tkspinControl, tkspin3d,
57-
toggleButton, toggleWidget, triangulate,
60+
toggleWidget, triangulate,
5861
tmesh3d, transform3d, translate3d, translationMatrix, triangles3d,
59-
turn3d, useSubscene3d, vertexSetter, view3d, wire3d,
62+
turn3d, useSubscene3d, view3d, wire3d,
6063
writeASY, writeOBJ, writePLY, writeSTL, writeWebGL)
6164

6265
S3method(dot3d, shapelist3d)
@@ -135,7 +138,6 @@ export(.check3d,
135138
S3method(print, rglscene)
136139
S3method(print, rglobject)
137140
S3method(print, rglsubscene)
138-
S3method(print, indexedSetter)
139141
S3method(print, rglId)
140142
S3method(print, rglOpen3d)
141143
S3method(print, mesh3d)

NEWS.md

+31
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,34 @@
1+
# rgl 1.0.1
2+
3+
## Major changes
4+
5+
* The long promised deprecations of the `rgl.*` functions
6+
have happened. Now deprecated: `rgl.abclines`,
7+
`rgl.bbox`, `rgl.bg`, `rgl.clear`, `rgl.clipplanes`,
8+
`rgl.close`, `rgl.light`, `rgl.lines`,
9+
`rgl.linestrips`, `rgl.material`, `rgl.open`,
10+
`rgl.planes`, `rgl.points`, `rgl.quads`,
11+
`rgl.select3d`, `rgl.set`, `rgl.setAxisCallback`,
12+
`rgl.sprites`, `rgl.surface`, `rgl.texts`,
13+
`rgl.triangles`, and `rgl.viewpoint`.
14+
* A vignette "Deprecating the `rgl.*` interface"
15+
has been added.
16+
* Also deprecated: `elementId2Prefix`, `writeWebGL`
17+
18+
## Minor changes
19+
20+
* Since `rgl.material` is deprecated and no
21+
longer contains the list of material types in its
22+
argument list, `rgl.material.names` and `rgl.material.readonly` have been
23+
added.
24+
* Similarly, `rgl.par3d.names` and `rgl.par3d.readonly`
25+
contain lists of properties that may be set or queried
26+
in `par3d()`.
27+
* The flexibility improvements for `surface3d()` in
28+
0.111.6 were incomplete.
29+
* Argument `flip` has been added to `surface3d()` to allow
30+
front and back to be switched.
31+
132
# rgl 0.111.6
233

334
## Minor changes

R/axes.R

+2-2
Original file line numberDiff line numberDiff line change
@@ -172,10 +172,10 @@ mtext3d <- function(text, edge, at = NULL, line = 0,
172172
save <- par3d(ignoreExtent = TRUE)
173173
on.exit(par3d(save))
174174

175-
bboxdeco <- rgl.ids("bboxdeco")
175+
bboxdeco <- ids3d("bboxdeco")
176176
if (!is.na(floating) && !nrow(bboxdeco)) {
177177
dummyBbox()
178-
bboxdeco <- rgl.ids("bboxdeco")
178+
bboxdeco <- ids3d("bboxdeco")
179179
}
180180

181181
if (!nrow(bboxdeco) || (missing(floating) && !missing(pos)))

R/callbacks.R

+3
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,9 @@ rgl.getWheelCallback <- function(dev = cur3d(), subscene = currentSubscene3d(dev
1414
.Call(rgl_getWheelCallback, as.integer(dev), as.integer(subscene))
1515

1616
rgl.setAxisCallback <- function(axis, draw = NULL, dev = cur3d(), subscene = currentSubscene3d(dev)) {
17+
18+
.Deprecated("setAxisCallbacks")
19+
1720
stopifnot(length(axis) == 1, axis %in% 1:3)
1821
.Call(rgl_setAxisCallback, draw, as.integer(dev), as.integer(subscene), as.integer(axis - 1))
1922
invisible(NULL)

R/device.R

+7-15
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@ rgl.useNULL <- function() {
2828

2929
rgl.open <- function(useNULL = rgl.useNULL()) {
3030

31+
.Deprecated("open3d")
32+
3133
ret <- .C( rgl_dev_open, success=FALSE, useNULL=useNULL )
3234

3335
if (! ret$success)
@@ -43,6 +45,8 @@ rgl.open <- function(useNULL = rgl.useNULL()) {
4345

4446
rgl.close <- function() {
4547

48+
.Deprecated("close3d")
49+
4650
if (length(hook <- getHook("on.rgl.close"))) {
4751
if (is.list(hook)) hook <- hook[[1]] # test is for compatibility with R < 3.0.0
4852
hook()
@@ -55,27 +59,13 @@ rgl.close <- function() {
5559

5660
}
5761

58-
##
59-
## get current device
60-
##
61-
##
62-
63-
rgl.cur <- function() {
64-
65-
.Call( rgl_dev_getcurrent )
66-
67-
}
68-
6962
##
7063
## get all devices
7164
##
7265
##
7366

74-
rgl.dev.list <- function() {
75-
67+
rgl.dev.list <- function()
7668
.Call( rgl_dev_list )
77-
78-
}
7969

8070

8171
##
@@ -84,6 +74,8 @@ rgl.dev.list <- function() {
8474
##
8575

8676
rgl.set <- function(which, silent = FALSE) {
77+
78+
.Deprecated("set3d")
8779

8880
idata <- c( as.integer(which), as.integer(silent) )
8981

R/material.R

+6-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
## ===[ SECTION: generic appearance function ]================================
99
##
1010

11-
rgl.material <- function(
11+
rgl.material0 <- function(
1212
color = "white",
1313
alpha = 1.0,
1414
lit = TRUE,
@@ -138,6 +138,11 @@ rgl.material <- function(
138138
)
139139
}
140140

141+
rgl.material <- function(...) {
142+
.Deprecated("material3d")
143+
rgl.material0(...)
144+
}
145+
141146
rgl.getcolorcount <- function() .C( rgl_getcolorcount, count=integer(1) )$count
142147

143148
rgl.getmaterial <- function(ncolors, id = NULL) {

0 commit comments

Comments
 (0)