diff options
-rwxr-xr-x | Gem/Gem.pd_darwin | bin | 5013852 -> 5013852 bytes | |||
-rwxr-xr-x | Gem/gem_filmAVFoundation.so | bin | 34768 -> 34768 bytes | |||
-rwxr-xr-x | Gem/gem_imageJPEG.so | bin | 50324 -> 50324 bytes | |||
-rwxr-xr-x | Gem/gem_imageMAGICK.la | 2 | ||||
-rwxr-xr-x | Gem/gem_imageMAGICK.so | bin | 53336 -> 53336 bytes | |||
-rwxr-xr-x | Gem/gem_imageSGI.so | bin | 57280 -> 57280 bytes | |||
-rwxr-xr-x | Gem/gem_imageTIFF.so | bin | 65476 -> 65476 bytes | |||
-rwxr-xr-x | Gem/gem_modelOBJ.so | bin | 86536 -> 86536 bytes | |||
-rwxr-xr-x | Gem/gemcocoawindow.pd_darwin | bin | 38616 -> 38616 bytes | |||
-rwxr-xr-x | Gem/gemglfw2window.pd_darwin | bin | 27172 -> 27172 bytes | |||
-rwxr-xr-x | Gem/gemglfw3window.la | 41 | ||||
-rwxr-xr-x | Gem/gemglfw3window.pd_darwin | bin | 36500 -> 0 bytes | |||
-rwxr-xr-x | Gem/gemglutwindow.pd_darwin | bin | 42536 -> 42536 bytes | |||
-rwxr-xr-x | Gem/gemsdlwindow.pd_darwin | bin | 39496 -> 39496 bytes | |||
-rw-r--r-- | Gem/gemwin.pd | 65 | ||||
-rwxr-xr-x | Gem/pix_drum.pd_darwin | bin | 25556 -> 25556 bytes | |||
-rwxr-xr-x | Gem/pix_fiducialtrack.pd_darwin | bin | 69808 -> 69808 bytes | |||
-rwxr-xr-x | Gem/pix_hit.pd_darwin | bin | 27280 -> 27280 bytes | |||
-rwxr-xr-x | Gem/pix_mano.pd_darwin | bin | 39512 -> 39512 bytes |
19 files changed, 41 insertions, 67 deletions
diff --git a/Gem/Gem.pd_darwin b/Gem/Gem.pd_darwin Binary files differindex b2053c8..4a55baa 100755 --- a/Gem/Gem.pd_darwin +++ b/Gem/Gem.pd_darwin diff --git a/Gem/gem_filmAVFoundation.so b/Gem/gem_filmAVFoundation.so Binary files differindex 978435f..927f612 100755 --- a/Gem/gem_filmAVFoundation.so +++ b/Gem/gem_filmAVFoundation.so diff --git a/Gem/gem_imageJPEG.so b/Gem/gem_imageJPEG.so Binary files differindex 0c4a3bd..32d3064 100755 --- a/Gem/gem_imageJPEG.so +++ b/Gem/gem_imageJPEG.so diff --git a/Gem/gem_imageMAGICK.la b/Gem/gem_imageMAGICK.la index 0b37205..8806c26 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.46-5.app/Contents/Resources//bin -L../.. -L/usr/local/Cellar/imagemagick/6.9.6-6/lib /usr/local/Cellar/imagemagick/6.9.6-6/lib/libMagick++-6.Q16.la -L/usr/local/opt/freetype/lib -L/usr/local/Cellar/xz/5.2.2/lib /usr/local/Cellar/imagemagick/6.9.6-6/lib/libMagickWand-6.Q16.la /usr/local/Cellar/imagemagick/6.9.6-6/lib/libMagickCore-6.Q16.la -lfreetype -llzma -lbz2 -lltdl -ldl -lz -lm' +dependency_libs=' -L/Users/travis/build/umlaeute/Gem/build/travis-ci/deps/Pd-0.46-5.app/Contents/Resources//bin -L../.. -L/usr/local/Cellar/imagemagick/6.9.7-0/lib /usr/local/Cellar/imagemagick/6.9.7-0/lib/libMagick++-6.Q16.la -L/usr/local/opt/freetype/lib -L/usr/local/Cellar/xz/5.2.2/lib /usr/local/Cellar/imagemagick/6.9.7-0/lib/libMagickWand-6.Q16.la /usr/local/Cellar/imagemagick/6.9.7-0/lib/libMagickCore-6.Q16.la -lfreetype -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 c7b4183..fa1eb03 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 05cdd6d..a6b2e45 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 4840a8c..07b2cae 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 51eb2fc..6912b25 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 a6baa2d..0763eda 100755 --- a/Gem/gemcocoawindow.pd_darwin +++ b/Gem/gemcocoawindow.pd_darwin diff --git a/Gem/gemglfw2window.pd_darwin b/Gem/gemglfw2window.pd_darwin Binary files differindex fd8ef03..2c2c66d 100755 --- a/Gem/gemglfw2window.pd_darwin +++ b/Gem/gemglfw2window.pd_darwin diff --git a/Gem/gemglfw3window.la b/Gem/gemglfw3window.la deleted file mode 100755 index b77714f..0000000 --- a/Gem/gemglfw3window.la +++ /dev/null @@ -1,41 +0,0 @@ -# gemglfw3window.la - a libtool library file -# Generated by libtool (GNU libtool) 2.4.6 -# -# Please DO NOT delete this file! -# It is necessary for linking the library. - -# The name that we can dlopen(3). -dlname='gemglfw3window.pd_darwin' - -# Names of this library. -library_names='gemglfw3window.pd_darwin gemglfw3window.pd_darwin' - -# The name of the static archive. -old_library='' - -# Linker flags that cannot go in dependency_libs. -inherited_linker_flags=' ' - -# Libraries that this one depends upon. -dependency_libs=' -L/Users/travis/build/umlaeute/Gem/build/travis-ci/deps/Pd-0.46-5.app/Contents/Resources//bin -L../.. -L/usr/local/Cellar/glfw3/3.2.1/lib -lglfw3 -ldl -lz -lm' - -# Names of additional weak libraries provided by this library -weak_library_names='' - -# Version information for gemglfw3window. -current=0 -age=0 -revision=0 - -# Is this an already installed library? -installed=yes - -# Should we warn about portability when linking against -modules? -shouldnotlink=yes - -# Files to dlopen/dlpreopen -dlopen='' -dlpreopen='' - -# Directory that this library needs to be installed in: -libdir='/usr/local/lib/pd/extra/Gem' diff --git a/Gem/gemglfw3window.pd_darwin b/Gem/gemglfw3window.pd_darwin Binary files differdeleted file mode 100755 index 60799c7..0000000 --- a/Gem/gemglfw3window.pd_darwin +++ /dev/null diff --git a/Gem/gemglutwindow.pd_darwin b/Gem/gemglutwindow.pd_darwin Binary files differindex ed95faf..a104c81 100755 --- a/Gem/gemglutwindow.pd_darwin +++ b/Gem/gemglutwindow.pd_darwin diff --git a/Gem/gemsdlwindow.pd_darwin b/Gem/gemsdlwindow.pd_darwin Binary files differindex d93d3e8..67b97eb 100755 --- a/Gem/gemsdlwindow.pd_darwin +++ b/Gem/gemsdlwindow.pd_darwin diff --git a/Gem/gemwin.pd b/Gem/gemwin.pd index 770c73d..d40c288 100644 --- a/Gem/gemwin.pd +++ b/Gem/gemwin.pd @@ -101,16 +101,36 @@ cursor menubar border title topmost buffer reset print FSAA; #X text 333 154 info:; #N canvas 1 51 450 399 creation/destruction 0; #X obj 96 221 list prepend create; -#X obj 96 303 outlet gemwin; -#X obj 96 272 t a; +#X obj 96 363 outlet gemwin; +#X obj 96 332 t a; #X obj 96 196 r \$0-create; #X obj 275 197 r \$0-destroy; #X msg 275 221 destroy; -#X connect 0 0 2 0; +#X obj 446 125 r \$0-transparent; +#X obj 461 147 r \$0-color; +#X obj 461 169 unpack 0 0 0 0; +#X obj 446 220 ||; +#X obj 466 195 t b f; +#X obj 96 243 t a b; +#X obj 128 265 i; +#X msg 128 287 transparent \$1; +#X obj 556 190 < 1; +#X connect 0 0 11 0; #X connect 2 0 1 0; #X connect 3 0 0 0; #X connect 4 0 5 0; #X connect 5 0 2 0; +#X connect 6 0 9 0; +#X connect 7 0 8 0; +#X connect 8 3 14 0; +#X connect 9 0 12 1; +#X connect 10 0 9 0; +#X connect 10 1 9 1; +#X connect 11 0 2 0; +#X connect 11 1 12 0; +#X connect 12 0 13 0; +#X connect 13 0 2 0; +#X connect 14 0 10 0; #X restore 124 201 pd creation/destruction; #N canvas 29 472 611 377 window-decoration 0; #X obj 451 282 outlet gemwin; @@ -132,9 +152,6 @@ cursor menubar border title topmost buffer reset print FSAA; #X obj 451 100 t a; #X obj 451 160 t a; #X obj 451 223 t a; -#X obj 301 7 r \$0-transparent; -#X text 197 10 background; -#X msg 301 35 transparent \$1; #X connect 4 0 5 0; #X connect 5 0 16 0; #X connect 6 0 7 0; @@ -150,8 +167,6 @@ cursor menubar border title topmost buffer reset print FSAA; #X connect 16 0 17 0; #X connect 17 0 18 0; #X connect 18 0 0 0; -#X connect 19 0 21 0; -#X connect 21 0 16 0; #X restore 124 172 pd window-decoration; #N canvas 401 296 464 399 live 0; #X obj 92 273 outlet gemwin; @@ -905,7 +920,7 @@ stereoFoc stereofoc stereoLine stereoline; #X msg 148 165 1; #X msg 90 138 0 0 0 1; #X obj 90 114 r \$0-reset; -#X obj 67 214 s \$0-color; +#X obj 67 224 s \$0-color; #X obj 67 66 route color; #X obj 79 94 r \$0-loadbang; #X connect 0 0 8 0; @@ -2797,7 +2812,6 @@ stereoFoc stereofoc stereoLine stereoline; #X obj 130 209 GEMglEnable GL_DEPTH_TEST; #X obj 130 253 GEMglClearDepth 1; #X obj 130 283 GEMglClearColor; -#X obj 362 200 r \$0-clearcolor; #X obj 362 221 unpack 0 0 0 0; #X obj 130 304 outlet; #X obj 130 84 spigot 1; @@ -2807,25 +2821,26 @@ stereoFoc stereofoc stereoLine stereoline; #X obj 268 66 t b; #X msg 268 87 1; #X obj 130 231 GEMglDepthFunc GL_LEQUAL; -#X connect 0 0 9 0; +#X obj 362 200 r \$0-color; +#X connect 0 0 8 0; #X connect 1 0 2 0; #X connect 2 0 3 0; -#X connect 3 0 15 0; +#X connect 3 0 14 0; #X connect 4 0 5 0; -#X connect 5 0 8 0; -#X connect 6 0 7 0; -#X connect 7 0 5 1; -#X connect 7 1 5 2; -#X connect 7 2 5 3; -#X connect 7 3 5 4; -#X connect 9 0 10 0; -#X connect 10 0 1 0; -#X connect 10 1 11 0; -#X connect 11 0 9 1; +#X connect 5 0 7 0; +#X connect 6 0 5 1; +#X connect 6 1 5 2; +#X connect 6 2 5 3; +#X connect 6 3 5 4; +#X connect 8 0 9 0; +#X connect 9 0 1 0; +#X connect 9 1 10 0; +#X connect 10 0 8 1; +#X connect 11 0 12 0; #X connect 12 0 13 0; -#X connect 13 0 14 0; -#X connect 14 0 9 1; -#X connect 15 0 4 0; +#X connect 13 0 8 1; +#X connect 14 0 4 0; +#X connect 15 0 6 0; #X restore 163 415 pd windowInit; #X obj 131 393 t a a; #N canvas 1 51 450 300 startStopRendering 0; diff --git a/Gem/pix_drum.pd_darwin b/Gem/pix_drum.pd_darwin Binary files differindex cc4ff82..1e3d4ee 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 dc8dac3..44cc371 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 9d33333..6ac3ca9 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 4ef6252..5a21db6 100755 --- a/Gem/pix_mano.pd_darwin +++ b/Gem/pix_mano.pd_darwin |