Gem 8553d055b0a39acf02d31d8ae8cb6a0a2f732ef0 osx/i386

built 'master:8553d055b0a39acf02d31d8ae8cb6a0a2f732ef0' for osx/i386

22 files changed, 58 insertions, 34 deletions

diff --git a/Gem/Gem.pd_darwin b/Gem/Gem.pd_darwin
index 7d02a21..b552e60 100755
--- a/Gem/Gem.pd_darwin
+++ b/Gem/Gem.pd_darwin
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 <windows.h>
 #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_filmAVF.so b/Gem/gem_filmAVF.so
index 943de8b..7f38e44 100755
--- a/Gem/gem_filmAVF.so
+++ b/Gem/gem_filmAVF.so
diff --git a/Gem/gem_imageIO.so b/Gem/gem_imageIO.so
index 7be8f11..e62ef46 100755
--- a/Gem/gem_imageIO.so
+++ b/Gem/gem_imageIO.so
diff --git a/Gem/gem_imageJPEG.so b/Gem/gem_imageJPEG.so
index a9307fb..e054ca4 100755
--- a/Gem/gem_imageJPEG.so
+++ b/Gem/gem_imageJPEG.so
diff --git a/Gem/gem_imageMAGICK.la b/Gem/gem_imageMAGICK.la
index 28ced3f..7d9174e 100755
--- a/Gem/gem_imageMAGICK.la
+++ b/Gem/gem_imageMAGICK.la
@@ -17,7 +17,7 @@ old_library=''
 inherited_linker_flags='  -pthread'
 
 # Libraries that this one depends upon.
-dependency_libs=' -L/Users/travis/build/umlaeute/Gem/build/travis-ci/deps/Pd-0.48-0-i386.app/Contents/Resources/bin -L../.. -L/usr/local/Cellar/imagemagick/7.0.8-19/lib /usr/local/Cellar/imagemagick/7.0.8-19/lib/libMagickCore-7.Q16HDRI.la -L/usr/local/Cellar/little-cms2/2.9/lib -L/usr/local/opt/freetype/lib -L/usr/local/Cellar/xz/5.2.4/lib -llcms2 -lfreetype -lxml2 -llzma -lbz2 -lltdl -ldl -lz -lm'
+dependency_libs=' -L/Users/travis/build/umlaeute/Gem/build/travis-ci/deps/Pd-0.48-0-i386.app/Contents/Resources/bin -L../.. -L/usr/local/Cellar/imagemagick/7.0.8-22/lib /usr/local/Cellar/imagemagick/7.0.8-22/lib/libMagickCore-7.Q16HDRI.la -L/usr/local/Cellar/little-cms2/2.9/lib -L/usr/local/opt/freetype/lib -L/usr/local/Cellar/xz/5.2.4/lib -llcms2 -lfreetype -lxml2 -llzma -lbz2 -lltdl -ldl -lz -lm'
 
 # Names of additional weak libraries provided by this library
 weak_library_names=''
diff --git a/Gem/gem_imageMAGICK.so b/Gem/gem_imageMAGICK.so
index fe2c8ec..ee7f599 100755
--- a/Gem/gem_imageMAGICK.so
+++ b/Gem/gem_imageMAGICK.so
diff --git a/Gem/gem_imageSGI.so b/Gem/gem_imageSGI.so
index 29a4abc..f250a9d 100755
--- a/Gem/gem_imageSGI.so
+++ b/Gem/gem_imageSGI.so
diff --git a/Gem/gem_imageTIFF.so b/Gem/gem_imageTIFF.so
index 9212566..02aee07 100755
--- a/Gem/gem_imageTIFF.so
+++ b/Gem/gem_imageTIFF.so
diff --git a/Gem/gem_modelOBJ.so b/Gem/gem_modelOBJ.so
index fdaf671..6a71439 100755
--- a/Gem/gem_modelOBJ.so
+++ b/Gem/gem_modelOBJ.so
diff --git a/Gem/gem_videoAVF.so b/Gem/gem_videoAVF.so
index 929118c..580bce0 100755
--- a/Gem/gem_videoAVF.so
+++ b/Gem/gem_videoAVF.so
diff --git a/Gem/gemcocoawindow.pd_darwin b/Gem/gemcocoawindow.pd_darwin
index a9785f5..f4ccd0a 100755
--- a/Gem/gemcocoawindow.pd_darwin
+++ b/Gem/gemcocoawindow.pd_darwin
diff --git a/Gem/gemglutwindow.pd_darwin b/Gem/gemglutwindow.pd_darwin
index a1a5003..74efa8d 100755
--- a/Gem/gemglutwindow.pd_darwin
+++ b/Gem/gemglutwindow.pd_darwin
diff --git a/Gem/gemmacoswindow.pd_darwin b/Gem/gemmacoswindow.pd_darwin
index baab36d..0238ace 100755
--- a/Gem/gemmacoswindow.pd_darwin
+++ b/Gem/gemmacoswindow.pd_darwin
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 <a href="mailto:mark@danks.org">Mark Danks</a>

 <hr>

 In fact, this ought to be the second attempt at such a manual. There will not be much now.

-But send any comments to <a href="mailto:zmoelnig@iem.kug.ac.at">IOhannes m zm&ouml;lnig</a> instead.

+But send any comments to <a href="mailto:zmoelnig@iem.at">IOhannes m zm&ouml;lnig</a> instead.

 <p><img SRC="tribar.gif" height=13 width=561>

 <p><a href="Intro.html">Introduction</a>

 <br>&nbsp;&nbsp;&nbsp; An introduction to GEM and what you can do with

diff --git a/Gem/pix_drum.pd_darwin b/Gem/pix_drum.pd_darwin
index b8728fd..ce991da 100755
--- a/Gem/pix_drum.pd_darwin
+++ b/Gem/pix_drum.pd_darwin
diff --git a/Gem/pix_fiducialtrack.pd_darwin b/Gem/pix_fiducialtrack.pd_darwin
index 3d4de1f..486de7f 100755
--- a/Gem/pix_fiducialtrack.pd_darwin
+++ b/Gem/pix_fiducialtrack.pd_darwin
diff --git a/Gem/pix_hit.pd_darwin b/Gem/pix_hit.pd_darwin
index 4e50b88..6b14a9b 100755
--- a/Gem/pix_hit.pd_darwin
+++ b/Gem/pix_hit.pd_darwin
diff --git a/Gem/pix_mano.pd_darwin b/Gem/pix_mano.pd_darwin
index 5789a91..5e2ab46 100755
--- a/Gem/pix_mano.pd_darwin
+++ b/Gem/pix_mano.pd_darwin