From 6af0938ab57547a5f8212feffdd148b2ee08b705 Mon Sep 17 00:00:00 2001 From: Jonathan Wilkes <jon.w.wilkes@gmail.com> Date: Fri, 18 Sep 2015 00:17:28 -0400 Subject: [PATCH] revise demos, tutorials, and game to use [draw group] instead of [group] --- .../pd-l2ork/ds-demos/bulbs.pd | 2 +- .../pd-l2ork/ds-demos/notes.pd | 2 +- .../pd-l2ork/ds-demos/rocket-demo.pd | 8 +- .../pd-l2ork/ds-demos/simon-game.pd | 2 +- .../pd-l2ork/ds-demos/splines.pd | 2 +- .../pd-l2ork/ds-demos/tiger.pd | 16 +- .../pd-l2ork/ds-demos/unit-circle.pd | 2 +- .../pd-l2ork/ds-demos/violin.pd | 2 +- .../pd-l2ork/ds-demos/working-man.pd | 217 +++++++++--------- .../pd-l2ork/ds-demos/yin-yang.pd | 2 +- .../ds-tutorials/00.under.construction.pd | 2 +- .../pd-l2ork/ds-tutorials/01.intro.pd | 18 +- .../pd-l2ork/ds-tutorials/14.group.pd | 2 +- .../pd-l2ork/sprite-game/game.pd | 10 +- 14 files changed, 143 insertions(+), 144 deletions(-) diff --git a/pd/doc/4.data.structures/pd-l2ork/ds-demos/bulbs.pd b/pd/doc/4.data.structures/pd-l2ork/ds-demos/bulbs.pd index 0a1123e83..0ee44ea66 100644 --- a/pd/doc/4.data.structures/pd-l2ork/ds-demos/bulbs.pd +++ b/pd/doc/4.data.structures/pd-l2ork/ds-demos/bulbs.pd @@ -64,7 +64,7 @@ a float s; #X msg 34 102 fill r g b a \, stroke-width s \, stroke r g b; #X connect 0 0 20 0; #X connect 20 0 1 0; -#X restore 88 133 group; +#X restore 88 133 draw group; #X obj 88 154 outlet; #X msg 88 98 transform scale 0.5 \, fill none \, stroke black \, mouseover 1 \, mouseout 1; diff --git a/pd/doc/4.data.structures/pd-l2ork/ds-demos/notes.pd b/pd/doc/4.data.structures/pd-l2ork/ds-demos/notes.pd index 243d1cc3d..2f73b4739 100644 --- a/pd/doc/4.data.structures/pd-l2ork/ds-demos/notes.pd +++ b/pd/doc/4.data.structures/pd-l2ork/ds-demos/notes.pd @@ -188,7 +188,7 @@ c -100 -53 -163 -157 -163 -270 c 0 -87 22 -158 43 -230 c 84 102 155 #X connect 63 0 20 0; #X connect 64 0 22 0; #X connect 65 0 24 0; -#X restore 447 519 group; +#X restore 447 519 draw group; #X obj 447 408 * 0.01; #X obj 447 432 * 11; #X obj 447 473 pack; diff --git a/pd/doc/4.data.structures/pd-l2ork/ds-demos/rocket-demo.pd b/pd/doc/4.data.structures/pd-l2ork/ds-demos/rocket-demo.pd index dbf4f0e37..1bef9444b 100644 --- a/pd/doc/4.data.structures/pd-l2ork/ds-demos/rocket-demo.pd +++ b/pd/doc/4.data.structures/pd-l2ork/ds-demos/rocket-demo.pd @@ -36,7 +36,7 @@ transform matrix 1.0041 0 0 1.01474 -1.11186 -7.22347 \, stroke "" #X connect 5 0 2 0; #X connect 6 0 0 0; #X connect 6 0 2 0; -#X restore 27 66 group thrust; +#X restore 27 66 draw group thrust; #X obj 27 504 loadbang; #X obj 27 566 draw path M 43.244 60.7763 C 122.101 62.472 321.362 94.6929 397.675 290.563 C 371.389 295.651 306.948 358.397 296.773 393.161 C @@ -150,7 +150,7 @@ stroke-width 12.5 \, stroke-linejoin 1; #X connect 25 0 0 0; #X connect 25 1 0 1; #X connect 26 0 20 0; -#X restore 264 287 group rocket; +#X restore 264 287 draw group rocket; #N canvas 547 87 754 501 moon 0; #X obj 40 17 loadbang; #X obj 40 79 draw path m 10.671 231.42 c 89.543 56.086 188.11 -10.029 @@ -203,7 +203,7 @@ stroke-width 12.5 \, stroke-linejoin 1; #X connect 18 0 12 0; #X connect 19 0 14 0; #X connect 20 0 1 0; -#X restore 95 362 group moon; +#X restore 95 362 draw group moon; #X floatatom 45 167 5 0 0 0 - - -, f 5; #X obj 45 238 pack; #X floatatom 95 167 5 0 0 0 - - -, f 5; @@ -351,7 +351,7 @@ stroke-width 12.5 \, stroke-linejoin 1; #X connect 27 0 13 0; #X connect 28 0 1 0; #X connect 29 0 21 0; -#X restore 137 320 group; +#X restore 137 320 draw group; #X floatatom 164 138 5 0 0 0 - - -, f 5; #X floatatom 203 138 5 0 0 0 - - -, f 5; #X obj 203 189 t b a; diff --git a/pd/doc/4.data.structures/pd-l2ork/ds-demos/simon-game.pd b/pd/doc/4.data.structures/pd-l2ork/ds-demos/simon-game.pd index dc140cb0b..e94599c09 100644 --- a/pd/doc/4.data.structures/pd-l2ork/ds-demos/simon-game.pd +++ b/pd/doc/4.data.structures/pd-l2ork/ds-demos/simon-game.pd @@ -47,7 +47,7 @@ sc float wc; #X connect 18 0 17 0; #X connect 18 0 16 0; #X connect 18 0 15 0; -#X restore 375 166 group; +#X restore 375 166 draw group; #X obj 341 233 t b a; #X obj 375 461 set simon nc; #X obj 341 425 * 255; diff --git a/pd/doc/4.data.structures/pd-l2ork/ds-demos/splines.pd b/pd/doc/4.data.structures/pd-l2ork/ds-demos/splines.pd index 7f418728c..49ec9d3a5 100644 --- a/pd/doc/4.data.structures/pd-l2ork/ds-demos/splines.pd +++ b/pd/doc/4.data.structures/pd-l2ork/ds-demos/splines.pd @@ -66,7 +66,7 @@ #X connect 35 0 0 0; #X connect 36 0 24 0; #X connect 37 0 25 0; -#X restore 311 205 group; +#X restore 311 205 draw group; #X obj 309 93 struct splines float x float y float qmid float c1 float c2; #X text 272 394 <- Click-drag the inner red crosses to change the y-value diff --git a/pd/doc/4.data.structures/pd-l2ork/ds-demos/tiger.pd b/pd/doc/4.data.structures/pd-l2ork/ds-demos/tiger.pd index eb933b5f6..6ac7e75dc 100644 --- a/pd/doc/4.data.structures/pd-l2ork/ds-demos/tiger.pd +++ b/pd/doc/4.data.structures/pd-l2ork/ds-demos/tiger.pd @@ -1,7 +1,7 @@ #N struct tiger float x float y; #N struct tiger-array float x float y array a tiger; -#N canvas -9 19 741 374 10; -#X floatatom 309 80 5 0 0 0 - - -, f 5; +#N canvas 1 44 741 374 10; +#X floatatom 295 80 5 0 0 0 - - -, f 5; #X obj 63 36 struct tiger float x float y; #N canvas 0 27 1366 684 (subpatch) 0; #X obj 160 20 loadbang; @@ -2175,16 +2175,16 @@ C 256 273.5 269.5 292 269.5 299 C 269.5 299 272 291.5 270.5 287 z; #X connect 464 0 463 0; #X connect 466 0 465 0; #X connect 468 0 467 0; -#X restore 309 157 group; -#X text 354 157 <-- an awful lot of paths inside here. In a case like +#X restore 295 157 draw group; +#X text 364 157 <-- an awful lot of paths inside here. In a case like this it would probably be preferable to have a [draw svg] where you can just specify the file name. A GUI toolkit like Qt might be able to do this \, but tcl/tk cannot.; #X scalar tiger 157 216 \;; #X obj 100 303 output~; -#X obj 309 36 loadbang; -#X obj 309 101 * 0.01; -#X msg 309 57 30; +#X obj 295 36 loadbang; +#X obj 295 101 * 0.01; +#X msg 295 57 30; #X obj 63 78 bang; #N canvas 654 71 531 545 roar~ 0; #X obj 181 402 osc~; @@ -2355,7 +2355,7 @@ to do this \, but tcl/tk cannot.; #X connect 31 1 32 0; #X connect 32 0 29 1; #X restore 63 259 pd roar~; -#X msg 309 126 transform scale \$1 rotate -45; +#X msg 295 126 transform scale \$1 rotate -45; #X text 144 98 Enter the Tiger!; #X obj 63 57 route enter; #N canvas 609 64 706 300 tiger-array 0; diff --git a/pd/doc/4.data.structures/pd-l2ork/ds-demos/unit-circle.pd b/pd/doc/4.data.structures/pd-l2ork/ds-demos/unit-circle.pd index b6294184e..128066599 100644 --- a/pd/doc/4.data.structures/pd-l2ork/ds-demos/unit-circle.pd +++ b/pd/doc/4.data.structures/pd-l2ork/ds-demos/unit-circle.pd @@ -87,7 +87,7 @@ l 150 0 m -150 100 l 150 0 m 0 20 l 0 -240 0 20 20 0 m -20 100 l 20 #X connect 30 0 26 0; #X connect 36 0 0 0; #X connect 37 0 26 0; -#X restore 52 247 group; +#X restore 52 247 draw group; #X obj 92 5 struct unit_circle float x float y; #X obj 364 251 * 100; #X obj 548 243 * 600; diff --git a/pd/doc/4.data.structures/pd-l2ork/ds-demos/violin.pd b/pd/doc/4.data.structures/pd-l2ork/ds-demos/violin.pd index 0e76cfc82..3d34c236d 100644 --- a/pd/doc/4.data.structures/pd-l2ork/ds-demos/violin.pd +++ b/pd/doc/4.data.structures/pd-l2ork/ds-demos/violin.pd @@ -865,7 +865,7 @@ c 0.631 -0.071 0.188 0.931 0.96 0.72 c -0.03 -0.601 -0.458 -0.751 0.24 #X connect 84 0 85 0; #X connect 85 0 86 0; #X connect 86 0 87 0; -#X restore 137 114 group; +#X restore 137 114 draw group; #X obj 137 50 struct violin float x float y; #X obj 137 72 loadbang; #X msg 137 93 transform rotate -26 59 113 scale 0.5; diff --git a/pd/doc/4.data.structures/pd-l2ork/ds-demos/working-man.pd b/pd/doc/4.data.structures/pd-l2ork/ds-demos/working-man.pd index a25bf51b4..36e0d069c 100644 --- a/pd/doc/4.data.structures/pd-l2ork/ds-demos/working-man.pd +++ b/pd/doc/4.data.structures/pd-l2ork/ds-demos/working-man.pd @@ -1,86 +1,88 @@ #N struct working-man-scalar float x float y; -#N canvas -8 19 895 538 10; -#N canvas 446 273 450 300 template 0; -#X obj 115 -2441 loadbang; -#X obj 115 -2399 draw path M 41.184 453.06 C 18.504 453.06 0 434.556 -0 411.804 C 0 404.532 1.872 397.476 5.544 391.212 L 219.528 20.628 -C 235.44 -6.876 274.968 -6.876 290.88 20.628 L 504.864 391.212 C 508.464 +#N canvas 1 44 895 538 10; +#X scalar working-man-scalar 262 28 \;; +#X text 53 56 Still under heavy development!; +#N canvas 319 167 450 300 (subpatch) 1; +#X obj 32 58 loadbang; +#X obj 32 100 draw path M 41.184 453.06 C 18.504 453.06 0 434.556 0 +411.804 C 0 404.532 1.872 397.476 5.544 391.212 L 219.528 20.628 C +235.44 -6.876 274.968 -6.876 290.88 20.628 L 504.864 391.212 C 508.464 397.476 510.336 404.604 510.336 411.804 C 510.336 434.556 491.976 452.988 469.224 453.06 L 41.184 453.06 L 41.184 453.06 z; -#X obj 119 -2303 loadbang; -#X obj 119 -2261 draw polygon 52.2 405.468 458.136 405.468 255.168 -53.892 52.2 405.468; -#X msg 119 -2282 fill #feb82f; -#X obj 123 -2164 draw path M 419.4 378.396 L 419.4 384.444 L 90.648 -384.444 L 91.368 381.564 C 92.448 377.388 93.672 373.356 95.04 369.468 -C 96.048 366.3 97.56 363.06 99.36 360.108 C 100.584 358.092 101.736 -356.292 102.888 354.42 C 103.032 354.204 103.32 353.988 103.68 353.772 -L 104.4 352.548 L 107.064 346.716 C 107.712 345.204 108.576 343.764 -109.44 342.468 C 110.304 341.244 111.168 340.092 112.104 339.012 C -113.904 336.852 115.56 334.548 117 332.172 C 118.44 329.652 120.168 -327.42 122.184 325.332 C 122.976 324.468 123.912 323.676 124.92 323.1 -C 126.144 322.308 127.08 321.3 127.728 320.076 C 129.168 317.268 131.04 -314.604 133.128 312.228 C 135.936 308.988 140.328 307.62 144.504 308.7 -C 146.664 309.276 148.752 310.068 150.696 311.004 C 154.296 312.804 -157.608 315.036 160.56 317.7 L 162.576 316.692 C 171.648 312.3 180.144 -307.476 188.352 302.22 L 192.024 303.66 L 196.488 299.916 L 198.936 -297.252 L 203.616 293.868 C 209.304 289.692 215.424 286.164 221.832 -283.284 L 225.576 279.972 L 231.48 274.428 C 232.128 273.78 232.56 -272.988 232.776 272.196 C 233.496 269.892 233.928 267.516 234.072 265.212 -C 234.288 261.828 234.432 258.732 234.576 255.564 C 234.648 253.116 -234.864 250.668 235.152 248.22 C 235.584 244.98 235.728 241.884 235.728 -238.644 C 235.728 237.996 235.728 237.42 235.728 236.7 C 235.728 236.196 -235.656 235.116 235.656 233.964 C 235.584 232.02 235.368 231.228 234.936 -230.58 L 230.976 222.084 L 225.576 212.868 C 224.424 210.852 223.704 -208.548 223.56 206.172 C 223.416 203.796 223.632 201.42 224.136 199.116 -C 224.352 198.18 224.64 197.316 225 196.452 C 225.144 196.164 225.216 -195.804 225.216 195.444 C 225.216 194.94 225 194.436 224.712 194.004 -C 224.424 193.572 223.92 193.356 223.416 193.356 C 223.272 193.356 -223.128 193.356 222.984 193.428 C 221.4 193.788 219.744 193.428 218.52 -192.348 C 215.712 189.972 213.768 186.804 212.832 183.276 C 212.472 -181.98 212.04 180.612 211.608 179.244 C 211.32 178.236 210.744 177.444 -209.952 176.796 C 208.44 175.5 207.36 173.772 206.856 171.9 C 206.352 -169.812 206.352 167.724 206.856 165.636 C 207.432 163.332 208.656 161.172 -210.528 159.588 C 212.4 158.004 214.56 156.78 216.864 155.988 C 219.384 -155.196 221.976 154.548 224.568 154.188 C 225.936 153.972 227.376 154.188 -228.6 154.836 C 230.184 155.7 231.696 156.636 232.992 157.788 C 234.36 -158.868 235.368 160.38 235.944 162.108 C 236.52 163.764 237.024 165.42 -237.384 167.076 C 237.672 168.156 237.888 169.164 238.032 170.172 C -238.464 172.548 239.328 174.78 240.552 176.868 C 241.488 178.596 242.28 -179.892 243.144 181.188 C 243 180.972 244.152 181.836 245.52 182.268 -C 246.24 182.484 247.104 182.628 247.896 182.628 C 248.544 182.628 -249.12 182.556 249.696 182.412 C 252.072 181.908 254.376 181.62 256.752 -181.404 C 258.696 181.26 260.64 180.9 262.44 180.324 C 266.112 179.1 -269.712 178.092 273.384 177.012 C 275.4 176.436 277.704 176.292 279.936 -176.652 C 291.456 178.452 302.4 182.34 312.336 188.172 C 313.344 188.748 -314.352 189.324 315.288 189.972 C 316.728 190.908 317.88 192.204 318.528 -193.788 C 319.32 195.588 319.752 197.46 319.968 199.332 C 320.472 204.732 -321.048 209.556 321.768 214.38 C 322.2 217.548 323.784 220.86 326.304 -223.524 C 326.952 224.244 327.744 224.892 328.608 225.396 C 330.336 -226.404 331.776 227.844 332.856 229.572 C 333.36 230.292 333.576 231.156 -333.576 232.02 C 333.576 233.388 333 234.756 331.92 235.62 C 330.912 -236.412 329.832 237.204 328.752 237.852 C 327.888 238.428 326.952 238.716 -325.944 238.86 C 325.44 238.932 325.08 239.292 325.008 239.796 L 325.944 -260.604 L 326.088 277.74 L 325.8 285.948 L 325.944 293.076 L 325.512 -299.556 L 324.72 307.332 C 324.432 309.708 324.288 312.156 324.288 -314.532 C 324.288 318.132 324.576 321.66 325.08 325.188 C 325.44 327.42 -325.656 329.868 325.656 332.172 C 325.656 332.892 325.584 333.54 325.584 -334.188 L 325.728 343.548 L 325.512 354.276 L 325.224 364.212 L 325.368 -368.964 C 325.44 370.692 326.88 372.06 328.608 372.06 L 329.328 371.988 -L 333.576 368.532 C 334.224 368.028 334.584 367.236 334.584 366.444 -C 334.584 366.228 334.584 366.084 334.512 365.868 C 334.368 365.004 -334.224 363.996 334.224 363.06 C 334.152 362.196 334.44 361.404 335.016 -360.756 C 335.448 360.324 335.952 359.892 336.6 359.532 L 339.264 358.38 -L 342.144 356.796 C 344.664 355.428 347.04 353.844 349.2 351.972 C -349.776 351.468 350.28 351.036 350.784 350.676 C 351.576 349.884 352.872 -349.452 354.168 349.524 C 355.824 349.524 357.48 350.028 358.92 350.964 -C 360.072 351.756 361.008 352.836 361.584 354.132 C 365.328 362.772 -371.016 370.26 378.216 376.164 C 379.584 377.244 381.24 377.964 382.896 -378.252 L 419.4 378.396 z; -#X obj 123 -2206 loadbang; -#X obj 123 -1105 loadbang; -#X msg 123 -1084 fill #feb82f; -#X obj 123 -1063 draw path M 247.248 264.636 C 247.32 264.708 247.392 +#X obj 36 196 loadbang; +#X obj 36 238 draw polygon 52.2 405.468 458.136 405.468 255.168 53.892 +52.2 405.468; +#X msg 36 217 fill #feb82f; +#X obj 40 335 draw path M 419.4 378.396 L 419.4 384.444 L 90.648 384.444 +L 91.368 381.564 C 92.448 377.388 93.672 373.356 95.04 369.468 C 96.048 +366.3 97.56 363.06 99.36 360.108 C 100.584 358.092 101.736 356.292 +102.888 354.42 C 103.032 354.204 103.32 353.988 103.68 353.772 L 104.4 +352.548 L 107.064 346.716 C 107.712 345.204 108.576 343.764 109.44 +342.468 C 110.304 341.244 111.168 340.092 112.104 339.012 C 113.904 +336.852 115.56 334.548 117 332.172 C 118.44 329.652 120.168 327.42 +122.184 325.332 C 122.976 324.468 123.912 323.676 124.92 323.1 C 126.144 +322.308 127.08 321.3 127.728 320.076 C 129.168 317.268 131.04 314.604 +133.128 312.228 C 135.936 308.988 140.328 307.62 144.504 308.7 C 146.664 +309.276 148.752 310.068 150.696 311.004 C 154.296 312.804 157.608 315.036 +160.56 317.7 L 162.576 316.692 C 171.648 312.3 180.144 307.476 188.352 +302.22 L 192.024 303.66 L 196.488 299.916 L 198.936 297.252 L 203.616 +293.868 C 209.304 289.692 215.424 286.164 221.832 283.284 L 225.576 +279.972 L 231.48 274.428 C 232.128 273.78 232.56 272.988 232.776 272.196 +C 233.496 269.892 233.928 267.516 234.072 265.212 C 234.288 261.828 +234.432 258.732 234.576 255.564 C 234.648 253.116 234.864 250.668 235.152 +248.22 C 235.584 244.98 235.728 241.884 235.728 238.644 C 235.728 237.996 +235.728 237.42 235.728 236.7 C 235.728 236.196 235.656 235.116 235.656 +233.964 C 235.584 232.02 235.368 231.228 234.936 230.58 L 230.976 222.084 +L 225.576 212.868 C 224.424 210.852 223.704 208.548 223.56 206.172 +C 223.416 203.796 223.632 201.42 224.136 199.116 C 224.352 198.18 224.64 +197.316 225 196.452 C 225.144 196.164 225.216 195.804 225.216 195.444 +C 225.216 194.94 225 194.436 224.712 194.004 C 224.424 193.572 223.92 +193.356 223.416 193.356 C 223.272 193.356 223.128 193.356 222.984 193.428 +C 221.4 193.788 219.744 193.428 218.52 192.348 C 215.712 189.972 213.768 +186.804 212.832 183.276 C 212.472 181.98 212.04 180.612 211.608 179.244 +C 211.32 178.236 210.744 177.444 209.952 176.796 C 208.44 175.5 207.36 +173.772 206.856 171.9 C 206.352 169.812 206.352 167.724 206.856 165.636 +C 207.432 163.332 208.656 161.172 210.528 159.588 C 212.4 158.004 214.56 +156.78 216.864 155.988 C 219.384 155.196 221.976 154.548 224.568 154.188 +C 225.936 153.972 227.376 154.188 228.6 154.836 C 230.184 155.7 231.696 +156.636 232.992 157.788 C 234.36 158.868 235.368 160.38 235.944 162.108 +C 236.52 163.764 237.024 165.42 237.384 167.076 C 237.672 168.156 237.888 +169.164 238.032 170.172 C 238.464 172.548 239.328 174.78 240.552 176.868 +C 241.488 178.596 242.28 179.892 243.144 181.188 C 243 180.972 244.152 +181.836 245.52 182.268 C 246.24 182.484 247.104 182.628 247.896 182.628 +C 248.544 182.628 249.12 182.556 249.696 182.412 C 252.072 181.908 +254.376 181.62 256.752 181.404 C 258.696 181.26 260.64 180.9 262.44 +180.324 C 266.112 179.1 269.712 178.092 273.384 177.012 C 275.4 176.436 +277.704 176.292 279.936 176.652 C 291.456 178.452 302.4 182.34 312.336 +188.172 C 313.344 188.748 314.352 189.324 315.288 189.972 C 316.728 +190.908 317.88 192.204 318.528 193.788 C 319.32 195.588 319.752 197.46 +319.968 199.332 C 320.472 204.732 321.048 209.556 321.768 214.38 C +322.2 217.548 323.784 220.86 326.304 223.524 C 326.952 224.244 327.744 +224.892 328.608 225.396 C 330.336 226.404 331.776 227.844 332.856 229.572 +C 333.36 230.292 333.576 231.156 333.576 232.02 C 333.576 233.388 333 +234.756 331.92 235.62 C 330.912 236.412 329.832 237.204 328.752 237.852 +C 327.888 238.428 326.952 238.716 325.944 238.86 C 325.44 238.932 325.08 +239.292 325.008 239.796 L 325.944 260.604 L 326.088 277.74 L 325.8 +285.948 L 325.944 293.076 L 325.512 299.556 L 324.72 307.332 C 324.432 +309.708 324.288 312.156 324.288 314.532 C 324.288 318.132 324.576 321.66 +325.08 325.188 C 325.44 327.42 325.656 329.868 325.656 332.172 C 325.656 +332.892 325.584 333.54 325.584 334.188 L 325.728 343.548 L 325.512 +354.276 L 325.224 364.212 L 325.368 368.964 C 325.44 370.692 326.88 +372.06 328.608 372.06 L 329.328 371.988 L 333.576 368.532 C 334.224 +368.028 334.584 367.236 334.584 366.444 C 334.584 366.228 334.584 366.084 +334.512 365.868 C 334.368 365.004 334.224 363.996 334.224 363.06 C +334.152 362.196 334.44 361.404 335.016 360.756 C 335.448 360.324 335.952 +359.892 336.6 359.532 L 339.264 358.38 L 342.144 356.796 C 344.664 +355.428 347.04 353.844 349.2 351.972 C 349.776 351.468 350.28 351.036 +350.784 350.676 C 351.576 349.884 352.872 349.452 354.168 349.524 C +355.824 349.524 357.48 350.028 358.92 350.964 C 360.072 351.756 361.008 +352.836 361.584 354.132 C 365.328 362.772 371.016 370.26 378.216 376.164 +C 379.584 377.244 381.24 377.964 382.896 378.252 L 419.4 378.396 z +; +#X obj 40 293 loadbang; +#X obj 40 1394 loadbang; +#X msg 40 1415 fill #feb82f; +#X obj 40 1436 draw path M 247.248 264.636 C 247.32 264.708 247.392 264.708 247.536 264.708 C 247.824 264.708 248.112 264.636 248.328 264.348 C 249.768 262.692 251.064 261.108 252.288 259.452 C 253.224 258.3 254.016 257.076 254.88 255.852 C 255.528 254.844 256.176 253.764 256.896 252.756 @@ -96,14 +98,14 @@ C 253.512 237.348 253.368 238.716 253.08 240.084 C 252.936 240.732 256.572 L 248.04 259.02 L 247.032 261.972 C 246.816 262.476 246.672 263.052 246.672 263.628 C 246.672 263.772 246.672 263.916 246.744 264.06 C 246.744 264.348 246.96 264.636 247.248 264.636 z; -#X obj 148 -150; -#X obj 148 -129; -#X obj 125 -786 loadbang; -#X msg 125 -765 stroke black \, stroke-width 0.216; -#X obj 125 -744 draw line 246.744 263.988 247.176 264.636; -#X obj 126 -713 loadbang; -#X msg 126 -692 fill #feb82f; -#X obj 126 -671 draw path M 291.96 199.836 L 295.488 199.908 L 298.584 +#X obj 65 2349; +#X obj 65 2370; +#X obj 42 1713 loadbang; +#X msg 42 1734 stroke black \, stroke-width 0.216; +#X obj 42 1755 draw line 246.744 263.988 247.176 264.636; +#X obj 43 1786 loadbang; +#X msg 43 1807 fill #feb82f; +#X obj 43 1828 draw path M 291.96 199.836 L 295.488 199.908 L 298.584 200.268 L 303.408 201.204 C 303.624 201.276 303.912 201.42 303.984 201.708 L 305.28 204.516 L 306.216 206.604 L 306.864 208.404 L 307.872 210.78 L 309.528 214.092 L 310.536 215.892 L 311.688 218.7 L 312.768 @@ -115,9 +117,9 @@ L 303.192 219.132 L 302.328 217.476 C 301.68 216.108 301.032 214.74 300.528 213.3 L 297.288 209.628 L 293.256 205.164 L 290.016 201.996 C 289.8 201.78 289.8 201.492 290.088 201.348 L 291.024 200.196 C 291.24 199.98 291.6 199.836 291.96 199.836 z; -#X obj 127 -466 loadbang; -#X msg 127 -445 fill #feb82f; -#X obj 127 -424 draw path M 254.304 371.484 L 263.16 365.436 L 263.592 +#X obj 44 2033 loadbang; +#X msg 44 2054 fill #feb82f; +#X obj 44 2075 draw path M 254.304 371.484 L 263.16 365.436 L 263.592 365.148 L 265.248 364.644 L 268.56 363.852 L 274.968 360.036 L 274.608 358.74 C 274.104 356.508 273.024 354.348 271.656 352.476 C 270.504 350.82 269.424 349.092 268.56 347.22 C 267.84 345.78 267.48 344.34 @@ -148,9 +150,9 @@ C 297.288 367.884 296.208 368.82 295.992 370.044 C 295.848 370.62 295.776 374.796 C 288.936 374.94 287.28 375.156 285.552 375.444 L 280.296 375.588 L 274.176 375.3 L 269.28 374.508 L 266.184 373.788 L 261.432 372.852 L 258.192 372.204 L 254.304 371.484 z; -#X obj 131 98 loadbang; -#X msg 131 119 fill #feb82f; -#X obj 131 140 draw path M 163.224 321.372 L 165.096 321.012 L 170.064 +#X obj 48 2597 loadbang; +#X msg 48 2618 fill #feb82f; +#X obj 48 2639 draw path M 163.224 321.372 L 165.096 321.012 L 170.064 319.932 C 173.448 319.212 176.688 318.204 179.856 316.836 C 182.592 315.684 184.68 314.82 186.768 313.956 C 189.288 312.948 191.808 311.292 194.04 309.204 L 197.568 306.252 L 200.592 303.228 L 202.536 301.572 @@ -176,16 +178,12 @@ C 244.728 367.092 244.44 367.596 244.44 368.1 C 244.44 368.172 244.44 353.916 L 182.736 351.396 L 180 347.22 L 178.704 345.132 L 176.832 341.316 L 175.464 338.292 L 174.528 336.42 L 173.736 334.908 C 171 329.94 167.544 325.332 163.296 321.372 L 163.224 321.372 z; -#X obj 121 -2492 struct working-man-scalar float x float y; -#X msg 123 -2185 fill black; -#X obj 246 -2462 loadbang; -#X obj 246 -2420 draw group; -#X msg 246 -2441 transform matrix -1 0 0 1 510.336 0; -#X msg 115 -2420 fill #ed171f; -#X connect 0 0 29 0; +#X msg 40 314 fill black; +#X msg 32 79 fill #ed171f; +#X connect 0 0 25 0; #X connect 2 0 4 0; #X connect 4 0 3 0; -#X connect 6 0 25 0; +#X connect 6 0 24 0; #X connect 7 0 8 0; #X connect 8 0 9 0; #X connect 10 0 11 0; @@ -197,10 +195,11 @@ C 244.728 367.092 244.44 367.596 244.44 368.1 C 244.44 368.172 244.44 #X connect 19 0 20 0; #X connect 21 0 22 0; #X connect 22 0 23 0; -#X connect 25 0 5 0; -#X connect 26 0 28 0; -#X connect 28 0 27 0; -#X connect 29 0 1 0; -#X restore 40 172 pd template; -#X scalar working-man-scalar 198 39 \;; -#X text 53 56 Still under heavy development!; +#X connect 24 0 5 0; +#X connect 25 0 1 0; +#X restore 96 136 draw group; +#X obj 96 93 loadbang; +#X msg 96 114 transform matrix -1 0 0 1 510.336 0; +#X obj 123 11 struct working-man-scalar float x float y; +#X connect 3 0 4 0; +#X connect 4 0 2 0; diff --git a/pd/doc/4.data.structures/pd-l2ork/ds-demos/yin-yang.pd b/pd/doc/4.data.structures/pd-l2ork/ds-demos/yin-yang.pd index ecee156f0..08170df99 100644 --- a/pd/doc/4.data.structures/pd-l2ork/ds-demos/yin-yang.pd +++ b/pd/doc/4.data.structures/pd-l2ork/ds-demos/yin-yang.pd @@ -62,7 +62,7 @@ #X connect 12 0 7 0; #X connect 13 0 6 0; #X connect 14 0 8 0; -#X restore 151 581 group; +#X restore 151 581 draw group; #X scalar yin-yang 114 127 188.603 66.3972 \;; #X scalar yin-yang 315 136 0 255 \;; #X msg 383 412 traverse pd-yin-yang.pd \, next; diff --git a/pd/doc/4.data.structures/pd-l2ork/ds-tutorials/00.under.construction.pd b/pd/doc/4.data.structures/pd-l2ork/ds-tutorials/00.under.construction.pd index 47b7a2820..6820d2105 100644 --- a/pd/doc/4.data.structures/pd-l2ork/ds-tutorials/00.under.construction.pd +++ b/pd/doc/4.data.structures/pd-l2ork/ds-tutorials/00.under.construction.pd @@ -218,7 +218,7 @@ L 258.192 372.204 L 254.304 371.484 z; #X connect 19 0 20 0; #X connect 21 0 5 0; #X connect 22 0 1 0; -#X restore 121 -2430 group; +#X restore 121 -2430 draw group; #X connect 1 0 2 0; #X restore 443 6 pd template; #X scalar working-man-scalar 218 -11 \;; diff --git a/pd/doc/4.data.structures/pd-l2ork/ds-tutorials/01.intro.pd b/pd/doc/4.data.structures/pd-l2ork/ds-tutorials/01.intro.pd index c0b73d33d..a7c83566a 100644 --- a/pd/doc/4.data.structures/pd-l2ork/ds-tutorials/01.intro.pd +++ b/pd/doc/4.data.structures/pd-l2ork/ds-tutorials/01.intro.pd @@ -233,7 +233,7 @@ c 0 -0.0976 0.87891 -1.11328 0.95704 -1.24999 0.52734 -1.01562 0.52734 #X connect 6 0 0 0; #X connect 7 0 6 0; #X connect 8 0 6 0; -#X restore 37 17 group w; +#X restore 37 17 draw group w; #N canvas 433 184 450 300 e 0; #X obj 45 146 draw path m 113.062 98.0641 c 0.27344 0.781249 0.23438 1.52344 0.46875 2.22656 1.38672 3.92578 3.98438 6.5625 8.33984 6.5625 @@ -281,7 +281,7 @@ c 0.0977 0 0.41016 -0.175782 0.44922 -0.175782 0.39063 0 0.70313 0.371094 #X connect 6 0 7 0; #X connect 7 0 0 0; #X connect 8 0 7 0; -#X restore 37 37 group e; +#X restore 37 37 draw group e; #N canvas 433 184 450 300 l 0; #X obj 40 175 draw path m 132.32 106.658 c 0.60547 0 1.32813 0.0977 1.9336 0.15625 0.97656 -0.0195 1.54297 -0.25391 2.69531 -0.29297 0.0391 @@ -338,7 +338,7 @@ l 0.0586 -1.34766 -0.0195 -1.01562 c 0 -0.624999 0.0195 -1.26953 0.23438 #X connect 6 0 7 0; #X connect 7 0 0 0; #X connect 8 0 7 0; -#X restore 37 57 group l; +#X restore 37 57 draw group l; #N canvas 433 184 450 300 c 0; #X obj 26 127 draw path m 148.922 106.521 0.35157 0.29297 0.60547 0 c 2.77343 0 5.9375 -1.3086 6.8164 -4.25782 l 0 -0.23437 c 0 -0.42969 @@ -381,7 +381,7 @@ C 146.793 100.291 146.5 99.8024 146.5 98.611 l 0 -0.546875 -0.17578 #X connect 6 0 7 0; #X connect 7 0 0 0; #X connect 8 0 7 0; -#X restore 37 77 group c; +#X restore 37 77 draw group c; #N canvas 433 184 450 300 o 0; #X obj 56 165 draw path m 159.449 98.0055 0.15625 1.52344 c 0 1.01562 0.68359 1.71875 1.15234 2.55859 0.27344 0.3711 0.58594 0.78125 0.87891 @@ -436,7 +436,7 @@ l -0.74219 -0.70313 c -0.50781 -0.64453 -1.05469 -1.67968 -1.25 -2.53906 #X connect 6 0 7 0; #X connect 7 0 0 0; #X connect 8 0 7 0; -#X restore 37 97 group o; +#X restore 37 97 draw group o; #N canvas 433 184 450 300 m 0; #X obj 45 118 draw path m 180.895 105.779 c 0 0.29297 0.0195 0.60547 0.19531 0.74219 0.0977 0.0391 0.44922 0.0391 0.50782 0.0977 0.0781 @@ -540,7 +540,7 @@ c -0.3125 0.605468 -0.33203 1.21094 -0.33203 1.83594 l 0 1.36719 -0.0781 #X connect 6 0 7 0; #X connect 7 0 0 0; #X connect 8 0 7 0; -#X restore 37 117 group m; +#X restore 37 117 draw group m; #N canvas 433 184 450 300 e 0; #X obj 43 136 draw path m 211.734 98.0641 c 0.27344 0.781249 0.23438 1.52344 0.46875 2.22656 1.38672 3.92578 3.98438 6.5625 8.33985 6.5625 @@ -588,7 +588,7 @@ c -0.21485 -0.05859 -0.41016 -0.9375 -0.41016 -1.21094; #X connect 6 0 7 0; #X connect 7 0 0 0; #X connect 8 0 7 0; -#X restore 37 137 group e; +#X restore 37 137 draw group e; #N canvas 433 184 450 300 exclamation-point 0; #X obj 39 178 draw path m 232.496 104.724 c 0 0.0781 0 0.41016 0 0.41016 0.0586 0.17578 0.46875 0.9375 0.56641 1.11328 0.13672 0.19531 0.50781 @@ -630,8 +630,8 @@ c -0.21485 -0.05859 -0.41016 -0.9375 -0.41016 -1.21094; #X connect 6 0 7 0; #X connect 7 0 0 0; #X connect 8 0 7 0; -#X restore 37 157 group exclamation-point; -#X restore 189 66 group welcome-text; +#X restore 37 157 draw group exclamation-point; +#X restore 189 66 draw group welcome-text; #X msg 189 37 fill black; #X msg 311 35 stroke-dasharray 10 4 \, stroke-width 4 \, stroke gray \, fill none; diff --git a/pd/doc/4.data.structures/pd-l2ork/ds-tutorials/14.group.pd b/pd/doc/4.data.structures/pd-l2ork/ds-tutorials/14.group.pd index d6eff9dd6..54ca534ea 100644 --- a/pd/doc/4.data.structures/pd-l2ork/ds-tutorials/14.group.pd +++ b/pd/doc/4.data.structures/pd-l2ork/ds-tutorials/14.group.pd @@ -30,7 +30,7 @@ of individually.; #X connect 7 0 1 0; #X connect 8 0 1 0; #X connect 9 0 2 0; -#X restore 434 236 group; +#X restore 434 236 draw group; #X text 53 263 The [group] object is essentially just a subpatch with an inlet. You can send it all the same messages that you can send to shapes. This will set the attributes for any drawing commands inside diff --git a/pd/doc/4.data.structures/pd-l2ork/sprite-game/game.pd b/pd/doc/4.data.structures/pd-l2ork/sprite-game/game.pd index f4e97a285..fa36310aa 100644 --- a/pd/doc/4.data.structures/pd-l2ork/sprite-game/game.pd +++ b/pd/doc/4.data.structures/pd-l2ork/sprite-game/game.pd @@ -200,7 +200,7 @@ z; #X connect 15 0 0 0; #X connect 16 0 17 0; #X connect 17 0 0 0; -#X restore 288 284 group level-completed; +#X restore 288 284 draw group level-completed; #N canvas 690 179 450 300 level-failed 0; #N canvas 770 19 450 683 out-of-bullets 0; #X obj 49 40 draw path m 109.196 123.09 c -17.9481 -2.15321 2.34765 @@ -277,7 +277,7 @@ z m -10.2 6.76 c -16.409 -1.07188 2.85868 -24.3778 6.81644 -7.79128 #X connect 13 0 3 0; #X connect 13 0 2 0; #X connect 13 0 1 0; -#X restore 152 115 group out-of-bullets; +#X restore 152 115 draw group out-of-bullets; #N canvas 831 86 450 472 go-to-jail 0; #X obj 48 86 draw path m 163.521 171.89 c -18.0526 10.1245 -15.1912 -29.9926 0.19314 -13.8101 9.7597 -7.53129 -12.8866 -9.97304 -15.248 @@ -331,7 +331,7 @@ z m -10.2 6.76 c -16.409 -1.07188 2.85868 -24.3778 6.81644 -7.79128 #X connect 8 0 10 0; #X connect 8 0 9 0; #X connect 10 0 9 0; -#X restore 152 197 group go-to-jail; +#X restore 152 197 draw group go-to-jail; #X obj 269 68 loadbang; #X msg 269 89 fill black; #X obj 245 151 loadbang; @@ -343,7 +343,7 @@ z m -10.2 6.76 c -16.409 -1.07188 2.85868 -24.3778 6.81644 -7.79128 #X connect 5 0 1 1; #X connect 6 0 0 0; #X connect 6 0 1 0; -#X restore 501 214 group level-failed; +#X restore 501 214 draw group level-failed; #X msg 39 266 0; #X msg 606 189 transform translate -140 70 scale 0.75; #X msg 219 126 0; @@ -427,7 +427,7 @@ z m -10.2 6.76 c -16.409 -1.07188 2.85868 -24.3778 6.81644 -7.79128 #X connect 52 0 10 0; #X connect 53 0 11 0; #X connect 54 0 12 0; -#X restore 734 138 group; +#X restore 734 138 draw group; #N canvas 333 68 1002 543 guts 0; #X obj 155 292 * 6; #X obj 181 254 + 1; -- GitLab