Skip to content

Commit 4f5a68b

Browse files
dmurdochcran-robot
authored andcommitted
version 0.100.47
1 parent 9aeda2e commit 4f5a68b

Some content is hidden

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

68 files changed

+3442
-2225
lines changed

DESCRIPTION

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
Package: rgl
2-
Version: 0.100.30
2+
Version: 0.100.47
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, plotrix (>= 3.7-3), tripack, interp,
9-
alphashape3d
9+
alphashape3d, tcltk
1010
Imports: graphics, grDevices, stats, utils, htmlwidgets, htmltools,
1111
knitr, jsonlite (>= 0.9.20), shiny, magrittr, crosstalk,
1212
manipulateWidget (>= 0.9.0)
@@ -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-08-18 19:53:12 UTC; murdoch
26+
Packaged: 2020-02-11 21:07:20 UTC; murdoch
2727
Repository: CRAN
28-
Date/Publication: 2019-08-19 18:50:12 UTC
28+
Date/Publication: 2020-02-12 12:20:03 UTC

MD5

+66-60
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
e73499cb89e0d6e97b8ba271c46739fd *COPYING
2-
f82ae3b2c717a32d9e6a5a8ba73f262d *DESCRIPTION
3-
e9e81e77ee4022ab110aa68b21ee3e06 *NAMESPACE
2+
2fca0b26b94f54cc7f02a0a5792396d9 *DESCRIPTION
3+
c67b12a9c9dbfc6590657d9c4ddd81bb *NAMESPACE
44
8d6709606696359548d94a4bf71ce78d *R/Sweave_knitr.R
55
3c20a30ef6a398649341d9b1f227cb7d *R/addNormals.mesh3d.R
6-
edef6334c9a5dd55a144229d50a04899 *R/animate.R
6+
55f8ee27d66e1e86fdfdc188d74d6b81 *R/animate.R
77
baf0c2fd640c730aad8f424f407e4d1d *R/arc3d.R
88
fec9c253d519937d9c3bb352897f9828 *R/arrow3d.R
99
e137c0c0a50d2845895cae06ba0f2100 *R/as.mesh3d.default.R
1010
2262cbd7f063da98c7fa9a75c711b61a *R/as.triangles3d.R
1111
20014bb45bd77d65600819736ab30d62 *R/ashape3d.R
1212
853ac34ab3568c44d0326e6f89ccd68d *R/aspect3d.R
13-
192f32beb804bfa5679ebd73244ada1b *R/asy.R
13+
944fce42bd08fa6c43e549dc324b7569 *R/asy.R
1414
af2817585e3d1db7bd4adbba29992ec1 *R/axes.R
15-
80a8766c3764328d0e7098eaae10aec6 *R/bgplot3d.R
15+
0d177811e81da6e611f6046344030c78 *R/bgplot3d.R
1616
4b36f1447badb49dd32d3283e52f95e5 *R/callbacks.R
1717
8f3f5be7d7a1a66d929896b09a0cafd3 *R/clipMesh3d.R
1818
149f8a63713267831727369515a66e8c *R/conversions.R
@@ -30,21 +30,21 @@ f3867418939a2537a1480ae2a4d71126 *R/internal.R
3030
3fffaf39d7e64d1516468ba87772b097 *R/material.R
3131
a76f70f19e4e470afdac99d8173379b5 *R/matrices.R
3232
7d6705c2dcd8849bb65658adaa611113 *R/mesh3d.R
33-
c7e4123282c4b363ea997e3ba7bae6f7 *R/obj.R
33+
955e5028ace7eafe614c534826aee711 *R/obj.R
3434
e7329453008644d2c2a8a474cc029c99 *R/oh3d.R
35-
e286073653e2776bbb00e418acc57e2e *R/par3d.R
35+
137d2527ae90a2ef7808db1cf431503f *R/par3d.R
3636
6295280d7b5ca70773e3bc81dcbae8af *R/pch3d.R
3737
bf0b85110de1587de80fd3eeceabea10 *R/persp3d.R
38-
5b92a18b45bcda5214b6909d7a3dda6e *R/playwidget.R
39-
35b1b29f592962dc955ef32dfe51b6f0 *R/plot3d.R
38+
22498669ae72fcb1a7ed938036cc99b7 *R/playwidget.R
39+
156d21bd1be9829c5d7d61b20c74cd7d *R/plot3d.R
4040
ab72f9571814ef8c44de6f2343b547c1 *R/plotmath3d.R
4141
af9a986f1752f610b392a47202f8cb59 *R/plugin.R
4242
7c156818e20bab511277a1851b4d09c4 *R/ply.R
43-
27192e49ee721f6635825c7806201a1e *R/r3d.rgl.R
43+
2cc4a84623cd35db5d7bde1c49f20449 *R/r3d.rgl.R
4444
a82494d493925454323cd8102200995d *R/rgl.bringtotop.R
4545
16799b9a7f5ee8eb00c2059ee948d261 *R/rglMouse.R
4646
d1ea9aafe532dda4dee6b213b90b18f8 *R/rglcontroller.R
47-
808f2de709cfe3b0bbda1023d475a2f2 *R/rglwidget.R
47+
b66396283520cbf4f9b3e5368dba697b *R/rglwidget.R
4848
5c99d2752b60bd7accc368814094b3c3 *R/scene.R
4949
06ca697fc07bde9e5d06d936bb4ad5e9 *R/selectpoints3d.R
5050
a92f06f33fc88700e73e7928ccec18ef *R/setUserShaders.R
@@ -54,16 +54,18 @@ b8fcaff709d438c64fe31c712b04a30a *R/solids3d.R
5454
848372016dc3567e06f473836e4145eb *R/subdivision.mesh3d.R
5555
a1f7b5422a13c64dbf75d3215f57b2c1 *R/subscenes.R
5656
3c030acca34f88270334c69e511a240f *R/thigmophobe3d.R
57+
37c4cfffd93840992a9feaf0cd0f7684 *R/tkpar3dsave.R
58+
dd70ae5d2dba8758e2c694b30b2248d7 *R/tkspin3d.R
5759
5bd916f84d651ec3c477700ea73ade49 *R/triangulate.R
5860
3447eb732f99d8015c8575c9a4e5077e *R/turn3d.R
5961
0510e98135fa6b5d756250ca24195514 *R/webGL.R
6062
19a59bb1f17af961b763722f93b8d9f4 *R/webGLcontrols.R
6163
9ff3684d2c3dca329c981b671c6b1c93 *R/zzz.R
6264
df2624d49e00f56c06ce339040b035ca *README
63-
6e9e134a94137c5f1ccc0976706cfff1 *build/vignette.rds
65+
4cad81b9b1a4447c0f0743d8d8bef481 *build/vignette.rds
6466
a6a183397bea52041e6eebb1e2609eb2 *cleanup
65-
7d37669393c8be241f1ae7f5bde64d5e *configure
66-
3f3edde5cdea72fb28297b95fc208234 *configure.ac
67+
0d50480168b64d978c9e8fd97eb3bd5d *configure
68+
d0075b73e15f27516865c3c51779d149 *configure.ac
6769
6fe0d1fa5030665bc66938eee8e61423 *configure.win
6870
7069327c854bd8bddf867f9f3d4fd1a6 *demo/00Index
6971
ae4a727a90b8e66e141906769a78404d *demo/abundance.r
@@ -81,21 +83,21 @@ df244a7d325a77c36f2312f2fde095f2 *demo/shapes3d.R
8183
71d040afb08a28ca56f6c8036beee37c *demo/shinyDemo.R
8284
2371218cccf301be0d44147b3747beb9 *demo/shinyToggle.R
8385
a8cbd8dd339ba65adf23a165a8dfeef6 *demo/simpleShinyRgl.R
84-
866ebfda71509e83a98a7a034e004269 *demo/stereo.R
86+
c8c00de09de689b87c63a76eea76411e *demo/stereo.R
8587
c19c31ef34d40d4c41c7bc0caf112054 *demo/subdivision.r
86-
9eaaad8c3bac5021315eda96c80d3f1d *inst/NEWS
88+
462222fda7b6c1a5542c5621b9cae660 *inst/NEWS
8789
8c5d291e3f47c3395fff092f09f599b9 *inst/WebGL/template.html
8890
5bac46c36b13eac1302260ee06b16c0f *inst/demodata/population.dat
8991
5544dce93555cfaced50ee41283e9e58 *inst/demodata/region.dat
90-
466888b2baf565e5f4fead5a98bbbee7 *inst/doc/WebGL.R
91-
7bf4c0cb3a8f66ebf6335e04f5a21d4d *inst/doc/WebGL.Rmd
92-
02a6ed98b5693eb853aade33ce0f14d0 *inst/doc/WebGL.html
93-
975c5cb8a92968f780d33de734d7fbc7 *inst/doc/legacyWebGL.R
94-
ab830fea771ea15dd6687b7c5f9f655c *inst/doc/legacyWebGL.Rmd
95-
aa640a3377601cf2070c9633b4e34f9d *inst/doc/legacyWebGL.html
96-
50c5f1367fc2f207aa59c7b5523c5704 *inst/doc/rgl.R
97-
3bf4db9522c3e4e3b33dcc942dcf98bf *inst/doc/rgl.Rmd
98-
0d85c4e4c3b310b880fdb2daedfe5cef *inst/doc/rgl.html
92+
c40cc4e10cb5dd80db13f19928d94432 *inst/doc/WebGL.R
93+
19e0a2a03dcbf4352326d218cd921f76 *inst/doc/WebGL.Rmd
94+
9664712df15aa0dacfaa3bfb87bb6481 *inst/doc/WebGL.html
95+
d1211c7d09cac42687b895ea891260df *inst/doc/legacyWebGL.R
96+
aab81d9a5de33a179945af7343f02079 *inst/doc/legacyWebGL.Rmd
97+
8a4182ae69081edca48ac7b030821f39 *inst/doc/legacyWebGL.html
98+
2dc1020285c498f2c851d1f94ddb29fc *inst/doc/rgl.R
99+
a80221c67a85e2195f92ea482c301a01 *inst/doc/rgl.Rmd
100+
a33a8d79005a91e678a62d3b82a6969e *inst/doc/rgl.html
99101
b4ef592c88333c7c509dd74fcd1912d9 *inst/fonts/FreeMono.ttf
100102
867469f13ff81dec9adf2ae2f6ea2899 *inst/fonts/FreeSans.ttf
101103
dc0004a804503e126bc99998c7a1c677 *inst/fonts/FreeSerif.ttf
@@ -110,14 +112,15 @@ e96d5d133e0bd80f67e1ed9a120b64a5 *inst/htmlwidgets/rglWebGL.js
110112
eb74fabf5803a67c70ddbd1e102d88e5 *inst/shinyDemo/ui.R
111113
dbeccecbac4f57c3ffe6d6298a687bec *inst/shinySimple/server.R
112114
862b9619f90121ffb506a6c6d03f52ea *inst/shinySimple/ui.R
113-
6bce8d2ca5c1408d884dbabdaa06b42e *inst/textures/bump_dust.png
114-
ee4e831c7898e173f4303810bb962e04 *inst/textures/nightfire.png
115-
9bc95de401ad938293a31eeda3e634f9 *inst/textures/particle.png
116-
d0da68556f680ce0b2543bf7d528a3b8 *inst/textures/refmap.png
117-
d28cefd893c7df888fa432e7de20dd18 *inst/textures/rgl2.png
118-
67de745a59476bacb0c1be2078313f08 *inst/textures/sunsleep.png
119-
7080d7e4b8fce2d49ffb0b93313b973a *inst/textures/world.png
120-
26c41afa7c4554201ad8735d6cf7b3ab *inst/textures/worldsmall.png
115+
169369bcb1b3c10ca31398684db53275 *inst/slowTests/demos.R
116+
cbe2e33ebb5b25d551984106b4875304 *inst/textures/bump_dust.png
117+
e221746e4c3cab9350cbd533d3c3f53b *inst/textures/nightfire.png
118+
a68491872e00896979cf9e7247cd380b *inst/textures/particle.png
119+
8b20dae04ada6cf245757b0d1aa28788 *inst/textures/refmap.png
120+
7143472a404be347ecb78ea35e1efa84 *inst/textures/rgl2.png
121+
6913e9b79b90af9ef162055d09c3ff44 *inst/textures/sunsleep.png
122+
760f11bccf3dc39aad741060ca7008aa *inst/textures/world.png
123+
055baa857f3e397b0dece1a75f9092d0 *inst/textures/worldsmall.png
121124
c3bf9b027eae02a968cb1f319be29423 *man/3dobjects.Rd
122125
36193edd2bf704e55ceeddbee64fc1ac *man/GramSchmidt.Rd
123126
e9bc0980d966600f346989489932253d *man/abclines.Rd
@@ -126,7 +129,7 @@ e9bc0980d966600f346989489932253d *man/abclines.Rd
126129
74bc35bd1b2ef87419beef2e19875140 *man/ageSetter.Rd
127130
e0824cb277d6362c4b5c80d89a81fb6e *man/arc3d.Rd
128131
ff920476e3c89bbc0595c0bc93b177a0 *man/arrow3d.Rd
129-
aa39ecfa4995507eddba052be10c348a *man/as.mesh3d.ashape3d.Rd
132+
c541706d40071d9a3428b72b08fc46e2 *man/as.mesh3d.ashape3d.Rd
130133
cdc5692c82502fd88cdf0b1d7b94d9f2 *man/as.mesh3d.default.Rd
131134
218f312552b6c89f043a63584af2a38c *man/as.mesh3d.rglId.Rd
132135
4393ffc2c18f6ac41f2d3e64484b1308 *man/as.triangles3d.Rd
@@ -136,7 +139,7 @@ e54c3b2accf9b373c879cb8ff3e32527 *man/attributes.Rd
136139
0cf6103623fa50a9279cc22d95c58a82 *man/axes3d.Rd
137140
550ac2cbf490eca10620e32be4ed5702 *man/bbox.Rd
138141
9002b792cbe9361484072d5924b0011d *man/bg.Rd
139-
44bcc64d7cc5caf6a96246184843db21 *man/bgplot3d.Rd
142+
ae6be20ca75075f5d1d23383df9efd9b *man/bgplot3d.Rd
140143
9be53c0e1daf5032ebdf924003576672 *man/callbacks.Rd
141144
dd065d7a4231b33a55488a3a4535bf7f *man/check3d.Rd
142145
0f08f21288ba272b1b3e27347fb688ec *man/clipMesh3d.Rd
@@ -149,16 +152,16 @@ d9090b36676ab9ca34651bfbeb065216 *man/ellipse3d.Rd
149152
b45b8c32e7731c5e6e886706da165451 *man/grid3d.Rd
150153
d4ab4c231c6bee4fb64778f48da0af03 *man/hook_rgl.Rd
151154
21fc712708f1c91188801630d568c427 *man/identify3d.Rd
152-
43e0ecebabc488e87b91c7de6a9166d1 *man/import.Rd
155+
7ab6d7d03af0fee5880b73351dbcd14f *man/import.Rd
153156
b01450ce1a78ff4ee2dd6cb749c7871a *man/light.Rd
154157
a64a9cfdee0b69302eca9e8e10b69f40 *man/material.Rd
155158
7d57f553532670c6fb7e3dcc70afc75e *man/matrices.Rd
156159
8e17034b1326086ed51e16515be6728c *man/mergeVertices.Rd
157160
a80d344c65109139002e39b215c4d167 *man/mesh3d.Rd
158161
84507e788d68dc3738ddffa546095892 *man/mfrow3d.Rd
159162
e70a34e3f2998e17d21caf686134d595 *man/observer3d.Rd
160-
9c512df3020934a8eb6f5a42c321c55e *man/par3d.Rd
161-
738f6a057355f4391dfb7b400a8e76a4 *man/par3dinterp.Rd
163+
5c3741a728df6fe539cea0b63848f89a *man/par3d.Rd
164+
1d6b064fded56df155d97bf4d92a3feb *man/par3dinterp.Rd
162165
57e704f74406face1979fc592cb4a8c4 *man/par3dinterpControl.Rd
163166
25ef65736e25671f087997c77f3feece *man/pch3d.Rd
164167
596d87c07068ecf260445b3ef429c379 *man/persp3d.Rd
@@ -167,15 +170,15 @@ f78df3a55593b4122311e576972a86b8 *man/persp3d.deldir.Rd
167170
038d11432336935137344ca347f95d4f *man/persp3d.tri.Rd
168171
0c048680d0fee79639e4b6f783115f38 *man/planes.Rd
169172
3336a78f3409a9c9f5e19f8090f0cc1c *man/play3d.Rd
170-
eda5e88bdcc1eb2d348693b2fc7ebc3e *man/playwidget.Rd
173+
ded20b6b23c137366c0cd854bef2f99a *man/playwidget.Rd
171174
03403e1834e1f89d7ba12586ed7b5701 *man/plot3d.Rd
172175
652bba58fa82b29e08e2c7086e8cf5fc *man/plot3d.formula.Rd
173176
8b88fca4f6fbbedc75278771ce28b936 *man/plot3d.lm.Rd
174177
4bccd4a564fc08174f42dcf328e42dba *man/plotmath3d.Rd
175178
ebc0b9d4e3956ffd0f6c7be6d8026043 *man/polygon3d.Rd
176179
251dc0c6c9d50a0712c443c7802d914a *man/postscript.Rd
177180
f8ee8a261f18f776c95d24b52e5a7683 *man/primitive.Rd
178-
0d3d776e61559501530404faf08cff76 *man/propertyControl.Rd
181+
f764f872ca6bcd15baf225fdf304017e *man/propertyControl.Rd
179182
a6c1f736b547536f8b660d3ed9c63e30 *man/propertySetter.Rd
180183
28ceee8b15aadede362da9d0b8a036d4 *man/r3d.Rd
181184
9d48288df06284ec59f250be186fb436 *man/readSTL.Rd
@@ -190,10 +193,10 @@ a6c1f736b547536f8b660d3ed9c63e30 *man/propertySetter.Rd
190193
f0c6becdf88501d800daedb47458655a *man/rgl.useNULL.Rd
191194
e6f44aec1d7445b52e71166d0e7f1e82 *man/rgl.user2window.Rd
192195
3753669b9b0febd13b0e6afa88ef71f5 *man/rglIds.Rd
193-
3da3bd9b2995b0714ba8be42a9476f14 *man/rglMouse.Rd
196+
436d7a5147e7b9fea1c673c921912e88 *man/rglMouse.Rd
194197
859320e005b22dea7bb1c15dbcc6b4a6 *man/rglShared.Rd
195-
533a7b58fef66311612ac53277c501a8 *man/rglToLattice.Rd
196-
b316f60e42da752ec20eb7f2cbe5176f *man/rglwidget.Rd
198+
44b047e65d61f01c07be6515ea267d20 *man/rglToLattice.Rd
199+
22f381c5b03ff4f9df7b3e3501ebb1f7 *man/rglwidget.Rd
197200
2b1ff289f36ce3eeee989d15d233bf72 *man/scene.Rd
198201
60cff8998acc2306f4ec9174b9234b19 *man/scene3d.Rd
199202
6a3bd7a3272edd2796fd5a886f510363 *man/sceneChange.Rd
@@ -214,14 +217,18 @@ ba4f6386dc5690df779999495b6dde15 *man/subsceneInfo.Rd
214217
d5e4877306d55b96493dda8466d0e190 *man/surface.Rd
215218
42cb9cd9a1eea589fb0b7393f919c26e *man/surface3d.Rd
216219
682089e62229e7498ef2b010262e1f95 *man/texts.Rd
217-
514258c242ae290039b36365cb21e41a *man/thigmophobe3d.Rd
220+
0c49be28876dde5d14d19550f9fb9ae8 *man/thigmophobe3d.Rd
221+
85075c23c1acf02b0e722625859731fb *man/tkpar3dsave.Rd
222+
41de5e42569d6b7ef51a6885bb80e95c *man/tkrgl.Rd
223+
a46ee8d700fc227ccb92aa86556e80a7 *man/tkspin3d.Rd
224+
e07283072c56b7e7a435fb47979424a8 *man/tkspinControl.Rd
218225
bf1a76f15161c297cf284e608bbd37ad *man/toggleWidget.Rd
219226
91734759b662229aca1cf379a5f7461f *man/triangulate.Rd
220227
67496ece74b19278232adbfdcbc40d1c *man/turn3d.Rd
221228
fb8c99c331048bfeb6d0f41efa19304a *man/vertexControl.Rd
222229
ddfd766c2131b58e6e3d9306bccfecd9 *man/viewpoint.Rd
223230
dbcfb845f505ec79e07cfdeabd904b65 *man/webGLcontrols.Rd
224-
1f74fe91c86e3722af4e8822f2e85725 *man/writeASY.Rd
231+
384a5804c8811439edce2f47ff3a7a0f *man/writeASY.Rd
225232
f9ad730e504485e70f473223bcf96a42 *man/writeOBJ.Rd
226233
61f8fceba1d4a260ffd078fb6bdd95e3 *man/writePLY.Rd
227234
ad3e80be430d66229eb4b4b6a4a4a15a *man/writeWebGL.Rd
@@ -245,12 +252,12 @@ ec3c3d5ec6c414702b1aca0f877ebebe *src/Light.cpp
245252
b03e2ab2e386594cd527d3cbad2b9f3a *src/Light.h
246253
70a705fe2978bd44a7a3db0a4c23dac5 *src/LineSet.cpp
247254
0f203733196c2cfc2a5252043d3e2cbc *src/LineStripSet.cpp
248-
56cef7816edf4f89e4db4fc4daaef8dd *src/Makevars.in
255+
965d41480a2ae7c9e49279cdead6ec99 *src/Makevars.in
249256
b602fc1b4ebbaabb1788457cfc160f92 *src/Material.cpp
250257
acad6cffd4dac8a0e2897f68d48295ea *src/Material.h
251258
ed476450570763d8d9d2ffc76f9c4521 *src/NULLgui.cpp
252259
159a5bcfb884241441749baf6332fccb *src/NULLgui.h
253-
bba9b96f05da1669f40c04710a7e227d *src/PlaneSet.cpp
260+
cb057244e58014e2d998da89dfad98c6 *src/PlaneSet.cpp
254261
1b510976127456879201e4e737a6fcb4 *src/PlaneSet.h
255262
63cabba14319bcaf9e15b9c65703ad4e *src/PointSet.cpp
256263
b504726b3617de06edb294403bfdd4f9 *src/PrimitiveSet.cpp
@@ -281,8 +288,8 @@ d568deb19ef7db4d787bfa92e48e7924 *src/api.cpp
281288
641fcd4ca273a00ccf9c3522a38b230a *src/api.h
282289
bb5f3d08f63b9c2414e546a8b0afd335 *src/assert.cpp
283290
0e68374c29258e2b6fe6e88fa9b4958d *src/assert.h
284-
08478727a5b38779bc62b632166b9f7f *src/build/autoconf/config.guess
285-
b4b24b88055910a6b4dbb0f436af648e *src/build/autoconf/config.sub
291+
56c8530a22f26cdae7c9b5e946c06429 *src/build/autoconf/config.guess
292+
190c5eaf225abd14513d768efc5073eb *src/build/autoconf/config.sub
286293
6e5fe73723cd40a28adc5b7b5650c8d1 *src/build/autoconf/install-sh
287294
a9d5b47ed83098987478e3083d55aad7 *src/callbacks.cpp
288295
bccfd3c1231fe09c743279715ed012b2 *src/config.h
@@ -399,8 +406,8 @@ fb28ba3824ca5551cf5bb1983c319f92 *src/gl2ps.h
399406
c22dabe5e4ff8257a905288ff35d01af *src/glErrors.cpp
400407
2ca65e7fc89e44f6438ce7ec5741d51b *src/glgui.cpp
401408
6cc9a674fe1ac369ca058edacdbd2e7d *src/glgui.h
402-
5ab05a5f288b7a9c7d690ad4d32387cc *src/gui.cpp
403-
2b8d8a5bba422113401c6ce5311129c2 *src/gui.h
409+
b733cabeee3115aeeb9484ffabc3557a *src/gui.cpp
410+
4c95c5198ea476651002056a0c0020b0 *src/gui.h
404411
35f747c8085c82f506360df49ba4c484 *src/init.cpp
405412
98b41399ac5f905f55cf3b051f7e7eae *src/init.h
406413
991226eae77aedeeb6cab28bcda90023 *src/lib.h
@@ -419,23 +426,22 @@ c105329a33d82519ead8e6841a6110f7 *src/pixmap.cpp
419426
d140e13b2a81bf64aca893a3de84c40f *src/rgl-win.def
420427
fe953c704bc921334d7f9a5dabda5dd1 *src/rglmath.cpp
421428
87a7067a1fe7250632e07d342c7f1f5d *src/rglmath.h
422-
f86f0aba5a78f960896f74e7ea58bf25 *src/rglview.cpp
423-
779a15d6e719f71404c3f40ba966ae49 *src/rglview.h
424-
282126366930323ab0b1579b332b699d *src/scene.cpp
429+
e5c5fd2f5740d361f402decdf27eafb5 *src/rglview.cpp
430+
7620aff341fbd4a1d79f3b89758f3916 *src/rglview.h
431+
4a0b1edb0d111fd3120c338d713fdd81 *src/scene.cpp
425432
d907d0f446f8121a01b33f750138d84a *src/scene.h
426433
1d5d3cc76b12eab1f7be77c4e9564a39 *src/select.cpp
427434
f3fb1125c8e91830a0447f265c0d33e4 *src/select.h
428435
e411e567fd9ec7105ea0127e78a26f40 *src/subscene.cpp
429436
7cfa67317c7580aa1890254221cfd2e3 *src/subscene.h
430437
b1c1e5e8d4dc94c9f6e3967575fab332 *src/types.h
431-
54ee84077be4682054b5e17097af5cb7 *src/win32gui.cpp
438+
b165803926c343987112349d91070241 *src/win32gui.cpp
432439
922dbc57b271b783a941142f04d9b9c2 *src/win32gui.h
433440
ec44405ab8a3c4f584a6d4b33c53446f *src/win32lib.cpp
434-
f071128261354c2acfff3a96ea56eb7b *src/x11gui.cpp
441+
dd60002714d2d7aca31c37e70ed3e19d *src/x11gui.cpp
435442
13bd0b1d57062d5715de47f204038a8c *src/x11gui.h
436443
8f57f7b292407932ab95440ceff7a637 *src/x11lib.cpp
437-
8a924b25f7c72437d489eb191f285ed1 *tests/demos.R
438-
7bf4c0cb3a8f66ebf6335e04f5a21d4d *vignettes/WebGL.Rmd
439-
ab830fea771ea15dd6687b7c5f9f655c *vignettes/legacyWebGL.Rmd
440-
3bf4db9522c3e4e3b33dcc942dcf98bf *vignettes/rgl.Rmd
444+
19e0a2a03dcbf4352326d218cd921f76 *vignettes/WebGL.Rmd
445+
aab81d9a5de33a179945af7343f02079 *vignettes/legacyWebGL.Rmd
446+
a80221c67a85e2195f92ea482c301a01 *vignettes/rgl.Rmd
441447
e9a24591721d9f4f142087bae6936a9e *vignettes/setup.R

NAMESPACE

+3-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,9 @@ export(.check3d,
3838
subsceneInfo, subsceneList, subsetSetter, subsetSlider, Sweave.snapshot,
3939
surface3d, terrain3d,
4040
tetrahedron3d, text3d, texts3d,
41-
thigmophobe3d, title3d, toggleButton, toggleWidget, triangulate,
41+
thigmophobe3d, title3d,
42+
tkpar3dsave, tkspinControl, tkspin3d,
43+
toggleButton, toggleWidget, triangulate,
4244
tmesh3d, transform3d, translate3d, translationMatrix, triangles3d,
4345
turn3d, useSubscene3d, vertexSetter, view3d, wire3d,
4446
writeASY, writeOBJ, writePLY, writeSTL, writeWebGL)

R/animate.R

+4-4
Original file line numberDiff line numberDiff line change
@@ -57,11 +57,11 @@ par3dinterp <- function(times=NULL, userMatrix, scale, zoom, FOV, method=c("spli
5757
stopifnot( length(userMatrix) == 16*length(times) )
5858
userMatrix <- array(userMatrix, c(4,4,length(times)))
5959
xlat <- ncol(data) + 1:4
60-
data <- cbind(data, t(userMatrix[,4,]))
60+
data <- cbind(data, t(userMatrix[,4,, drop = TRUE]))
6161
persp <- ncol(data) + 1:3
62-
data <- cbind(data, t(userMatrix[4,1:3,]))
62+
data <- cbind(data, t(userMatrix[4,1:3,, drop = TRUE]))
6363
rot <- ncol(data) + 1:4
64-
quat <- toQuaternions(userMatrix[1:3, 1:3, ])
64+
quat <- toQuaternions(userMatrix[1:3, 1:3, , drop = FALSE])
6565
# Since q and -q are the same rotation, we want to interpolate
6666
# to the nearer one.
6767
for (i in seq_len(nrow(quat))[-1]) {
@@ -111,7 +111,7 @@ par3dinterp <- function(times=NULL, userMatrix, scale, zoom, FOV, method=c("spli
111111

112112
function(time) {
113113
if (time < mintime || time > maxtime) {
114-
if (extrapolate == "constant")
114+
if (extrapolate == "constant" || mintime == maxtime)
115115
time <- ifelse(time < mintime, mintime, maxtime)
116116
else if (extrapolate == "cycle")
117117
time <- (time - mintime) %% (maxtime - mintime) + mintime

0 commit comments

Comments
 (0)