Skip to content

Commit b47235e

Browse files
dmurdochcran-robot
dmurdoch
authored and
cran-robot
committed
version 0.99.9
1 parent bff79f7 commit b47235e

33 files changed

+3682
-1644
lines changed

‎DESCRIPTION

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
Package: rgl
2-
Version: 0.98.22
2+
Version: 0.99.9
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>
66
Depends: R (>= 3.2.0)
77
Suggests: MASS, rmarkdown, deldir, orientlib, lattice, misc3d,
88
rstudioapi, magick
99
Imports: graphics, grDevices, stats, utils, htmlwidgets, htmltools,
10-
knitr, jsonlite (>= 0.9.20), shiny, magrittr
10+
knitr, jsonlite (>= 0.9.20), shiny, magrittr, crosstalk
1111
Description: Provides medium to high level functions for 3D interactive graphics, including
1212
functions modelled on base graphics (plot3d(), etc.) as well as functions for
1313
constructing representations of geometric objects (cube3d(), etc.). Output
@@ -17,10 +17,10 @@ License: GPL
1717
URL: https://r-forge.r-project.org/projects/rgl/
1818
SystemRequirements: OpenGL, GLU Library, XQuartz (on OSX), zlib
1919
(optional), libpng (>=1.2.9, optional), FreeType (optional),
20-
pandoc (>=1.13.1, needed for vignettes)
20+
pandoc (>=1.14, needed for vignettes)
2121
BugReports: https://r-forge.r-project.org/projects/rgl/
2222
VignetteBuilder: knitr
2323
NeedsCompilation: yes
24-
Packaged: 2017-12-12 14:23:50 UTC; murdoch
24+
Packaged: 2018-01-12 12:21:16 UTC; murdoch
2525
Repository: CRAN
26-
Date/Publication: 2017-12-13 17:12:19 UTC
26+
Date/Publication: 2018-01-13 00:19:00 UTC

‎MD5

+32-29
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
e73499cb89e0d6e97b8ba271c46739fd *COPYING
2-
e8322e829b792a2140b9a76f38fbe5dc *DESCRIPTION
3-
cd82ce4bafa45841300f86ea3bb6910c *NAMESPACE
4-
be82079d3adeeb60321442d938b049cd *R/Sweave_knitr.R
2+
4d2b2a38237b5fd41c6746eaded6ea39 *DESCRIPTION
3+
19d9b75c9d20ca5cc18f98406dd2ef8a *NAMESPACE
4+
8d6709606696359548d94a4bf71ce78d *R/Sweave_knitr.R
55
3c20a30ef6a398649341d9b1f227cb7d *R/addNormals.mesh3d.R
66
edef6334c9a5dd55a144229d50a04899 *R/animate.R
77
fec9c253d519937d9c3bb352897f9828 *R/arrow3d.R
@@ -11,7 +11,7 @@ af2817585e3d1db7bd4adbba29992ec1 *R/axes.R
1111
80a8766c3764328d0e7098eaae10aec6 *R/bgplot3d.R
1212
ac4ab4a705386441e9b2b267244dca04 *R/callbacks.R
1313
149f8a63713267831727369515a66e8c *R/conversions.R
14-
8f2616bab90007dca83f593453b08a25 *R/convertScene.R
14+
9b815f4387f0842e12ec097e7872bd28 *R/convertScene.R
1515
be6d6da7d96a3b4812139e0301df398d *R/cylinder3d.R
1616
6994ae0b50137f3a1f7038fb6b8922f2 *R/device.R
1717
5e855bf30c385ae3c1b662a862d3bb5a *R/ellipse3d.R
@@ -37,8 +37,9 @@ af9a986f1752f610b392a47202f8cb59 *R/plugin.R
3737
7c156818e20bab511277a1851b4d09c4 *R/ply.R
3838
6882cd1fc817229516180c3e4bfd36a6 *R/r3d.rgl.R
3939
a82494d493925454323cd8102200995d *R/rgl.bringtotop.R
40+
84830dac276a9711bed2a698995063c6 *R/rglMouse.R
4041
d1ea9aafe532dda4dee6b213b90b18f8 *R/rglcontroller.R
41-
a225b7b83892a7a1a3306cd518b164f9 *R/rglwidget.R
42+
123917f97a556635cb58c266194a0f7c *R/rglwidget.R
4243
e68e0fa91bed669f3a02ff4940fe1ad9 *R/scene.R
4344
06ca697fc07bde9e5d06d936bb4ad5e9 *R/selectpoints3d.R
4445
a92f06f33fc88700e73e7928ccec18ef *R/setUserShaders.R
@@ -49,11 +50,11 @@ ea7858f239f5b05f14d91a8d12e959ab *R/subdivision.mesh3d.R
4950
eb0d5e43687a97f77c7fcb5c6e3fe654 *R/subscenes.R
5051
5bd916f84d651ec3c477700ea73ade49 *R/triangulate.R
5152
3447eb732f99d8015c8575c9a4e5077e *R/turn3d.R
52-
42290ed778e6df24c9a47f2672d099d5 *R/webGL.R
53+
0510e98135fa6b5d756250ca24195514 *R/webGL.R
5354
19a59bb1f17af961b763722f93b8d9f4 *R/webGLcontrols.R
5455
4d4ef63e08def9f5f0983a7c9f5cb362 *R/zzz.R
5556
cf86e8f4b46a62a3d0d7682a5d6cc330 *README
56-
5902e8a507a3a33bb1c6ddd0d86d4d8e *build/vignette.rds
57+
089afdfcae157b6a5205ed8383a6c410 *build/vignette.rds
5758
a6a183397bea52041e6eebb1e2609eb2 *cleanup
5859
edc562823bc21832d73ac88117eb9dab *configure
5960
273687a0a5143d008e5fb145589c1ba2 *configure.ac
@@ -76,28 +77,28 @@ bb7b69a42a128d44ccc9232aa9b13eca *demo/regression.r
7677
a8cbd8dd339ba65adf23a165a8dfeef6 *demo/simpleShinyRgl.R
7778
866ebfda71509e83a98a7a034e004269 *demo/stereo.R
7879
70324e9f3c6750f14dc5fdfe99003625 *demo/subdivision.r
79-
e04fbef0e3fd1d4f2bbd0a2adbb04360 *inst/NEWS
80+
e18a47ac2597d1119259f525748da6af *inst/NEWS
8081
8c5d291e3f47c3395fff092f09f599b9 *inst/WebGL/template.html
8182
5bac46c36b13eac1302260ee06b16c0f *inst/demodata/population.dat
8283
5544dce93555cfaced50ee41283e9e58 *inst/demodata/region.dat
83-
8c3e331ee094ab2f179231f30caf7c20 *inst/doc/WebGL.R
84-
ccf1872bda743047d8a665aa70db86bb *inst/doc/WebGL.Rmd
85-
cbadc9e2ab9dae882644a49496e34eea *inst/doc/WebGL.html
84+
47a1a231546fbe175ef8ba7ccb1aca70 *inst/doc/WebGL.R
85+
54a0a2929c13a380d0c97a0348491e04 *inst/doc/WebGL.Rmd
86+
90c5f48ff2a3515eebc709cdbf6bf226 *inst/doc/WebGL.html
8687
975c5cb8a92968f780d33de734d7fbc7 *inst/doc/legacyWebGL.R
87-
31b32f5680eccba793154715f43f7db2 *inst/doc/legacyWebGL.Rmd
88-
d43a6694e0bb79f013df90a2ce7cbada *inst/doc/legacyWebGL.html
88+
ab830fea771ea15dd6687b7c5f9f655c *inst/doc/legacyWebGL.Rmd
89+
926d146b6422876eadb8da509dfa85c5 *inst/doc/legacyWebGL.html
8990
75aceca2bb27caabd754ab714248c89e *inst/doc/rgl.R
90-
92374f786b258f115ab3a54f538a98ae *inst/doc/rgl.Rmd
91-
aed2d3f73db28f28f6b299dd3acb50b8 *inst/doc/rgl.html
91+
5d041d3a0bd1344d4f881bd2e0519a71 *inst/doc/rgl.Rmd
92+
084f6e79d6f6a9c7ba18842548a5140a *inst/doc/rgl.html
9293
b4ef592c88333c7c509dd74fcd1912d9 *inst/fonts/FreeMono.ttf
9394
867469f13ff81dec9adf2ae2f6ea2899 *inst/fonts/FreeSans.ttf
9495
dc0004a804503e126bc99998c7a1c677 *inst/fonts/FreeSerif.ttf
9596
f531509fcc00f86e611197ed9b802e73 *inst/htmlwidgets/lib/CanvasMatrix/CanvasMatrix.src.js
9697
affdd5bb24638f5909595f0e7d9c7713 *inst/htmlwidgets/lib/rglClass/rgl.css
97-
b8e41c75acc450db90d1dcee9890a262 *inst/htmlwidgets/lib/rglClass/rglClass.src.js
98+
e9194919394f49776799ac8fbb919042 *inst/htmlwidgets/lib/rglClass/rglClass.src.js
9899
d4f8954a62741bd5e57c77c3db9ad391 *inst/htmlwidgets/rglPlayer.js
99100
0ec592bdc675b0cca5b089c13e6f6b42 *inst/htmlwidgets/rglPlayer.yaml
100-
a1a230c69047a6901e36620ea166632b *inst/htmlwidgets/rglWebGL.js
101+
9be5f106ed7a3d3199cdbfa5edcb956a *inst/htmlwidgets/rglWebGL.js
101102
3e1a8bb45dab0242d5430b34d1e73050 *inst/htmlwidgets/rglWebGL.yaml
102103
876277887a79b6dda0057a77a9c39e96 *inst/initNotes.txt
103104
2d6f196e7090e6782650682c1b0110e7 *inst/shinyDemo/server.R
@@ -158,7 +159,7 @@ bf0749c32ae991475ca9b6d92af26a4e *man/plotmath3d.Rd
158159
ebc0b9d4e3956ffd0f6c7be6d8026043 *man/polygon3d.Rd
159160
4f2109b4c992a1811e3ab1365f7e5aa0 *man/postscript.Rd
160161
f8ee8a261f18f776c95d24b52e5a7683 *man/primitive.Rd
161-
5a7f8ce7b1567d8125bacbe76bd8e6e6 *man/propertyControl.Rd
162+
0d3d776e61559501530404faf08cff76 *man/propertyControl.Rd
162163
a6c1f736b547536f8b660d3ed9c63e30 *man/propertySetter.Rd
163164
9a1f00cfcee7b35ed4a6bb068710d45e *man/r3d.Rd
164165
9d48288df06284ec59f250be186fb436 *man/readSTL.Rd
@@ -173,8 +174,10 @@ c1850ba50574ca2cb0cba4b39c6729e4 *man/rgl-internal.Rd
173174
f0c6becdf88501d800daedb47458655a *man/rgl.useNULL.Rd
174175
eb39bd5b917064e17c1650fcbf600e53 *man/rgl.user2window.Rd
175176
2ce4f863cfeac59d71fc94a06184eb7f *man/rglIds.Rd
177+
af5947300916c2b0d4a31bfc636f2bc3 *man/rglMouse.Rd
178+
89a8e4f540e05062043c1e400e4e9c56 *man/rglShared.Rd
176179
533a7b58fef66311612ac53277c501a8 *man/rglToLattice.Rd
177-
33e386ddf8af2d47a3bde2fc66036ff5 *man/rglwidget.Rd
180+
b316f60e42da752ec20eb7f2cbe5176f *man/rglwidget.Rd
178181
2b1ff289f36ce3eeee989d15d233bf72 *man/scene.Rd
179182
60cff8998acc2306f4ec9174b9234b19 *man/scene3d.Rd
180183
6a3bd7a3272edd2796fd5a886f510363 *man/sceneChange.Rd
@@ -211,7 +214,7 @@ d8fa5bf811ae1d9584054ed1a367a6be *po/R-rgl.pot
211214
6036e35683f44d9c752f86280dab247e *src/BBoxDeco.h
212215
e380f32ee63a0304e661d7e0ff4616d0 *src/Background.cpp
213216
895db1a3a245076e869cdfd652d5bedf *src/Background.h
214-
07787092d891d8e841598acf6a1b267e *src/COPYING.GL2PS
217+
6b1349ed40ea31cc7560a03acc029455 *src/COPYING.GL2PS
215218
a69be3aa64ec31aa38bd96ccab53f96b *src/ClipPlane.cpp
216219
969b28736e44716031c26ab2bc9ff209 *src/ClipPlane.h
217220
92c8148c5c10e5ca9125a8fa6630d975 *src/Color.cpp
@@ -240,10 +243,10 @@ a690ee6caf929116ca61fd2a97cd328e *src/R.h
240243
eed5a8ca9c46b4217d7fe218e887d484 *src/SceneNode.h
241244
2e22f1041b6710f1a58038a764df42e0 *src/Shape.cpp
242245
834694f5ca480478be67b15e1b50c0c7 *src/Shape.h
243-
91150103c448f30ed39750e7bde5b352 *src/SphereMesh.cpp
244-
43e455fbfb1d41226b6445343c0fa3ca *src/SphereMesh.h
245-
c123b8b2267d66579361d17c61029324 *src/SphereSet.cpp
246-
7b2e83c95eac4da6e9788b877f29dbc7 *src/SphereSet.h
246+
f3747a908762d82d661d5a0763cd6691 *src/SphereMesh.cpp
247+
89d265b652286745456a86979b4aba9a *src/SphereMesh.h
248+
6190f6bc32da04e5f8841d29ace1e9b2 *src/SphereSet.cpp
249+
a12c4e2f7bfd3a9ecae816c8ae41a8fa *src/SphereSet.h
247250
3cc889d38793ee7487b8675068579642 *src/SpriteSet.cpp
248251
8f846f3615ed1cc0942cd516f56b0358 *src/SpriteSet.h
249252
0b29e87abeba8671a0c4c5194d784a6b *src/String.cpp
@@ -373,8 +376,8 @@ e5aa79236fa82468d5e415401e5ddd0f *src/fps.h
373376
1fdd71d5a6d05d33bf335c0c10283aba *src/ftgl.cpp
374377
9dd32b80e913c360584b022485e50a06 *src/geom.cpp
375378
801de6ffecb85d9ad80257b168cfce48 *src/geom.h
376-
47c89c2fbae62d65ca73308469721f08 *src/gl2ps.c
377-
c2df43358f9dc57b02321b60feca6637 *src/gl2ps.h
379+
c4b212ccaa63de94ddeff40e1ec2c753 *src/gl2ps.c
380+
12f2a2b409ccf378cf59ccaf54b4cf51 *src/gl2ps.h
378381
c22dabe5e4ff8257a905288ff35d01af *src/glErrors.cpp
379382
5040b4ccdd96de708170cfefd5b54af6 *src/glgui.cpp
380383
910b1ec13c167031ece01e7488397fe3 *src/glgui.h
@@ -414,7 +417,7 @@ ec44405ab8a3c4f584a6d4b33c53446f *src/win32lib.cpp
414417
13bd0b1d57062d5715de47f204038a8c *src/x11gui.h
415418
8f57f7b292407932ab95440ceff7a637 *src/x11lib.cpp
416419
8a924b25f7c72437d489eb191f285ed1 *tests/demos.R
417-
ccf1872bda743047d8a665aa70db86bb *vignettes/WebGL.Rmd
418-
31b32f5680eccba793154715f43f7db2 *vignettes/legacyWebGL.Rmd
419-
92374f786b258f115ab3a54f538a98ae *vignettes/rgl.Rmd
420+
54a0a2929c13a380d0c97a0348491e04 *vignettes/WebGL.Rmd
421+
ab830fea771ea15dd6687b7c5f9f655c *vignettes/legacyWebGL.Rmd
422+
5d041d3a0bd1344d4f881bd2e0519a71 *vignettes/rgl.Rmd
420423
cfa8bdf50b9596c93a8142dfc54a80e7 *vignettes/setup.R

‎NAMESPACE

+4-2
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ export(.check3d,
2525
rgl.select, rgl.select3d, rgl.set, rgl.snapshot, rgl.spheres, rgl.sprites,
2626
rgl.surface, rgl.texts, rgl.triangles, rgl.user2window,
2727
rgl.attrib, rgl.attrib.count, rgl.attrib.info, rgl.dev.list, rgl.useNULL,
28-
rglToLattice, rglToBase,
28+
rglMouse, rglShared, rglToLattice, rglToBase,
2929
rgl.viewpoint, rgl.window2user, rglFonts, r3dDefaults, rotate3d, rotationMatrix,
3030
scale3d, scaleMatrix, scene3d, segments3d, select3d, selectpoints3d,
3131
rgl.setMouseCallbacks, rgl.setWheelCallback, setupKnitr,
@@ -106,6 +106,7 @@ export(.check3d,
106106
importFrom(stats, approxfun, qchisq, qf, splinefun, var)
107107
importFrom(utils, count.fields, file_test, flush.console,
108108
packageVersion, read.table)
109+
importFrom(crosstalk, crosstalkLibs, SharedData, is.SharedData)
109110

110111
# These were in rglwidget
111112

@@ -116,7 +117,8 @@ export(rglwidget, renderRglwidget, rglwidgetOutput,
116117
"%>%")
117118

118119
importFrom(htmlwidgets, createWidget, shinyRenderWidget, shinyWidgetOutput, sizingPolicy)
119-
importFrom(htmltools, includeScript, tags, tagList, browsable)
120+
importFrom(htmltools, HTML, includeScript, tags, tagAppendAttributes,
121+
tagHasAttribute, tagList, browsable)
120122
importFrom(jsonlite, toJSON)
121123
importFrom(knitr, fig_path, hook_plot_custom, image_uri, knit_hooks, knit_print, opts_current, opts_knit)
122124
importFrom(shiny, getDefaultReactiveDomain, markRenderFunction)

‎R/Sweave_knitr.R

+2-2
Original file line numberDiff line numberDiff line change
@@ -180,9 +180,9 @@ setupKnitr <- function() {
180180

181181
figWidth <- function()
182182
if (length(result <- with(opts_current$get(c("fig.width", "dpi", "fig.retina")),
183-
fig.width*dpi/fig.retina))) result else NULL
183+
fig.width*dpi/fig.retina))) result[1] else NULL
184184

185185

186186
figHeight <- function()
187187
if (length(result <- with(opts_current$get(c("fig.height", "dpi", "fig.retina")),
188-
fig.height*dpi/fig.retina))) result else NULL
188+
fig.height*dpi/fig.retina))) result[1] else NULL

0 commit comments

Comments
 (0)