Skip to content

Commit 9aeda2e

Browse files
dmurdochcran-robot
authored andcommitted
version 0.100.30
1 parent 58055a9 commit 9aeda2e

17 files changed

+280
-134
lines changed

DESCRIPTION

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

MD5

+16-16
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
e73499cb89e0d6e97b8ba271c46739fd *COPYING
2-
92ec3c55e50ad7c45980b9c18fe135fe *DESCRIPTION
3-
3fc1d7bd95e506b955524cdd720e1c58 *NAMESPACE
2+
f82ae3b2c717a32d9e6a5a8ba73f262d *DESCRIPTION
3+
e9e81e77ee4022ab110aa68b21ee3e06 *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
99
e137c0c0a50d2845895cae06ba0f2100 *R/as.mesh3d.default.R
1010
2262cbd7f063da98c7fa9a75c711b61a *R/as.triangles3d.R
11-
cfce3817dfdcaa8d6ca3b11c5b67158c *R/ashape3d.R
11+
20014bb45bd77d65600819736ab30d62 *R/ashape3d.R
1212
853ac34ab3568c44d0326e6f89ccd68d *R/aspect3d.R
1313
192f32beb804bfa5679ebd73244ada1b *R/asy.R
1414
af2817585e3d1db7bd4adbba29992ec1 *R/axes.R
@@ -29,7 +29,7 @@ ecdeca7d0766658fcb1189ce421c507d *R/identify3d.R
2929
f3867418939a2537a1480ae2a4d71126 *R/internal.R
3030
3fffaf39d7e64d1516468ba87772b097 *R/material.R
3131
a76f70f19e4e470afdac99d8173379b5 *R/matrices.R
32-
8fdd547aa1321883cae49d98fe2aa922 *R/mesh3d.R
32+
7d6705c2dcd8849bb65658adaa611113 *R/mesh3d.R
3333
c7e4123282c4b363ea997e3ba7bae6f7 *R/obj.R
3434
e7329453008644d2c2a8a474cc029c99 *R/oh3d.R
3535
e286073653e2776bbb00e418acc57e2e *R/par3d.R
@@ -60,7 +60,7 @@ a1f7b5422a13c64dbf75d3215f57b2c1 *R/subscenes.R
6060
19a59bb1f17af961b763722f93b8d9f4 *R/webGLcontrols.R
6161
9ff3684d2c3dca329c981b671c6b1c93 *R/zzz.R
6262
df2624d49e00f56c06ce339040b035ca *README
63-
47edbc64704c6a73db3542353d96a6fa *build/vignette.rds
63+
6e9e134a94137c5f1ccc0976706cfff1 *build/vignette.rds
6464
a6a183397bea52041e6eebb1e2609eb2 *cleanup
6565
7d37669393c8be241f1ae7f5bde64d5e *configure
6666
3f3edde5cdea72fb28297b95fc208234 *configure.ac
@@ -83,19 +83,19 @@ df244a7d325a77c36f2312f2fde095f2 *demo/shapes3d.R
8383
a8cbd8dd339ba65adf23a165a8dfeef6 *demo/simpleShinyRgl.R
8484
866ebfda71509e83a98a7a034e004269 *demo/stereo.R
8585
c19c31ef34d40d4c41c7bc0caf112054 *demo/subdivision.r
86-
2f3835e2544c76cb14afb6e9d6a6ca1e *inst/NEWS
86+
9eaaad8c3bac5021315eda96c80d3f1d *inst/NEWS
8787
8c5d291e3f47c3395fff092f09f599b9 *inst/WebGL/template.html
8888
5bac46c36b13eac1302260ee06b16c0f *inst/demodata/population.dat
8989
5544dce93555cfaced50ee41283e9e58 *inst/demodata/region.dat
9090
466888b2baf565e5f4fead5a98bbbee7 *inst/doc/WebGL.R
9191
7bf4c0cb3a8f66ebf6335e04f5a21d4d *inst/doc/WebGL.Rmd
92-
ee3a6f17c8e988518b7b0945f3de6767 *inst/doc/WebGL.html
92+
02a6ed98b5693eb853aade33ce0f14d0 *inst/doc/WebGL.html
9393
975c5cb8a92968f780d33de734d7fbc7 *inst/doc/legacyWebGL.R
9494
ab830fea771ea15dd6687b7c5f9f655c *inst/doc/legacyWebGL.Rmd
95-
a4ff5f92f91966c6b2e96f66e860b8fb *inst/doc/legacyWebGL.html
95+
aa640a3377601cf2070c9633b4e34f9d *inst/doc/legacyWebGL.html
9696
50c5f1367fc2f207aa59c7b5523c5704 *inst/doc/rgl.R
9797
3bf4db9522c3e4e3b33dcc942dcf98bf *inst/doc/rgl.Rmd
98-
6fcc1648f73bae47742b282be52660c6 *inst/doc/rgl.html
98+
0d85c4e4c3b310b880fdb2daedfe5cef *inst/doc/rgl.html
9999
b4ef592c88333c7c509dd74fcd1912d9 *inst/fonts/FreeMono.ttf
100100
867469f13ff81dec9adf2ae2f6ea2899 *inst/fonts/FreeSans.ttf
101101
dc0004a804503e126bc99998c7a1c677 *inst/fonts/FreeSerif.ttf
@@ -126,7 +126,7 @@ e9bc0980d966600f346989489932253d *man/abclines.Rd
126126
74bc35bd1b2ef87419beef2e19875140 *man/ageSetter.Rd
127127
e0824cb277d6362c4b5c80d89a81fb6e *man/arc3d.Rd
128128
ff920476e3c89bbc0595c0bc93b177a0 *man/arrow3d.Rd
129-
47edc3c8b94b8b4fcbd9047f4d8109b8 *man/as.mesh3d.ashape3d.Rd
129+
aa39ecfa4995507eddba052be10c348a *man/as.mesh3d.ashape3d.Rd
130130
cdc5692c82502fd88cdf0b1d7b94d9f2 *man/as.mesh3d.default.Rd
131131
218f312552b6c89f043a63584af2a38c *man/as.mesh3d.rglId.Rd
132132
4393ffc2c18f6ac41f2d3e64484b1308 *man/as.triangles3d.Rd
@@ -154,7 +154,7 @@ b01450ce1a78ff4ee2dd6cb749c7871a *man/light.Rd
154154
a64a9cfdee0b69302eca9e8e10b69f40 *man/material.Rd
155155
7d57f553532670c6fb7e3dcc70afc75e *man/matrices.Rd
156156
8e17034b1326086ed51e16515be6728c *man/mergeVertices.Rd
157-
c9e206413bd3ea71bfef58fbfeab1d33 *man/mesh3d.Rd
157+
a80d344c65109139002e39b215c4d167 *man/mesh3d.Rd
158158
84507e788d68dc3738ddffa546095892 *man/mfrow3d.Rd
159159
e70a34e3f2998e17d21caf686134d595 *man/observer3d.Rd
160160
9c512df3020934a8eb6f5a42c321c55e *man/par3d.Rd
@@ -245,7 +245,7 @@ ec3c3d5ec6c414702b1aca0f877ebebe *src/Light.cpp
245245
b03e2ab2e386594cd527d3cbad2b9f3a *src/Light.h
246246
70a705fe2978bd44a7a3db0a4c23dac5 *src/LineSet.cpp
247247
0f203733196c2cfc2a5252043d3e2cbc *src/LineStripSet.cpp
248-
b825262365eb0d1e222f197c143d8a29 *src/Makevars.in
248+
56cef7816edf4f89e4db4fc4daaef8dd *src/Makevars.in
249249
b602fc1b4ebbaabb1788457cfc160f92 *src/Material.cpp
250250
acad6cffd4dac8a0e2897f68d48295ea *src/Material.h
251251
ed476450570763d8d9d2ffc76f9c4521 *src/NULLgui.cpp
@@ -394,8 +394,8 @@ e5aa79236fa82468d5e415401e5ddd0f *src/fps.h
394394
1fdd71d5a6d05d33bf335c0c10283aba *src/ftgl.cpp
395395
9dd32b80e913c360584b022485e50a06 *src/geom.cpp
396396
801de6ffecb85d9ad80257b168cfce48 *src/geom.h
397-
c4b212ccaa63de94ddeff40e1ec2c753 *src/gl2ps.c
398-
12f2a2b409ccf378cf59ccaf54b4cf51 *src/gl2ps.h
397+
8161f0604ef08b82e09e1b97e2998d1f *src/gl2ps.c
398+
fb28ba3824ca5551cf5bb1983c319f92 *src/gl2ps.h
399399
c22dabe5e4ff8257a905288ff35d01af *src/glErrors.cpp
400400
2ca65e7fc89e44f6438ce7ec5741d51b *src/glgui.cpp
401401
6cc9a674fe1ac369ca058edacdbd2e7d *src/glgui.h
@@ -421,11 +421,11 @@ fe953c704bc921334d7f9a5dabda5dd1 *src/rglmath.cpp
421421
87a7067a1fe7250632e07d342c7f1f5d *src/rglmath.h
422422
f86f0aba5a78f960896f74e7ea58bf25 *src/rglview.cpp
423423
779a15d6e719f71404c3f40ba966ae49 *src/rglview.h
424-
743ad187b7c562c33cca03042297a760 *src/scene.cpp
424+
282126366930323ab0b1579b332b699d *src/scene.cpp
425425
d907d0f446f8121a01b33f750138d84a *src/scene.h
426426
1d5d3cc76b12eab1f7be77c4e9564a39 *src/select.cpp
427427
f3fb1125c8e91830a0447f265c0d33e4 *src/select.h
428-
8f5ddc15b75db73a7e3284125143dda3 *src/subscene.cpp
428+
e411e567fd9ec7105ea0127e78a26f40 *src/subscene.cpp
429429
7cfa67317c7580aa1890254221cfd2e3 *src/subscene.h
430430
b1c1e5e8d4dc94c9f6e3967575fab332 *src/types.h
431431
54ee84077be4682054b5e17097af5cb7 *src/win32gui.cpp

NAMESPACE

+2
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,8 @@ export(.check3d,
6363

6464
S3method(plot3d, mesh3d)
6565

66+
S3method(all.equal, mesh3d)
67+
6668
S3method(as.mesh3d, deldir)
6769
S3method(as.mesh3d, tri)
6870
S3method(as.mesh3d, triSht)

R/ashape3d.R

+2-2
Original file line numberDiff line numberDiff line change
@@ -78,15 +78,15 @@ reOrient <- function(vertices) {
7878
vertices
7979
}
8080

81-
as.mesh3d.ashape3d <- function(x, alpha = x$alpha[1],
81+
as.mesh3d.ashape3d <- function(x, alpha = x$alpha[1], tri_to_keep = 2L,
8282
col = "gray", smooth = FALSE,
8383
normals = NULL, texcoords = NULL,
8484
...) {
8585
whichAlpha <- which(alpha == x$alpha)[1]
8686
if (!length(whichAlpha))
8787
stop("'alpha = ", alpha, "' not found in ", deparse(substitute(x)))
8888
triangles <- x$triang
89-
keep <- triangles[,8 + whichAlpha] > 1
89+
keep <- triangles[,8 + whichAlpha] %in% tri_to_keep
9090
triangs <- t(triangles[keep, 1:3])
9191
points <- t(x$x)
9292
if (!is.null(texcoords))

0 commit comments

Comments
 (0)