diff options
| -rwxr-xr-x | Gem/Gem.la | 2 | ||||
| -rwxr-xr-x | Gem/Gem.pd_darwin | bin | 5104588 -> 5104588 bytes | |||
| -rw-r--r-- | Gem/develop/include/Gem/Base/TextBase.h | 7 | ||||
| -rwxr-xr-x | Gem/gem_filmAVF.so | bin | 57604 -> 57604 bytes | |||
| -rwxr-xr-x | Gem/gem_imageJPEG.so | bin | 52192 -> 52192 bytes | |||
| -rwxr-xr-x | Gem/gem_imageMAGICK.la | 2 | ||||
| -rwxr-xr-x | Gem/gem_imageMAGICK.so | bin | 54584 -> 54584 bytes | |||
| -rwxr-xr-x | Gem/gem_imageSGI.so | bin | 59264 -> 59264 bytes | |||
| -rwxr-xr-x | Gem/gem_imageTIFF.so | bin | 68332 -> 68332 bytes | |||
| -rwxr-xr-x | Gem/gem_modelOBJ.so | bin | 90316 -> 90316 bytes | |||
| -rwxr-xr-x | Gem/gemcocoawindow.pd_darwin | bin | 36348 -> 36348 bytes | |||
| -rwxr-xr-x | Gem/gemglutwindow.pd_darwin | bin | 44268 -> 44268 bytes | |||
| -rwxr-xr-x | Gem/gemmacoswindow.pd_darwin | bin | 36308 -> 36308 bytes | |||
| -rwxr-xr-x | Gem/pix_drum.pd_darwin | bin | 26304 -> 26304 bytes | |||
| -rwxr-xr-x | Gem/pix_fiducialtrack.pd_darwin | bin | 76332 -> 76332 bytes | |||
| -rwxr-xr-x | Gem/pix_hit.pd_darwin | bin | 24312 -> 24312 bytes | |||
| -rwxr-xr-x | Gem/pix_mano.pd_darwin | bin | 40512 -> 40512 bytes |
17 files changed, 5 insertions, 6 deletions
@@ -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.app/Contents/Resources//bin -L/usr/local/Cellar/fribidi/1.0.1/lib -lfribidi -ldl -lz -lm' +dependency_libs=' -L/Users/travis/build/umlaeute/Gem/build/travis-ci/deps/Pd-0.48-0.app/Contents/Resources//bin -L/usr/local/Cellar/fribidi/1.0.2/lib -lfribidi -ldl -lz -lm' # Names of additional weak libraries provided by this library weak_library_names='' diff --git a/Gem/Gem.pd_darwin b/Gem/Gem.pd_darwin Binary files differindex 7d4db98..4ca4c8e 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 74421b9..ad3e134 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 291ab30..3debf3d 100755 --- a/Gem/gem_imageJPEG.so +++ b/Gem/gem_imageJPEG.so diff --git a/Gem/gem_imageMAGICK.la b/Gem/gem_imageMAGICK.la index 03c842d..d0c1d9c 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.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.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 4103d34..c73db9f 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 fbdca6f..830bc07 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 d033dc3..a445b76 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 f1efae2..93bee9f 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 357f43e..22329aa 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 a8bbc48..7ad8671 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 5d3305e..ec639df 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 004145d..68fef15 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 4e626f5..3378652 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 42a500e..cb848a3 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 4ac4334..89511ae 100755 --- a/Gem/pix_mano.pd_darwin +++ b/Gem/pix_mano.pd_darwin |