From ff8546615b4eccbffe44eafc457156bd66d31790 Mon Sep 17 00:00:00 2001 From: Travis CI Date: Thu, 24 Nov 2016 23:15:19 +0000 Subject: Gem 5d2d22852a3f80791ddc0aa87ce271c823cc6f8f linux/amd64 built 'master:5d2d22852a3f80791ddc0aa87ce271c823cc6f8f' for linux/amd64 --- Gem/examples/10.glsl/02.primitive_distortion.pd | 129 +++++++++++++----------- Gem/examples/10.glsl/P_distord.frag | 9 -- 2 files changed, 71 insertions(+), 67 deletions(-) (limited to 'Gem/examples/10.glsl') diff --git a/Gem/examples/10.glsl/02.primitive_distortion.pd b/Gem/examples/10.glsl/02.primitive_distortion.pd index 9a5280a..9b93121 100644 --- a/Gem/examples/10.glsl/02.primitive_distortion.pd +++ b/Gem/examples/10.glsl/02.primitive_distortion.pd @@ -1,22 +1,20 @@ -#N canvas 462 82 520 667 10; -#X obj 74 -1 gemhead; -#X msg 29 80 print; -#X obj 74 262 glsl_program; -#X obj 146 121 change; -#X msg 98 233 print; -#X floatatom 146 144 2 0 0 0 ID - -; -#X obj 164 212 print linking; -#X obj 74 102 glsl_vertex; -#X obj 74 451 pix_texture; -#X obj 124 59 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1 --1; -#X obj 74 24 alpha; -#X obj 101 397 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 0 +#N canvas 228 49 587 690 10; +#X obj 74 19 gemhead; +#X msg 29 100 print; +#X obj 74 362 glsl_program; +#X obj 215 141 change; +#X msg 98 333 print; +#X floatatom 215 164 2 0 0 0 ID - -, f 2; +#X obj 164 312 print linking; +#X obj 74 122 glsl_vertex; +#X obj 74 551 pix_texture; +#X obj 74 44 alpha; +#X obj 101 497 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 0 1; -#X floatatom 292 202 5 0 0 0 - - -; -#X msg 101 375 0; -#X msg 292 223 K \$1; -#X obj 74 494 sphere 2 30; +#X floatatom 292 302 5 0 0 0 - - -, f 5; +#X msg 101 475 0; +#X msg 292 323 K \$1; +#X obj 74 594 sphere 2 30; #N canvas 0 50 450 300 load_shader 0; #X obj 89 99 t b b; #X msg 119 126 0; @@ -26,7 +24,7 @@ #X connect 0 1 1 0; #X connect 1 0 3 0; #X connect 3 0 0 0; -#X restore 124 38 pd load_shader; +#X restore 166 14 pd load_shader; #N canvas 50 82 450 300 init_shader 0; #X obj 89 154 outlet; #X obj 89 45 inlet; @@ -35,16 +33,14 @@ #X connect 1 0 2 0; #X connect 2 0 3 0; #X connect 3 0 0 0; -#X restore 153 286 pd init_shader; -#X obj 101 354 loadbang; -#X text 347 201 <- 2; -#X text 395 670 ch 20007; -#X msg 103 305 open texture.jpg; -#X obj 74 471 rotateXYZ -90 0 0; -#X msg 292 177 0.1; -#X obj 74 328 pix_image img3.jpg; -#X msg 88 80 open P_distord.vert; -#X text 69 527 this shader create a dirty pseudo random value \, and +#X restore 153 386 pd init_shader; +#X obj 101 454 loadbang; +#X text 347 301 <- 2; +#X msg 103 405 open texture.jpg; +#X obj 74 571 rotateXYZ -90 0 0; +#X msg 292 277 0.1; +#X obj 74 428 pix_image img3.jpg; +#X text 69 627 this shader create a dirty pseudo random value \, and move all vertices separatly; #N canvas 87 154 247 179 Gem.init 0; #X obj 118 46 loadbang; @@ -52,10 +48,10 @@ move all vertices separatly; #X obj 118 113 outlet; #X connect 0 0 1 0; #X connect 1 0 2 0; -#X restore 389 41 pd Gem.init; +#X restore 389 61 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 1 1; +-1 -1 0 1; #X obj 102 161 r \$0-gemstart; #X obj 102 182 select 1 0; #X msg 102 214 create \, 1; @@ -92,34 +88,51 @@ move all vertices separatly; #X connect 15 0 16 0; #X connect 16 0 0 0; #X coords 0 -1 1 1 85 40 1 100 100; -#X restore 359 58 pd gemwin; -#X msg 101 417 rectangle \$1; -#X msg 146 191 link \$1; -#X connect 0 0 10 0; +#X restore 359 78 pd gemwin; +#X msg 101 517 rectangle \$1; +#X obj 74 180 glsl_fragment; +#X obj 162 202 change; +#X floatatom 162 225 2 0 0 0 ID - -, f 2; +#X obj 162 244 pack 0 0; +#X msg 162 291 link \$1 \$2; +#X msg 198 100 open \$1.frag; +#X msg 166 43 symbol P_distord; +#X obj 166 63 t s s; +#X msg 88 100 open \$1.vert; +#X text 423 651 ch 2007; +#X connect 0 0 9 0; #X connect 1 0 7 0; -#X connect 2 0 24 0; -#X connect 2 1 17 0; +#X connect 2 0 22 0; +#X connect 2 1 16 0; #X connect 3 0 5 0; #X connect 4 0 2 0; -#X connect 5 0 30 0; -#X connect 7 0 2 0; +#X connect 5 0 30 1; +#X connect 7 0 27 0; #X connect 7 1 3 0; -#X connect 8 0 22 0; -#X connect 9 0 25 0; -#X connect 10 0 7 0; -#X connect 11 0 29 0; -#X connect 12 0 14 0; -#X connect 13 0 11 0; -#X connect 14 0 2 0; -#X connect 16 0 9 0; -#X connect 17 0 23 0; -#X connect 18 0 13 0; -#X connect 21 0 24 0; -#X connect 22 0 15 0; -#X connect 23 0 12 0; -#X connect 24 0 8 0; -#X connect 25 0 7 0; -#X connect 27 0 28 0; -#X connect 29 0 8 0; -#X connect 30 0 2 0; -#X connect 30 0 6 0; +#X connect 8 0 20 0; +#X connect 9 0 7 0; +#X connect 10 0 26 0; +#X connect 11 0 13 0; +#X connect 12 0 10 0; +#X connect 13 0 2 0; +#X connect 15 0 33 0; +#X connect 16 0 21 0; +#X connect 17 0 12 0; +#X connect 19 0 22 0; +#X connect 20 0 14 0; +#X connect 21 0 11 0; +#X connect 22 0 8 0; +#X connect 24 0 25 0; +#X connect 26 0 8 0; +#X connect 27 0 2 0; +#X connect 27 1 28 0; +#X connect 28 0 29 0; +#X connect 29 0 30 0; +#X connect 30 0 31 0; +#X connect 31 0 2 0; +#X connect 31 0 6 0; +#X connect 32 0 27 0; +#X connect 33 0 34 0; +#X connect 34 0 35 0; +#X connect 34 1 32 0; +#X connect 35 0 7 0; diff --git a/Gem/examples/10.glsl/P_distord.frag b/Gem/examples/10.glsl/P_distord.frag index 5460d6c..29f3e63 100644 --- a/Gem/examples/10.glsl/P_distord.frag +++ b/Gem/examples/10.glsl/P_distord.frag @@ -8,12 +8,3 @@ void main() gl_FragColor = texture2D(tex0, C ) ; } - - - - - - - - - -- cgit v1.2.1