diff options
| -rwxr-xr-x | Gem/Gem.pd_darwin | bin | 4835588 -> 4835588 bytes | |||
| -rw-r--r-- | Gem/develop/include/Gem/Base/TextBase.h | 7 | ||||
| -rwxr-xr-x | Gem/gem_filmAVF.so | bin | 57380 -> 57380 bytes | |||
| -rwxr-xr-x | Gem/gem_imageJPEG.so | bin | 50452 -> 50452 bytes | |||
| -rwxr-xr-x | Gem/gem_imageMAGICK.la | 2 | ||||
| -rwxr-xr-x | Gem/gem_imageMAGICK.so | bin | 52672 -> 52672 bytes | |||
| -rwxr-xr-x | Gem/gem_imageSGI.so | bin | 57276 -> 57276 bytes | |||
| -rwxr-xr-x | Gem/gem_imageTIFF.so | bin | 65548 -> 65548 bytes | |||
| -rwxr-xr-x | Gem/gem_modelOBJ.so | bin | 86564 -> 86564 bytes | |||
| -rwxr-xr-x | Gem/gemcocoawindow.pd_darwin | bin | 38484 -> 38484 bytes | |||
| -rwxr-xr-x | Gem/gemglutwindow.pd_darwin | bin | 42388 -> 42388 bytes | |||
| -rwxr-xr-x | Gem/gemmacoswindow.pd_darwin | bin | 38404 -> 38404 bytes | |||
| -rwxr-xr-x | Gem/pix_drum.pd_darwin | bin | 25560 -> 25560 bytes | |||
| -rwxr-xr-x | Gem/pix_fiducialtrack.pd_darwin | bin | 69740 -> 69740 bytes | |||
| -rwxr-xr-x | Gem/pix_hit.pd_darwin | bin | 23232 -> 23232 bytes | |||
| -rwxr-xr-x | Gem/pix_mano.pd_darwin | bin | 39564 -> 39564 bytes |
16 files changed, 4 insertions, 5 deletions
diff --git a/Gem/Gem.pd_darwin b/Gem/Gem.pd_darwin Binary files differindex cfc8844..709672e 100755 --- a/Gem/Gem.pd_darwin +++ b/Gem/Gem.pd_darwin diff --git a/Gem/develop/include/Gem/Base/TextBase.h b/Gem/develop/include/Gem/Base/TextBase.h index 0834ef0..7c6b832 100644 --- a/Gem/develop/include/Gem/Base/TextBase.h +++ b/Gem/develop/include/Gem/Base/TextBase.h @@ -202,16 +202,12 @@ protected: static std::string DEFAULT_FONT; ////////// - // get the bounding-box for the current text/font/... - void getBBox(float&x0,float&y0,float&z0, float&x1,float&y1,float&z1); - ////////// // output information about the current font/text // including the bbox void fontInfo(void); // an outlet to send font/text/...-info back to the patch gem::RTE::Outlet m_infoOut; - ////////// // The font structure #ifdef FTGL @@ -243,6 +239,9 @@ private: // helper to make the // line distance vector void makeLineDist(); + ////////// + // get the bounding-box for the current text/font/... (per line and total) and output it + void getBBox(); ////////// // Static member functions diff --git a/Gem/gem_filmAVF.so b/Gem/gem_filmAVF.so Binary files differindex b5b6c03..2c5ed3c 100755 --- a/Gem/gem_filmAVF.so +++ b/Gem/gem_filmAVF.so diff --git a/Gem/gem_imageJPEG.so b/Gem/gem_imageJPEG.so Binary files differindex 93bf1ee..d5efcfc 100755 --- a/Gem/gem_imageJPEG.so +++ b/Gem/gem_imageJPEG.so diff --git a/Gem/gem_imageMAGICK.la b/Gem/gem_imageMAGICK.la index 7316c41..3265f3f 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.7-22/lib /usr/local/Cellar/imagemagick/7.0.7-22/lib/libMagickCore-7.Q16HDRI.la -L/usr/local/opt/freetype/lib -L/usr/local/Cellar/xz/5.2.3/lib -lfreetype -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.7-31/lib /usr/local/Cellar/imagemagick/7.0.7-31/lib/libMagickCore-7.Q16HDRI.la -L/usr/local/opt/freetype/lib -L/usr/local/Cellar/xz/5.2.4/lib -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 Binary files differindex 40067e8..fdc8848 100755 --- a/Gem/gem_imageMAGICK.so +++ b/Gem/gem_imageMAGICK.so diff --git a/Gem/gem_imageSGI.so b/Gem/gem_imageSGI.so Binary files differindex dc9b3ee..e02f9d4 100755 --- a/Gem/gem_imageSGI.so +++ b/Gem/gem_imageSGI.so diff --git a/Gem/gem_imageTIFF.so b/Gem/gem_imageTIFF.so Binary files differindex 7b7e1b6..dfc3380 100755 --- a/Gem/gem_imageTIFF.so +++ b/Gem/gem_imageTIFF.so diff --git a/Gem/gem_modelOBJ.so b/Gem/gem_modelOBJ.so Binary files differindex 5e0e254..d0d79cc 100755 --- a/Gem/gem_modelOBJ.so +++ b/Gem/gem_modelOBJ.so diff --git a/Gem/gemcocoawindow.pd_darwin b/Gem/gemcocoawindow.pd_darwin Binary files differindex 3264989..9900906 100755 --- a/Gem/gemcocoawindow.pd_darwin +++ b/Gem/gemcocoawindow.pd_darwin diff --git a/Gem/gemglutwindow.pd_darwin b/Gem/gemglutwindow.pd_darwin Binary files differindex 843ce93..bb507a4 100755 --- a/Gem/gemglutwindow.pd_darwin +++ b/Gem/gemglutwindow.pd_darwin diff --git a/Gem/gemmacoswindow.pd_darwin b/Gem/gemmacoswindow.pd_darwin Binary files differindex 8d5b874..0025c33 100755 --- a/Gem/gemmacoswindow.pd_darwin +++ b/Gem/gemmacoswindow.pd_darwin diff --git a/Gem/pix_drum.pd_darwin b/Gem/pix_drum.pd_darwin Binary files differindex c36bf32..ce15823 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 Binary files differindex e53db0a..f39ca97 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 Binary files differindex 8aa629c..0d017ba 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 Binary files differindex e979028..3a997a7 100755 --- a/Gem/pix_mano.pd_darwin +++ b/Gem/pix_mano.pd_darwin |