From 1e85ee96172e866b325f4778916d77c46249ca3d Mon Sep 17 00:00:00 2001 From: Travis CI Date: Fri, 4 Jan 2019 23:39:54 +0000 Subject: Gem 8553d055b0a39acf02d31d8ae8cb6a0a2f732ef0 linux/amd64 built 'master:8553d055b0a39acf02d31d8ae8cb6a0a2f732ef0' for linux/amd64 --- Gem/Gem.pd_linux | Bin 33357890 -> 33489033 bytes Gem/develop/include/Gem/Gem/GemGL.h | 6 ++- Gem/develop/include/Gem/Gem/GemGLconfig.h | 7 +++ Gem/develop/include/Gem/Gem/Manager.h | 7 +-- Gem/gem_filmGMERLIN.so | Bin 149755 -> 149755 bytes Gem/gem_filmMPEG3.so | Bin 176942 -> 176942 bytes Gem/gem_imageJPEG.so | Bin 190661 -> 190637 bytes Gem/gem_imageMAGICK.so | Bin 275690 -> 275762 bytes Gem/gem_imageSGI.so | Bin 259801 -> 259809 bytes Gem/gem_imageTIFF.so | Bin 304874 -> 304898 bytes Gem/gem_modelOBJ.so | Bin 694800 -> 694832 bytes Gem/gem_recordQT4L.so | Bin 456603 -> 456531 bytes Gem/gem_recordV4L.so | Bin 127345 -> 127337 bytes Gem/gem_recordV4L2.so | Bin 126176 -> 126128 bytes Gem/gem_videoDC1394.so | Bin 417482 -> 417498 bytes Gem/gem_videoDV4L.so | Bin 284368 -> 284368 bytes Gem/gem_videoUNICAP.so | Bin 546228 -> 546212 bytes Gem/gem_videoV4L.so | Bin 475554 -> 475554 bytes Gem/gem_videoV4L2.so | Bin 600164 -> 600100 bytes Gem/gem_videoVNC.so | Bin 245579 -> 245539 bytes Gem/gemwin.pd | 68 ++++++++++++++++++------------ Gem/manual/index.html | 2 +- 22 files changed, 57 insertions(+), 33 deletions(-) create mode 100644 Gem/develop/include/Gem/Gem/GemGLconfig.h diff --git a/Gem/Gem.pd_linux b/Gem/Gem.pd_linux index 959dfec..3338c99 100755 Binary files a/Gem/Gem.pd_linux and b/Gem/Gem.pd_linux differ diff --git a/Gem/develop/include/Gem/Gem/GemGL.h b/Gem/develop/include/Gem/Gem/GemGL.h index 797e889..a009928 100644 --- a/Gem/develop/include/Gem/Gem/GemGL.h +++ b/Gem/develop/include/Gem/Gem/GemGL.h @@ -26,8 +26,10 @@ # include #endif -#ifdef GLEW_MX -# define GEM_MULTICONTEXT +#include "Gem/GemGLconfig.h" + +#ifdef GEM_MULTICONTEXT +# define GLEW_MX #endif #include "Gem/glew.h" diff --git a/Gem/develop/include/Gem/Gem/GemGLconfig.h b/Gem/develop/include/Gem/Gem/GemGLconfig.h new file mode 100644 index 0000000..2165eb6 --- /dev/null +++ b/Gem/develop/include/Gem/Gem/GemGLconfig.h @@ -0,0 +1,7 @@ +/* src/Gem/GemGLconfig.h. Generated from GemGLconfig.h.in by configure. */ + +/* Define to 1 if Gem is built with multi-context support */ +#define GEM_MULTICONTEXT 1 + +/* Define to 1 if using the built-in GLEW */ +#define GLEW_BUILD 1 diff --git a/Gem/develop/include/Gem/Gem/Manager.h b/Gem/develop/include/Gem/Gem/Manager.h index cbca8ba..48abce7 100644 --- a/Gem/develop/include/Gem/Gem/Manager.h +++ b/Gem/develop/include/Gem/Gem/Manager.h @@ -68,7 +68,7 @@ public: ////////// // is there a context (has its meaning under X) - static void createContext(char* disp); + static void createContext(const char* disp); static int contextExists(void); ////////// @@ -98,7 +98,7 @@ public: ////////// // Create the window with the current parameters - static int createWindow(char* disp = 0); + static int createWindow(const char* disp = 0); ////////// // Destroy the window @@ -123,6 +123,7 @@ public: static void getDimen(int*width, int*height); static void getRealDimen(int*width, int*height); static void getOffset(int*x, int*y); + static void setDimen(int width, int height); ////////// // Turn on/off lighting @@ -219,7 +220,7 @@ private: // This window is always available (although not visible) static WindowInfo &getConstWindowInfo(void); #endif /* GEM_MULTICONTEXT */ - static int createConstWindow(char* disp = 0); + static int createConstWindow(const char* disp = 0); // gemwin is allowed to modifying "global" window attributes friend class gemwin; diff --git a/Gem/gem_filmGMERLIN.so b/Gem/gem_filmGMERLIN.so index f9ea8ee..32bc06c 100755 Binary files a/Gem/gem_filmGMERLIN.so and b/Gem/gem_filmGMERLIN.so differ diff --git a/Gem/gem_filmMPEG3.so b/Gem/gem_filmMPEG3.so index b12bd58..1a701c9 100755 Binary files a/Gem/gem_filmMPEG3.so and b/Gem/gem_filmMPEG3.so differ diff --git a/Gem/gem_imageJPEG.so b/Gem/gem_imageJPEG.so index 1aa183a..a3f80be 100755 Binary files a/Gem/gem_imageJPEG.so and b/Gem/gem_imageJPEG.so differ diff --git a/Gem/gem_imageMAGICK.so b/Gem/gem_imageMAGICK.so index bbe1481..f0f30ef 100755 Binary files a/Gem/gem_imageMAGICK.so and b/Gem/gem_imageMAGICK.so differ diff --git a/Gem/gem_imageSGI.so b/Gem/gem_imageSGI.so index c3c83a8..8da571b 100755 Binary files a/Gem/gem_imageSGI.so and b/Gem/gem_imageSGI.so differ diff --git a/Gem/gem_imageTIFF.so b/Gem/gem_imageTIFF.so index c9c7556..2fcc434 100755 Binary files a/Gem/gem_imageTIFF.so and b/Gem/gem_imageTIFF.so differ diff --git a/Gem/gem_modelOBJ.so b/Gem/gem_modelOBJ.so index 0f2b139..b07a69d 100755 Binary files a/Gem/gem_modelOBJ.so and b/Gem/gem_modelOBJ.so differ diff --git a/Gem/gem_recordQT4L.so b/Gem/gem_recordQT4L.so index ae62c2f..58d8828 100755 Binary files a/Gem/gem_recordQT4L.so and b/Gem/gem_recordQT4L.so differ diff --git a/Gem/gem_recordV4L.so b/Gem/gem_recordV4L.so index ed049a4..1a119c1 100755 Binary files a/Gem/gem_recordV4L.so and b/Gem/gem_recordV4L.so differ diff --git a/Gem/gem_recordV4L2.so b/Gem/gem_recordV4L2.so index 584025b..264e314 100755 Binary files a/Gem/gem_recordV4L2.so and b/Gem/gem_recordV4L2.so differ diff --git a/Gem/gem_videoDC1394.so b/Gem/gem_videoDC1394.so index fc1fb60..f2a30d9 100755 Binary files a/Gem/gem_videoDC1394.so and b/Gem/gem_videoDC1394.so differ diff --git a/Gem/gem_videoDV4L.so b/Gem/gem_videoDV4L.so index ce5375b..cf13113 100755 Binary files a/Gem/gem_videoDV4L.so and b/Gem/gem_videoDV4L.so differ diff --git a/Gem/gem_videoUNICAP.so b/Gem/gem_videoUNICAP.so index 3ed2de9..7031d93 100755 Binary files a/Gem/gem_videoUNICAP.so and b/Gem/gem_videoUNICAP.so differ diff --git a/Gem/gem_videoV4L.so b/Gem/gem_videoV4L.so index 24615c7..aa5c23c 100755 Binary files a/Gem/gem_videoV4L.so and b/Gem/gem_videoV4L.so differ diff --git a/Gem/gem_videoV4L2.so b/Gem/gem_videoV4L2.so index a41b48d..67d5654 100755 Binary files a/Gem/gem_videoV4L2.so and b/Gem/gem_videoV4L2.so differ diff --git a/Gem/gem_videoVNC.so b/Gem/gem_videoVNC.so index f02cafb..17f0b58 100755 Binary files a/Gem/gem_videoVNC.so and b/Gem/gem_videoVNC.so differ diff --git a/Gem/gemwin.pd b/Gem/gemwin.pd index dc26b44..d78796b 100644 --- a/Gem/gemwin.pd +++ b/Gem/gemwin.pd @@ -78,12 +78,12 @@ frame fps; #X text 71 589 unused:; #X text 112 604 blur; #X restore 230 59 pd messages; -#N canvas 114 51 901 630 window 0; +#N canvas 114 61 901 811 window 0; #X obj 282 340 t a; #X obj 282 389 t a; -#X obj 282 574 outlet; +#X obj 282 664 outlet; #X text 417 23 messages to be understood:; -#N canvas 0 50 450 300 messages 0; +#N canvas 6 61 450 300 messages 0; #X text 22 100 create destroy dimen offset secondscreen fullscreen cursor menubar border title topmost buffer reset print FSAA; #X restore 639 19 pd messages; @@ -187,8 +187,7 @@ cursor menubar border title topmost buffer reset print FSAA; #X connect 7 0 8 0; #X connect 8 0 1 0; #X restore 124 241 pd live decoration; -#X obj 282 502 t b; -#X text 113 485 context established \, now draw!; +#X text 113 585 context established \, now draw!; #X obj 439 557 route mouse keyboard dimen offset info; #X obj 439 535 outlet info; #X obj 282 288 t a; @@ -234,23 +233,38 @@ GEM \, buffer 2 \, cursor 1 \, topmost 0; #X connect 3 0 1 0; #X connect 4 0 3 0; #X restore 126 291 pd rendercontext; -#X connect 0 0 30 0; -#X connect 1 0 33 0; -#X connect 17 0 24 0; -#X connect 18 0 24 0; -#X connect 19 0 24 0; -#X connect 20 0 2 0; -#X connect 24 0 25 0; -#X connect 25 0 0 0; -#X connect 29 0 24 0; -#X connect 30 0 1 0; -#X connect 32 0 0 0; -#X connect 33 0 20 0; +#X obj 282 602 t b b; +#N canvas 6 61 450 300 gemman 0; +#X obj 130 195 gemmanager; +#X msg 130 172 dimen \$1 \$2; +#X obj 247 124 r \$0-realdimen; +#X obj 130 149 list prepend 500 500; +#X obj 130 26 inlet; +#X obj 130 49 t b; +#X connect 1 0 0 0; +#X connect 2 0 3 1; +#X connect 3 0 1 0; +#X connect 4 0 5 0; +#X connect 5 0 3 0; +#X restore 309 635 pd gemman; +#X connect 0 0 29 0; +#X connect 1 0 32 0; +#X connect 17 0 23 0; +#X connect 18 0 23 0; +#X connect 19 0 23 0; +#X connect 23 0 24 0; +#X connect 24 0 0 0; +#X connect 28 0 23 0; +#X connect 29 0 1 0; +#X connect 31 0 0 0; +#X connect 32 0 36 0; +#X connect 32 1 33 0; +#X connect 33 0 22 0; #X connect 33 1 34 0; -#X connect 34 0 23 0; -#X connect 34 1 35 0; -#X connect 35 2 31 0; -#X connect 36 0 24 0; +#X connect 34 2 30 0; +#X connect 35 0 23 0; +#X connect 36 0 2 0; +#X connect 36 1 37 0; #X restore 131 285 pd window; #X text 55 19 meant as a modular replacement for the internal [gemwin] ; @@ -1047,7 +1061,7 @@ stereoFoc stereofoc stereoLine stereoline; #X connect 14 0 8 0; #X connect 14 1 10 0; #X restore 144 166 pd perspec; -#N canvas 1900 93 450 229 viewport 0; +#N canvas 1464 93 450 229 viewport 0; #X obj 87 93 inlet; #X obj 87 157 outlet; #X obj 87 126 GEMglViewport 0 0 500 500; @@ -1289,8 +1303,8 @@ stereoFoc stereofoc stereoLine stereoline; #X obj 175 126 r \$0-lighting; #X obj 320 84 print light; #X obj 71 235 GEMglDisable GL_LIGHTING; -#X floatatom 437 214 5 0 0 0 - - -, f 5; -#X floatatom 242 149 5 0 0 0 - - -, f 5; +#X floatatom 437 214 5 0 0 0 - - -; +#X floatatom 242 149 5 0 0 0 - - -; #X obj 414 191 == 0; #X connect 0 0 1 0; #X connect 0 1 2 0; @@ -1389,7 +1403,7 @@ stereoFoc stereofoc stereoLine stereoline; #X connect 3 0 4 0; #X connect 4 0 5 0; #X restore 163 580 pd normalRendering; -#N canvas 4 50 596 529 2screenStereo 0; +#N canvas 6 61 596 529 2screenStereo 0; #X obj 95 70 inlet; #X obj 95 90 t a b; #X obj 163 92 list append 500 500; @@ -1898,7 +1912,7 @@ stereoFoc stereofoc stereoLine stereoline; #X connect 16 0 8 0; #X connect 16 1 15 0; #X restore 163 496 pd stereoDemux; -#N canvas 4 50 436 529 anaglyphStereo 0; +#N canvas 6 61 436 529 anaglyphStereo 0; #X obj 95 70 inlet; #X obj 95 90 t a b; #X obj 146 142 list append 500 500; @@ -2350,7 +2364,7 @@ stereoFoc stereofoc stereoLine stereoline; #X connect 10 0 9 0; #X connect 10 1 8 0; #X restore 226 536 pd anaglyphStereo; -#N canvas 519 50 506 526 CrystalEyeStereo 0; +#N canvas 519 61 506 526 CrystalEyeStereo 0; #X obj 95 70 inlet; #X obj 95 90 t a b; #X obj 146 142 list append 500 500; diff --git a/Gem/manual/index.html b/Gem/manual/index.html index d3a6308..6d67068 100644 --- a/Gem/manual/index.html +++ b/Gem/manual/index.html @@ -17,7 +17,7 @@ Any comments are appreciated. Send them to Mark Danks
In fact, this ought to be the second attempt at such a manual. There will not be much now. -But send any comments to IOhannes m zmölnig instead. +But send any comments to IOhannes m zmölnig instead.

Introduction
    An introduction to GEM and what you can do with -- cgit v1.2.1