aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTravis CI <zmoelnig@travis-ci.umlaeute.mur.at>2019-01-21 17:55:38 +0000
committerTravis CI <zmoelnig@travis-ci.umlaeute.mur.at>2019-01-21 17:55:38 +0000
commit4fc148a72711db29cc5ded5ea7cbba54a98c5c77 (patch)
treea9c461e4789778b827a9c937f6bc44127479de34
parenta8a281874e905e8dce0719d3edc36efc574514ff (diff)
Gem c259bf9345007bc8daa4a8b8a1648d31a2a4208b linux/amd64
built 'master:c259bf9345007bc8daa4a8b8a1648d31a2a4208b' for linux/amd64
-rwxr-xr-xGem/Gem.pd_linuxbin33557381 -> 33557381 bytes
-rw-r--r--Gem/examples/10.glsl/07.framebuffer_and_shader.pd2
-rw-r--r--Gem/examples/10.glsl/11.geometry.pd58
-rw-r--r--Gem/examples/10.glsl/12.tri2fan.pd16
-rw-r--r--Gem/examples/10.glsl/13.panoramique.pd32
-rw-r--r--Gem/examples/10.glsl/15.bicubic_image_interpolation.pd2
-rw-r--r--Gem/examples/10.glsl/_glsl.pd8
7 files changed, 59 insertions, 59 deletions
diff --git a/Gem/Gem.pd_linux b/Gem/Gem.pd_linux
index 8a874d8..7507ed6 100755
--- a/Gem/Gem.pd_linux
+++ b/Gem/Gem.pd_linux
Binary files differ
diff --git a/Gem/examples/10.glsl/07.framebuffer_and_shader.pd b/Gem/examples/10.glsl/07.framebuffer_and_shader.pd
index 3aa5b54..b59a1af 100644
--- a/Gem/examples/10.glsl/07.framebuffer_and_shader.pd
+++ b/Gem/examples/10.glsl/07.framebuffer_and_shader.pd
@@ -255,7 +255,7 @@
#X connect 11 0 0 0;
#X restore 402 542 pd gouttes;
#X msg 244 284 quality 0;
-#X obj 774 541 rectangle -4 -4;
+#X obj 774 541 rectangle 4 4;
#X obj 9 155 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 0 1
;
#X obj 220 180 delay 1000;
diff --git a/Gem/examples/10.glsl/11.geometry.pd b/Gem/examples/10.glsl/11.geometry.pd
index 2782494..1cebc5e 100644
--- a/Gem/examples/10.glsl/11.geometry.pd
+++ b/Gem/examples/10.glsl/11.geometry.pd
@@ -14,7 +14,6 @@
#X floatatom 164 531 5 0 0 0 - - -;
#X floatatom 209 532 5 0 0 0 - - -;
#X obj 44 512 glsl_program;
-#X msg 182 200 -1;
#X obj 182 156 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144
-1 -1;
#X obj 132 258 change;
@@ -25,7 +24,6 @@
#X floatatom 128 174 5 0 0 0 - - -;
#X obj 44 177 depth 1;
#X obj 44 576 circle;
-#X obj 182 176 t b b;
#X text 184 7 geometry shader;
#X text 48 28 The geometry shader is useful to create new geometry
;
@@ -47,7 +45,7 @@ vertex shader. coordinate are in 2d.;
#X restore 366 247 pd Gem.init;
#N canvas 340 107 682 322 gemwin 0;
#X obj 102 122 tgl 15 0 \$0-gemstart \$0-gemstart empty 17 7 0 10 -262144
--1 -1 0 1;
+-1 -1 1 1;
#X obj 102 161 r \$0-gemstart;
#X obj 102 182 select 1 0;
#X msg 102 214 create \, 1;
@@ -85,6 +83,8 @@ vertex shader. coordinate are in 2d.;
#X connect 16 0 0 0;
#X coords 0 -1 1 1 85 40 1 100 100;
#X restore 336 264 pd gemwin;
+#X msg 233 206 set -1;
+#X obj 182 176 t b b b b;
#X connect 0 0 3 0;
#X connect 1 0 3 2;
#X connect 3 0 6 0;
@@ -93,31 +93,31 @@ vertex shader. coordinate are in 2d.;
#X connect 6 0 2 0;
#X connect 6 0 14 0;
#X connect 7 0 8 0;
-#X connect 7 1 18 0;
+#X connect 7 1 17 0;
#X connect 8 0 14 0;
-#X connect 8 1 19 0;
+#X connect 8 1 18 0;
#X connect 9 0 7 0;
-#X connect 9 1 17 0;
-#X connect 10 0 23 0;
-#X connect 11 0 20 1;
-#X connect 12 0 20 2;
-#X connect 13 0 20 3;
-#X connect 14 0 20 0;
-#X connect 15 0 19 0;
-#X connect 16 0 25 0;
-#X connect 17 0 1 0;
-#X connect 18 0 4 0;
-#X connect 19 0 0 0;
-#X connect 20 0 24 0;
-#X connect 21 0 9 0;
-#X connect 22 0 21 2;
-#X connect 23 0 21 0;
-#X connect 25 0 15 0;
-#X connect 25 1 32 0;
-#X connect 25 1 30 0;
-#X connect 25 1 31 0;
-#X connect 30 0 9 0;
-#X connect 31 0 7 0;
-#X connect 32 0 8 0;
-#X connect 33 0 16 0;
-#X connect 35 0 36 0;
+#X connect 9 1 16 0;
+#X connect 10 0 22 0;
+#X connect 11 0 19 1;
+#X connect 12 0 19 2;
+#X connect 13 0 19 3;
+#X connect 14 0 19 0;
+#X connect 15 0 36 0;
+#X connect 16 0 1 0;
+#X connect 17 0 4 0;
+#X connect 18 0 0 0;
+#X connect 19 0 23 0;
+#X connect 20 0 9 0;
+#X connect 21 0 20 2;
+#X connect 22 0 20 0;
+#X connect 28 0 9 0;
+#X connect 29 0 7 0;
+#X connect 30 0 8 0;
+#X connect 31 0 15 0;
+#X connect 33 0 34 0;
+#X connect 35 0 18 0;
+#X connect 36 0 30 0;
+#X connect 36 1 28 0;
+#X connect 36 2 29 0;
+#X connect 36 3 35 0;
diff --git a/Gem/examples/10.glsl/12.tri2fan.pd b/Gem/examples/10.glsl/12.tri2fan.pd
index 04f267c..c681b1b 100644
--- a/Gem/examples/10.glsl/12.tri2fan.pd
+++ b/Gem/examples/10.glsl/12.tri2fan.pd
@@ -12,7 +12,7 @@
#X floatatom 289 579 5 0 0 0 - - -;
#X obj 161 526 glsl_program;
#X obj 42 117 t b b b b;
-#X msg 42 147 -1;
+#X msg 286 157 -1;
#X obj 42 98 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144 -1
-1;
#X obj 249 242 change;
@@ -39,7 +39,7 @@
#X msg 460 180 perspec -0.1 0.1 -0.1 0.1 1 110;
#X obj 422 229 gemwin;
#X obj 460 159 loadbang;
-#N canvas 0 0 877 520 light 0;
+#N canvas 5 51 877 520 light 0;
#X obj 225 45 gemhead 10;
#X floatatom 258 78 5 0 0 0 - - -;
#X floatatom 299 77 5 0 0 0 - - -;
@@ -82,8 +82,8 @@
#X restore 421 253 pd light;
#X obj 161 595 rotateXYZ -55 20 0;
#X floatatom 298 537 5 0 0 0 - - -;
-#X text 235 13 replace triangle with 3 triangles the orientations of which
-depend on the normal of the original primitive;
+#X text 235 13 replace triangle with 3 triangles the orientations of
+which depend on the normal of the original primitive;
#X obj 161 554 scaleXYZ 0.2 0.2 0.2;
#X msg 172 129 auto 1;
#X obj 172 108 loadbang;
@@ -108,10 +108,10 @@ depend on the normal of the original primitive;
#X connect 9 0 38 2;
#X connect 10 0 38 3;
#X connect 11 0 41 0;
-#X connect 12 0 13 0;
-#X connect 12 1 46 0;
-#X connect 12 2 45 0;
-#X connect 12 3 44 0;
+#X connect 12 0 46 0;
+#X connect 12 1 45 0;
+#X connect 12 2 44 0;
+#X connect 12 3 13 0;
#X connect 13 0 17 0;
#X connect 14 0 12 0;
#X connect 15 0 1 0;
diff --git a/Gem/examples/10.glsl/13.panoramique.pd b/Gem/examples/10.glsl/13.panoramique.pd
index 01cd7f6..c0ccbd2 100644
--- a/Gem/examples/10.glsl/13.panoramique.pd
+++ b/Gem/examples/10.glsl/13.panoramique.pd
@@ -4,7 +4,7 @@
#X obj 160 405 pix_texture;
#X obj 169 165 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144
-1 -1;
-#N canvas 38 29 792 790 glsl 0;
+#N canvas 38 51 792 790 glsl 0;
#X obj 78 339 glsl_vertex;
#X msg 32 338 print;
#X obj 78 626 glsl_program;
@@ -65,9 +65,9 @@
#X connect 24 0 29 0;
#X connect 25 0 24 0;
#X connect 26 0 21 0;
-#X connect 27 0 26 0;
-#X connect 27 1 10 0;
-#X connect 27 2 28 0;
+#X connect 27 0 10 0;
+#X connect 27 1 28 0;
+#X connect 27 2 26 0;
#X connect 28 0 0 0;
#X connect 29 0 9 0;
#X restore 160 182 pd glsl;
@@ -81,7 +81,7 @@
#X obj 353 406 pix_texture;
#X obj 362 166 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144
-1 -1;
-#N canvas 38 29 792 790 glsl 0;
+#N canvas 38 51 792 790 glsl 0;
#X obj 78 339 glsl_vertex;
#X msg 32 338 print;
#X obj 78 626 glsl_program;
@@ -142,9 +142,9 @@
#X connect 24 0 29 0;
#X connect 25 0 24 0;
#X connect 26 0 21 0;
-#X connect 27 0 26 0;
-#X connect 27 1 10 0;
-#X connect 27 2 28 0;
+#X connect 27 0 10 0;
+#X connect 27 1 28 0;
+#X connect 27 2 26 0;
#X connect 28 0 0 0;
#X connect 29 0 9 0;
#X restore 353 183 pd glsl;
@@ -158,7 +158,7 @@
#X obj 552 407 pix_texture;
#X obj 561 167 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144
-1 -1;
-#N canvas 38 29 792 790 glsl 0;
+#N canvas 38 51 792 790 glsl 0;
#X obj 78 339 glsl_vertex;
#X msg 32 338 print;
#X obj 78 626 glsl_program;
@@ -219,9 +219,9 @@
#X connect 24 0 29 0;
#X connect 25 0 24 0;
#X connect 26 0 21 0;
-#X connect 27 0 26 0;
-#X connect 27 1 10 0;
-#X connect 27 2 28 0;
+#X connect 27 0 10 0;
+#X connect 27 1 28 0;
+#X connect 27 2 26 0;
#X connect 28 0 0 0;
#X connect 29 0 9 0;
#X restore 552 184 pd glsl;
@@ -238,7 +238,7 @@
#X obj 747 408 pix_texture;
#X obj 756 168 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144
-1 -1;
-#N canvas 38 29 792 790 glsl 0;
+#N canvas 38 51 792 790 glsl 0;
#X obj 78 339 glsl_vertex;
#X msg 32 338 print;
#X obj 78 626 glsl_program;
@@ -299,9 +299,9 @@
#X connect 24 0 29 0;
#X connect 25 0 24 0;
#X connect 26 0 21 0;
-#X connect 27 0 26 0;
-#X connect 27 1 10 0;
-#X connect 27 2 28 0;
+#X connect 27 0 10 0;
+#X connect 27 1 28 0;
+#X connect 27 2 26 0;
#X connect 28 0 0 0;
#X connect 29 0 9 0;
#X restore 747 185 pd glsl;
diff --git a/Gem/examples/10.glsl/15.bicubic_image_interpolation.pd b/Gem/examples/10.glsl/15.bicubic_image_interpolation.pd
index 889fa3c..e77e971 100644
--- a/Gem/examples/10.glsl/15.bicubic_image_interpolation.pd
+++ b/Gem/examples/10.glsl/15.bicubic_image_interpolation.pd
@@ -21,7 +21,7 @@
#X obj 358 389 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 1
1;
#X obj 33 246 vradio 15 1 1 3 empty empty empty 0 -8 0 10 -262144 -1
--1 0;
+-1 1;
#X text 53 246 bicubic interpolation;
#X text 53 264 bilinear interpolation;
#X text 55 276 no interpolation;
diff --git a/Gem/examples/10.glsl/_glsl.pd b/Gem/examples/10.glsl/_glsl.pd
index a6bf6e5..ca41544 100644
--- a/Gem/examples/10.glsl/_glsl.pd
+++ b/Gem/examples/10.glsl/_glsl.pd
@@ -29,7 +29,7 @@
#X obj 90 426 symbol;
#X obj 90 401 t b;
#X msg 287 598 0;
-#X obj 15 65 t b b b;
+#X obj 15 65 t b b b, f 29;
#X obj 140 199 symbol \$1;
#X text 270 193 This abstraction can be useful to load shader. Shader
location is relative to this abstraction path.;
@@ -67,7 +67,7 @@ location is relative to this abstraction path.;
#X connect 27 0 16 0;
#X connect 28 0 27 0;
#X connect 29 0 23 0;
-#X connect 30 0 29 0;
-#X connect 30 1 10 0;
-#X connect 30 2 31 0;
+#X connect 30 0 10 0;
+#X connect 30 1 31 0;
+#X connect 30 2 29 0;
#X connect 31 0 26 0;