From 647e9ac4dd9cd31f90e54ee6bc046807ea061edd Mon Sep 17 00:00:00 2001 From: Travis CI Date: Tue, 18 Dec 2018 14:07:54 +0000 Subject: Gem 51a2c26d1617a5e7d6775e147a6823347e317821 linux/amd64 built 'master:51a2c26d1617a5e7d6775e147a6823347e317821' for linux/amd64 --- Gem/Gem.pd_linux | Bin 32487495 -> 32763143 bytes Gem/develop/include/Gem/Utils/any.h | 8 +++ Gem/gem_filmGMERLIN.so | Bin 151560 -> 149755 bytes Gem/gem_filmMPEG3.so | Bin 182707 -> 176942 bytes Gem/gem_filmQT4L.so | Bin 168953 -> 167252 bytes Gem/gem_imageJPEG.so | Bin 196338 -> 190613 bytes Gem/gem_imageMAGICK.so | Bin 277487 -> 275714 bytes Gem/gem_imageSGI.so | Bin 261304 -> 259785 bytes Gem/gem_imageTIFF.so | Bin 307853 -> 304906 bytes Gem/gem_modelOBJ.so | Bin 630624 -> 694872 bytes Gem/gem_recordQT4L.so | Bin 463758 -> 456627 bytes Gem/gem_recordV4L.so | Bin 127337 -> 127337 bytes Gem/gem_recordV4L2.so | Bin 126192 -> 126192 bytes Gem/gem_videoDC1394.so | Bin 424477 -> 417482 bytes Gem/gem_videoDV4L.so | Bin 287993 -> 284376 bytes Gem/gem_videoUNICAP.so | Bin 553440 -> 545892 bytes Gem/gem_videoV4L.so | Bin 479251 -> 475610 bytes Gem/gem_videoV4L2.so | Bin 603727 -> 600212 bytes Gem/gem_videoVNC.so | Bin 251262 -> 245515 bytes Gem/model-help.pd | 98 +++++++++++++++++++++++++----------- 20 files changed, 77 insertions(+), 29 deletions(-) diff --git a/Gem/Gem.pd_linux b/Gem/Gem.pd_linux index 55f06f7..e6b7dd5 100755 Binary files a/Gem/Gem.pd_linux and b/Gem/Gem.pd_linux differ diff --git a/Gem/develop/include/Gem/Utils/any.h b/Gem/develop/include/Gem/Utils/any.h index 4ce48b0..5841c79 100644 --- a/Gem/develop/include/Gem/Utils/any.h +++ b/Gem/develop/include/Gem/Utils/any.h @@ -70,11 +70,15 @@ struct fxns { struct type { static const std::type_info& get_type(void) { +#if 0 const std::type_info&res=typeid(T); // the following is a dummy use of the type_info struct // to make the template engine work properly on OSX/10.9 static std::string _ = res.name(); return res; +#else + return typeid(T); +#endif } static void static_delete(void** x) { @@ -100,8 +104,12 @@ struct fxns { struct type { static const std::type_info& get_type(void) { +#if 0 const std::type_info&res=typeid(T); return res; +#else + return typeid(T); +#endif } static void static_delete(void** x) { diff --git a/Gem/gem_filmGMERLIN.so b/Gem/gem_filmGMERLIN.so index f780b5a..da96f32 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 dbdde3f..e835bca 100755 Binary files a/Gem/gem_filmMPEG3.so and b/Gem/gem_filmMPEG3.so differ diff --git a/Gem/gem_filmQT4L.so b/Gem/gem_filmQT4L.so index 4d59d00..951288c 100755 Binary files a/Gem/gem_filmQT4L.so and b/Gem/gem_filmQT4L.so differ diff --git a/Gem/gem_imageJPEG.so b/Gem/gem_imageJPEG.so index c5b81d0..d07f200 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 ff1b4d9..49d9bc8 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 0b3550e..15effd0 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 7e5a6c9..3d2f69d 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 6940119..76216f4 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 0bb9a64..003cb6b 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 dc650fa..f7e232c 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 ac793a8..06b8a20 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 341c924..13f91f2 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 4afa5c0..4c3feb6 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 82d1054..b5fe63a 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 9030af2..cdcdc83 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 f64ca24..c552a8e 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 40f030e..eceb218 100755 Binary files a/Gem/gem_videoVNC.so and b/Gem/gem_videoVNC.so differ diff --git a/Gem/model-help.pd b/Gem/model-help.pd index 013712b..7837110 100644 --- a/Gem/model-help.pd +++ b/Gem/model-help.pd @@ -1,8 +1,8 @@ -#N canvas 404 93 710 647 10; +#N canvas 426 119 793 647 10; #X text 54 30 Class: geometric object; -#X obj 464 77 cnv 15 200 380 empty empty empty 20 12 0 14 -228992 -66577 +#X obj 464 77 cnv 15 200 480 empty empty empty 20 12 0 14 -228992 -66577 0; -#X obj 466 464 cnv 15 200 60 empty empty empty 20 12 0 14 -195568 -66577 +#X obj 466 564 cnv 15 200 60 empty empty empty 20 12 0 14 -195568 -66577 0; #N canvas 0 50 450 300 gemwin 0; #X obj 132 136 gemwin; @@ -22,9 +22,9 @@ #X connect 5 0 1 0; #X connect 6 0 0 0; #X connect 7 0 0 0; -#X restore 471 503 pd gemwin; -#X msg 471 484 create; -#X text 468 465 Create window:; +#X restore 471 603 pd gemwin; +#X msg 471 584 create; +#X text 468 565 Create window:; #X text 475 59 Example:; #X obj 7 67 cnv 15 450 210 empty empty empty 20 12 0 14 -233017 -66577 0; @@ -38,19 +38,19 @@ #X text 27 333 Inlet 1: gemlist; #X text 9 600 Outlets:; #X text 21 613 Outlet 1: gemlist; -#X obj 472 136 cnv 15 180 265 empty empty empty 20 12 0 14 -106458 +#X obj 472 136 cnv 15 180 325 empty empty empty 20 12 0 14 -106458 -66577 0; #X text 33 14 Synopsis: [model]; #X text 7 69 Description: Renders an Alias/Wavefront-Model.; #X text 16 86 The model object renders 3D-models that are saved in Alias/Wavefront's OBJ-format.; #X text 63 292 optional: name of a OBJ-file to be loaded; -#X obj 470 413 cnv 15 50 30 empty empty empty 20 12 0 14 -24198 -66577 +#X obj 470 473 cnv 15 50 30 empty empty empty 20 12 0 14 -24198 -66577 0; -#X obj 583 484 gemhead; -#X obj 583 503 world_light; +#X obj 583 584 gemhead; +#X obj 583 603 world_light; #X obj 473 84 gemhead; -#X obj 473 419 model; +#X obj 473 479 model; #X obj 486 140 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1 -1; #X obj 486 158 openpanel; @@ -64,10 +64,10 @@ Alias/Wavefront's OBJ-format.; #X msg 486 274 material \$1; #X msg 574 274 texture \$1; #X msg 576 326 group \$1; -#X floatatom 490 206 5 0 1 0 - - -, f 5; +#X floatatom 490 206 5 0 1 0 - - -; #X msg 486 179 open \$1; #X obj 576 308 hradio 15 1 0 3 empty empty empty 0 -6 0 8 -262144 -1 --1 0; +-1 2; #X text 27 350 Inlet 1: message: open ; #X text 27 367 Inlet 1: message: rescale 1|0 :: normalize the model (must be set PRIOR to opening a model (default:1); @@ -95,31 +95,71 @@ to be displayed.; \, 1==sphere mapping \, 2==UV-mapping (default); #X obj 574 254 hradio 15 1 0 3 empty empty empty 0 -6 0 8 -262144 -1 -1 0; -#X text 17 210 Images can be applied either as linear \, spherical or -UV textures.; -#X msg 511 351 backends OBJ; -#X msg 521 371 backends ASSIMP3; -#X text 27 542 Inlet 1: message: backends :: choose which -backend to use first to open the model; +#X text 17 210 Images can be applied either as linear \, spherical +or UV textures.; +#X msg 511 381 loader OBJ; +#X msg 520 401 loader ASSIMP3; +#X text 27 542 Inlet 1: message: loader :: choose which backend +to use first to open the model; +#X obj 500 524 print info; +#X msg 518 424 loader; +#X obj 473 325 t a; +#X obj 558 346 t a; +#X text 559 423 query loaders; +#X obj 490 424 t a; +#N canvas 1230 127 534 459 properties 0; +#X obj 39 405 outlet; +#X msg 39 175 enumProps; +#X text 107 177 print available properties (for reading and/or writing) +; +#X msg 61 214 get texheight texwidth; +#X msg 84 245 set usematerial 1; +#X text 209 246 set an (available) named properties; +#X text 208 215 get (available) named properties; +#X msg 84 310 setProps usematerial 1; +#X text 232 309 store a named property for applying LATER; +#X msg 84 340 applyProps; +#X text 162 340 apply stored properties; +#X msg 84 370 clearProps; +#X text 161 366 clear stored properties; +#X text 26 35 ==========================; +#X text 26 22 getting/setting properties; +#X text 26 68 depending on the used backend for loading a model \, +different properties might be available., f 61; +#X text 30 104 properties can only be enumerated after a model has +been loaded (and thus the loader-backend has been determined); +#X connect 1 0 0 0; +#X connect 3 0 0 0; +#X connect 4 0 0 0; +#X connect 7 0 0 0; +#X connect 9 0 0 0; +#X connect 11 0 0 0; +#X restore 533 478 pd properties; #X connect 3 0 4 0; #X connect 4 0 3 0; #X connect 22 0 23 0; #X connect 24 0 48 0; +#X connect 25 1 57 0; #X connect 26 0 27 0; #X connect 27 0 37 0; #X connect 28 0 29 0; -#X connect 29 0 25 0; -#X connect 30 0 25 0; +#X connect 29 0 60 0; +#X connect 30 0 59 0; #X connect 31 0 32 0; -#X connect 32 0 25 0; -#X connect 33 0 25 0; -#X connect 34 0 25 0; -#X connect 35 0 25 0; +#X connect 32 0 60 0; +#X connect 33 0 59 0; +#X connect 34 0 60 0; +#X connect 35 0 60 0; #X connect 36 0 30 0; -#X connect 37 0 25 0; +#X connect 37 0 59 0; #X connect 38 0 35 0; -#X connect 48 0 25 0; +#X connect 48 0 59 0; #X connect 49 0 33 0; #X connect 52 0 34 0; -#X connect 54 0 25 0; -#X connect 55 0 25 0; +#X connect 54 0 62 0; +#X connect 55 0 62 0; +#X connect 58 0 62 0; +#X connect 59 0 25 0; +#X connect 60 0 25 0; +#X connect 62 0 25 0; +#X connect 63 0 25 0; -- cgit v1.2.1