Skip to content

Commit 3afb93d

Browse files
dmurdochcran-robot
authored andcommitted
version 0.105.12
1 parent 07c0ef6 commit 3afb93d

Some content is hidden

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

59 files changed

+2942
-15700
lines changed

DESCRIPTION

+8-7
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
Package: rgl
2-
Version: 0.104.16
2+
Version: 0.105.12
33
Title: 3D Visualization Using OpenGL
44
Author: Daniel Adler <dadler@uni-goettingen.de>, Duncan Murdoch <murdoch.duncan@gmail.com>, and others (see README)
55
Maintainer: Duncan Murdoch <murdoch.duncan@gmail.com>
6-
Depends: R (>= 3.2.0)
6+
Depends: R (>= 3.3.0)
77
Suggests: MASS, rmarkdown, deldir, orientlib, lattice, misc3d,
88
rstudioapi, magick, plotrix (>= 3.7-3), tripack, interp,
9-
alphashape3d, tcltk, js (>= 1.2), akima
9+
alphashape3d, tcltk, js (>= 1.2), akima, webshot2
1010
Imports: graphics, grDevices, stats, utils, htmlwidgets, htmltools,
1111
knitr, jsonlite (>= 0.9.20), shiny, magrittr, crosstalk,
1212
manipulateWidget (>= 0.9.0)
@@ -16,13 +16,14 @@ Description: Provides medium to high level functions for 3D interactive graphics
1616
may be on screen using OpenGL, or to various standard 3D file formats including
1717
WebGL, PLY, OBJ, STL as well as 2D image formats, including PNG, Postscript, SVG, PGF.
1818
License: GPL
19-
URL: https://r-forge.r-project.org/projects/rgl/
19+
URL: https://github.com/dmurdoch/rgl
2020
SystemRequirements: OpenGL, GLU Library, XQuartz (on OSX), zlib
2121
(optional), libpng (>=1.2.9, optional), FreeType (optional),
2222
pandoc (>=1.14, needed for vignettes)
23-
BugReports: https://r-forge.r-project.org/projects/rgl/
23+
BugReports: https://github.com/dmurdoch/rgl/issues
2424
VignetteBuilder: knitr
25+
Additional_repositories: https://dmurdoch.github.io/drat
2526
NeedsCompilation: yes
26-
Packaged: 2021-01-09 01:07:36 UTC; murdoch
27+
Packaged: 2021-02-14 20:46:05 UTC; murdoch
2728
Repository: CRAN
28-
Date/Publication: 2021-01-10 17:10:13 UTC
29+
Date/Publication: 2021-02-14 22:50:03 UTC

MD5

+55-44
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
e73499cb89e0d6e97b8ba271c46739fd *COPYING
2-
e2c19b29443c4fc09748b3f13356c257 *DESCRIPTION
3-
f675723055d55f6d09640b864000c1ba *NAMESPACE
4-
d28c998775bb430520e0663f6aee925e *R/Sweave_knitr.R
2+
c8871d0eb12d9756c18c587e80e3919a *DESCRIPTION
3+
4e0bac383d7e404c88a0c10d77ac3e70 *NAMESPACE
4+
664118a44d0cbf5e0754bf2b3fcce21b *R/Sweave.R
55
67e457f4a3ecfa12f8b911faf11e7ab6 *R/addNormals.mesh3d.R
6-
94c77b57cb082374ffc53b278292a19a *R/animate.R
6+
37ee0d5829608839096c18670eac3cce *R/animate.R
77
baf0c2fd640c730aad8f424f407e4d1d *R/arc3d.R
88
e56b1d2ea8a0ab652d17a561a7415b40 *R/arrow3d.R
9-
d141cedf1582ddfa7c89bf594753076c *R/as.mesh3d.default.R
9+
fb4a023d9c8e327027b51329f73d2922 *R/as.mesh3d.default.R
1010
c4611e746f8484dd73df7aa7f83f6d92 *R/as.triangles3d.R
1111
21d8ad9dc97626936f671cc24413f700 *R/ashape3d.R
1212
853ac34ab3568c44d0326e6f89ccd68d *R/aspect3d.R
@@ -17,18 +17,19 @@ c9a4d8f2a5c25ba335e07224a47f731a *R/axes.R
1717
cd2346f0dda10c4eee7c223e91580c52 *R/clipMesh3d.R
1818
f84082194ec14e7ce9ecac1412ba38ba *R/contourLines3d.R
1919
149f8a63713267831727369515a66e8c *R/conversions.R
20-
5576889d2fd6cf4366d69a7c8a9b9d35 *R/convertScene.R
20+
738c68554da049c88ab4aaf1689da504 *R/convertScene.R
2121
e02c0b99986d8439fc3cfebf2c7f0ac2 *R/cylinder3d.R
22-
c892be902abb86af0729ffd970b12e27 *R/device.R
22+
ee008f2ca2afcec2ddc69cdb501a5622 *R/device.R
2323
3b7a562a2087834ac77c58be27e22574 *R/ellipse3d.R
2424
0f5823cce9e9ed435a06d8d887f70386 *R/enum.R
25-
d5cb47807dbaa0e9c6aafa171ad3e3cb *R/filledContour3d.R
25+
e94a9e7b2777277f4ddb891b53ad4c64 *R/filledContour3d.R
2626
ab542483bf671cb977c1680b2ad4568a *R/fonts.R
2727
50a8c3f0270568cd5621f9ea8b9e0833 *R/getscene.R
2828
878f2258edc9e9958e09aad1939575d9 *R/grid3d.R
2929
30e958a2ea6839292dd3472079007439 *R/hooks.R
3030
0db39cbfb3fe01c3cd5ac549cbb61d2d *R/identify3d.R
3131
84bb7eac068ca7484d58e598b9585394 *R/internal.R
32+
139443d9c55a3dd3257036068fc8daca *R/knitr.R
3233
07fdc67854ee75ff203c02b572df1892 *R/material.R
3334
bc7554cd3a9014b392aab255e0be9dad *R/matrices.R
3435
522fb8b8f8e0c70bae8594b6cc352693 *R/merge.mesh3d.R
@@ -39,16 +40,16 @@ ff913a930b33fabfad05e1302461c236 *R/obj.R
3940
ff2b672d7ae560988caeee3324d0d285 *R/par3d.R
4041
10033235c3fcbf78a7d9e17837213d95 *R/pch3d.R
4142
0fe719494d7e267c5f813508cd02571a *R/persp3d.R
42-
c7e319307ff5acfe79fa2eca3dd638f1 *R/playwidget.R
43+
bbf577f06d7ff609796b0300a470b0be *R/playwidget.R
4344
71bf8ad83a30660056eb557dd200b103 *R/plot3d.R
4445
172328f612e2414de217db24b0e91f1b *R/plotmath3d.R
4546
6c65179fb5627597f264c331297dbe74 *R/plugin.R
4647
512d796009f564b91c47ff284ba9867a *R/ply.R
47-
507e721293eb847bfa3fad9737f8b558 *R/r3d.rgl.R
48+
84a562abfa17c139c9d9ea89cef4f731 *R/r3d.rgl.R
4849
a82494d493925454323cd8102200995d *R/rgl.bringtotop.R
49-
fd75eb15a8f8789419774b624479c607 *R/rglMouse.R
50+
345a339edc1448b2702eb614b3108a57 *R/rglMouse.R
5051
b7cc9c529a2c44b063562909aaca6e2e *R/rglcontroller.R
51-
475233decf915aa6a34a34a86922b396 *R/rglwidget.R
52+
a15191f52cdd13797be61b176655e4ee *R/rglwidget.R
5253
50efd82368dd3b4df9c217b8280cfda5 *R/saveURI.R
5354
dc92359aaee6f50a9fdc56a57963181a *R/scene.R
5455
447e6c7fddf51487b69157230df311fa *R/selectpoints3d.R
@@ -58,20 +59,20 @@ b8fcaff709d438c64fe31c712b04a30a *R/solids3d.R
5859
a73b1fb705952c1cf33d721db5c34a92 *R/stl.R
5960
c0d16a399fc7561f2cfbe4e9457105a2 *R/subdivision.mesh3d.R
6061
5422ae70f6fa776bb158630b6c9b4cdc *R/subscenes.R
61-
f2b2f73cf843aa693654b213cafff789 *R/thigmophobe3d.R
62+
08226bf7d2b7d355107fd7204c0ec36d *R/thigmophobe3d.R
6263
3c00c089d6ef2488381138e3304e4030 *R/tkpar3dsave.R
6364
c3c69ccb1aa9033c78d8b9667c91e71c *R/tkspin3d.R
6465
5eb7756634ad2024f81bb2a5d7f7d1e2 *R/triangulate.R
6566
3447eb732f99d8015c8575c9a4e5077e *R/turn3d.R
6667
347f2085eadb6613740fde045e54c55b *R/webGL.R
6768
3f3ec6108c694f57c77e23dbf0063e9b *R/webGLcontrols.R
68-
fc4a0887646ab401423c9149c744352f *R/zzz.R
69-
12220320cabae64279647ac1b2b524e6 *README
70-
cf938db4f91fd7390b81d7453e657a35 *build/vignette.rds
71-
67e8d57017f35e62259114731c140086 *cleanup
72-
7c93a93b15da8b550e39f79bfba547b8 *configure
73-
e574ac67636b8f1bf5a4f213fdc6faa5 *configure.ac
74-
5158fb75fe08580c9360c6e54060a184 *configure.win
69+
f32a0ea3e26476f31b5e08e24ac11b2b *R/zzz.R
70+
432645047267467060677d5975ba2369 *README.md
71+
819c0166990a1b579fcfd46b34693ee6 *build/vignette.rds
72+
10e89b551cff8c2453ea69fde1b97493 *cleanup
73+
184807702286196ea6e4d4833ed4736b *configure
74+
c6cf576f509c9d05a8ec40887a47f17e *configure.ac
75+
2f6709e644fc4cd3ddf547a595d379ce *configure.win
7576
03561f8b3b96760a631e07f0a3c297fd *demo/00Index
7677
e3f778b562290afb28800fb26ae9a159 *demo/abundance.r
7778
ef0a77cfb7929550b9b7b8ce062ef7cf *demo/bivar.r
@@ -92,16 +93,20 @@ dbc013d5d4e50f2120e2cf524427d529 *demo/shinyMouse.R
9293
0047d90960eb9af45c4ae63780a10473 *demo/simpleShinyRgl.R
9394
009f222b0a5cd9e48ebcc9e9ea227a99 *demo/stereo.R
9495
680b2e3bdfd450f60f8ebdfa8d5bfc09 *demo/subdivision.r
95-
9329412f943c4b447c708337805f5218 *inst/NEWS
96+
555dee07ffd69426a85bcecf23065c1e *inst/NEWS
97+
330251b29f85cc1ffe5bdad929d47230 *inst/WORDLIST
9698
8c5d291e3f47c3395fff092f09f599b9 *inst/WebGL/template.html
9799
5bac46c36b13eac1302260ee06b16c0f *inst/demodata/population.dat
98100
5544dce93555cfaced50ee41283e9e58 *inst/demodata/region.dat
99-
a093e383bc4034a315964e3f0677108a *inst/doc/WebGL.R
100-
5dc9f07fa229c54166409f1fd65f7999 *inst/doc/WebGL.Rmd
101-
8cc6c4cae942b68b8140223b6ee240fa *inst/doc/WebGL.html
102-
f9248d3cc396213a6cbfae49762a97b0 *inst/doc/rgl.R
103-
9994cedbdd547cd11e657a16232fc8fd *inst/doc/rgl.Rmd
104-
c2338f469fd58e608f14c93bd7520dbc *inst/doc/rgl.html
101+
736ad37b7a65f9ca945e58530199cc37 *inst/doc/WebGL.R
102+
e745c22dc2d4d6197c369651c7a2b3a8 *inst/doc/WebGL.Rmd
103+
b02c88f86db227b61d8f947d53bfcedd *inst/doc/WebGL.html
104+
f99aac24de4ff50cdbf669f6c13844a6 *inst/doc/rgl.R
105+
02ccacb374bb2ccaa4df122486d2a155 *inst/doc/rgl.Rmd
106+
d9fa2b25cb8cf0fe807571eb578dae79 *inst/doc/rgl.html
107+
1304ffa6515f831168733a70e41bda2a *inst/doc/transparency.R
108+
821a4e7cbed6d4d36a46a8880e928c62 *inst/doc/transparency.Rmd
109+
286bd8be1494ebb1af0bbafa6aaac658 *inst/doc/transparency.html
105110
b4ef592c88333c7c509dd74fcd1912d9 *inst/fonts/FreeMono.ttf
106111
867469f13ff81dec9adf2ae2f6ea2899 *inst/fonts/FreeSans.ttf
107112
dc0004a804503e126bc99998c7a1c677 *inst/fonts/FreeSerif.ttf
@@ -119,7 +124,7 @@ f3042f095b2c102f0f95a98b56671744 *inst/htmlwidgets/lib/rglClass/rglClass.src.js
119124
4a0c3dd9df73b8b0f089aa1d99bc024a *inst/htmlwidgets/lib/rglClass/shaders.src.js
120125
d3b1052b919101dd4c8d71777b0cb697 *inst/htmlwidgets/lib/rglClass/subscenes.src.js
121126
9088fc4290bdc1b292c45c27bce84118 *inst/htmlwidgets/lib/rglClass/textures.src.js
122-
a52915d19473ca2735dadae297de9f8c *inst/htmlwidgets/lib/rglClass/utils.src.js
127+
e73a687bf8a6bb5a9fc58b59440afedb *inst/htmlwidgets/lib/rglClass/utils.src.js
123128
cc1cfad09e78db798014b3d123e7d292 *inst/htmlwidgets/rglPlayer.js
124129
2b4422ab434ff5c106bf53f3c21f3894 *inst/htmlwidgets/rglWebGL.js
125130
41278bf843dea9954d79e7c03c5280c9 *inst/slowTests/demos.R
@@ -131,6 +136,7 @@ a68491872e00896979cf9e7247cd380b *inst/textures/particle.png
131136
6913e9b79b90af9ef162055d09c3ff44 *inst/textures/sunsleep.png
132137
760f11bccf3dc39aad741060ca7008aa *inst/textures/world.png
133138
055baa857f3e397b0dece1a75f9092d0 *inst/textures/worldsmall.png
139+
9672cd33dafccf3f11f677a8cb19218b *inst/useNULL/README.txt
134140
3bbc7697a6b91b452ca6c34f2dcccadc *man/3dobjects.Rd
135141
36193edd2bf704e55ceeddbee64fc1ac *man/GramSchmidt.Rd
136142
e9bc0980d966600f346989489932253d *man/abclines.Rd
@@ -152,14 +158,15 @@ eb5bb64e5a44ee70624ca6f118b125bf *man/bg.Rd
152158
68bf2f27a093047c5c5c5c31dbf332ea *man/bgplot3d.Rd
153159
ca7c0b1d4e53564bdcc9b58fe744ebcf *man/callbacks.Rd
154160
dd065d7a4231b33a55488a3a4535bf7f *man/check3d.Rd
155-
fe6eb1ed392d42ef59e49e9fe1485f27 *man/clipMesh3d.Rd
161+
8f7dd743007283f4c294b3632681d606 *man/clipMesh3d.Rd
156162
976eae40752edd4c40620f1ddcfb557d *man/clipplaneControl.Rd
157-
f8669e8d2b453edbac5aff9af4dc8ae1 *man/contourLines3d.Rd
163+
d1446207d400073febf43a12e6f2792f *man/contourLines3d.Rd
158164
1e2f215a31f63f075e36eeee12aa3492 *man/cylinder3d.Rd
159165
72dbade5f337450131b5849e7fada55c *man/elementId2Prefix.Rd
160166
d9090b36676ab9ca34651bfbeb065216 *man/ellipse3d.Rd
161167
9341bca00a9c0c0170964684b215dbe7 *man/extrude3d.Rd
162168
5fd1a23019718c77ca50a87c431dba53 *man/figWidth.Rd
169+
e3bb9c5aca46685ffe065fa5cab9229f *man/figures/README/polyhedra-rgl-1.png
163170
b45b8c32e7731c5e6e886706da165451 *man/grid3d.Rd
164171
21fc712708f1c91188801630d568c427 *man/identify3d.Rd
165172
7ab6d7d03af0fee5880b73351dbcd14f *man/import.Rd
@@ -173,7 +180,7 @@ b45b8c32e7731c5e6e886706da165451 *man/grid3d.Rd
173180
80600c99ccd158190a2a0302fb13e8ef *man/mfrow3d.Rd
174181
e70a34e3f2998e17d21caf686134d595 *man/observer3d.Rd
175182
fcf2c6203d72378934e5dfe6246f3afb *man/open3d.Rd
176-
eed001980654e275e37233067909f206 *man/par3d.Rd
183+
bdd71cc05a6a31f235f673b613650e9a *man/par3d.Rd
177184
754f77869d8d3fb4b7b34ff0323c2463 *man/par3dinterp.Rd
178185
57e704f74406face1979fc592cb4a8c4 *man/par3dinterpControl.Rd
179186
25ef65736e25671f087997c77f3feece *man/pch3d.Rd
@@ -182,14 +189,14 @@ eed001980654e275e37233067909f206 *man/par3d.Rd
182189
b8b8fcaebb75c173e3ff66408bb578b7 *man/persp3d.function.Rd
183190
dbaf058a2e3afd8c3e703c848f933129 *man/persp3d.tri.Rd
184191
0c048680d0fee79639e4b6f783115f38 *man/planes.Rd
185-
95e5d370c828ace156b59d01c6b6cac9 *man/play3d.Rd
192+
fbd1294f01092c5e810d4238e3a7cb68 *man/play3d.Rd
186193
ded20b6b23c137366c0cd854bef2f99a *man/playwidget.Rd
187194
03403e1834e1f89d7ba12586ed7b5701 *man/plot3d.Rd
188195
652bba58fa82b29e08e2c7086e8cf5fc *man/plot3d.formula.Rd
189196
82e0c1e38b74b163c806eef527bebb25 *man/plot3d.lm.Rd
190197
4bccd4a564fc08174f42dcf328e42dba *man/plotmath3d.Rd
191198
ebc0b9d4e3956ffd0f6c7be6d8026043 *man/polygon3d.Rd
192-
2687bbb16360da6dedb3d9be1d82be23 *man/postscript.Rd
199+
d72a89268f209875e667bb44f16c822e *man/postscript.Rd
193200
aa1238dfbca0813cb3b4e3c773c606dd *man/primitive.Rd
194201
f764f872ca6bcd15baf225fdf304017e *man/propertyControl.Rd
195202
ec17227817175ee59986694984b506e0 *man/propertySetter.Rd
@@ -200,7 +207,7 @@ ec17227817175ee59986694984b506e0 *man/propertySetter.Rd
200207
96ec0d97c21724dffce48f8b041048b3 *man/rgl.Sweave.Rd
201208
693ea005b198d8e9b98a06324830917c *man/rgl.attrib.info.Rd
202209
377cbdac5434cadc5f5ef7c420b912a6 *man/rgl.bringtotop.Rd
203-
87d54d00b864d1e35548a871d3c97d34 *man/rgl.init.Rd
210+
8cab9ef99e4b1fb1992b0b40f2f995a2 *man/rgl.init.Rd
204211
b501ed898516bdad833376162bc38ac0 *man/rgl.open.Rd
205212
37ed09923795b7aaf6a603e0420f3d86 *man/rgl.pixels.Rd
206213
8b687cb677c89a2eecd45c8fc23cbd75 *man/rgl.select.Rd
@@ -210,23 +217,23 @@ f0c6becdf88501d800daedb47458655a *man/rgl.useNULL.Rd
210217
e8903c89572bf73e5fd12a2167401bd5 *man/rglMouse.Rd
211218
b3f49e3a6c2759f71a477a2c5bc92f8b *man/rglShared.Rd
212219
f3ac90e8a01e5a270794a2b772fd226c *man/rglToLattice.Rd
213-
2beb5c88363502bf02ae9eb754c30c22 *man/rglwidget.Rd
220+
8909f6fac01c9853899e80fcad9c5ca3 *man/rglwidget.Rd
214221
2ce688bd5b5ac82e21ee550e640b452f *man/scene.Rd
215222
9ed3755eb82a9e063d5994f951c6b1fc *man/scene3d.Rd
216223
ef63bae9826deb1a816b27d241fd4e39 *man/sceneChange.Rd
217224
10ef81a4edfabd0719069b5d0b614d49 *man/select3d.Rd
218225
e9e74de3d08db9a390f7314b55273b2a *man/selectpoints3d.Rd
219-
bf9461fc3bcb07c1497d4cd2322e5b44 *man/setGraphicsDelay.Rd
226+
96e0b1405607755dcc59befdd3669bbc *man/setGraphicsDelay.Rd
220227
2e666f241a03e35cf75ce0476011a44c *man/setUserShaders.Rd
221228
cbd6ffd884544e167f57289d7bb41459 *man/setupKnitr.Rd
222229
d71689c55996c3f624c5005eef65f77f *man/shapelist3d.Rd
223230
ae44587adf142df45043c8a4b3a28755 *man/shiny.Rd
224-
15ca30284eee442dca5987649fe4b0fb *man/shinyGetPar3d.Rd
231+
d1c25579801f37978a0cb07f7d57ffda *man/shinyGetPar3d.Rd
225232
eef32e5f19320f9ee9af2cd0517054d9 *man/show2d.Rd
226-
237f4bc4b6c8d6339c4a8337778bc9c7 *man/snapshot.Rd
233+
4bcff0780012d07da932f3bf08b49a8f *man/snapshot.Rd
227234
f6b0d9667089be0a5214e046f2a6775d *man/spheres.Rd
228235
e0fa5e808fdd8da7c265ef539eb86fca *man/spin3d.Rd
229-
ac36302c4b3364b051bcc9991b0c30a8 *man/sprites.Rd
236+
75d387c6c89cea0af5edd98fb533346d *man/sprites.Rd
230237
22e36b361192b2343ea12437b3e4d4ad *man/subdivision3d.Rd
231238
d87f15231f946059beb7669f39bb4b2c *man/subscene3d.Rd
232239
ba4f6386dc5690df779999495b6dde15 *man/subsceneInfo.Rd
@@ -248,7 +255,6 @@ b246560b955fd2ef9a3622a8c557692b *man/webGLcontrols.Rd
248255
067d85b6fe1df2142b11f9bd28cb7d4f *man/writeOBJ.Rd
249256
de0668c1d39b4986211aa0908f3fc57d *man/writePLY.Rd
250257
354b624757db72f53637c909f8a28575 *man/writeWebGL.Rd
251-
703d1b243e352d5c18e7d937579c6622 *po/R-rgl.pot
252258
3fd46c90a42a13fc520d765dce32ed50 *src/ABCLineSet.cpp
253259
4e93c61da331b4806ec9d481f17b47cb *src/ABCLineSet.h
254260
bd91f21934356d554c655621461ffdd2 *src/BBoxDeco.cpp
@@ -268,7 +274,8 @@ b128eb378abdd8e63ea8287e7f9f6254 *src/Disposable.h
268274
b03e2ab2e386594cd527d3cbad2b9f3a *src/Light.h
269275
70a705fe2978bd44a7a3db0a4c23dac5 *src/LineSet.cpp
270276
952ee5f775d740bd9719db38229a61c7 *src/LineStripSet.cpp
271-
6bb8823fd0fab60a6be0574cd17c2e42 *src/Makevars.in
277+
741af36cacf24b26483eb7c326e50aba *src/Makevars.in
278+
ef228a6534671e41750e62671def621d *src/Makevars.win
272279
d166702d0a968805882d8d42c1c4f191 *src/Material.cpp
273280
334339682edb8edae85fb1e3c1672a87 *src/Material.h
274281
60142dbc40c2fe78213b0047508937cc *src/NULLgui.cpp
@@ -418,7 +425,7 @@ f628642b6af28e07c8fff0a9464ba650 *src/ext/ftgl/FTVectoriser.h
418425
1fdd71d5a6d05d33bf335c0c10283aba *src/ftgl.cpp
419426
9dd32b80e913c360584b022485e50a06 *src/geom.cpp
420427
801de6ffecb85d9ad80257b168cfce48 *src/geom.h
421-
d584d0e8e5e95c12accefe923cb181db *src/gl2ps.c
428+
0caa00bb13ae0907a7ca6471fd11c735 *src/gl2ps.c
422429
f98a5fba15e844bd7696aff31d2cb65c *src/gl2ps.h
423430
01922e999eff711b7d11e7bf67e01dbc *src/glErrors.cpp
424431
888c581ff741adb928006e9294092a0a *src/glgui.cpp
@@ -452,12 +459,16 @@ fac235696a7454133d287870ac5a1237 *src/scene.h
452459
55b54c99f879462d2210a9350eee2cbd *src/subscene.cpp
453460
285b44a7aa19fc57c96e98527f9a8c5a *src/subscene.h
454461
85a2bf4ffefd0d62fb061e7fc5db0a0d *src/types.h
462+
0870e06ae1a10e67c338601cc661d035 *src/useNULL/Makevars
463+
4b5fbf7880302f8193ca1da478a0689e *src/useNULL/Makevars.in
455464
c9005faeb90ea5c47f1cce3af44cde88 *src/win32gui.cpp
456465
305ea9cb6c67ba53cd2e719ceb614479 *src/win32gui.h
457466
ab0397501390c9e91b1f4718fac66419 *src/win32lib.cpp
458467
d084c06f864328fe238e1349832c764d *src/x11gui.cpp
459468
59c4054e9def01595d86f02e515c2d37 *src/x11gui.h
460469
bb033aaefa628fb5e2c2eb0628db269c *src/x11lib.cpp
461-
5dc9f07fa229c54166409f1fd65f7999 *vignettes/WebGL.Rmd
462-
9994cedbdd547cd11e657a16232fc8fd *vignettes/rgl.Rmd
470+
a7fa1d2be854209389accfa66ff7febb *tools/winlibs.R
471+
e745c22dc2d4d6197c369651c7a2b3a8 *vignettes/WebGL.Rmd
472+
02ccacb374bb2ccaa4df122486d2a155 *vignettes/rgl.Rmd
463473
68a10c00ee9ecd268ff080cce2cba6a4 *vignettes/setup.R
474+
821a4e7cbed6d4d36a46a8880e928c62 *vignettes/transparency.Rmd

NAMESPACE

+5-5
Original file line numberDiff line numberDiff line change
@@ -140,13 +140,12 @@ export(.check3d,
140140

141141
importFrom(graphics, legend, par, plot, plot.new, polygon,
142142
strwidth, strheight)
143-
importFrom(grDevices, col2rgb, colorRamp, dev.cur, dev.off,
144-
hcl.colors, png,
143+
importFrom(grDevices, col2rgb, colorRamp, dev.cur, dev.off, png,
145144
postscript, rgb, xy.coords, xyz.coords)
146145
importFrom(stats, approxfun, get_all_vars, model.frame,
147146
qchisq, qf, splinefun, terms, var)
148-
importFrom(utils, count.fields, file_test, flush.console,
149-
packageVersion, read.table, head, tail)
147+
importFrom(utils, capture.output, count.fields, file_test,
148+
flush.console, packageVersion, read.table, head, tail)
150149
importFrom(crosstalk, crosstalkLibs, SharedData, is.SharedData)
151150

152151
# These were in rglwidget
@@ -157,7 +156,8 @@ export(rglwidget, renderRglwidget, rglwidgetOutput,
157156
elementId2Prefix, registerSceneChange, sceneChange,
158157
"%>%")
159158

160-
importFrom(htmlwidgets, createWidget, prependContent, shinyRenderWidget, shinyWidgetOutput, sizingPolicy)
159+
importFrom(htmlwidgets, createWidget, prependContent, saveWidget,
160+
shinyRenderWidget, shinyWidgetOutput, sizingPolicy)
161161
importFrom(htmltools, css, HTML, htmlDependency, img,
162162
includeScript, tags, tagAppendAttributes,
163163
tagHasAttribute, tagList, browsable, resolveDependencies)

R/Sweave.R

+71
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
1+
##
2+
## Sweave device
3+
##
4+
##
5+
6+
rgl.Sweave <- function(name, width, height, options, ...) {
7+
if (length(hook <- getHook("on.rgl.close"))) {
8+
# test is for compatibility with R < 3.0.0
9+
if (is.list(hook)) hook <- hook[[1]]
10+
dev <- environment(hook)$dev
11+
set3d(dev)
12+
} else {
13+
wr <- c(0, 0, width*options$resolution, height*options$resolution)
14+
open3d(windowRect=wr)
15+
if (is.null(delay <- options$delay)) delay <- 0.1
16+
Sys.sleep(as.numeric(delay))
17+
wrnew <- par3d("windowRect")
18+
if (wr[3] - wr[1] != wrnew[3] - wrnew[1] ||
19+
wr[4] - wr[2] != wrnew[4] - wrnew[2])
20+
stop("rgl window creation error; try reducing resolution, width or height")
21+
dev <- cur3d()
22+
}
23+
24+
snapshotDone <- FALSE
25+
26+
# stayOpen is used below in rgl.Sweave.off
27+
stayOpen <- isTRUE(options$stayopen)
28+
29+
type <- options$outputtype
30+
if (is.null(type)) type <- "png"
31+
32+
setHook("on.rgl.close", action="replace", function(remove=TRUE) {
33+
prev.dev <- cur3d()
34+
on.exit(set3d(prev.dev))
35+
36+
if (!snapshotDone) {
37+
set3d(dev)
38+
switch(type,
39+
png = snapshot3d(filename=paste(name, "png", sep=".")),
40+
pdf = rgl.postscript(filename=paste(name, "pdf", sep="."), fmt="pdf"),
41+
eps = rgl.postscript(filename=paste(name, "eps", sep="."), fmt="eps"),
42+
stop(gettextf("Unrecognized rgl outputtype: '%s'", type), domain = NA)
43+
)
44+
snapshotDone <<- TRUE
45+
}
46+
47+
if (remove)
48+
setHook("on.rgl.close", action="replace", NULL)
49+
})
50+
}
51+
52+
rgl.Sweave.off <- function() {
53+
if (length(hook <- getHook("on.rgl.close"))) {
54+
if (is.list(hook)) hook <- hook[[1]] # test is for R pre-3.0.0 compatibility
55+
stayOpen <- environment(hook)$stayOpen
56+
if (stayOpen) hook(FALSE)
57+
else close3d()
58+
}
59+
}
60+
61+
##
62+
## Sweave snapshot
63+
##
64+
##
65+
66+
Sweave.snapshot <- function() {
67+
if (length(hook <- getHook("on.rgl.close"))) {
68+
if (is.list(hook)) hook <- hook[[1]] # test is for R pre-3.0.0 compatibility
69+
hook(remove = FALSE)
70+
}
71+
}

0 commit comments

Comments
 (0)