Skip to content

Commit c08a32d

Browse files
dmurdochcran-robot
authored andcommitted
version 0.100.24
1 parent 28848c0 commit c08a32d

13 files changed

+116
-90
lines changed

DESCRIPTION

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Package: rgl
2-
Version: 0.100.19
2+
Version: 0.100.24
33
Title: 3D Visualization Using OpenGL
44
Author: Daniel Adler <dadler@uni-goettingen.de>, Duncan Murdoch <murdoch@stats.uwo.ca>, and others (see README)
55
Maintainer: Duncan Murdoch <murdoch@stats.uwo.ca>
@@ -23,6 +23,6 @@ SystemRequirements: OpenGL, GLU Library, XQuartz (on OSX), zlib
2323
BugReports: https://r-forge.r-project.org/projects/rgl/
2424
VignetteBuilder: knitr
2525
NeedsCompilation: yes
26-
Packaged: 2019-03-12 15:58:50 UTC; murdoch
26+
Packaged: 2019-06-26 10:46:15 UTC; murdoch
2727
Repository: CRAN
28-
Date/Publication: 2019-03-12 17:50:03 UTC
28+
Date/Publication: 2019-06-26 14:00:03 UTC

MD5

+10-10
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
e73499cb89e0d6e97b8ba271c46739fd *COPYING
2-
8842574d75aff07cd50d914c0550b4f2 *DESCRIPTION
2+
a6f95828e68b12837b918579ca33719d *DESCRIPTION
33
c7a0907c48009c53c3f3e62186116b32 *NAMESPACE
44
8d6709606696359548d94a4bf71ce78d *R/Sweave_knitr.R
55
3c20a30ef6a398649341d9b1f227cb7d *R/addNormals.mesh3d.R
@@ -37,7 +37,7 @@ de4b7f1e4152a067650527ce2b00e2a1 *R/plot3d.R
3737
ab72f9571814ef8c44de6f2343b547c1 *R/plotmath3d.R
3838
af9a986f1752f610b392a47202f8cb59 *R/plugin.R
3939
7c156818e20bab511277a1851b4d09c4 *R/ply.R
40-
2469b4eec639e6d2ece5ee4dac58833d *R/r3d.rgl.R
40+
5eea7c920436d118cc4432dec27e8ace *R/r3d.rgl.R
4141
a82494d493925454323cd8102200995d *R/rgl.bringtotop.R
4242
16799b9a7f5ee8eb00c2059ee948d261 *R/rglMouse.R
4343
d1ea9aafe532dda4dee6b213b90b18f8 *R/rglcontroller.R
@@ -50,14 +50,14 @@ b8fcaff709d438c64fe31c712b04a30a *R/solids3d.R
5050
8dc214a6b3f270d593edfe45fe98f8b4 *R/stl.R
5151
848372016dc3567e06f473836e4145eb *R/subdivision.mesh3d.R
5252
a1f7b5422a13c64dbf75d3215f57b2c1 *R/subscenes.R
53-
018274ef858d0d552730483f1c54040d *R/thigmophobe3d.R
53+
3c030acca34f88270334c69e511a240f *R/thigmophobe3d.R
5454
5bd916f84d651ec3c477700ea73ade49 *R/triangulate.R
5555
3447eb732f99d8015c8575c9a4e5077e *R/turn3d.R
5656
0510e98135fa6b5d756250ca24195514 *R/webGL.R
5757
19a59bb1f17af961b763722f93b8d9f4 *R/webGLcontrols.R
58-
f90a862b0275362d317e691e6cc6e324 *R/zzz.R
58+
0e0d40c849bd16d4fa22db13d0388600 *R/zzz.R
5959
df2624d49e00f56c06ce339040b035ca *README
60-
f4d3e9804cf097ac41b45a29840fcd65 *build/vignette.rds
60+
47edbc64704c6a73db3542353d96a6fa *build/vignette.rds
6161
a6a183397bea52041e6eebb1e2609eb2 *cleanup
6262
7d37669393c8be241f1ae7f5bde64d5e *configure
6363
3f3edde5cdea72fb28297b95fc208234 *configure.ac
@@ -80,19 +80,19 @@ df244a7d325a77c36f2312f2fde095f2 *demo/shapes3d.R
8080
a8cbd8dd339ba65adf23a165a8dfeef6 *demo/simpleShinyRgl.R
8181
866ebfda71509e83a98a7a034e004269 *demo/stereo.R
8282
c19c31ef34d40d4c41c7bc0caf112054 *demo/subdivision.r
83-
596d12e78991a9e0697116f6e28d20c4 *inst/NEWS
83+
6d85434f451359aa3b660e8c86dc527d *inst/NEWS
8484
8c5d291e3f47c3395fff092f09f599b9 *inst/WebGL/template.html
8585
5bac46c36b13eac1302260ee06b16c0f *inst/demodata/population.dat
8686
5544dce93555cfaced50ee41283e9e58 *inst/demodata/region.dat
8787
466888b2baf565e5f4fead5a98bbbee7 *inst/doc/WebGL.R
8888
7bf4c0cb3a8f66ebf6335e04f5a21d4d *inst/doc/WebGL.Rmd
89-
550d41904c055944c32a5b88cc22464e *inst/doc/WebGL.html
89+
703ba2139fddcdbe1bbd738d9a7227e1 *inst/doc/WebGL.html
9090
975c5cb8a92968f780d33de734d7fbc7 *inst/doc/legacyWebGL.R
9191
ab830fea771ea15dd6687b7c5f9f655c *inst/doc/legacyWebGL.Rmd
92-
ccfcbad454590cbb3deffeb66b117c24 *inst/doc/legacyWebGL.html
92+
1ef50b4a92380763097cb05fd46b1a34 *inst/doc/legacyWebGL.html
9393
50c5f1367fc2f207aa59c7b5523c5704 *inst/doc/rgl.R
9494
c54a03f6dd7e548c7c52511d1fb4740d *inst/doc/rgl.Rmd
95-
f2d0ca915a104377c4a338c95c1effa1 *inst/doc/rgl.html
95+
07822e5b33dced66592a07baf890aa22 *inst/doc/rgl.html
9696
b4ef592c88333c7c509dd74fcd1912d9 *inst/fonts/FreeMono.ttf
9797
867469f13ff81dec9adf2ae2f6ea2899 *inst/fonts/FreeSans.ttf
9898
dc0004a804503e126bc99998c7a1c677 *inst/fonts/FreeSerif.ttf
@@ -165,7 +165,7 @@ eda5e88bdcc1eb2d348693b2fc7ebc3e *man/playwidget.Rd
165165
8588b0b2e4ff43512877f0de6a5db7e1 *man/plot3d.lm.Rd
166166
4bccd4a564fc08174f42dcf328e42dba *man/plotmath3d.Rd
167167
ebc0b9d4e3956ffd0f6c7be6d8026043 *man/polygon3d.Rd
168-
46b5b23d8e82fe8dc42776717fac542f *man/postscript.Rd
168+
251dc0c6c9d50a0712c443c7802d914a *man/postscript.Rd
169169
f8ee8a261f18f776c95d24b52e5a7683 *man/primitive.Rd
170170
0d3d776e61559501530404faf08cff76 *man/propertyControl.Rd
171171
a6c1f736b547536f8b660d3ed9c63e30 *man/propertySetter.Rd

R/r3d.rgl.R

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#
22
# R3D rendering functions - rgl implementation
3-
# $Id: r3d.rgl.R 1667 2019-02-16 20:57:21Z murdoch $
3+
# $Id: r3d.rgl.R 1681 2019-06-25 19:19:12Z murdoch $
44
#
55

66
# Node Management

R/thigmophobe3d.R

+10-2
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,14 @@ thigmophobe3d <- function(x, y = NULL, z = NULL,
1313
h <- diff(windowRect[c(2,4)])
1414
pts2d <- cbind(w*pts2d[,1], h*pts2d[,2])
1515

16-
plotrix::thigmophobe(pts2d, plot.span = c(-w, w, -h, h),
17-
xlog = FALSE, ylog = FALSE)
16+
if (packageVersion("plotrix") < "3.7.5")
17+
plotrix::thigmophobe(pts2d, plot.span = c(-w, w, -h, h),
18+
xlog = FALSE, ylog = FALSE)
19+
else if (packageVersion("plotrix") < "3.7.6")
20+
plotrix::thigmophobe(pts2d, usr = c(-w, w, -h, h),
21+
xlog = FALSE, ylog = FALSE) # This doesn't seem to matter...
22+
else
23+
plotrix::thigmophobe(pts2d, usr = c(-w, w, -h, h),
24+
xlog = FALSE, ylog = FALSE,
25+
pin = c(w, h)/50) # This doesn't seem to matter...
1826
}

R/zzz.R

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
## R source file
33
## This file is part of rgl
44
##
5-
## $Id: zzz.R 1632 2018-09-21 14:02:31Z murdoch $
5+
## $Id: zzz.R 1681 2019-06-25 19:19:12Z murdoch $
66
##
77

88
##

build/vignette.rds

-2 Bytes
Binary file not shown.

inst/NEWS

+6-1
Original file line numberDiff line numberDiff line change
@@ -966,4 +966,9 @@ base graphics.
966966
- A number of memory bugs found by rchk have been fixed.
967967

968968
0.100.19
969-
- Fix some bugs detected by valgrind
969+
- Fix some bugs detected by valgrind
970+
971+
0.100.24
972+
- Fix thigmophobe3d to try to keep up with changes in
973+
plotrix::thigmophobe.
974+
- Stop ?rgl.postscript from writing files to current directory

inst/doc/WebGL.html

+26-23
Large diffs are not rendered by default.

inst/doc/legacyWebGL.html

+44-41
Large diffs are not rendered by default.

inst/doc/rgl.html

+11-8
Large diffs are not rendered by default.

man/postscript.Rd

+4
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@ GL2PS: an OpenGL to PostScript printing library by Christophe Geuzaine,
2727
}
2828
\author{ Christophe Geuzaine / Albrecht Gebhardt }
2929
\examples{
30+
# Create new files in tempdir
31+
savedir <- setwd(tempdir())
3032

3133
x <- y <- seq(-10, 10, length = 20)
3234
z <- outer(x, y, function(x, y) x^2 + y^2)
@@ -42,6 +44,8 @@ rgl.postscript("persp3db.ps", "ps")
4244
rgl.postscript("persp3db.pdf", "pdf")
4345
rgl.postscript("persp3db.tex", "tex", drawText = FALSE)
4446

47+
setwd(savedir)
48+
4549
\dontrun{
4650

4751
#

src/build/autoconf/config.guess

100644100755
File mode changed.

src/build/autoconf/config.sub

100644100755
File mode changed.

0 commit comments

Comments
 (0)