From a1d3abc4bb67808620b263a2610151d84d6540fb Mon Sep 17 00:00:00 2001 From: Thomas Grill Date: Tue, 3 May 2005 12:03:42 +0000 Subject: fixed patches, improved error reporting svn path=/trunk/externals/nusmuk/; revision=2890 --- msd.h | 4 +- msd3D/02_msd3Dperf.pd | 154 ++++++++++++++++++++++++++------------------------ 2 files changed, 83 insertions(+), 75 deletions(-) diff --git a/msd.h b/msd.h index 901ddc1..baeecd7 100644 --- a/msd.h +++ b/msd.h @@ -145,7 +145,7 @@ public: } } - static t_float dist(const Mass &m1,const Mass &m2) + static inline t_float dist(const Mass &m1,const Mass &m2) { if(N == 1) return fabs(m1.pos[0]-m2.pos[0]); // L[n] = |x1 - x2| @@ -366,7 +366,7 @@ protected: void m_mass(int argc,t_atom *argv) { if(argc != 3+N) { - error("mass : Id mobile mass X"); + error("mass : Id mobile mass X%s%s",N >= 2?" Y":"",N >= 3?" Z":""); return; } diff --git a/msd3D/02_msd3Dperf.pd b/msd3D/02_msd3Dperf.pd index 65dc785..296d990 100644 --- a/msd3D/02_msd3Dperf.pd +++ b/msd3D/02_msd3Dperf.pd @@ -1,4 +1,4 @@ -#N canvas 545 25 692 818 10; +#N canvas 545 25 696 822 10; #X obj 177 369 t a; #X obj 159 5 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1 -1; @@ -9,9 +9,8 @@ #X msg 456 528 0 \, destroy; #X obj 456 583 gemhead; #X obj 460 670 world_light; -#X msg 213 177 mass fix 0 100 50 50; #X msg 456 468 reset \, create \, lighting 1 \, 1; -#X obj 52 391 t b; +#X obj 52 380 t b; #N canvas 643 123 605 590 massrender 0; #X obj 127 22 inlet; #X obj 48 203 translateXYZ; @@ -60,14 +59,13 @@ #X obj 586 166 f -1; #X obj 586 255 pack f f; #X msg 177 339 link souple \$1 \$2 100 0.5 0.5; -#X obj 52 368 gemhead; +#X obj 52 357 gemhead; #X obj 456 548 gemwin; #X obj 52 655 msd3D --------------------------------; #X obj 376 105 t b b b b; #X obj 505 254 random 100; #X msg 505 233 seed 4; #X obj 177 271 pack f f f f; -#X msg 177 293 mass mob 1 \$1 \$2 \$3 \$4; #X msg 177 316 Xmax 100 \, Xmin 0 \, Ymax 100 \, Ymin 0 \, Zmax 100 \, Zmin 0; #X msg 456 508 view 8 0 0.5 0 0 0 0 0 1; @@ -76,84 +74,94 @@ #X text 501 21 <-- Number of masses; #X obj 456 487 t b; #X obj 52 678 route massesPos; -#X msg 52 425 bang \, get massesPos; -#X text 265 487 <-- Move masses; +#X msg 52 414 bang \, get massesPos; +#X text 300 485 <-- Move masses; #X floatatom 495 615 5 0 0 0 - - -; #X floatatom 536 618 5 0 0 0 - - -; #X floatatom 589 619 5 0 0 0 - - -; #X obj 457 640 rotateXYZ 30 30 0; #X msg 459 20 3999; -#X msg 163 529 forceY mob 100; -#X msg 162 553 forceY mob -100; -#X msg 176 577 forceZ mob 100; -#X msg 175 601 forceZ mob -100; -#X msg 143 479 forceX mob 100; -#X msg 144 503 forceX mob -100; -#X connect 0 0 31 0; +#X msg 198 527 forceY mob 100; +#X msg 197 551 forceY mob -100; +#X msg 211 575 forceZ mob 100; +#X msg 210 599 forceZ mob -100; +#X msg 178 477 forceX mob 100; +#X msg 179 501 forceX mob -100; +#X msg 213 177 mass fix 0 100 50 50 0; +#X msg 177 293 mass mob 1 \$1 \$2 \$3 \$4; +#X obj 75 491 metro 10; +#X obj 76 469 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 1 1 +; +#X floatatom 107 470 5 0 0 0 - - -; +#X text 74 453 instead of GEM; +#X connect 0 0 30 0; #X connect 1 0 5 0; #X connect 2 0 0 0; #X connect 3 0 5 0; -#X connect 5 0 40 0; -#X connect 5 1 37 0; -#X connect 5 2 39 0; -#X connect 5 3 9 0; +#X connect 5 0 38 0; +#X connect 5 1 35 0; +#X connect 5 2 37 0; +#X connect 5 3 55 0; #X connect 5 4 2 0; -#X connect 5 4 25 0; -#X connect 5 4 18 0; -#X connect 5 4 14 0; +#X connect 5 4 24 0; #X connect 5 4 17 0; -#X connect 5 4 34 0; -#X connect 6 0 30 0; -#X connect 7 0 49 0; -#X connect 9 0 0 0; -#X connect 10 0 30 0; +#X connect 5 4 13 0; +#X connect 5 4 16 0; +#X connect 5 4 33 0; +#X connect 6 0 29 0; +#X connect 7 0 47 0; +#X connect 9 0 29 0; +#X connect 9 0 40 0; #X connect 10 0 42 0; -#X connect 11 0 44 0; -#X connect 13 0 35 2; -#X connect 14 0 13 0; -#X connect 15 0 35 1; -#X connect 16 0 19 0; +#X connect 12 0 34 2; +#X connect 13 0 12 0; +#X connect 14 0 34 1; +#X connect 15 0 18 0; +#X connect 16 0 14 0; #X connect 17 0 15 0; -#X connect 18 0 16 0; -#X connect 19 0 35 0; -#X connect 20 0 26 0; -#X connect 21 0 23 0; -#X connect 21 0 24 0; +#X connect 18 0 34 0; +#X connect 19 0 25 0; +#X connect 20 0 22 0; +#X connect 20 0 23 0; +#X connect 20 0 25 1; #X connect 21 0 26 1; -#X connect 22 0 27 1; -#X connect 23 0 22 1; -#X connect 24 0 27 0; -#X connect 24 1 22 0; -#X connect 25 0 26 1; -#X connect 26 0 21 0; -#X connect 27 0 28 0; -#X connect 28 0 0 0; -#X connect 29 0 11 0; -#X connect 31 0 43 0; -#X connect 32 0 16 0; -#X connect 32 1 15 0; -#X connect 32 1 33 0; -#X connect 32 2 13 0; -#X connect 33 0 35 3; -#X connect 34 0 33 0; -#X connect 35 0 36 0; -#X connect 36 0 0 0; -#X connect 37 0 0 0; -#X connect 38 0 30 0; -#X connect 39 0 32 0; -#X connect 40 0 20 0; -#X connect 42 0 38 0; -#X connect 43 0 12 0; -#X connect 44 0 31 0; -#X connect 46 0 49 1; -#X connect 47 0 49 2; -#X connect 48 0 49 3; -#X connect 49 0 8 0; -#X connect 50 0 39 1; -#X connect 50 0 40 1; -#X connect 51 0 31 0; -#X connect 52 0 31 0; -#X connect 53 0 31 0; -#X connect 54 0 31 0; -#X connect 55 0 31 0; -#X connect 56 0 31 0; +#X connect 22 0 21 1; +#X connect 23 0 26 0; +#X connect 23 1 21 0; +#X connect 24 0 25 1; +#X connect 25 0 20 0; +#X connect 26 0 27 0; +#X connect 27 0 0 0; +#X connect 28 0 10 0; +#X connect 30 0 41 0; +#X connect 31 0 15 0; +#X connect 31 1 14 0; +#X connect 31 1 32 0; +#X connect 31 2 12 0; +#X connect 32 0 34 3; +#X connect 33 0 32 0; +#X connect 34 0 56 0; +#X connect 35 0 0 0; +#X connect 36 0 29 0; +#X connect 37 0 31 0; +#X connect 38 0 19 0; +#X connect 40 0 36 0; +#X connect 41 0 11 0; +#X connect 42 0 30 0; +#X connect 44 0 47 1; +#X connect 45 0 47 2; +#X connect 46 0 47 3; +#X connect 47 0 8 0; +#X connect 48 0 37 1; +#X connect 48 0 38 1; +#X connect 49 0 30 0; +#X connect 50 0 30 0; +#X connect 51 0 30 0; +#X connect 52 0 30 0; +#X connect 53 0 30 0; +#X connect 54 0 30 0; +#X connect 55 0 0 0; +#X connect 56 0 0 0; +#X connect 57 0 30 0; +#X connect 58 0 57 0; +#X connect 59 0 57 1; -- cgit v1.2.1