From 2ec16dfb72e0026724ae11c91e5c1d8bc463e3b9 Mon Sep 17 00:00:00 2001 From: Travis CI Date: Mon, 28 Nov 2016 23:14:16 +0000 Subject: Gem 57b4a16df4e1e763b719bf63cef3df84afdee444 linux/amd64 built 'coverity_scan:57b4a16df4e1e763b719bf63cef3df84afdee444' for linux/amd64 --- Gem/Gem.pd_linux | Bin 28632685 -> 28637580 bytes Gem/develop/include/Gem/Base/GemWindow.h | 2 + Gem/gemglxwindow.pd_linux | Bin 215095 -> 214014 bytes Gem/gemwin-help.pd | 21 ++++--- Gem/gemwin.pd | 92 +++++++++++++++++-------------- 5 files changed, 68 insertions(+), 47 deletions(-) (limited to 'Gem') diff --git a/Gem/Gem.pd_linux b/Gem/Gem.pd_linux index 696d782..5e4785f 100755 Binary files a/Gem/Gem.pd_linux and b/Gem/Gem.pd_linux differ diff --git a/Gem/develop/include/Gem/Base/GemWindow.h b/Gem/develop/include/Gem/Base/GemWindow.h index 18ad28f..c69f249 100644 --- a/Gem/develop/include/Gem/Base/GemWindow.h +++ b/Gem/develop/include/Gem/Base/GemWindow.h @@ -174,6 +174,7 @@ class GEM_EXTERN GemWindow : public CPPExtern /* render context (pre creation) */ virtual void bufferMess(int buf); virtual void fsaaMess(int value); + virtual void transparentMess(bool on); /* window decoration (pre creation) */ virtual void titleMess(std::string); @@ -208,6 +209,7 @@ class GEM_EXTERN GemWindow : public CPPExtern unsigned int m_buffer; std::string m_title; bool m_cursor; + bool m_transparent; int m_fsaa; gem::Context* m_context; diff --git a/Gem/gemglxwindow.pd_linux b/Gem/gemglxwindow.pd_linux index dac9ff1..524b04e 100755 Binary files a/Gem/gemglxwindow.pd_linux and b/Gem/gemglxwindow.pd_linux differ diff --git a/Gem/gemwin-help.pd b/Gem/gemwin-help.pd index 2355f99..2edbc7f 100644 --- a/Gem/gemwin-help.pd +++ b/Gem/gemwin-help.pd @@ -1,4 +1,4 @@ -#N canvas 129 98 676 689 10; +#N canvas 126 111 676 689 10; #X text 452 8 GEM object; #X obj 7 193 cnv 15 430 480 empty empty empty 20 12 0 14 -233017 -66577 0; @@ -328,7 +328,6 @@ some lights to see something \, such as:; #X restore 30 575 pd more lighting; #X obj 490 242 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 0 1; -#X msg 490 261 color \$1 \$1 \$1; #X text 29 635 stereo 0|1|2|3 : set 3D stereo-mode to off(0) \, 2-screen-mode(1) \, Red/Green-mode(2); #N canvas 680 259 468 458 draw_geos 0; @@ -378,7 +377,7 @@ some lights to see something \, such as:; #X connect 22 0 6 0; #X restore 455 378 pd draw_geos; #X msg 472 152 create \, 1; -#N canvas 255 86 448 630 buffering 0; +#N canvas 252 99 539 630 buffering 0; #X msg 63 127 buffer 1; #X msg 78 152 buffer 2; #X text 134 127 single buffering; @@ -413,6 +412,11 @@ the gemhead each time you want to draw. like:; is created in order to take effect.; #X obj 176 494 t f f; #X obj 149 405 t b b; +#X msg 279 142 transparent \$1; +#X obj 279 123 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 0 +1; +#X text 299 108 use RGBA buffer to have an alpha channel and a transparent +window, f 32; #X connect 0 0 11 0; #X connect 1 0 11 0; #X connect 4 0 11 0; @@ -433,6 +437,8 @@ is created in order to take effect.; #X connect 28 1 20 1; #X connect 29 0 16 0; #X connect 29 1 20 0; +#X connect 30 0 11 0; +#X connect 31 0 30 0; #X restore 355 405 pd buffering; #N canvas 556 191 548 430 stereo-3D 0; #X text 32 18 messages to [gemwin] regarding stereoscopic appearance: @@ -793,10 +799,11 @@ attributes of the window and controls the render-cycle. Multiple instances of this object can interact with separate windows.; #X text 30 177 2d argument : context name; #X text 443 457 see also examples/14.multiple_windows; +#X msg 490 260 color \$1 \$1 \$1 \$1; #X connect 11 0 10 0; #X connect 12 0 10 0; #X connect 21 0 10 0; -#X connect 34 0 35 0; -#X connect 35 0 10 0; -#X connect 38 0 10 0; -#X connect 53 0 37 0; +#X connect 34 0 63 0; +#X connect 37 0 10 0; +#X connect 52 0 36 0; +#X connect 63 0 10 0; diff --git a/Gem/gemwin.pd b/Gem/gemwin.pd index 2220ca2..770c73d 100644 --- a/Gem/gemwin.pd +++ b/Gem/gemwin.pd @@ -1,4 +1,4 @@ -#N canvas 425 52 937 708 10; +#N canvas 789 95 937 708 10; #X obj 126 74 inlet; #X obj 626 678 outlet; #N canvas 1 51 1018 458 argument 0; @@ -112,7 +112,7 @@ cursor menubar border title topmost buffer reset print FSAA; #X connect 4 0 5 0; #X connect 5 0 2 0; #X restore 124 201 pd creation/destruction; -#N canvas 271 109 611 377 window-decoration 0; +#N canvas 29 472 611 377 window-decoration 0; #X obj 451 282 outlet gemwin; #X text 125 101 size; #X text 112 167 position; @@ -132,6 +132,9 @@ 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; @@ -147,6 +150,8 @@ 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; @@ -271,7 +276,7 @@ they do need).; #X text 641 450 the sole purpose of this abstraction is to provide a minimum compatibility with old patches; #X restore 592 3 pd README; -#N canvas 157 51 544 526 callbacks 0; +#N canvas 148 119 544 526 callbacks 0; #N canvas 61 50 963 457 viewpoint 0; #X obj 476 254 t l l; #X obj 508 277 list length; @@ -658,13 +663,12 @@ a minimum compatibility with old patches; #X connect 16 0 17 0; #X connect 17 0 18 0; #X restore 118 193 pd lighting; -#N canvas 1 51 1001 529 window 0; +#N canvas 0 106 1001 529 window 0; #X obj 111 53 inlet; #X obj 700 421 outlet; #X obj 111 109 route create destroy; #X text 300 17 create destroy \; dimen fullscreen offset secondscreen \; border title \; cursor topmost menubar \; buffer \; FSAA; -#X obj 111 163 route dimen fullscreen offset secondscreen; #X obj 111 283 route border title; #X obj 111 403 route cursor topmost menubar; #X obj 570 420 route buffer FSAA; @@ -706,7 +710,6 @@ a minimum compatibility with old patches; #X obj 111 333 != 0; #X obj 111 355 s \$0-border; #X obj 201 354 s \$0-title; -#X obj 605 99 r \$0-reset; #N canvas 487 195 450 300 dimen 0; #X obj 80 14 inlet; #X obj 80 242 s \$0-dimen; @@ -764,41 +767,50 @@ a minimum compatibility with old patches; -1 -1 \, secondscreen 0; #X obj 277 106 t a b; #X msg 320 107 0; +#X obj 111 162 route dimen fullscreen offset secondscreen transparent +; +#X obj 457 185 i; +#X obj 457 207 != 0; +#X obj 605 99 r \$0-reset; +#X obj 457 229 s \$0-transparent; #X connect 0 0 2 0; -#X connect 2 0 10 0; -#X connect 2 1 34 0; -#X connect 2 2 4 0; -#X connect 4 0 25 0; -#X connect 4 1 26 0; -#X connect 4 2 29 0; -#X connect 4 3 30 0; -#X connect 4 4 5 0; -#X connect 5 0 20 0; -#X connect 5 1 23 0; -#X connect 5 2 6 0; -#X connect 6 0 13 0; -#X connect 6 1 15 0; -#X connect 6 2 18 0; -#X connect 6 3 7 0; -#X connect 7 0 8 0; -#X connect 7 1 9 0; -#X connect 7 2 1 0; -#X connect 13 0 14 0; -#X connect 14 0 12 0; +#X connect 2 0 9 0; +#X connect 2 1 32 0; +#X connect 2 2 34 0; +#X connect 4 0 19 0; +#X connect 4 1 22 0; +#X connect 4 2 5 0; +#X connect 5 0 12 0; +#X connect 5 1 14 0; +#X connect 5 2 17 0; +#X connect 5 3 6 0; +#X connect 6 0 7 0; +#X connect 6 1 8 0; +#X connect 6 2 1 0; +#X connect 12 0 13 0; +#X connect 13 0 11 0; +#X connect 14 0 15 0; #X connect 15 0 16 0; -#X connect 16 0 17 0; -#X connect 18 0 19 0; +#X connect 17 0 18 0; +#X connect 19 0 20 0; #X connect 20 0 21 0; -#X connect 21 0 22 0; -#X connect 24 0 33 0; -#X connect 26 0 27 0; -#X connect 27 0 28 0; -#X connect 30 0 31 0; -#X connect 31 0 32 0; -#X connect 33 0 4 0; -#X connect 34 0 11 0; -#X connect 34 1 35 0; -#X connect 35 0 1 0; +#X connect 24 0 25 0; +#X connect 25 0 26 0; +#X connect 28 0 29 0; +#X connect 29 0 30 0; +#X connect 31 0 34 0; +#X connect 32 0 10 0; +#X connect 32 1 33 0; +#X connect 33 0 1 0; +#X connect 34 0 23 0; +#X connect 34 1 24 0; +#X connect 34 2 27 0; +#X connect 34 3 28 0; +#X connect 34 4 35 0; +#X connect 34 5 4 0; +#X connect 35 0 36 0; +#X connect 36 0 38 0; +#X connect 37 0 31 0; #X restore 118 106 pd window; #N canvas 1 51 450 300 print 0; #X obj 118 78 t b; @@ -907,7 +919,7 @@ stereoFoc stereofoc stereoLine stereoline; #X connect 8 1 1 0; #X connect 9 0 5 0; #X restore 118 272 pd color; -#N canvas 1 51 749 300 render 0; +#N canvas 0 93 749 300 render 0; #X obj 31 38 inlet; #X obj 143 36 outlet; #X obj 31 189 s \$0-render; @@ -2995,7 +3007,7 @@ stereoFoc stereofoc stereoLine stereoline; #X obj 358 210 r \$0-doclear; #X obj 22 219 r \$0-dorender; #X obj 126 96 t a b; -#N canvas 5 49 450 300 loadbang 0; +#N canvas 2 93 450 300 loadbang 0; #X obj 77 35 inlet; #X obj 77 57 t b; #X obj 77 79 spigot 1; -- cgit v1.2.1