Skip to content

Commit 58055a9

Browse files
dmurdochcran-robot
authored andcommitted
version 0.100.26
1 parent c08a32d commit 58055a9

33 files changed

+1272
-268
lines changed

DESCRIPTION

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Package: rgl
2-
Version: 0.100.24
2+
Version: 0.100.26
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-06-26 10:46:15 UTC; murdoch
26+
Packaged: 2019-07-08 14:03:20 UTC; murdoch
2727
Repository: CRAN
28-
Date/Publication: 2019-06-26 14:00:03 UTC
28+
Date/Publication: 2019-07-08 18:51:03 UTC

MD5

+30-22
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,20 @@
11
e73499cb89e0d6e97b8ba271c46739fd *COPYING
2-
a6f95828e68b12837b918579ca33719d *DESCRIPTION
3-
c7a0907c48009c53c3f3e62186116b32 *NAMESPACE
2+
92ec3c55e50ad7c45980b9c18fe135fe *DESCRIPTION
3+
3fc1d7bd95e506b955524cdd720e1c58 *NAMESPACE
44
8d6709606696359548d94a4bf71ce78d *R/Sweave_knitr.R
55
3c20a30ef6a398649341d9b1f227cb7d *R/addNormals.mesh3d.R
66
edef6334c9a5dd55a144229d50a04899 *R/animate.R
77
baf0c2fd640c730aad8f424f407e4d1d *R/arc3d.R
88
fec9c253d519937d9c3bb352897f9828 *R/arrow3d.R
9+
e137c0c0a50d2845895cae06ba0f2100 *R/as.mesh3d.default.R
10+
2262cbd7f063da98c7fa9a75c711b61a *R/as.triangles3d.R
911
cfce3817dfdcaa8d6ca3b11c5b67158c *R/ashape3d.R
1012
853ac34ab3568c44d0326e6f89ccd68d *R/aspect3d.R
1113
192f32beb804bfa5679ebd73244ada1b *R/asy.R
1214
af2817585e3d1db7bd4adbba29992ec1 *R/axes.R
1315
80a8766c3764328d0e7098eaae10aec6 *R/bgplot3d.R
1416
4b36f1447badb49dd32d3283e52f95e5 *R/callbacks.R
17+
8f3f5be7d7a1a66d929896b09a0cafd3 *R/clipMesh3d.R
1518
149f8a63713267831727369515a66e8c *R/conversions.R
1619
07d75142c05fc20372291be26d870889 *R/convertScene.R
1720
be6d6da7d96a3b4812139e0301df398d *R/cylinder3d.R
@@ -21,28 +24,28 @@ be6d6da7d96a3b4812139e0301df398d *R/cylinder3d.R
2124
ab542483bf671cb977c1680b2ad4568a *R/fonts.R
2225
97a6f25edd1b190eb679fea8b268ac36 *R/getscene.R
2326
0c40436b76d2257a47a2d1b514f76d90 *R/grid3d.R
24-
921b3cc2960f3d7fabf554d0fd04e30c *R/hooks.R
27+
70f4f248a876dde16a5dc1117ec6208c *R/hooks.R
2528
ecdeca7d0766658fcb1189ce421c507d *R/identify3d.R
2629
f3867418939a2537a1480ae2a4d71126 *R/internal.R
2730
3fffaf39d7e64d1516468ba87772b097 *R/material.R
2831
a76f70f19e4e470afdac99d8173379b5 *R/matrices.R
29-
18160c6635c301dedbe915e7fa8a9d41 *R/mesh3d.R
32+
8fdd547aa1321883cae49d98fe2aa922 *R/mesh3d.R
3033
c7e4123282c4b363ea997e3ba7bae6f7 *R/obj.R
3134
e7329453008644d2c2a8a474cc029c99 *R/oh3d.R
3235
e286073653e2776bbb00e418acc57e2e *R/par3d.R
3336
6295280d7b5ca70773e3bc81dcbae8af *R/pch3d.R
3437
bf0b85110de1587de80fd3eeceabea10 *R/persp3d.R
35-
cfabf26681667654e7710ab3005f0d93 *R/playwidget.R
36-
de4b7f1e4152a067650527ce2b00e2a1 *R/plot3d.R
38+
5b92a18b45bcda5214b6909d7a3dda6e *R/playwidget.R
39+
35b1b29f592962dc955ef32dfe51b6f0 *R/plot3d.R
3740
ab72f9571814ef8c44de6f2343b547c1 *R/plotmath3d.R
3841
af9a986f1752f610b392a47202f8cb59 *R/plugin.R
3942
7c156818e20bab511277a1851b4d09c4 *R/ply.R
40-
5eea7c920436d118cc4432dec27e8ace *R/r3d.rgl.R
43+
27192e49ee721f6635825c7806201a1e *R/r3d.rgl.R
4144
a82494d493925454323cd8102200995d *R/rgl.bringtotop.R
4245
16799b9a7f5ee8eb00c2059ee948d261 *R/rglMouse.R
4346
d1ea9aafe532dda4dee6b213b90b18f8 *R/rglcontroller.R
4447
808f2de709cfe3b0bbda1023d475a2f2 *R/rglwidget.R
45-
3d1d370728b3b2c19382ebd05930dcff *R/scene.R
48+
5c99d2752b60bd7accc368814094b3c3 *R/scene.R
4649
06ca697fc07bde9e5d06d936bb4ad5e9 *R/selectpoints3d.R
4750
a92f06f33fc88700e73e7928ccec18ef *R/setUserShaders.R
4851
87acc66c9ed05a5d53e620047c16dfbf *R/shapelist3d.R
@@ -55,7 +58,7 @@ a1f7b5422a13c64dbf75d3215f57b2c1 *R/subscenes.R
5558
3447eb732f99d8015c8575c9a4e5077e *R/turn3d.R
5659
0510e98135fa6b5d756250ca24195514 *R/webGL.R
5760
19a59bb1f17af961b763722f93b8d9f4 *R/webGLcontrols.R
58-
0e0d40c849bd16d4fa22db13d0388600 *R/zzz.R
61+
9ff3684d2c3dca329c981b671c6b1c93 *R/zzz.R
5962
df2624d49e00f56c06ce339040b035ca *README
6063
47edbc64704c6a73db3542353d96a6fa *build/vignette.rds
6164
a6a183397bea52041e6eebb1e2609eb2 *cleanup
@@ -80,19 +83,19 @@ df244a7d325a77c36f2312f2fde095f2 *demo/shapes3d.R
8083
a8cbd8dd339ba65adf23a165a8dfeef6 *demo/simpleShinyRgl.R
8184
866ebfda71509e83a98a7a034e004269 *demo/stereo.R
8285
c19c31ef34d40d4c41c7bc0caf112054 *demo/subdivision.r
83-
6d85434f451359aa3b660e8c86dc527d *inst/NEWS
86+
2f3835e2544c76cb14afb6e9d6a6ca1e *inst/NEWS
8487
8c5d291e3f47c3395fff092f09f599b9 *inst/WebGL/template.html
8588
5bac46c36b13eac1302260ee06b16c0f *inst/demodata/population.dat
8689
5544dce93555cfaced50ee41283e9e58 *inst/demodata/region.dat
8790
466888b2baf565e5f4fead5a98bbbee7 *inst/doc/WebGL.R
8891
7bf4c0cb3a8f66ebf6335e04f5a21d4d *inst/doc/WebGL.Rmd
89-
703ba2139fddcdbe1bbd738d9a7227e1 *inst/doc/WebGL.html
92+
ee3a6f17c8e988518b7b0945f3de6767 *inst/doc/WebGL.html
9093
975c5cb8a92968f780d33de734d7fbc7 *inst/doc/legacyWebGL.R
9194
ab830fea771ea15dd6687b7c5f9f655c *inst/doc/legacyWebGL.Rmd
92-
1ef50b4a92380763097cb05fd46b1a34 *inst/doc/legacyWebGL.html
95+
a4ff5f92f91966c6b2e96f66e860b8fb *inst/doc/legacyWebGL.html
9396
50c5f1367fc2f207aa59c7b5523c5704 *inst/doc/rgl.R
94-
c54a03f6dd7e548c7c52511d1fb4740d *inst/doc/rgl.Rmd
95-
07822e5b33dced66592a07baf890aa22 *inst/doc/rgl.html
97+
3bf4db9522c3e4e3b33dcc942dcf98bf *inst/doc/rgl.Rmd
98+
6fcc1648f73bae47742b282be52660c6 *inst/doc/rgl.html
9699
b4ef592c88333c7c509dd74fcd1912d9 *inst/fonts/FreeMono.ttf
97100
867469f13ff81dec9adf2ae2f6ea2899 *inst/fonts/FreeSans.ttf
98101
dc0004a804503e126bc99998c7a1c677 *inst/fonts/FreeSerif.ttf
@@ -124,6 +127,9 @@ e9bc0980d966600f346989489932253d *man/abclines.Rd
124127
e0824cb277d6362c4b5c80d89a81fb6e *man/arc3d.Rd
125128
ff920476e3c89bbc0595c0bc93b177a0 *man/arrow3d.Rd
126129
47edc3c8b94b8b4fcbd9047f4d8109b8 *man/as.mesh3d.ashape3d.Rd
130+
cdc5692c82502fd88cdf0b1d7b94d9f2 *man/as.mesh3d.default.Rd
131+
218f312552b6c89f043a63584af2a38c *man/as.mesh3d.rglId.Rd
132+
4393ffc2c18f6ac41f2d3e64484b1308 *man/as.triangles3d.Rd
127133
e5996b17ae0ed83d33b19bdc083fbfee *man/asRow.Rd
128134
91224edeba2f1c2b44988b76069571b4 *man/aspect3d.Rd
129135
e54c3b2accf9b373c879cb8ff3e32527 *man/attributes.Rd
@@ -133,6 +139,7 @@ e54c3b2accf9b373c879cb8ff3e32527 *man/attributes.Rd
133139
44bcc64d7cc5caf6a96246184843db21 *man/bgplot3d.Rd
134140
9be53c0e1daf5032ebdf924003576672 *man/callbacks.Rd
135141
dd065d7a4231b33a55488a3a4535bf7f *man/check3d.Rd
142+
0f08f21288ba272b1b3e27347fb688ec *man/clipMesh3d.Rd
136143
976eae40752edd4c40620f1ddcfb557d *man/clipplaneControl.Rd
137144
1e2f215a31f63f075e36eeee12aa3492 *man/cylinder3d.Rd
138145
0119fd1caeec989bb824e636a50d8890 *man/elementId2Prefix.Rd
@@ -146,7 +153,8 @@ d4ab4c231c6bee4fb64778f48da0af03 *man/hook_rgl.Rd
146153
b01450ce1a78ff4ee2dd6cb749c7871a *man/light.Rd
147154
a64a9cfdee0b69302eca9e8e10b69f40 *man/material.Rd
148155
7d57f553532670c6fb7e3dcc70afc75e *man/matrices.Rd
149-
13e5d3f1cfabc8f64abd0c0c16196433 *man/mesh3d.Rd
156+
8e17034b1326086ed51e16515be6728c *man/mergeVertices.Rd
157+
c9e206413bd3ea71bfef58fbfeab1d33 *man/mesh3d.Rd
150158
84507e788d68dc3738ddffa546095892 *man/mfrow3d.Rd
151159
e70a34e3f2998e17d21caf686134d595 *man/observer3d.Rd
152160
9c512df3020934a8eb6f5a42c321c55e *man/par3d.Rd
@@ -158,11 +166,11 @@ f78df3a55593b4122311e576972a86b8 *man/persp3d.deldir.Rd
158166
1240e5887f3c8f51f14e7dccf3ab725c *man/persp3d.function.Rd
159167
038d11432336935137344ca347f95d4f *man/persp3d.tri.Rd
160168
0c048680d0fee79639e4b6f783115f38 *man/planes.Rd
161-
88e6a28d85e8a4b34f3830992ba516ae *man/play3d.Rd
169+
3336a78f3409a9c9f5e19f8090f0cc1c *man/play3d.Rd
162170
eda5e88bdcc1eb2d348693b2fc7ebc3e *man/playwidget.Rd
163171
03403e1834e1f89d7ba12586ed7b5701 *man/plot3d.Rd
164172
652bba58fa82b29e08e2c7086e8cf5fc *man/plot3d.formula.Rd
165-
8588b0b2e4ff43512877f0de6a5db7e1 *man/plot3d.lm.Rd
173+
8b88fca4f6fbbedc75278771ce28b936 *man/plot3d.lm.Rd
166174
4bccd4a564fc08174f42dcf328e42dba *man/plotmath3d.Rd
167175
ebc0b9d4e3956ffd0f6c7be6d8026043 *man/polygon3d.Rd
168176
251dc0c6c9d50a0712c443c7802d914a *man/postscript.Rd
@@ -181,7 +189,7 @@ a6c1f736b547536f8b660d3ed9c63e30 *man/propertySetter.Rd
181189
20162085b408fb217227e707a9321636 *man/rgl.select.Rd
182190
f0c6becdf88501d800daedb47458655a *man/rgl.useNULL.Rd
183191
e6f44aec1d7445b52e71166d0e7f1e82 *man/rgl.user2window.Rd
184-
2ce4f863cfeac59d71fc94a06184eb7f *man/rglIds.Rd
192+
3753669b9b0febd13b0e6afa88ef71f5 *man/rglIds.Rd
185193
3da3bd9b2995b0714ba8be42a9476f14 *man/rglMouse.Rd
186194
859320e005b22dea7bb1c15dbcc6b4a6 *man/rglShared.Rd
187195
533a7b58fef66311612ac53277c501a8 *man/rglToLattice.Rd
@@ -204,10 +212,10 @@ dd445e118be0a078458bd433ef388939 *man/spin3d.Rd
204212
c4b03ff8c4edc2dfca3f99beec61c248 *man/subscene3d.Rd
205213
ba4f6386dc5690df779999495b6dde15 *man/subsceneInfo.Rd
206214
d5e4877306d55b96493dda8466d0e190 *man/surface.Rd
207-
d1dc2da38e4a718d48da8f6bb3730ffc *man/surface3d.Rd
215+
42cb9cd9a1eea589fb0b7393f919c26e *man/surface3d.Rd
208216
682089e62229e7498ef2b010262e1f95 *man/texts.Rd
209217
514258c242ae290039b36365cb21e41a *man/thigmophobe3d.Rd
210-
d317ef7f27abc58325929f7acc634846 *man/toggleWidget.Rd
218+
bf1a76f15161c297cf284e608bbd37ad *man/toggleWidget.Rd
211219
91734759b662229aca1cf379a5f7461f *man/triangulate.Rd
212220
67496ece74b19278232adbfdcbc40d1c *man/turn3d.Rd
213221
fb8c99c331048bfeb6d0f41efa19304a *man/vertexControl.Rd
@@ -261,7 +269,7 @@ a12c4e2f7bfd3a9ecae816c8ae41a8fa *src/SphereSet.h
261269
dbce32392dea327d9093ea622dd2bc93 *src/SpriteSet.h
262270
0b29e87abeba8671a0c4c5194d784a6b *src/String.cpp
263271
e9a31e14589146f498de32e1d7e1a706 *src/String.h
264-
008d462c17fdb089f4ee25d0790529ef *src/Surface.cpp
272+
de7beb3a44ab580cff79916091d6adc4 *src/Surface.cpp
265273
230ecf15f274784204529487720e5451 *src/Surface.h
266274
838c4d9579b67728bd339a96dc6d8908 *src/TextSet.cpp
267275
e97ef3d84175284df5356155fee73b2e *src/TextSet.h
@@ -429,5 +437,5 @@ f071128261354c2acfff3a96ea56eb7b *src/x11gui.cpp
429437
8a924b25f7c72437d489eb191f285ed1 *tests/demos.R
430438
7bf4c0cb3a8f66ebf6335e04f5a21d4d *vignettes/WebGL.Rmd
431439
ab830fea771ea15dd6687b7c5f9f655c *vignettes/legacyWebGL.Rmd
432-
c54a03f6dd7e548c7c52511d1fb4740d *vignettes/rgl.Rmd
440+
3bf4db9522c3e4e3b33dcc942dcf98bf *vignettes/rgl.Rmd
433441
e9a24591721d9f4f142087bae6936a9e *vignettes/setup.R

NAMESPACE

+13-5
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
export(.check3d,
22
abclines3d, addNormals, addToSubscene3d, arc3d,
3-
arrow3d, as.mesh3d, asRow,
3+
arrow3d, as.mesh3d, as.triangles3d, asRow,
44
ageSetter, asEuclidean, asHomogeneous, aspect3d, axes3d, axis3d, box3d,
55
bbox3d, bg3d, bgplot3d,
66
clear3d, clearSubsceneList, clipplanes3d, clipplaneSlider,
7+
clipMesh3d, # clipTriangles3d,
78
cube3d, cuboctahedron3d,
89
currentSubscene3d, cylinder3d,
910
decorate3d, deform.mesh3d, delFromSubscene3d, divide.mesh3d, dodecahedron3d, dot3d, ellipse3d, extrude3d,
@@ -12,7 +13,7 @@ export(.check3d,
1213
highlevel, hook_rgl, hook_webgl,
1314
icosahedron3d, identify3d, identityMatrix,
1415
layout3d, legend3d, light3d, lines3d, lowlevel, material3d,
15-
matrixSetter, mfrow3d, movie3d, mtext3d,
16+
matrixSetter, mergeVertices, mfrow3d, movie3d, mtext3d,
1617
newSubscene3d, next3d, normalize.mesh3d, observer3d, octahedron3d, oh3d, open3d,
1718
par3d, par3dinterp, par3dinterpControl, par3dinterpSetter,
1819
particles3d, pch3d, persp3d, planes3d,
@@ -26,8 +27,9 @@ export(.check3d,
2627
rgl.select, rgl.select3d, rgl.set, rgl.snapshot, rgl.spheres, rgl.sprites,
2728
rgl.surface, rgl.texts, rgl.triangles, rgl.user2window,
2829
rgl.attrib, rgl.attrib.count, rgl.attrib.info, rgl.dev.list, rgl.useNULL,
29-
rglMouse, rglShared, rglToLattice, rglToBase,
30-
rgl.viewpoint, rgl.window2user, rglFonts, r3dDefaults, rotate3d, rotationMatrix,
30+
rgl.viewpoint, rgl.window2user,
31+
rglFonts, rglId, rglMouse, rglShared, rglToLattice, rglToBase,
32+
r3dDefaults, rotate3d, rotationMatrix,
3133
scale3d, scaleMatrix, scene3d, segments3d, select3d, selectpoints3d,
3234
rgl.setMouseCallbacks, rgl.setWheelCallback, setupKnitr,
3335
setUserShaders, shade3d,
@@ -65,6 +67,11 @@ export(.check3d,
6567
S3method(as.mesh3d, tri)
6668
S3method(as.mesh3d, triSht)
6769
S3method(as.mesh3d, ashape3d)
70+
S3method(as.mesh3d, rglId)
71+
S3method(as.mesh3d, default)
72+
73+
S3method(as.triangles3d, mesh3d)
74+
S3method(as.triangles3d, rglId)
6875

6976
S3method(translate3d, default)
7077
S3method(rotate3d, default)
@@ -118,7 +125,8 @@ export(.check3d,
118125
strwidth, strheight)
119126
importFrom(grDevices, col2rgb, colorRamp, dev.off, png,
120127
postscript, rgb, xy.coords, xyz.coords)
121-
importFrom(stats, approxfun, qchisq, qf, splinefun, var)
128+
importFrom(stats, approxfun, get_all_vars, model.frame,
129+
qchisq, qf, splinefun, terms, var)
122130
importFrom(utils, count.fields, file_test, flush.console,
123131
packageVersion, read.table)
124132
importFrom(crosstalk, crosstalkLibs, SharedData, is.SharedData)

0 commit comments

Comments
 (0)