Skip to content

Commit e8e1d39

Browse files
dmurdochcran-robot
dmurdoch
authored and
cran-robot
committed
version 0.105.13
1 parent 3afb93d commit e8e1d39

13 files changed

+125
-119
lines changed

‎DESCRIPTION

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Package: rgl
2-
Version: 0.105.12
2+
Version: 0.105.13
33
Title: 3D Visualization Using OpenGL
44
Author: Daniel Adler <dadler@uni-goettingen.de>, Duncan Murdoch <murdoch.duncan@gmail.com>, and others (see README)
55
Maintainer: Duncan Murdoch <murdoch.duncan@gmail.com>
@@ -24,6 +24,6 @@ BugReports: https://github.com/dmurdoch/rgl/issues
2424
VignetteBuilder: knitr
2525
Additional_repositories: https://dmurdoch.github.io/drat
2626
NeedsCompilation: yes
27-
Packaged: 2021-02-14 20:46:05 UTC; murdoch
27+
Packaged: 2021-02-15 14:55:17 UTC; murdoch
2828
Repository: CRAN
29-
Date/Publication: 2021-02-14 22:50:03 UTC
29+
Date/Publication: 2021-02-15 16:10:02 UTC

‎MD5

+12-12
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
e73499cb89e0d6e97b8ba271c46739fd *COPYING
2-
c8871d0eb12d9756c18c587e80e3919a *DESCRIPTION
2+
0cd4b1ef4aaf05faf932e081c2534399 *DESCRIPTION
33
4e0bac383d7e404c88a0c10d77ac3e70 *NAMESPACE
44
664118a44d0cbf5e0754bf2b3fcce21b *R/Sweave.R
55
67e457f4a3ecfa12f8b911faf11e7ab6 *R/addNormals.mesh3d.R
@@ -93,20 +93,20 @@ dbc013d5d4e50f2120e2cf524427d529 *demo/shinyMouse.R
9393
0047d90960eb9af45c4ae63780a10473 *demo/simpleShinyRgl.R
9494
009f222b0a5cd9e48ebcc9e9ea227a99 *demo/stereo.R
9595
680b2e3bdfd450f60f8ebdfa8d5bfc09 *demo/subdivision.r
96-
555dee07ffd69426a85bcecf23065c1e *inst/NEWS
96+
8508bacdfda47ce9835e4635cef3b2d8 *inst/NEWS
9797
330251b29f85cc1ffe5bdad929d47230 *inst/WORDLIST
9898
8c5d291e3f47c3395fff092f09f599b9 *inst/WebGL/template.html
9999
5bac46c36b13eac1302260ee06b16c0f *inst/demodata/population.dat
100100
5544dce93555cfaced50ee41283e9e58 *inst/demodata/region.dat
101101
736ad37b7a65f9ca945e58530199cc37 *inst/doc/WebGL.R
102102
e745c22dc2d4d6197c369651c7a2b3a8 *inst/doc/WebGL.Rmd
103-
b02c88f86db227b61d8f947d53bfcedd *inst/doc/WebGL.html
103+
b1a609deb93afd92af81fd9d8601c3c9 *inst/doc/WebGL.html
104104
f99aac24de4ff50cdbf669f6c13844a6 *inst/doc/rgl.R
105105
02ccacb374bb2ccaa4df122486d2a155 *inst/doc/rgl.Rmd
106-
d9fa2b25cb8cf0fe807571eb578dae79 *inst/doc/rgl.html
106+
8cbe461b6f18f62b9f4e3a441d67f26b *inst/doc/rgl.html
107107
1304ffa6515f831168733a70e41bda2a *inst/doc/transparency.R
108108
821a4e7cbed6d4d36a46a8880e928c62 *inst/doc/transparency.Rmd
109-
286bd8be1494ebb1af0bbafa6aaac658 *inst/doc/transparency.html
109+
56e362bccb578dea8348f7b94206afa2 *inst/doc/transparency.html
110110
b4ef592c88333c7c509dd74fcd1912d9 *inst/fonts/FreeMono.ttf
111111
867469f13ff81dec9adf2ae2f6ea2899 *inst/fonts/FreeSans.ttf
112112
dc0004a804503e126bc99998c7a1c677 *inst/fonts/FreeSerif.ttf
@@ -274,7 +274,7 @@ b128eb378abdd8e63ea8287e7f9f6254 *src/Disposable.h
274274
b03e2ab2e386594cd527d3cbad2b9f3a *src/Light.h
275275
70a705fe2978bd44a7a3db0a4c23dac5 *src/LineSet.cpp
276276
952ee5f775d740bd9719db38229a61c7 *src/LineStripSet.cpp
277-
741af36cacf24b26483eb7c326e50aba *src/Makevars.in
277+
cb8c1deecce7df00d727948f94a1935d *src/Makevars.in
278278
ef228a6534671e41750e62671def621d *src/Makevars.win
279279
d166702d0a968805882d8d42c1c4f191 *src/Material.cpp
280280
334339682edb8edae85fb1e3c1672a87 *src/Material.h
@@ -306,8 +306,8 @@ e9a31e14589146f498de32e1d7e1a706 *src/String.h
306306
e97ef3d84175284df5356155fee73b2e *src/TextSet.h
307307
fbfc8be14016b8ffc82b951a5f531c04 *src/Texture.cpp
308308
57491612dd6fd9fd94519e1598a226b0 *src/Texture.h
309-
9232e54214a0074e179b0ef8aeaa75c4 *src/Viewpoint.cpp
310-
9a6beee7540f56822966b895ec564a37 *src/Viewpoint.h
309+
2a62e7eef319c946d7616c36bdd0cd14 *src/Viewpoint.cpp
310+
405ac9f8fd106d601fdadf356cfefc98 *src/Viewpoint.h
311311
c935605f86deddb75a4ed35aa6d9c74c *src/api.cpp
312312
9eb36c194877a636ae279dc76dae1252 *src/api.h
313313
bb5f3d08f63b9c2414e546a8b0afd335 *src/assert.cpp
@@ -430,8 +430,8 @@ f98a5fba15e844bd7696aff31d2cb65c *src/gl2ps.h
430430
01922e999eff711b7d11e7bf67e01dbc *src/glErrors.cpp
431431
888c581ff741adb928006e9294092a0a *src/glgui.cpp
432432
f5ca32aa314f4b26aa1730390a31af29 *src/glgui.h
433-
32413a09a3e04d1f367b82f47eec7231 *src/gui.cpp
434-
bf078c7ed2965b7fb05d8f4b9397d2e9 *src/gui.h
433+
d04478c5aed359c3833cf8d2ff048689 *src/gui.cpp
434+
a0c2119f8a1db1a385ec0121d7d505cf *src/gui.h
435435
ebfc9f298280d5bf458d9d6e260fb781 *src/init.cpp
436436
190208962b2847c69e26112f22078f92 *src/init.h
437437
fe7602c5e1f839e5a131e1e75e95a219 *src/lib.h
@@ -445,7 +445,7 @@ aca94f6c0ac70dc568684bb277098107 *src/pngpixmap.h
445445
0f3cbcc107a805669552e140ede08ed7 *src/pragma.h
446446
3e7dde6417aea22e2720ecf946cf164d *src/pretty.c
447447
28ba9504069a992227eec0a430d4803e *src/pretty.h
448-
3499647d928c291f504348c14847ed84 *src/render.cpp
448+
4287787a48466387db4e97ff6e70939d *src/render.cpp
449449
bf2cba6c9ed0e3321cd48c702f3f1b67 *src/render.h
450450
d140e13b2a81bf64aca893a3de84c40f *src/rgl-win.def
451451
84e1c8efdbebd445f55f08cc7168a0db *src/rglmath.cpp
@@ -456,7 +456,7 @@ e09e5a9cbdc20aa7beca56756bc8d47e *src/scene.cpp
456456
fac235696a7454133d287870ac5a1237 *src/scene.h
457457
5a7649daaf33cbe272304dd001515acb *src/select.cpp
458458
4f05e840d60d3d37706ef41e59e1b28e *src/select.h
459-
55b54c99f879462d2210a9350eee2cbd *src/subscene.cpp
459+
d9c0b1fdea4ccd844d78df1bd8ecb8b6 *src/subscene.cpp
460460
285b44a7aa19fc57c96e98527f9a8c5a *src/subscene.h
461461
85a2bf4ffefd0d62fb061e7fc5db0a0d *src/types.h
462462
0870e06ae1a10e67c338601cc661d035 *src/useNULL/Makevars

‎inst/NEWS

+1-1
Original file line numberDiff line numberDiff line change
@@ -1170,7 +1170,7 @@ base graphics.
11701170
- The result of open3d() now has class "rglOpen3d",
11711171
and knitr will use this during auto-plotting.
11721172

1173-
0.105.12:
1173+
0.105.13:
11741174
- Windows builds now download Freetype from rwinlib
11751175
during the build. (Contributed by Jeroen Ooms.)
11761176
- shinySetPar3d() now accepts a list, as returned in

‎inst/doc/WebGL.html

+13-13
Large diffs are not rendered by default.

‎inst/doc/rgl.html

+18-18
Large diffs are not rendered by default.

‎inst/doc/transparency.html

+8-8
Large diffs are not rendered by default.

‎src/Makevars.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,6 @@ all: $(SHLIB) @HIDE_IF_NO_OPENGL@ ../inst/useNULL$(R_ARCH)/$(SHLIB)
3030

3131
../inst/useNULL$(R_ARCH)/$(SHLIB): $(SHLIB)
3232
cp -R *.cpp *.c *.h OpenGL useNULL
33-
cd useNULL;$(R_HOME)/bin/R CMD SHLIB -o $(SHLIB);rm *.cpp *.c *.h OpenGL/*; cd ..
33+
cd useNULL;$(R_HOME)/bin/R CMD SHLIB -o $(SHLIB) *.cpp *.c;rm *.cpp *.c *.h OpenGL/*; cd ..
3434
mkdir -p ../inst/useNULL$(R_ARCH)
3535
mv useNULL/$(SHLIB) ../inst/useNULL$(R_ARCH)/

‎src/Viewpoint.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -157,11 +157,11 @@ Vertex UserViewpoint::getObserver()
157157
return this->eye;
158158
}
159159

160-
void UserViewpoint::setObserver(bool automatic, Vertex eye)
160+
void UserViewpoint::setObserver(bool automatic, Vertex in_eye)
161161
{
162162
viewerInScene = !automatic;
163-
if (viewerInScene && !ISNAN(eye.x) &&!ISNAN(eye.y) && !ISNAN(eye.z))
164-
this->eye = eye;
163+
if (viewerInScene && !ISNAN(in_eye.x) &&!ISNAN(in_eye.y) && !ISNAN(in_eye.z))
164+
this->eye = in_eye;
165165
}
166166

167167
void UserViewpoint::setupViewer(RenderContext* rctx)

‎src/Viewpoint.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ class UserViewpoint : public SceneNode
5959
void setupFrustum(RenderContext* rctx, const Sphere& viewvolumeSphere);
6060
void setupProjMatrix(RenderContext* rctx, const Sphere& viewvolumeSphere);
6161
Vertex getObserver();
62-
void setObserver(bool automatic, Vertex eye);
62+
void setObserver(bool automatic, Vertex in_eye);
6363
void setupViewer(RenderContext* rctx);
6464
virtual void getTypeName(char* buffer, int buflen) { strncpy(buffer, "userviewpoint", buflen); };
6565
Frustum frustum;

‎src/gui.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -192,9 +192,9 @@ void Window::bringToTop(int stay)
192192
windowImpl->bringToTop(stay);
193193
}
194194
// ---------------------------------------------------------------------------
195-
void Window::getWindowRect(int *left, int *top, int *width, int *height)
195+
void Window::getWindowRect(int *in_left, int *in_top, int *in_width, int *in_height)
196196
{
197-
windowImpl->getWindowRect(left, top, width, height);
197+
windowImpl->getWindowRect(in_left, in_top, in_width, in_height);
198198
}
199199
// ---------------------------------------------------------------------------
200200
void Window::setWindowRect(int left, int top, int right, int bottom)

‎src/gui.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ class WindowImpl
6666
inline void unbind() { window = 0; }
6767
virtual void setTitle(const char* title) = 0;
6868
virtual void setWindowRect(int left, int top, int right, int bottom) = 0;
69-
virtual void getWindowRect(int *left, int *top, int *right, int *bottom) = 0;
69+
virtual void getWindowRect(int *in_left, int *in_top, int *in_right, int *in_bottom) = 0;
7070
virtual void show(void) = 0;
7171
virtual void hide(void) = 0;
7272
virtual void update(void) = 0;

‎src/render.cpp

+8-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
#include "render.h"
22

33
#include "opengl.h"
4+
#include "R.h"
45

56
using namespace rgl;
67

@@ -40,9 +41,14 @@ void VertexArray::alloc(int in_nvertex)
4041
arrayptr = new float [nvertex*3];
4142
}
4243

43-
void VertexArray::copy(int nvertex, double* vertices)
44+
void VertexArray::copy(int in_nvertex, double* vertices)
4445
{
45-
for(int i=0;i<nvertex;i++) {
46+
if (in_nvertex > nvertex) {
47+
warning("Only %d values copied", nvertex);
48+
in_nvertex = nvertex;
49+
}
50+
51+
for(int i=0;i<in_nvertex;i++) {
4652
arrayptr[i*3+0] = (float) vertices[i*3+0];
4753
arrayptr[i*3+1] = (float) vertices[i*3+1];
4854
arrayptr[i*3+2] = (float) vertices[i*3+2];

0 commit comments

Comments
 (0)