Skip to content

Commit bff79f7

Browse files
dmurdochcran-robot
authored andcommitted
version 0.98.22
1 parent 10daf13 commit bff79f7

Some content is hidden

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

60 files changed

+4654
-1933
lines changed

DESCRIPTION

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Package: rgl
2-
Version: 0.98.1
2+
Version: 0.98.22
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>
@@ -21,6 +21,6 @@ SystemRequirements: OpenGL, GLU Library, XQuartz (on OSX), zlib
2121
BugReports: https://r-forge.r-project.org/projects/rgl/
2222
VignetteBuilder: knitr
2323
NeedsCompilation: yes
24-
Packaged: 2017-03-08 10:19:55 UTC; murdoch
24+
Packaged: 2017-12-12 14:23:50 UTC; murdoch
2525
Repository: CRAN
26-
Date/Publication: 2017-03-08 19:22:56
26+
Date/Publication: 2017-12-13 17:12:19 UTC

MD5

+59-58
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
e73499cb89e0d6e97b8ba271c46739fd *COPYING
2-
5a1aaa1b8739fa19e87c4be19fdce5cd *DESCRIPTION
3-
d276226d3d4267fca16e725320c00e96 *NAMESPACE
2+
e8322e829b792a2140b9a76f38fbe5dc *DESCRIPTION
3+
cd82ce4bafa45841300f86ea3bb6910c *NAMESPACE
44
be82079d3adeeb60321442d938b049cd *R/Sweave_knitr.R
55
3c20a30ef6a398649341d9b1f227cb7d *R/addNormals.mesh3d.R
6-
61af720221408ad039a9791867acde86 *R/animate.R
6+
edef6334c9a5dd55a144229d50a04899 *R/animate.R
77
fec9c253d519937d9c3bb352897f9828 *R/arrow3d.R
88
853ac34ab3568c44d0326e6f89ccd68d *R/aspect3d.R
99
192f32beb804bfa5679ebd73244ada1b *R/asy.R
10-
99977bf99c641f91266a13e499c292ee *R/axes.R
10+
af2817585e3d1db7bd4adbba29992ec1 *R/axes.R
1111
80a8766c3764328d0e7098eaae10aec6 *R/bgplot3d.R
1212
ac4ab4a705386441e9b2b267244dca04 *R/callbacks.R
1313
149f8a63713267831727369515a66e8c *R/conversions.R
14-
6c0cec61e5777a602f2981d740402c9a *R/convertScene.R
14+
8f2616bab90007dca83f593453b08a25 *R/convertScene.R
1515
be6d6da7d96a3b4812139e0301df398d *R/cylinder3d.R
1616
6994ae0b50137f3a1f7038fb6b8922f2 *R/device.R
1717
5e855bf30c385ae3c1b662a862d3bb5a *R/ellipse3d.R
@@ -25,40 +25,40 @@ f3867418939a2537a1480ae2a4d71126 *R/internal.R
2525
5fd75977b724d3e821f50dd71eb430b7 *R/material.R
2626
a76f70f19e4e470afdac99d8173379b5 *R/matrices.R
2727
6d25f548e97a94287c129562088cc8b1 *R/mesh3d.R
28-
aabe16a4db2cb2ea47c771e8b84f8e89 *R/obj.R
28+
c7e4123282c4b363ea997e3ba7bae6f7 *R/obj.R
2929
e7329453008644d2c2a8a474cc029c99 *R/oh3d.R
3030
7d873495f595e7f5d80e6c48cde312c5 *R/par3d.R
3131
298f718a4c83d630a2234579792d9de2 *R/pch3d.R
3232
9cac057763caa31fd6c0364a3d85148c *R/persp3d.R
33-
b3def72d1a5e0c202bf8cf52a9328e0f *R/playwidget.R
33+
9f1722376c9c003779276311f30060ef *R/playwidget.R
3434
d7e7cc34399769b7a7db3e9a722113f9 *R/plot3d.R
3535
ce7a2db92faee74d464b83780d1f4d30 *R/plotmath3d.R
3636
af9a986f1752f610b392a47202f8cb59 *R/plugin.R
3737
7c156818e20bab511277a1851b4d09c4 *R/ply.R
3838
6882cd1fc817229516180c3e4bfd36a6 *R/r3d.rgl.R
3939
a82494d493925454323cd8102200995d *R/rgl.bringtotop.R
40-
84da9b6bf818218320f52ddd5b2e4c84 *R/rglcontroller.R
41-
5242c214a730aa63f440b627b6071148 *R/rglwidget.R
40+
d1ea9aafe532dda4dee6b213b90b18f8 *R/rglcontroller.R
41+
a225b7b83892a7a1a3306cd518b164f9 *R/rglwidget.R
4242
e68e0fa91bed669f3a02ff4940fe1ad9 *R/scene.R
4343
06ca697fc07bde9e5d06d936bb4ad5e9 *R/selectpoints3d.R
4444
a92f06f33fc88700e73e7928ccec18ef *R/setUserShaders.R
4545
074105f2d0b1efc1c0570eff40897f89 *R/shapelist3d.R
4646
b8fcaff709d438c64fe31c712b04a30a *R/solids3d.R
4747
8dc214a6b3f270d593edfe45fe98f8b4 *R/stl.R
4848
ea7858f239f5b05f14d91a8d12e959ab *R/subdivision.mesh3d.R
49-
b9df7bfa26a96c47a8cda96b4c7e45ba *R/subscenes.R
49+
eb0d5e43687a97f77c7fcb5c6e3fe654 *R/subscenes.R
5050
5bd916f84d651ec3c477700ea73ade49 *R/triangulate.R
5151
3447eb732f99d8015c8575c9a4e5077e *R/turn3d.R
5252
42290ed778e6df24c9a47f2672d099d5 *R/webGL.R
5353
19a59bb1f17af961b763722f93b8d9f4 *R/webGLcontrols.R
54-
b87a5e78a49bc3edd37364fdab4ec4a8 *R/zzz.R
54+
4d4ef63e08def9f5f0983a7c9f5cb362 *R/zzz.R
5555
cf86e8f4b46a62a3d0d7682a5d6cc330 *README
56-
6bd0bd89386c8cbc2f2a018af61a7d1c *build/vignette.rds
56+
5902e8a507a3a33bb1c6ddd0d86d4d8e *build/vignette.rds
5757
a6a183397bea52041e6eebb1e2609eb2 *cleanup
5858
edc562823bc21832d73ac88117eb9dab *configure
5959
273687a0a5143d008e5fb145589c1ba2 *configure.ac
6060
6fe0d1fa5030665bc66938eee8e61423 *configure.win
61-
7d4d00ac964cc9181cab2ef3309f65a5 *demo/00Index
61+
7069327c854bd8bddf867f9f3d4fd1a6 *demo/00Index
6262
ae4a727a90b8e66e141906769a78404d *demo/abundance.r
6363
3e3a22e0505c12b6af3c02ab0c31e40f *demo/bivar.r
6464
88e4edcb3715776e731633a121078926 *demo/envmap.r
@@ -72,29 +72,30 @@ bb7b69a42a128d44ccc9232aa9b13eca *demo/regression.r
7272
171b513fae836147c1ec2cb5203e35b7 *demo/rglExamples.R
7373
154cec7452c730564d63034357b897a0 *demo/shapes3d.R
7474
71d040afb08a28ca56f6c8036beee37c *demo/shinyDemo.R
75+
2371218cccf301be0d44147b3747beb9 *demo/shinyToggle.R
7576
a8cbd8dd339ba65adf23a165a8dfeef6 *demo/simpleShinyRgl.R
7677
866ebfda71509e83a98a7a034e004269 *demo/stereo.R
7778
70324e9f3c6750f14dc5fdfe99003625 *demo/subdivision.r
78-
9b8741a36a57141e4b2a9cb6ab68d72d *inst/NEWS
79+
e04fbef0e3fd1d4f2bbd0a2adbb04360 *inst/NEWS
7980
8c5d291e3f47c3395fff092f09f599b9 *inst/WebGL/template.html
8081
5bac46c36b13eac1302260ee06b16c0f *inst/demodata/population.dat
8182
5544dce93555cfaced50ee41283e9e58 *inst/demodata/region.dat
82-
6aba25dfe5fa76ec129e4dcb51bdf6e8 *inst/doc/WebGL.R
83-
238c17ee23770a08271a968ad5eb8b32 *inst/doc/WebGL.Rmd
84-
df157f12937b1acf4810e4203d9d241b *inst/doc/WebGL.html
83+
8c3e331ee094ab2f179231f30caf7c20 *inst/doc/WebGL.R
84+
ccf1872bda743047d8a665aa70db86bb *inst/doc/WebGL.Rmd
85+
cbadc9e2ab9dae882644a49496e34eea *inst/doc/WebGL.html
8586
975c5cb8a92968f780d33de734d7fbc7 *inst/doc/legacyWebGL.R
8687
31b32f5680eccba793154715f43f7db2 *inst/doc/legacyWebGL.Rmd
87-
7e3ead1ec33d85065965ebd291f20da3 *inst/doc/legacyWebGL.html
88+
d43a6694e0bb79f013df90a2ce7cbada *inst/doc/legacyWebGL.html
8889
75aceca2bb27caabd754ab714248c89e *inst/doc/rgl.R
8990
92374f786b258f115ab3a54f538a98ae *inst/doc/rgl.Rmd
90-
50d42416374b9fa346ec42cf56be4651 *inst/doc/rgl.html
91+
aed2d3f73db28f28f6b299dd3acb50b8 *inst/doc/rgl.html
9192
b4ef592c88333c7c509dd74fcd1912d9 *inst/fonts/FreeMono.ttf
9293
867469f13ff81dec9adf2ae2f6ea2899 *inst/fonts/FreeSans.ttf
9394
dc0004a804503e126bc99998c7a1c677 *inst/fonts/FreeSerif.ttf
9495
f531509fcc00f86e611197ed9b802e73 *inst/htmlwidgets/lib/CanvasMatrix/CanvasMatrix.src.js
9596
affdd5bb24638f5909595f0e7d9c7713 *inst/htmlwidgets/lib/rglClass/rgl.css
96-
8df878955084affc2af6cd4380461933 *inst/htmlwidgets/lib/rglClass/rglClass.src.js
97-
42708f61410666f23668328de2987f7f *inst/htmlwidgets/rglPlayer.js
97+
b8e41c75acc450db90d1dcee9890a262 *inst/htmlwidgets/lib/rglClass/rglClass.src.js
98+
d4f8954a62741bd5e57c77c3db9ad391 *inst/htmlwidgets/rglPlayer.js
9899
0ec592bdc675b0cca5b089c13e6f6b42 *inst/htmlwidgets/rglPlayer.yaml
99100
a1a230c69047a6901e36620ea166632b *inst/htmlwidgets/rglWebGL.js
100101
3e1a8bb45dab0242d5430b34d1e73050 *inst/htmlwidgets/rglWebGL.yaml
@@ -115,7 +116,7 @@ f93d86b65210d8f6e5f6a460bd2e256d *man/3dobjects.Rd
115116
36193edd2bf704e55ceeddbee64fc1ac *man/GramSchmidt.Rd
116117
e9bc0980d966600f346989489932253d *man/abclines.Rd
117118
20b13c30f7ebb52719caf1e5d950a14d *man/addNormals.Rd
118-
0b9cebaaf43c04690f3b99d18af25849 *man/ageControl.Rd
119+
3948e62f10f307713c18092a470f7df5 *man/ageControl.Rd
119120
74bc35bd1b2ef87419beef2e19875140 *man/ageSetter.Rd
120121
ff920476e3c89bbc0595c0bc93b177a0 *man/arrow3d.Rd
121122
91224edeba2f1c2b44988b76069571b4 *man/aspect3d.Rd
@@ -149,10 +150,10 @@ e70a34e3f2998e17d21caf686134d595 *man/observer3d.Rd
149150
b0397fcae37f6017551b952a904400e5 *man/persp3d.Rd
150151
bc1116637e1f6a7000ad4b2b37377d6b *man/persp3d.deldir.Rd
151152
1240e5887f3c8f51f14e7dccf3ab725c *man/persp3d.function.Rd
152-
7cae54c8a91e7a8e8d4ec0ae0823f372 *man/planes.Rd
153-
554ea661b074d973a0c21f6982c98b3c *man/play3d.Rd
153+
0c048680d0fee79639e4b6f783115f38 *man/planes.Rd
154+
88e6a28d85e8a4b34f3830992ba516ae *man/play3d.Rd
154155
cc438424695f0d877ec05ed0fd08f189 *man/playwidget.Rd
155-
182d3becdf359855d3b1ffa538add7d4 *man/plot3d.Rd
156+
a0e6fedae14d7201e98d6c26a9153124 *man/plot3d.Rd
156157
bf0749c32ae991475ca9b6d92af26a4e *man/plotmath3d.Rd
157158
ebc0b9d4e3956ffd0f6c7be6d8026043 *man/polygon3d.Rd
158159
4f2109b4c992a1811e3ab1365f7e5aa0 *man/postscript.Rd
@@ -181,38 +182,38 @@ eb39bd5b917064e17c1650fcbf600e53 *man/rgl.user2window.Rd
181182
aa00aee06c005e7cab45e5d213a1ac49 *man/selectpoints3d.Rd
182183
1f682db573b5f218956b8fa097bac9c8 *man/setUserShaders.Rd
183184
d71689c55996c3f624c5005eef65f77f *man/shapelist3d.Rd
184-
a066f365d5ef588189f63beee1e0d903 *man/shiny.Rd
185+
3732f36a9aef0c534d44b69b05a0de7c *man/shiny.Rd
185186
6167e9bcf217c971b217e9b2d85f5c69 *man/show2d.Rd
186-
9b86b26e37aeecb603a240a98fa3fe98 *man/snapshot.Rd
187+
c24d92fd7dbd4149f00102e6c9dd8204 *man/snapshot.Rd
187188
68137428b04700d507db4a90b65e7b06 *man/spheres.Rd
188189
dd445e118be0a078458bd433ef388939 *man/spin3d.Rd
189190
3e9447376d8f981c0b8eec8d29f0f0c3 *man/sprites.Rd
190191
22e36b361192b2343ea12437b3e4d4ad *man/subdivision3d.Rd
191-
ce31e160db13ca4a6cebd877c62781c8 *man/subscene3d.Rd
192+
6254b2295409909041f32786cf6277f0 *man/subscene3d.Rd
192193
ba4f6386dc5690df779999495b6dde15 *man/subsceneInfo.Rd
193194
d5e4877306d55b96493dda8466d0e190 *man/surface.Rd
194195
d1dc2da38e4a718d48da8f6bb3730ffc *man/surface3d.Rd
195196
2c94298e62d94ecf0b670c173f3cd2c9 *man/texts.Rd
196197
d317ef7f27abc58325929f7acc634846 *man/toggleWidget.Rd
197198
91734759b662229aca1cf379a5f7461f *man/triangulate.Rd
198199
67496ece74b19278232adbfdcbc40d1c *man/turn3d.Rd
199-
2eb192e467d5c2c26c275cabf5cb8012 *man/vertexControl.Rd
200+
fb8c99c331048bfeb6d0f41efa19304a *man/vertexControl.Rd
200201
ddfd766c2131b58e6e3d9306bccfecd9 *man/viewpoint.Rd
201202
dbcfb845f505ec79e07cfdeabd904b65 *man/webGLcontrols.Rd
202-
df564f557ad042864ca275797676fc61 *man/writeASY.Rd
203-
6556315ab26ae2270ced917599f9b54c *man/writeOBJ.Rd
203+
1f74fe91c86e3722af4e8822f2e85725 *man/writeASY.Rd
204+
ea6c2f62ed8f177c7a4ccd5a0030a1ae *man/writeOBJ.Rd
204205
61f8fceba1d4a260ffd078fb6bdd95e3 *man/writePLY.Rd
205206
ad3e80be430d66229eb4b4b6a4a4a15a *man/writeWebGL.Rd
206207
d8fa5bf811ae1d9584054ed1a367a6be *po/R-rgl.pot
207208
6d84d6f8a7d01e28e554663decb28967 *src/ABCLineSet.cpp
208209
4e93c61da331b4806ec9d481f17b47cb *src/ABCLineSet.h
209210
8c49ee4680b4c35df1166b40c1e69e8c *src/BBoxDeco.cpp
210211
6036e35683f44d9c752f86280dab247e *src/BBoxDeco.h
211-
24f6061143829c27cb2d22b68d0c3a45 *src/Background.cpp
212-
52f9dc703c2c46e5ea05a4de9e1608e2 *src/Background.h
212+
e380f32ee63a0304e661d7e0ff4616d0 *src/Background.cpp
213+
895db1a3a245076e869cdfd652d5bedf *src/Background.h
213214
07787092d891d8e841598acf6a1b267e *src/COPYING.GL2PS
214-
47e8a4a7e46351fe6e2659c4b7a23020 *src/ClipPlane.cpp
215-
3ba8e335135deb32583e586507a9db03 *src/ClipPlane.h
215+
a69be3aa64ec31aa38bd96ccab53f96b *src/ClipPlane.cpp
216+
969b28736e44716031c26ab2bc9ff209 *src/ClipPlane.h
216217
92c8148c5c10e5ca9125a8fa6630d975 *src/Color.cpp
217218
3b231f79bf9228e58fd6fd658d2b4148 *src/Color.h
218219
ef44ecd70149fd1a8db74bea37073154 *src/Device.h
@@ -222,7 +223,7 @@ b128eb378abdd8e63ea8287e7f9f6254 *src/Disposable.h
222223
ec3c3d5ec6c414702b1aca0f877ebebe *src/Light.cpp
223224
b03e2ab2e386594cd527d3cbad2b9f3a *src/Light.h
224225
70a705fe2978bd44a7a3db0a4c23dac5 *src/LineSet.cpp
225-
20e0919c074f065bca632ebce09636e3 *src/LineStripSet.cpp
226+
0f203733196c2cfc2a5252043d3e2cbc *src/LineStripSet.cpp
226227
b825262365eb0d1e222f197c143d8a29 *src/Makevars.in
227228
990007f5f09f580ed175b8512a4bfe87 *src/Material.cpp
228229
5401f7c12f05bbfe42d8a646ec23495e *src/Material.h
@@ -231,31 +232,31 @@ ed476450570763d8d9d2ffc76f9c4521 *src/NULLgui.cpp
231232
bba9b96f05da1669f40c04710a7e227d *src/PlaneSet.cpp
232233
1b510976127456879201e4e737a6fcb4 *src/PlaneSet.h
233234
63cabba14319bcaf9e15b9c65703ad4e *src/PointSet.cpp
234-
418bd6cc144844251966871e85756b21 *src/PrimitiveSet.cpp
235-
069cd2f8a8c94a7dc4f0b050d9f3a8a5 *src/PrimitiveSet.h
235+
b504726b3617de06edb294403bfdd4f9 *src/PrimitiveSet.cpp
236+
6c7d45ab782bea849c42fae7353b3570 *src/PrimitiveSet.h
236237
a690ee6caf929116ca61fd2a97cd328e *src/R.h
237238
9dd4aa8ad74533c5cd129a03d93c81df *src/RenderContext.cpp
238239
2397bb9b330dc081bc2a8db7e8a6abcb *src/RenderContext.h
239240
eed5a8ca9c46b4217d7fe218e887d484 *src/SceneNode.h
240-
3e7e2c4a716f4e1b978a5a9cad2371ff *src/Shape.cpp
241-
aad852a6ceba5afdc1236097f3bc17ec *src/Shape.h
242-
64f2c202ac923cf3bdc4edb720601439 *src/SphereMesh.cpp
243-
8003255fc83bb1d65cf1a4e9fec93898 *src/SphereMesh.h
244-
08cba2f2e8b2a26d1544bb8914022df4 *src/SphereSet.cpp
245-
e8735c2e620b730a21f69405c7682aea *src/SphereSet.h
246-
060f4c409010031621f181d9e34ae0d1 *src/SpriteSet.cpp
247-
ad7c424f54026f4ca803589cacdca3d4 *src/SpriteSet.h
241+
2e22f1041b6710f1a58038a764df42e0 *src/Shape.cpp
242+
834694f5ca480478be67b15e1b50c0c7 *src/Shape.h
243+
91150103c448f30ed39750e7bde5b352 *src/SphereMesh.cpp
244+
43e455fbfb1d41226b6445343c0fa3ca *src/SphereMesh.h
245+
c123b8b2267d66579361d17c61029324 *src/SphereSet.cpp
246+
7b2e83c95eac4da6e9788b877f29dbc7 *src/SphereSet.h
247+
3cc889d38793ee7487b8675068579642 *src/SpriteSet.cpp
248+
8f846f3615ed1cc0942cd516f56b0358 *src/SpriteSet.h
248249
0b29e87abeba8671a0c4c5194d784a6b *src/String.cpp
249250
e9a31e14589146f498de32e1d7e1a706 *src/String.h
250-
7ed86344162a230d9e2cb26f1b7d52f6 *src/Surface.cpp
251-
efa53854024221fbe7a736fecc2f92a6 *src/Surface.h
252-
929430b988256eb8932956cb9869873b *src/TextSet.cpp
253-
eef1deddc0f22ebe8f8c34e139b32f62 *src/TextSet.h
251+
5020c40c109188dc2751ce53c287ba64 *src/Surface.cpp
252+
230ecf15f274784204529487720e5451 *src/Surface.h
253+
93fdae795fa2edea61d190b8fb20147e *src/TextSet.cpp
254+
ea33d1dd0054ba89769dffdc848c7c56 *src/TextSet.h
254255
3edabc59652f715da748cc16eb58f92e *src/Texture.cpp
255256
57491612dd6fd9fd94519e1598a226b0 *src/Texture.h
256257
49f352b1355b0185b401d22c24d679ca *src/Viewpoint.cpp
257258
820bc232ed7b5fd0dac01ab5246026ad *src/Viewpoint.h
258-
6f16adf65936157f17b5f1f457d7b004 *src/api.cpp
259+
8c35ab3075fc37e0dffb6d2354e9856d *src/api.cpp
259260
0c6947ff203bed73cbe033e6d7c1ecef *src/api.h
260261
bb5f3d08f63b9c2414e546a8b0afd335 *src/assert.cpp
261262
0e68374c29258e2b6fe6e88fa9b4958d *src/assert.h
@@ -370,7 +371,7 @@ f628642b6af28e07c8fff0a9464ba650 *src/ext/ftgl/FTVectoriser.h
370371
ca5fc8b9582ffebd9baf824d9c37b7d3 *src/fps.cpp
371372
e5aa79236fa82468d5e415401e5ddd0f *src/fps.h
372373
1fdd71d5a6d05d33bf335c0c10283aba *src/ftgl.cpp
373-
8d50e9688f61e9298db1b86bdcf19fd8 *src/geom.cpp
374+
9dd32b80e913c360584b022485e50a06 *src/geom.cpp
374375
801de6ffecb85d9ad80257b168cfce48 *src/geom.h
375376
47c89c2fbae62d65ca73308469721f08 *src/gl2ps.c
376377
c2df43358f9dc57b02321b60feca6637 *src/gl2ps.h
@@ -386,7 +387,7 @@ c0760b16090144010a6322b26cb60583 *src/init.cpp
386387
317b371cc2e90200563e53c20e2b66bf *src/par3d.cpp
387388
c105329a33d82519ead8e6841a6110f7 *src/pixmap.cpp
388389
4823fcd47dff6930865d7fb056dd0b25 *src/pixmap.h
389-
56c23f46f775513981a5f8ae15e9a4e4 *src/platform.cpp
390+
86d92471083829c432ca8459d3f59a1e *src/platform.cpp
390391
990da172f3a90201bfc36f747d733427 *src/platform.h
391392
27ad47ba56a8785fa3c729983c8971ff *src/pngpixmap.h
392393
0f3cbcc107a805669552e140ede08ed7 *src/pragma.h
@@ -399,12 +400,12 @@ fe953c704bc921334d7f9a5dabda5dd1 *src/rglmath.cpp
399400
87a7067a1fe7250632e07d342c7f1f5d *src/rglmath.h
400401
181d701ef27887bd5a3fcc6ad2579972 *src/rglview.cpp
401402
df2d3d8bfc49477d4ff635f6367be958 *src/rglview.h
402-
2cc487993f6bbab9354ea840bbf44c5d *src/scene.cpp
403-
52daa9d90b27b10fa738da5fceb577d8 *src/scene.h
403+
f48305e176de69c188b54320b1da88db *src/scene.cpp
404+
de5fea91970e5de9a6d32f41e566e485 *src/scene.h
404405
1d5d3cc76b12eab1f7be77c4e9564a39 *src/select.cpp
405406
f3fb1125c8e91830a0447f265c0d33e4 *src/select.h
406-
07a9ce77431b4643d379c95c86be9bef *src/subscene.cpp
407-
3461deb81bb709780b486b2cf57b907b *src/subscene.h
407+
63a58a42173015bbfc6f20a2429c3eba *src/subscene.cpp
408+
ca566c51f77368e88e818979f32dea18 *src/subscene.h
408409
b1c1e5e8d4dc94c9f6e3967575fab332 *src/types.h
409410
54ee84077be4682054b5e17097af5cb7 *src/win32gui.cpp
410411
922dbc57b271b783a941142f04d9b9c2 *src/win32gui.h
@@ -413,7 +414,7 @@ ec44405ab8a3c4f584a6d4b33c53446f *src/win32lib.cpp
413414
13bd0b1d57062d5715de47f204038a8c *src/x11gui.h
414415
8f57f7b292407932ab95440ceff7a637 *src/x11lib.cpp
415416
8a924b25f7c72437d489eb191f285ed1 *tests/demos.R
416-
238c17ee23770a08271a968ad5eb8b32 *vignettes/WebGL.Rmd
417+
ccf1872bda743047d8a665aa70db86bb *vignettes/WebGL.Rmd
417418
31b32f5680eccba793154715f43f7db2 *vignettes/legacyWebGL.Rmd
418419
92374f786b258f115ab3a54f538a98ae *vignettes/rgl.Rmd
419420
cfa8bdf50b9596c93a8142dfc54a80e7 *vignettes/setup.R

NAMESPACE

+2-2
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ export(.check3d,
104104
importFrom(grDevices, col2rgb, colorRamp, dev.off, png,
105105
postscript, rgb, xy.coords, xyz.coords)
106106
importFrom(stats, approxfun, qchisq, qf, splinefun, var)
107-
importFrom(utils, file_test, flush.console,
107+
importFrom(utils, count.fields, file_test, flush.console,
108108
packageVersion, read.table)
109109

110110
# These were in rglwidget
@@ -119,7 +119,7 @@ importFrom(htmlwidgets, createWidget, shinyRenderWidget, shinyWidgetOutput, sizi
119119
importFrom(htmltools, includeScript, tags, tagList, browsable)
120120
importFrom(jsonlite, toJSON)
121121
importFrom(knitr, fig_path, hook_plot_custom, image_uri, knit_hooks, knit_print, opts_current, opts_knit)
122-
importFrom(shiny, getDefaultReactiveDomain)
122+
importFrom(shiny, getDefaultReactiveDomain, markRenderFunction)
123123
importFrom(magrittr, "%>%")
124124

125125
S3method(playwidget, default)

R/animate.R

+8-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,14 @@ par3dinterp <- function(times=NULL, userMatrix, scale, zoom, FOV, method=c("spli
6161
persp <- ncol(data) + 1:3
6262
data <- cbind(data, t(userMatrix[4,1:3,]))
6363
rot <- ncol(data) + 1:4
64-
data <- cbind(data, toQuaternions(userMatrix[1:3,1:3,]))
64+
quat <- toQuaternions(userMatrix[1:3, 1:3, ])
65+
# Since q and -q are the same rotation, we want to interpolate
66+
# to the nearer one.
67+
for (i in seq_len(nrow(quat))[-1]) {
68+
if (sum((quat[i - 1, ] - quat[i, ])^2) > sum((quat[i - 1, ] + quat[i, ])^2))
69+
quat[i, ] <- -quat[i, ]
70+
}
71+
data <- cbind(data, quat)
6572
} else {
6673
xlat <- NULL
6774
}

R/axes.R

+7-2
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,13 @@ axes3d <- function(edges='bbox', labels=TRUE,
9191
save <- par3d(skipRedraw = TRUE, ignoreExtent = TRUE)
9292
on.exit(par3d(save))
9393
if (identical(edges, 'bbox')) {
94-
result <- do.call('bbox3d', c(list(nticks=nticks, draw_front=box, expand=expand),
95-
.fixMaterialArgs(..., Params = list(front='lines', back='lines'))))
94+
bboxargs <- names(formals(rgl.bbox))
95+
bboxargs <- intersect(bboxargs, names(list(...)))
96+
otherargs <- setdiff(names(list(...)), bboxargs)
97+
bboxargs <- list(...)[bboxargs]
98+
otherargs <- list(...)[otherargs]
99+
result <- do.call('bbox3d', c(list(draw_front=box, expand=expand), bboxargs,
100+
do.call('.fixMaterialArgs', c(otherargs, list(Params = list(front='lines', back='lines'))))))
96101
} else {
97102
result <- numeric(0)
98103
for (e in edges)

0 commit comments

Comments
 (0)