Pd-cvs May 2005

pd-cvs@lists.iem.at

14 participants
407 discussions

externals/nusmuk/msd3D help-msd3D.pd,1.6,1.7
by Nicolas Montgermont 09 May '05

09 May '05

Update of /cvsroot/pure-data/externals/nusmuk/msd3D In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18370/msd3D Modified Files: help-msd3D.pd Log Message: bugs fixed and lists methods ordered Index: help-msd3D.pd =================================================================== RCS file: /cvsroot/pure-data/externals/nusmuk/msd3D/help-msd3D.pd,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** help-msd3D.pd 4 May 2005 12:36:18 -0000 1.6 --- help-msd3D.pd 9 May 2005 14:12:25 -0000 1.7 *************** *** 23,28 **** #X obj 61 595 cnv 15 610 245 empty empty GET_ATTRIBUTES 20 12 0 14 -261689 -66577 0; - #X msg 147 622 massePosL; - #X msg 146 696 masseForcesL; #X text 248 622 output all masses positions in a list on outlet No 1; --- 23,26 ---- *************** *** 39,52 **** #X text 246 817 Get infos on all masses and links on outlet No 2; #X text 347 533 \$1 : Value; ! #X text 73 22 MASSES :; ! #X text 66 69 They got only one physical parameter \, the value of their; ! #X text 67 83 mass. They can be mobile or fixed \, in this case forces ; ! #X text 67 54 The msd masses are the principals objects of the model. ; ! #X text 66 97 applied on them automatically \, by links \, or manually \, by; ! #X text 67 112 messages \, don't do anything.; #X msg 81 556 setMobile \$1 \, setFixed \$1; #X text 345 556 Change mobile parameter; --- 37,50 ---- #X text 246 817 Get infos on all masses and links on outlet No 2; #X text 347 533 \$1 : Value; ! #X text 73 9 MASSES :; ! #X text 64 45 They got only one physical parameter \, the value of their; ! #X text 65 59 mass. They can be mobile or fixed \, in this case forces ; ! #X text 64 30 The msd masses are the principals objects of the model. ; ! #X text 64 73 applied on them automatically \, by links \, or manually \, by; ! #X text 65 88 messages \, don't do anything.; #X msg 81 556 setMobile \$1 \, setFixed \$1; #X text 345 556 Change mobile parameter; *************** *** 66,87 **** #X text 247 648 output all masses x/y/z positions in a list on outlet No 1; ! #X msg 146 648 massePosYL; ! #X msg 147 670 massePosZL; ! #X msg 67 648 massePosXL; ! #X connect 1 0 50 0; ! #X connect 8 0 50 0; ! #X connect 13 0 50 0; ! #X connect 16 0 50 0; ! #X connect 18 0 50 0; ! #X connect 19 0 50 0; ! #X connect 22 0 50 0; ! #X connect 26 0 50 0; ! #X connect 29 0 50 0; ! #X connect 38 0 50 0; ! #X connect 44 0 50 0; ! #X connect 45 0 50 0; ! #X connect 54 0 50 0; ! #X connect 55 0 50 0; ! #X connect 56 0 50 0; #X restore 159 305 pd masses; #X text 12 305 HELP on masses --->; --- 64,89 ---- #X text 247 648 output all masses x/y/z positions in a list on outlet No 1; ! #X msg 147 622 massesPosL; ! #X msg 146 648 massesPosYL; ! #X msg 147 670 massesPosZL; ! #X msg 146 696 massesForcesL; ! #X msg 67 648 massesPosXL; ! #X text 64 103 Be careful : if masses are deleted \, lists messages ! won't work; ! #X connect 1 0 48 0; ! #X connect 8 0 48 0; ! #X connect 13 0 48 0; ! #X connect 16 0 48 0; ! #X connect 20 0 48 0; ! #X connect 24 0 48 0; ! #X connect 27 0 48 0; ! #X connect 36 0 48 0; ! #X connect 42 0 48 0; ! #X connect 43 0 48 0; ! #X connect 52 0 48 0; ! #X connect 53 0 48 0; ! #X connect 54 0 48 0; ! #X connect 55 0 48 0; ! #X connect 56 0 48 0; #X restore 159 305 pd masses; #X text 12 305 HELP on masses --->;

1 0

externals/nusmuk/msd 01_msdtest.pd, 1.2, 1.3 help-msd.pd, 1.5, 1.6
by Nicolas Montgermont 09 May '05

09 May '05

Update of /cvsroot/pure-data/externals/nusmuk/msd In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18370/msd Modified Files: 01_msdtest.pd help-msd.pd Log Message: bugs fixed and lists methods ordered Index: help-msd.pd =================================================================== RCS file: /cvsroot/pure-data/externals/nusmuk/msd/help-msd.pd,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** help-msd.pd 28 Apr 2005 15:22:05 -0000 1.5 --- help-msd.pd 9 May 2005 14:12:22 -0000 1.6 *************** *** 24,29 **** #X obj 61 617 cnv 15 610 198 empty empty GET_ATTRIBUTES 20 12 0 14 -261689 -66577 0; - #X msg 147 644 massePosL; - #X msg 147 672 masseForcesL; #X text 248 644 output all masses positions in a list on outlet No 1; --- 24,27 ---- *************** *** 48,52 **** #X text 67 83 mass. They can be mobile or fixed \, in this case forces ; ! #X text 67 54 The msd masses are the principals objects of the model. ; #X text 66 97 applied on them automatically \, by links \, or manually --- 46,50 ---- #X text 67 83 mass. They can be mobile or fixed \, in this case forces ; ! #X text 66 54 The msd masses are the principals objects of the model. ; #X text 66 97 applied on them automatically \, by links \, or manually *************** *** 59,74 **** #X text 350 449 \$1 : Id (symbol) or No; #X text 348 503 \$1 : Id (symbol) or No; #X connect 2 0 0 0; #X connect 9 0 0 0; #X connect 14 0 0 0; #X connect 17 0 0 0; ! #X connect 19 0 0 0; ! #X connect 20 0 0 0; ! #X connect 23 0 0 0; ! #X connect 27 0 0 0; ! #X connect 28 0 0 0; #X connect 31 0 0 0; ! #X connect 33 0 0 0; ! #X connect 42 0 0 0; #X restore 282 323 pd masses; #N canvas 222 83 808 841 links 0; --- 57,76 ---- #X text 350 449 \$1 : Id (symbol) or No; #X text 348 503 \$1 : Id (symbol) or No; + #X msg 147 644 massesPosL; + #X msg 147 672 massesForcesL; + #X text 66 128 Be careful : if masses are deleted \, lists messages + won't work; #X connect 2 0 0 0; #X connect 9 0 0 0; #X connect 14 0 0 0; #X connect 17 0 0 0; ! #X connect 21 0 0 0; ! #X connect 25 0 0 0; ! #X connect 26 0 0 0; ! #X connect 29 0 0 0; #X connect 31 0 0 0; ! #X connect 40 0 0 0; ! #X connect 46 0 0 0; ! #X connect 47 0 0 0; #X restore 282 323 pd masses; #N canvas 222 83 808 841 links 0; Index: 01_msdtest.pd =================================================================== RCS file: /cvsroot/pure-data/externals/nusmuk/msd/01_msdtest.pd,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** 01_msdtest.pd 15 Apr 2005 18:13:39 -0000 1.2 --- 01_msdtest.pd 9 May 2005 14:12:22 -0000 1.3 *************** *** 33,46 **** 0; #X obj 88 590 vsl 15 128 0 100 0 0 empty empty empty 0 -8 0 8 -261689 ! -1 -1 8218 1; #X obj 111 590 vsl 15 128 0 100 0 0 empty empty empty 0 -8 0 8 -261689 ! -1 -1 6270 1; #X obj 66 590 vsl 15 128 0 100 0 0 empty empty empty 0 -8 0 8 -261689 -1 -1 10160 1; #X msg 52 736 posX fix \$1; #X obj 156 590 vsl 15 128 0 100 0 0 empty empty empty 0 -8 0 8 -261689 ! -1 -1 2445 1; #X obj 134 590 vsl 15 128 0 100 0 0 empty empty empty 0 -8 0 8 -261689 ! -1 -1 4345 1; #X text 199 638 MOVE FIRST SLIDER; #X text 182 662 TO MOVE THE FIXED MASS; --- 33,46 ---- 0; #X obj 88 590 vsl 15 128 0 100 0 0 empty empty empty 0 -8 0 8 -261689 ! -1 -1 8396 1; #X obj 111 590 vsl 15 128 0 100 0 0 empty empty empty 0 -8 0 8 -261689 ! -1 -1 6393 1; #X obj 66 590 vsl 15 128 0 100 0 0 empty empty empty 0 -8 0 8 -261689 -1 -1 10160 1; #X msg 52 736 posX fix \$1; #X obj 156 590 vsl 15 128 0 100 0 0 empty empty empty 0 -8 0 8 -261689 ! -1 -1 2427 1; #X obj 134 590 vsl 15 128 0 100 0 0 empty empty empty 0 -8 0 8 -261689 ! -1 -1 4369 1; #X text 199 638 MOVE FIRST SLIDER; #X text 182 662 TO MOVE THE FIXED MASS; *************** *** 51,62 **** #X obj 167 55 t b b b b b b; #X text 205 34 RESET; - #X msg 52 335 bang \, massesPosL; #X obj 52 545 unpack f f f f f; #X obj 52 523 route massesPosL; #X connect 0 0 38 0; ! #X connect 2 0 42 0; #X connect 2 1 1 0; #X connect 3 0 6 0; ! #X connect 6 0 40 0; #X connect 9 0 2 0; #X connect 10 0 38 0; --- 51,62 ---- #X obj 167 55 t b b b b b b; #X text 205 34 RESET; #X obj 52 545 unpack f f f f f; #X obj 52 523 route massesPosL; + #X msg 52 335 bang \, massesPosL; #X connect 0 0 38 0; ! #X connect 2 0 41 0; #X connect 2 1 1 0; #X connect 3 0 6 0; ! #X connect 6 0 42 0; #X connect 9 0 2 0; #X connect 10 0 38 0; *************** *** 85,94 **** #X connect 38 4 14 0; #X connect 38 5 11 0; ! #X connect 40 0 2 0; ! #X connect 41 0 28 0; ! #X connect 41 1 26 0; ! #X connect 41 2 27 0; ! #X connect 41 3 31 0; ! #X connect 41 4 30 0; ! #X connect 42 0 41 0; ! #X connect 42 1 1 0; --- 85,94 ---- #X connect 38 4 14 0; #X connect 38 5 11 0; ! #X connect 40 0 28 0; ! #X connect 40 1 26 0; ! #X connect 40 2 27 0; ! #X connect 40 3 31 0; ! #X connect 40 4 30 0; ! #X connect 41 0 40 0; ! #X connect 41 1 1 0; ! #X connect 42 0 2 0;

1 0

externals/nusmuk msd.h,1.7,1.8
by Nicolas Montgermont 09 May '05

09 May '05

Update of /cvsroot/pure-data/externals/nusmuk In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18370 Modified Files: msd.h Log Message: bugs fixed and lists methods ordered Index: msd.h =================================================================== RCS file: /cvsroot/pure-data/externals/nusmuk/msd.h,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** msd.h 4 May 2005 16:12:09 -0000 1.7 --- msd.h 9 May 2005 14:12:19 -0000 1.8 *************** *** 336,340 **** t_float limit[N][2]; // Limit values ! unsigned int id_mass, id_link, mouse_grab, nearest_mass; // --------------------------------------------------------------- RESET --- 336,340 ---- t_float limit[N][2]; // Limit values ! unsigned int id_mass, id_link, mouse_grab, nearest_mass, link_deleted, mass_deleted; // --------------------------------------------------------------- RESET *************** *** 473,480 **** } ! t_mass *m = mass.remove(GetAInt(argv[0])); if(m) { // Delete all associated links ! for(typename std::vector<t_link *>::iterator it = m->links.begin(); it != m->links.end(); ++it) deletelink(*it); outmass(S_Mass_deleted,m); --- 473,480 ---- } ! t_mass *m = mass.find(GetAInt(argv[0])); if(m) { // Delete all associated links ! for(typename std::vector<t_link *>::iterator it = m->links.begin(); it < m->links.end(); ++it) deletelink(*it); outmass(S_Mass_deleted,m); *************** *** 482,485 **** --- 482,486 ---- mass.remove(m->nbr); delete m; + mass_deleted = 1; } else *************** *** 678,683 **** t_link *l = link.find(GetAInt(argv[0])); ! if(l) deletelink(l); else { error("%s - %s : Index not found",thisName(),GetString(thisTag())); --- 679,686 ---- t_link *l = link.find(GetAInt(argv[0])); ! if(l) { deletelink(l); + link_deleted = 1; + } else { error("%s - %s : Index not found",thisName(),GetString(thisTag())); *************** *** 838,860 **** // List of masses positions on first outlet void m_mass_dumpl() ! { ! int sz = mass.size(); ! NEWARR(t_atom,sortie,sz*N); ! t_atom *s = sortie; ! for(typename IndexMap<t_mass *>::iterator mit(mass); mit; ++mit) ! for(int i = 0; i < N; ++i) SetFloat(*(s++),mit.data()->pos[i]); ! ToOutAnything(0, S_massesPosL, sz*N, sortie); ! DELARR(sortie); } // List of masses x positions on first outlet void m_mass_dump_xl() { ! int sz = mass.size(); ! NEWARR(t_atom,sortie,sz); ! t_atom *s = sortie; ! for(typename IndexMap<t_mass *>::iterator mit(mass); mit; ++mit) ! SetFloat(*(s++),mit.data()->pos[0]); ! ToOutAnything(0, S_massesPosXL, sz, sortie); ! DELARR(sortie); } --- 841,872 ---- // List of masses positions on first outlet void m_mass_dumpl() ! { ! if (mass_deleted ==0) { ! int sz = mass.size(); ! NEWARR(t_atom,sortie,sz*N); ! t_atom *s = sortie; ! for(typename IndexMap<t_mass *>::iterator mit(mass); mit; ++mit) ! for(int i = 0; i < N; ++i) SetFloat(s[mit.data()->nbr*N+i],mit.data()->pos[i]); ! ToOutAnything(0, S_massesPosL, sz*N, sortie); ! DELARR(sortie); ! } ! else ! error("%s - %s : Message Forbidden when deletion is used",thisName(),GetString(thisTag())); } + // List of masses x positions on first outlet void m_mass_dump_xl() { ! if (mass_deleted ==0) { ! int sz = mass.size(); ! NEWARR(t_atom,sortie,sz); ! t_atom *s = sortie; ! for(typename IndexMap<t_mass *>::iterator mit(mass); mit; ++mit) ! SetFloat(s[mit.data()->nbr],mit.data()->pos[0]); ! ToOutAnything(0, S_massesPosXL, sz, sortie); ! DELARR(sortie); ! } ! else ! error("%s - %s : Message Forbidden when deletion is used",thisName(),GetString(thisTag())); } *************** *** 862,872 **** void m_mass_dump_yl() { ! int sz = mass.size(); ! NEWARR(t_atom,sortie,sz); ! t_atom *s = sortie; ! for(typename IndexMap<t_mass *>::iterator mit(mass); mit; ++mit) ! SetFloat(*(s++),mit.data()->pos[1]); ! ToOutAnything(0, S_massesPosYL, sz, sortie); ! DELARR(sortie); } --- 874,888 ---- void m_mass_dump_yl() { ! if (mass_deleted ==0) { ! int sz = mass.size(); ! NEWARR(t_atom,sortie,sz); ! t_atom *s = sortie; ! for(typename IndexMap<t_mass *>::iterator mit(mass); mit; ++mit) ! SetFloat(s[mit.data()->nbr],mit.data()->pos[1]); ! ToOutAnything(0, S_massesPosYL, sz, sortie); ! DELARR(sortie); ! } ! else ! error("%s - %s : Message Forbidden when deletion is used",thisName(),GetString(thisTag())); } *************** *** 874,884 **** void m_mass_dump_zl() { ! int sz = mass.size(); ! NEWARR(t_atom,sortie,sz); ! t_atom *s = sortie; ! for(typename IndexMap<t_mass *>::iterator mit(mass); mit; ++mit) ! SetFloat(*(s++),mit.data()->pos[2]); ! ToOutAnything(0, S_massesPosZL, sz, sortie); ! DELARR(sortie); } --- 890,904 ---- void m_mass_dump_zl() { ! if (mass_deleted ==0) { ! int sz = mass.size(); ! NEWARR(t_atom,sortie,sz); ! t_atom *s = sortie; ! for(typename IndexMap<t_mass *>::iterator mit(mass); mit; ++mit) ! SetFloat(s[mit.data()->nbr],mit.data()->pos[2]); ! ToOutAnything(0, S_massesPosZL, sz, sortie); ! DELARR(sortie); ! } ! else ! error("%s - %s : Message Forbidden when deletion is used",thisName(),GetString(thisTag())); } *************** *** 886,896 **** void m_force_dumpl() { ! int sz = mass.size(); ! NEWARR(t_atom,sortie,sz*N); ! t_atom *s = sortie; ! for(typename IndexMap<t_mass *>::iterator mit(mass); mit; ++mit) ! for(int i = 0; i < N; ++i) SetFloat(*(s++),mit.data()->out_force[i]); ! ToOutAnything(0, S_massesForcesL, sz*N, sortie); ! DELARR(sortie); } --- 906,920 ---- void m_force_dumpl() { ! if (mass_deleted ==0) { ! int sz = mass.size(); ! NEWARR(t_atom,sortie,sz*N); ! t_atom *s = sortie; ! for(typename IndexMap<t_mass *>::iterator mit(mass); mit; ++mit) ! for(int i = 0; i < N; ++i) SetFloat(s[mit.data()->nbr*N+i],mit.data()->out_force[i]); ! ToOutAnything(0, S_massesForcesL, sz*N, sortie); ! DELARR(sortie); ! } ! else ! error("%s - %s : Message Forbidden when deletion is used",thisName(),GetString(thisTag())); } *************** *** 919,923 **** mass.reset(); ! id_mass = id_link = mouse_grab = 0; } --- 943,947 ---- mass.reset(); ! id_mass = id_link = mouse_grab = mass_deleted = link_deleted = 0; }

1 0

pd/src m_fifo.c,1.1.2.12,1.1.2.13
by Tim Blechmann 09 May '05

09 May '05

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8096 Modified Files: Tag: devel_0_38 m_fifo.c Log Message: lockfree fifos for amd64 architecture (not working for all revisions) Index: m_fifo.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/m_fifo.c,v retrieving revision 1.1.2.12 retrieving revision 1.1.2.13 diff -C2 -d -r1.1.2.12 -r1.1.2.13 *** m_fifo.c 6 May 2005 09:33:52 -0000 1.1.2.12 --- m_fifo.c 9 May 2005 13:26:47 -0000 1.1.2.13 *************** *** 327,330 **** --- 327,382 ---- } + #elif defined(__GNUC__) && defined(__x86_64__) + + /* this will not work for all revisions of the amd64 architecture ... */ + + static void* lifo_pop(t_lifo* lifo) + { + void * data = 0; + __asm__ __volatile__ ( + "# LFPOP \n\t" + "push %%rbx \n\t" + "push %%rcx \n\t" + "mov 8(%%rdi), %%rdx \n\t" + "mov (%%rdi), %%rax \n\t" + "test %%rax, %%rax \n\t" + "jz 20f \n" + "10:\t" + "mov (%%rax), %%rbx \n\t" + "mov %%rdx, %%rcx \n\t" + "inc %%rcx \n\t" + LOCK "cmpxchg16b (%%rdi) \n\t" + "jz 20f \n\t" + "test %%rax, %%rax \n\t" + "jnz 10b \n" + "20:\t" + "pop %%rcx \n\t" + "pop %%rbx \n\t" + :"=a" (data) + :"S" (&lifo->top) + :"memory", "rdx"); + return data; + } + + static void lifo_push(t_lifo * lifo, void * data) + { + __asm__ __volatile__ ( + "# LFPUSH \n\t" + "push %%rbx \n\t" + "push %%rcx \n\t" + "mov 0(%%rdi), %%rax \n\t" + "mov 8(%%rdi), %%rdx \n" + "1:\t" + "mov %%rax, %%rbx \n\t" + "inc %%rbx \n\t" + "mov %%rdx, (%%rcx) \n\t" + LOCK "cmpxchg16b (%%rdi) \n\t" + "jnz 1b \n\t" + "pop %%rcx \n\t" + "pop %%rbx \n\t" + :/* no output */ + :"S" (lifo), "c" (data) + :"memory", "rax", "rdx"); + } #elif defined(__Windows__)

1 0

pd/src s_inter.c, 1.5.4.7, 1.5.4.8 m_sched.c, 1.5.4.26, 1.5.4.27
by Tim Blechmann 09 May '05

09 May '05

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14304 Modified Files: Tag: devel_0_38 s_inter.c m_sched.c Log Message: - scheduler cleanup: there are professional profilers out there - split microsleep & socket polling Index: s_inter.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/s_inter.c,v retrieving revision 1.5.4.7 retrieving revision 1.5.4.8 diff -C2 -d -r1.5.4.7 -r1.5.4.8 *** s_inter.c 9 Jan 2005 13:03:01 -0000 1.5.4.7 --- s_inter.c 8 May 2005 23:14:35 -0000 1.5.4.8 *************** *** 151,198 **** } ! static int sys_domicrosleep(int microsec, int pollem) { struct timeval timout; ! int i, didsomething = 0; t_fdpoll *fp; timout.tv_sec = 0; ! timout.tv_usec = microsec; ! if (pollem) ! { ! fd_set readset, writeset, exceptset; ! FD_ZERO(&writeset); ! FD_ZERO(&readset); ! FD_ZERO(&exceptset); ! for (fp = sys_fdpoll, i = sys_nfdpoll; i--; fp++) ! FD_SET(fp->fdp_fd, &readset); ! #ifdef MSW ! if (sys_maxfd == 0) ! Sleep(microsec/1000); ! else ! #endif ! select(sys_maxfd+1, &readset, &writeset, &exceptset, &timout); ! for (i = 0; i < sys_nfdpoll; i++) ! if (FD_ISSET(sys_fdpoll[i].fdp_fd, &readset)) { (*sys_fdpoll[i].fdp_fn)(sys_fdpoll[i].fdp_ptr, sys_fdpoll[i].fdp_fd); didsomething = 1; } ! return (didsomething); ! } ! else ! { ! #ifdef MSW ! if (sys_maxfd == 0) ! Sleep(microsec/1000); ! else ! #endif ! select(0, 0, 0, 0, &timout); ! return (0); ! } } void sys_microsleep(int microsec) { ! sys_domicrosleep(microsec, 1); } --- 151,192 ---- } ! ! int sys_pollsockets (void) { struct timeval timout; ! int didsomething = 0; ! int i; t_fdpoll *fp; timout.tv_sec = 0; ! timout.tv_usec = 0; ! ! fd_set readset, writeset, exceptset; ! FD_ZERO(&writeset); ! FD_ZERO(&readset); ! FD_ZERO(&exceptset); ! for (fp = sys_fdpoll, i = sys_nfdpoll; i--; fp++) ! FD_SET(fp->fdp_fd, &readset); ! ! select(sys_maxfd+1, &readset, &writeset, &exceptset, &timout); ! for (i = 0; i < sys_nfdpoll; i++) ! if (FD_ISSET(sys_fdpoll[i].fdp_fd, &readset)) { (*sys_fdpoll[i].fdp_fn)(sys_fdpoll[i].fdp_ptr, sys_fdpoll[i].fdp_fd); didsomething = 1; } ! return (didsomething); } void sys_microsleep(int microsec) { ! #ifndef MSW ! struct timespec rec, rem; ! rec.tv_sec = 0; ! rec.tv_nsec = 100 * microsec; ! nanosleep(&rec, &rem); ! #else ! /* tb: sleep granularity on windows only 1ms??? */ ! Sleep(microsec/1000); ! #endif } *************** *** 818,822 **** int sys_pollgui(void) { ! return (sys_domicrosleep(0, 1) || sys_poll_togui()); } --- 812,817 ---- int sys_pollgui(void) { ! /* return (sys_domicrosleep(0, 1) || sys_poll_togui()); */ ! return (sys_pollsockets() || sys_poll_togui()); } Index: m_sched.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/m_sched.c,v retrieving revision 1.5.4.26 retrieving revision 1.5.4.27 diff -C2 -d -r1.5.4.26 -r1.5.4.27 *** m_sched.c 4 May 2005 17:13:57 -0000 1.5.4.26 --- m_sched.c 8 May 2005 23:14:35 -0000 1.5.4.27 *************** *** 356,363 **** } ! /* take the scheduler forward one DSP tick, also handling clock timeouts */ ! void sched_tick(double next_sys_time) { - int countdown = 5000; while (clock_setlist && clock_setlist->c_settime < next_sys_time) { --- 356,362 ---- } ! ! static void run_clock_callbacks(double next_sys_time) { while (clock_setlist && clock_setlist->c_settime < next_sys_time) { *************** *** 367,383 **** outlet_setstacklim(); (*c->c_fn)(c->c_owner); - if (!countdown--) - { - countdown = 5000; - sys_pollgui(); - } if (sys_quit) return; } ! sys_time = next_sys_time; dsp_tick(); - sched_diddsp++; } /* Here is Pd's "main loop." This routine dispatches clock timeouts and DSP --- 366,384 ---- outlet_setstacklim(); (*c->c_fn)(c->c_owner); if (sys_quit) return; } ! } ! ! ! /* take the scheduler forward one DSP tick, also handling clock timeouts */ ! void sched_tick(double next_sys_time) ! { ! run_clock_callbacks(next_sys_time); /* tb: is the dsp tick the right place for this? */ ! sys_time = next_sys_time; dsp_tick(); } + /* Here is Pd's "main loop." This routine dispatches clock timeouts and DSP *************** *** 431,435 **** int timeforward; - /* sys_addhist(0); */ waitfortick: if (sched_usedacs) --- 432,435 ---- *************** *** 467,471 **** } sys_setmiditimediff(0, 1e-6 * sys_schedadvance); ! /* sys_addhist(1); */ if (timeforward != SENDDACS_NO) sched_tick(sys_time + sys_time_per_dsp_tick); --- 467,471 ---- } sys_setmiditimediff(0, 1e-6 * sys_schedadvance); ! if (timeforward != SENDDACS_NO) sched_tick(sys_time + sys_time_per_dsp_tick); *************** *** 473,485 **** didsomething = 1; - /* sys_addhist(2); */ sys_pollmidiqueue(); if (sys_pollgui()) { - /* if (!didsomething) */ - /* sched_didpoll++; */ didsomething = 1; } - /* sys_addhist(3); */ /* test for idle; if so, do graphics updates. */ --- 473,481 ---- *************** *** 488,492 **** sched_pollformeters(); - /* sys_reportidle(); */ /* tb: call idle callbacks */ --- 484,487 ---- *************** *** 503,510 **** #endif } - - /* sys_addhist(5); */ - /* sched_didnothing++; */ - } } --- 498,501 ----

1 0

externals/PDContainer makefile, 1.3, 1.4 makefile_darwin, 1.2, 1.3 makefile_mingw, 1.1, 1.2 readme.txt, 1.1.1.1, 1.2
by Georg Holzmann 08 May '05

08 May '05

Update of /cvsroot/pure-data/externals/PDContainer In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26476 Modified Files: makefile makefile_darwin makefile_mingw readme.txt Log Message: new makefiles ... Index: makefile_darwin =================================================================== RCS file: /cvsroot/pure-data/externals/PDContainer/makefile_darwin,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** makefile_darwin 22 Feb 2005 11:32:37 -0000 1.2 --- makefile_darwin 8 May 2005 17:00:37 -0000 1.3 *************** *** 1,3 **** - PD-PATH=/usr/lib/pd PD-SCR=/usr/include --- 1,2 ---- *************** *** 18,22 **** HVector.o h_vector.o HDeque.o h_deque.o \ HQueue.o h_queue.o HStack.o h_stack.o \ ! HList.o h_list.o HPrioQueue.o h_prioqueue.o #-------------------------------------------------------- --- 17,22 ---- HVector.o h_vector.o HDeque.o h_deque.o \ HQueue.o h_queue.o HStack.o h_stack.o \ ! HList.o h_list.o HPrioQueue.o h_prioqueue.o \ ! tinystr.o tinyxml.o tinyxmlerror.o tinyxmlparser.o #-------------------------------------------------------- *************** *** 93,96 **** --- 93,113 ---- HPrioQueue.o: src/HPrioQueue.cpp include/HPrioQueue.h include/QueueStack.h include/ContainerBase.h include/GlobalStuff.h $(CC) $(CC_FLAGS) $(INCLUDE) src/HPrioQueue.cpp + + #TinyXML: + + tinyxml.o: tinyxml/tinyxml.h tinyxml/tinyxml.cpp + $(CC) $(CC_FLAGS) $(INCLUDE) tinyxml/tinyxml.cpp + + tinystr.o: tinyxml/tinystr.h tinyxml/tinystr.cpp + $(CC) $(CC_FLAGS) $(INCLUDE) tinyxml/tinystr.cpp + + tinyxmlerror.o: tinyxml/tinyxmlerror.cpp + $(CC) $(CC_FLAGS) $(INCLUDE) tinyxml/tinyxmlerror.cpp + + tinyxmlparser.o: tinyxml/tinyxmlparser.cpp + $(CC) $(CC_FLAGS) $(INCLUDE) tinyxml/tinyxmlparser.cpp + + + #----------------------------------------------------- Index: makefile =================================================================== RCS file: /cvsroot/pure-data/externals/PDContainer/makefile,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** makefile 29 Oct 2004 11:56:12 -0000 1.3 --- makefile 8 May 2005 17:00:37 -0000 1.4 *************** *** 16,20 **** HVector.o h_vector.o HDeque.o h_deque.o \ HQueue.o h_queue.o HStack.o h_stack.o \ ! HList.o h_list.o HPrioQueue.o h_prioqueue.o #-------------------------------------------------------- --- 16,21 ---- HVector.o h_vector.o HDeque.o h_deque.o \ HQueue.o h_queue.o HStack.o h_stack.o \ ! HList.o h_list.o HPrioQueue.o h_prioqueue.o \ ! tinystr.o tinyxml.o tinyxmlerror.o tinyxmlparser.o #-------------------------------------------------------- *************** *** 92,95 **** --- 93,113 ---- $(CC) $(CC_FLAGS) $(INCLUDE) src/HPrioQueue.cpp + #TinyXML: + + tinyxml.o: tinyxml/tinyxml.h tinyxml/tinyxml.cpp + $(CC) $(CC_FLAGS) $(INCLUDE) tinyxml/tinyxml.cpp + + tinystr.o: tinyxml/tinystr.h tinyxml/tinystr.cpp + $(CC) $(CC_FLAGS) $(INCLUDE) tinyxml/tinystr.cpp + + tinyxmlerror.o: tinyxml/tinyxmlerror.cpp + $(CC) $(CC_FLAGS) $(INCLUDE) tinyxml/tinyxmlerror.cpp + + tinyxmlparser.o: tinyxml/tinyxmlparser.cpp + $(CC) $(CC_FLAGS) $(INCLUDE) tinyxml/tinyxmlparser.cpp + + + #----------------------------------------------------- + clean: Index: makefile_mingw =================================================================== RCS file: /cvsroot/pure-data/externals/PDContainer/makefile_mingw,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** makefile_mingw 26 Oct 2004 16:29:12 -0000 1.1 --- makefile_mingw 8 May 2005 17:00:37 -0000 1.2 *************** *** 16,20 **** HVector.o h_vector.o HDeque.o h_deque.o \ HQueue.o h_queue.o HStack.o h_stack.o \ ! HList.o h_list.o HPrioQueue.o h_prioqueue.o #-------------------------------------------------------- --- 16,21 ---- HVector.o h_vector.o HDeque.o h_deque.o \ HQueue.o h_queue.o HStack.o h_stack.o \ ! HList.o h_list.o HPrioQueue.o h_prioqueue.o \ ! tinystr.o tinyxml.o tinyxmlerror.o tinyxmlparser.o #-------------------------------------------------------- *************** *** 91,94 **** --- 92,112 ---- HPrioQueue.o: src/HPrioQueue.cpp include/HPrioQueue.h include/QueueStack.h include/ContainerBase.h include/GlobalStuff.h $(CC) $(CC_FLAGS) $(INCLUDE) src/HPrioQueue.cpp + + #TinyXML: + + tinyxml.o: tinyxml/tinyxml.h tinyxml/tinyxml.cpp + $(CC) $(CC_FLAGS) $(INCLUDE) tinyxml/tinyxml.cpp + + tinystr.o: tinyxml/tinystr.h tinyxml/tinystr.cpp + $(CC) $(CC_FLAGS) $(INCLUDE) tinyxml/tinystr.cpp + + tinyxmlerror.o: tinyxml/tinyxmlerror.cpp + $(CC) $(CC_FLAGS) $(INCLUDE) tinyxml/tinyxmlerror.cpp + + tinyxmlparser.o: tinyxml/tinyxmlparser.cpp + $(CC) $(CC_FLAGS) $(INCLUDE) tinyxml/tinyxmlparser.cpp + + + #----------------------------------------------------- Index: readme.txt =================================================================== RCS file: /cvsroot/pure-data/externals/PDContainer/readme.txt,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** readme.txt 25 Oct 2004 19:02:29 -0000 1.1.1.1 --- readme.txt 8 May 2005 17:00:37 -0000 1.2 *************** *** 1,3 **** ! PDContainer - by Georg Holzmann <grh(a)gmx.at>, 2004 --- 1,3 ---- ! PDContainer - by Georg Holzmann <grh(a)mur.at>, 2004 *************** *** 44,48 **** ::: SAVE/LOAD ::: ! All the data of all containers can be saved to disk. So you can also manually edit ! the file with an editor (which is sometimes much faster) and then load it in PD into the ! specific container. (In future I'll also make a XML-fileformat, which will be easier to edit !) \ No newline at end of file --- 44,47 ---- ::: SAVE/LOAD ::: ! All the data of all containers can be saved to disk as XML or textfile. So you can also manually edit the file with an editor (which is sometimes much faster) and then load it in PD into a container. You can also load data from other containers. ! Please use the XML fileformat if possible, because it's easier to edit in an external editor and the XML parser is much more stable.

1 0

externals/nusmuk/msd2D/editor make_circ.pd,1.1,1.2
by Frank Barknecht 08 May '05

08 May '05

Update of /cvsroot/pure-data/externals/nusmuk/msd2D/editor In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20955 Modified Files: make_circ.pd Log Message: little simplification Index: make_circ.pd =================================================================== RCS file: /cvsroot/pure-data/externals/nusmuk/msd2D/editor/make_circ.pd,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** make_circ.pd 8 May 2005 13:19:05 -0000 1.1 --- make_circ.pd 8 May 2005 14:08:59 -0000 1.2 *************** *** 13,26 **** #X obj 79 330 + 0; #X obj 95 304 r \$0-x0; ! #N canvas 195 426 450 300 2029-turnme 0; ! #X obj 115 64 inlet; ! #X obj 120 218 outlet; ! #X obj 157 81 r \$0-masses; ! #X obj 301 137 r \$0-radius; ! #X obj 155 163 expr $f2 * sin($f1) \; $f2 * cos($f1); #X obj 119 102 / 1; ! #X obj 292 210 outlet; ! #X obj 155 135 * 0.01745; ! #X obj 157 113 * 360; #X connect 0 0 5 0; #X connect 2 0 5 1; --- 13,26 ---- #X obj 79 330 + 0; #X obj 95 304 r \$0-x0; ! #N canvas 484 634 450 300 1028-turnme 0; ! #X obj 119 48 inlet; ! #X obj 119 243 outlet; ! #X obj 135 77 r \$0-masses; ! #X obj 254 169 r \$0-radius; ! #X obj 119 195 expr $f2 * sin($f1) \; $f2 * cos($f1); #X obj 119 102 / 1; ! #X obj 254 242 outlet; ! #X obj 119 134 * 6.28319; ! #X text 192 132 2 * M_PI; #X connect 0 0 5 0; #X connect 2 0 5 1; *************** *** 28,38 **** #X connect 4 0 1 0; #X connect 4 1 6 0; ! #X connect 5 0 8 0; #X connect 7 0 4 0; - #X connect 8 0 7 0; #X restore 79 122 pd \$0-turnme; ! #N canvas 0 0 723 519 2029-count 0; #X text 294 126 count y; ! #N canvas 0 0 450 300 2029-count 0; #X obj 112 28 inlet; #X obj 116 96 f 0; --- 28,37 ---- #X connect 4 0 1 0; #X connect 4 1 6 0; ! #X connect 5 0 7 0; #X connect 7 0 4 0; #X restore 79 122 pd \$0-turnme; ! #N canvas 0 0 723 519 1028-count 0; #X text 294 126 count y; ! #N canvas 0 0 450 300 1028-count 0; #X obj 112 28 inlet; #X obj 116 96 f 0;

1 0

externals/nusmuk/msd2D/editor msd2d-editor.pd,1.9,1.10
by Frank Barknecht 08 May '05

08 May '05

Update of /cvsroot/pure-data/externals/nusmuk/msd2D/editor In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12144 Modified Files: msd2d-editor.pd Log Message: remove one missed debug print. Index: msd2d-editor.pd =================================================================== RCS file: /cvsroot/pure-data/externals/nusmuk/msd2D/editor/msd2d-editor.pd,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** msd2d-editor.pd 8 May 2005 13:19:05 -0000 1.9 --- msd2d-editor.pd 8 May 2005 13:26:40 -0000 1.10 *************** *** 237,241 **** #X obj 219 307 ds-next; #X msg 260 281 next; - #X obj 74 351 print set-lid; #X obj 238 51 del 0; #X connect 0 0 2 0; --- 237,240 ---- *************** *** 243,247 **** #X connect 3 0 2 1; #X connect 4 0 2 1; ! #X connect 5 0 21 0; #X connect 6 1 4 0; #X connect 6 2 9 0; --- 242,246 ---- #X connect 3 0 2 1; #X connect 4 0 2 1; ! #X connect 5 0 20 0; #X connect 6 1 4 0; #X connect 6 2 9 0; *************** *** 256,263 **** #X connect 11 1 14 0; #X connect 14 0 15 0; ! #X connect 14 0 20 0; ! #X connect 17 0 21 1; #X connect 19 0 7 0; ! #X connect 21 0 6 0; #X restore 148 322 pd set-lid; #X text 238 322 Correct lids to match what msd2D tells us; --- 255,261 ---- #X connect 11 1 14 0; #X connect 14 0 15 0; ! #X connect 17 0 20 1; #X connect 19 0 7 0; ! #X connect 20 0 6 0; #X restore 148 322 pd set-lid; #X text 238 322 Correct lids to match what msd2D tells us; *************** *** 753,759 **** select the other masses and set toggle to 0; #X obj 707 106 tgl 15 0 \$0-poll-ds \$0-poll-ds poll-ds 0 -6 0 8 -225280 ! -1 -1 1 1; #X obj 765 106 tgl 15 0 \$0-set-ds \$0-set-ds set-ds 0 -6 0 8 -225271 ! -1 -1 1 1; #X text 669 75 Data struct anim ON/OFF:; #N canvas 504 489 531 315 TODO 0; --- 751,757 ---- select the other masses and set toggle to 0; #X obj 707 106 tgl 15 0 \$0-poll-ds \$0-poll-ds poll-ds 0 -6 0 8 -225280 ! -1 -1 0 1; #X obj 765 106 tgl 15 0 \$0-set-ds \$0-set-ds set-ds 0 -6 0 8 -225271 ! -1 -1 0 1; #X text 669 75 Data struct anim ON/OFF:; #N canvas 504 489 531 315 TODO 0;

1 0

externals/nusmuk/msd2D/editor ds-next.pd, NONE, 1.1 ds-vnext.pd, NONE, 1.1 make_circ.pd, NONE, 1.1 make_rect.pd, NONE, 1.1 sixpack.pd, NONE, 1.1 morelinks.pd, 1.4, 1.5 msd2d-editor.pd, 1.8, 1.9 msd_append.pd, 1.3, 1.4
by Frank Barknecht 08 May '05

08 May '05

Update of /cvsroot/pure-data/externals/nusmuk/msd2D/editor In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10351 Modified Files: morelinks.pd msd2d-editor.pd msd_append.pd Added Files: ds-next.pd ds-vnext.pd make_circ.pd make_rect.pd sixpack.pd Log Message: Lots of changes: added geometric formations (geos), fixed some problems,... --- NEW FILE: make_circ.pd --- #N canvas 496 414 573 483 10; #X obj 79 355 pack 0 0; #X obj 79 388 outlet; #X obj 235 67 unpack 0 0 0 0; #X obj 235 233 s \$0-x0; #X obj 274 205 s \$0-y0; #X obj 312 173 s \$0-radius; #X obj 352 150 s \$0-masses; #X obj 235 43 inlet; #X obj 79 34 inlet; #X obj 130 332 + 0; #X obj 149 304 r \$0-y0; #X obj 79 330 + 0; #X obj 95 304 r \$0-x0; #N canvas 195 426 450 300 2029-turnme 0; #X obj 115 64 inlet; #X obj 120 218 outlet; #X obj 157 81 r \$0-masses; #X obj 301 137 r \$0-radius; #X obj 155 163 expr $f2 * sin($f1) \; $f2 * cos($f1); #X obj 119 102 / 1; #X obj 292 210 outlet; #X obj 155 135 * 0.01745; #X obj 157 113 * 360; #X connect 0 0 5 0; #X connect 2 0 5 1; #X connect 3 0 4 1; #X connect 4 0 1 0; #X connect 4 1 6 0; #X connect 5 0 8 0; #X connect 7 0 4 0; #X connect 8 0 7 0; #X restore 79 122 pd \$0-turnme; #N canvas 0 0 723 519 2029-count 0; #X text 294 126 count y; #N canvas 0 0 450 300 2029-count 0; #X obj 112 28 inlet; #X obj 116 96 f 0; #X obj 156 98 + 1; #X obj 178 52 inlet; #X msg 175 73 0; #X obj 118 122 outlet; #X obj 112 66 until; #X connect 0 0 6 0; #X connect 1 0 2 0; #X connect 1 0 5 0; #X connect 2 0 1 1; #X connect 3 0 4 0; #X connect 4 0 1 1; #X connect 6 0 1 0; #X restore 237 228 pd \$0-count; #X obj 237 103 inlet; #X obj 237 371 outlet; #X obj 237 130 t b b; #X obj 262 176 r \$0-masses; #X obj 237 197 f 1; #X connect 1 0 3 0; #X connect 2 0 4 0; #X connect 4 0 6 0; #X connect 4 1 1 1; #X connect 5 0 6 1; #X connect 6 0 1 0; #X restore 79 80 pd \$0-count; #X obj 235 125 f \$1; #X obj 274 124 f \$2; #X obj 312 124 f \$3; #X obj 352 124 f \$4; #X obj 352 67 loadbang; #X connect 0 0 1 0; #X connect 2 0 15 0; #X connect 2 1 16 0; #X connect 2 2 17 0; #X connect 2 3 18 0; #X connect 7 0 2 0; #X connect 8 0 14 0; #X connect 9 0 0 1; #X connect 10 0 9 1; #X connect 11 0 0 0; #X connect 12 0 11 1; #X connect 13 0 11 0; #X connect 13 1 9 0; #X connect 14 0 13 0; #X connect 15 0 3 0; #X connect 16 0 4 0; #X connect 17 0 5 0; #X connect 18 0 6 0; #X connect 19 0 18 0; #X connect 19 0 17 0; #X connect 19 0 16 0; #X connect 19 0 15 0; --- NEW FILE: ds-vnext.pd --- #N canvas 0 0 450 300 10; #X obj 138 76 inlet; #X obj 138 214 outlet; #X obj 138 111 t b; #X msg 138 168 vnext 1; #X obj 138 140 del 1; #X connect 0 0 2 0; #X connect 2 0 4 0; #X connect 3 0 1 0; #X connect 4 0 3 0; Index: msd2d-editor.pd =================================================================== RCS file: /cvsroot/pure-data/externals/nusmuk/msd2D/editor/msd2d-editor.pd,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** msd2d-editor.pd 5 May 2005 15:12:45 -0000 1.8 --- msd2d-editor.pd 8 May 2005 13:19:05 -0000 1.9 *************** *** 1,4 **** ! #N canvas 34 224 866 562 10; ! #N canvas 0 0 1222 870 data 0; #X restore 719 51 pd data; #X obj 24 523 structures; --- 1,4 ---- ! #N canvas 121 260 866 562 10; ! #N canvas 334 79 1222 870 data 0; #X restore 719 51 pd data; #X obj 24 523 structures; *************** *** 46,51 **** #X obj 43 72 t b b b b b b b; #X msg 79 168 traverse pd-data \, next; ! #X msg 20 230 next; ! #X obj 79 198 pointer mass; #X obj 143 103 s \$0-reset-counter; #N canvas 331 520 708 349 counter 0; --- 46,50 ---- #X obj 43 72 t b b b b b b b; #X msg 79 168 traverse pd-data \, next; ! #X obj 79 200 pointer mass; #X obj 143 103 s \$0-reset-counter; #N canvas 331 520 708 349 counter 0; *************** *** 71,97 **** #X text 125 434 Store a mapping mid => msdid for fixing links later ; ! #X obj 43 30 inlet; #X obj 158 221 outlet; #X connect 0 5 1 0; ! #X connect 0 6 4 0; ! #X connect 1 0 3 0; ! #X connect 2 0 3 0; ! #X connect 3 0 9 0; ! #X connect 3 1 2 0; ! #X connect 3 2 14 0; ! #X connect 5 0 10 0; ! #X connect 5 0 6 0; ! #X connect 8 0 10 1; ! #X connect 9 0 2 0; ! #X connect 9 1 5 0; ! #X connect 9 4 8 0; ! #X connect 9 5 6 1; ! #X connect 10 0 11 0; ! #X connect 13 0 0 0; #X restore 244 173 pd fix-mass-ids; #N canvas 403 15 685 826 fix-links 0; #X obj 139 158 t b b b b b b b; #X msg 175 254 traverse pd-data \, next; - #X msg 116 316 next; #X obj 239 189 s \$0-reset-counter; #X obj 175 284 pointer liaison; --- 70,101 ---- #X text 125 434 Store a mapping mid => msdid for fixing links later ; ! #X obj 43 24 inlet; #X obj 158 221 outlet; + #X text 96 52 Avoid stack overflow lops; + #X obj 85 23 r \$0-stack-delay; + #X obj 16 228 ds-next; + #X obj 43 51 del 0; #X connect 0 5 1 0; ! #X connect 0 6 3 0; ! #X connect 1 0 2 0; ! #X connect 2 0 8 0; ! #X connect 2 1 16 0; ! #X connect 2 2 13 0; ! #X connect 4 0 9 0; ! #X connect 4 0 5 0; ! #X connect 7 0 9 1; ! #X connect 8 0 16 0; ! #X connect 8 1 4 0; ! #X connect 8 4 7 0; ! #X connect 8 5 5 1; ! #X connect 9 0 10 0; ! #X connect 12 0 17 0; ! #X connect 15 0 17 1; ! #X connect 16 0 2 0; ! #X connect 17 0 0 0; #X restore 244 173 pd fix-mass-ids; #N canvas 403 15 685 826 fix-links 0; #X obj 139 158 t b b b b b b b; #X msg 175 254 traverse pd-data \, next; #X obj 239 189 s \$0-reset-counter; #X obj 175 284 pointer liaison; *************** *** 102,126 **** #X obj 192 389 get liaison mid1 mid2; #X obj 175 333 t b b b b p p; ! #X obj 139 128 inlet; #X obj 275 312 outlet; #X connect 0 5 1 0; ! #X connect 1 0 4 0; ! #X connect 2 0 4 0; ! #X connect 4 0 10 0; ! #X connect 4 1 2 0; ! #X connect 4 2 12 0; ! #X connect 6 0 7 0; ! #X connect 8 0 7 1; ! #X connect 9 0 6 0; ! #X connect 9 1 8 0; ! #X connect 10 0 2 0; ! #X connect 10 4 9 0; ! #X connect 10 5 7 2; ! #X connect 11 0 0 0; #X restore 244 196 pd fix-links; #N canvas 236 8 602 856 get-masses 0; #X obj 148 80 t b b b b b b b; #X msg 184 176 traverse pd-data \, next; - #X msg 135 280 next; #X obj 184 206 pointer mass; #X obj 325 385 select 0; --- 106,135 ---- #X obj 192 389 get liaison mid1 mid2; #X obj 175 333 t b b b b p p; ! #X obj 139 70 inlet; #X obj 275 312 outlet; + #X text 192 106 Avoid stack overflow lops; + #X obj 188 68 r \$0-stack-delay; + #X obj 113 282 ds-next; + #X obj 139 105 del 0; #X connect 0 5 1 0; ! #X connect 1 0 3 0; ! #X connect 3 0 9 0; ! #X connect 3 1 14 0; ! #X connect 3 2 11 0; ! #X connect 5 0 6 0; ! #X connect 7 0 6 1; ! #X connect 8 0 5 0; ! #X connect 8 1 7 0; ! #X connect 9 0 14 0; ! #X connect 9 4 8 0; ! #X connect 9 5 6 2; ! #X connect 10 0 15 0; ! #X connect 13 0 15 1; ! #X connect 14 0 3 0; ! #X connect 15 0 0 0; #X restore 244 196 pd fix-links; #N canvas 236 8 602 856 get-masses 0; #X obj 148 80 t b b b b b b b; #X msg 184 176 traverse pd-data \, next; #X obj 184 206 pointer mass; #X obj 325 385 select 0; *************** *** 139,171 **** #X obj 184 255 t b p; #X obj 214 402 scale-ds2msd; #X connect 0 5 1 0; #X connect 0 6 7 0; ! #X connect 0 6 8 0; ! #X connect 1 0 3 0; ! #X connect 2 0 3 0; ! #X connect 3 0 17 0; ! #X connect 3 1 2 0; ! #X connect 3 2 14 0; ! #X connect 4 0 6 0; ! #X connect 4 1 5 0; ! #X connect 5 0 16 3; ! #X connect 6 0 16 3; ! #X connect 8 0 9 0; ! #X connect 8 0 10 0; ! #X connect 12 0 0 0; ! #X connect 15 0 18 0; ! #X connect 15 1 18 1; ! #X connect 15 2 16 2; ! #X connect 15 3 4 0; ! #X connect 15 4 16 4; ! #X connect 16 0 13 0; ! #X connect 17 0 2 0; ! #X connect 17 1 15 0; ! #X connect 18 0 16 0; ! #X connect 18 1 16 1; #X restore 244 115 pd get-masses; #N canvas 0 0 768 708 make-links 0; #X obj 316 252 pointer liaison; - #X msg 316 226 next; #X msg 354 227 traverse pd-data \, bang; #X obj 286 274 t b p; --- 148,180 ---- #X obj 184 255 t b p; #X obj 214 402 scale-ds2msd; + #X obj 120 251 ds-next; #X connect 0 5 1 0; + #X connect 0 6 6 0; #X connect 0 6 7 0; ! #X connect 1 0 2 0; ! #X connect 2 0 16 0; ! #X connect 2 1 18 0; ! #X connect 2 2 13 0; ! #X connect 3 0 5 0; ! #X connect 3 1 4 0; ! #X connect 4 0 15 3; ! #X connect 5 0 15 3; ! #X connect 7 0 8 0; ! #X connect 7 0 9 0; ! #X connect 11 0 0 0; ! #X connect 14 0 17 0; ! #X connect 14 1 17 1; ! #X connect 14 2 15 2; ! #X connect 14 3 3 0; ! #X connect 14 4 15 4; ! #X connect 15 0 12 0; ! #X connect 16 0 18 0; ! #X connect 16 1 14 0; ! #X connect 17 0 15 0; ! #X connect 17 1 15 1; ! #X connect 18 0 2 0; #X restore 244 115 pd get-masses; #N canvas 0 0 768 708 make-links 0; #X obj 316 252 pointer liaison; #X msg 354 227 traverse pd-data \, bang; #X obj 286 274 t b p; *************** *** 176,193 **** #X obj 316 298 get liaison mid1 mid2 K D D2; #X obj 334 341 pack 0 0 0 0 0; ! #X connect 0 0 3 0; ! #X connect 0 1 1 0; ! #X connect 0 2 6 0; #X connect 1 0 0 0; ! #X connect 2 0 0 0; ! #X connect 3 0 1 0; ! #X connect 3 1 8 0; ! #X connect 5 0 2 0; ! #X connect 8 0 9 0; ! #X connect 8 1 9 1; ! #X connect 8 2 9 2; ! #X connect 8 3 9 3; ! #X connect 8 4 9 4; ! #X connect 9 0 4 0; #X restore 148 257 pd make-links; #X text 284 418 TABLES USED:; --- 185,208 ---- #X obj 316 298 get liaison mid1 mid2 K D D2; #X obj 334 341 pack 0 0 0 0 0; ! #X text 407 200 Avoid stack overflow lops; ! #X obj 399 167 r \$0-stack-delay; ! #X obj 286 226 ds-next; ! #X obj 354 201 del 0; ! #X connect 0 0 2 0; ! #X connect 0 1 11 0; ! #X connect 0 2 5 0; #X connect 1 0 0 0; ! #X connect 2 0 11 0; ! #X connect 2 1 7 0; ! #X connect 4 0 12 0; ! #X connect 7 0 8 0; ! #X connect 7 1 8 1; ! #X connect 7 2 8 2; ! #X connect 7 3 8 3; ! #X connect 7 4 8 4; ! #X connect 8 0 3 0; ! #X connect 10 0 12 1; ! #X connect 11 0 0 0; ! #X connect 12 0 1 0; #X restore 148 257 pd make-links; #X text 284 418 TABLES USED:; *************** *** 203,207 **** #X msg 292 129 1; #X msg 236 127 0; ! #X obj 238 62 inlet; #X obj 238 93 t b b b b b; #X obj 310 307 pointer liaison; --- 218,222 ---- #X msg 292 129 1; #X msg 236 127 0; ! #X obj 238 22 inlet; #X obj 238 93 t b b b b b; #X obj 310 307 pointer liaison; *************** *** 209,213 **** #X msg 288 163 infosL; #X obj 162 231 route Link; - #X msg 272 307 next; #X obj 145 254 t b a; #X text 105 394 This will move around the links \, but it's not critical --- 224,227 ---- *************** *** 219,240 **** #X msg 175 332 \$1 \$3 \$4 \$5 \$6 \$7; #X obj 175 357 set liaison lid mid1 mid2 K D D2; #X connect 0 0 2 0; #X connect 2 0 10 0; #X connect 3 0 2 1; #X connect 4 0 2 1; ! #X connect 5 0 6 0; #X connect 6 1 4 0; #X connect 6 2 9 0; #X connect 6 3 3 0; #X connect 6 4 8 0; ! #X connect 7 0 16 6; ! #X connect 7 1 11 0; #X connect 8 0 7 0; #X connect 9 0 1 0; ! #X connect 10 0 12 0; ! #X connect 11 0 7 0; ! #X connect 12 0 11 0; ! #X connect 12 1 15 0; ! #X connect 15 0 16 0; #X restore 148 322 pd set-lid; #X text 238 322 Correct lids to match what msd2D tells us; --- 233,263 ---- #X msg 175 332 \$1 \$3 \$4 \$5 \$6 \$7; #X obj 175 357 set liaison lid mid1 mid2 K D D2; + #X text 291 52 Avoid stack overflow lops; + #X obj 287 21 r \$0-stack-delay; + #X obj 219 307 ds-next; + #X msg 260 281 next; + #X obj 74 351 print set-lid; + #X obj 238 51 del 0; #X connect 0 0 2 0; #X connect 2 0 10 0; #X connect 3 0 2 1; #X connect 4 0 2 1; ! #X connect 5 0 21 0; #X connect 6 1 4 0; #X connect 6 2 9 0; #X connect 6 3 3 0; #X connect 6 4 8 0; ! #X connect 7 0 15 6; ! #X connect 7 1 19 0; #X connect 8 0 7 0; #X connect 9 0 1 0; ! #X connect 10 0 11 0; ! #X connect 11 0 19 0; ! #X connect 11 1 14 0; ! #X connect 14 0 15 0; ! #X connect 14 0 20 0; ! #X connect 17 0 21 1; ! #X connect 19 0 7 0; ! #X connect 21 0 6 0; #X restore 148 322 pd set-lid; #X text 238 322 Correct lids to match what msd2D tells us; *************** *** 305,309 **** #X connect 15 2 13 2; #X connect 16 0 17 0; ! #X restore 112 401 pd make-setters; #X obj 181 344 r pointer2msd; #X obj 112 91 inlet; --- 328,332 ---- #X connect 15 2 13 2; #X connect 16 0 17 0; ! #X restore 112 428 pd make-setters; #X obj 181 344 r pointer2msd; #X obj 112 91 inlet; *************** *** 363,373 **** #X connect 24 0 23 0; #X connect 25 0 23 1; ! #X restore 112 441 pd set-min-max; #X text 283 344 <== messages coming from the data structure setters ; #X connect 0 0 8 0; #X connect 0 1 9 0; #X connect 2 0 3 0; ! #X connect 4 0 5 0; #X connect 4 1 0 0; #X connect 4 3 2 0; --- 386,397 ---- #X connect 24 0 23 0; #X connect 25 0 23 1; ! #X restore 112 468 pd set-min-max; #X text 283 344 <== messages coming from the data structure setters ; + #X obj 112 399 del 200; #X connect 0 0 8 0; #X connect 0 1 9 0; #X connect 2 0 3 0; ! #X connect 4 0 12 0; #X connect 4 1 0 0; #X connect 4 3 2 0; *************** *** 377,380 **** --- 401,405 ---- #X connect 8 0 1 0; #X connect 9 0 1 0; + #X connect 12 0 5 0; #X restore 30 343 pd generator; #N canvas 0 0 718 819 activate 0; *************** *** 493,561 **** #X obj 147 210 r \$0-msd-out; #N canvas 0 0 578 686 setter 0; - #X obj 930 500 mass-set 31; - #X obj 900 500 mass-set 30; - #X obj 870 500 mass-set 29; - #X obj 840 500 mass-set 28; - #X obj 810 500 mass-set 27; - #X obj 780 500 mass-set 26; - #X obj 750 500 mass-set 25; - #X obj 720 500 mass-set 24; - #X obj 690 500 mass-set 23; - #X obj 660 500 mass-set 22; - #X obj 630 500 mass-set 21; - #X obj 600 500 mass-set 20; - #X obj 570 500 mass-set 19; - #X obj 540 500 mass-set 18; - #X obj 510 500 mass-set 17; - #X obj 480 500 mass-set 16; - #X obj 450 500 mass-set 15; - #X obj 420 500 mass-set 14; - #X obj 390 500 mass-set 13; - #X obj 360 500 mass-set 12; - #X obj 330 500 mass-set 11; - #X obj 300 500 mass-set 10; - #X obj 270 500 mass-set 9; - #X obj 240 500 mass-set 8; - #X obj 210 500 mass-set 7; - #X obj 180 500 mass-set 6; - #X obj 150 500 mass-set 5; - #X obj 120 500 mass-set 4; - #X obj 90 500 mass-set 3; - #X obj 60 500 mass-set 2; - #X obj 30 500 mass-set 1; - #X obj 0 500 mass-set 0; #X restore 521 67 pd setter; #N canvas 0 0 822 675 lsetter 0; - #X obj 0 500 link-set 15; - #X obj 30 500 link-set 23; - #X obj 60 500 link-set 7; - #X obj 90 500 link-set 27; - #X obj 120 500 link-set 11; - #X obj 150 500 link-set 19; - #X obj 180 500 link-set 3; - #X obj 210 500 link-set 29; - #X obj 240 500 link-set 13; - #X obj 270 500 link-set 21; - #X obj 300 500 link-set 5; - #X obj 330 500 link-set 25; - #X obj 360 500 link-set 9; - #X obj 390 500 link-set 17; - #X obj 420 500 link-set 1; - #X obj 450 500 link-set 30; - #X obj 480 500 link-set 14; - #X obj 510 500 link-set 22; - #X obj 540 500 link-set 6; - #X obj 570 500 link-set 26; - #X obj 600 500 link-set 10; - #X obj 630 500 link-set 18; - #X obj 660 500 link-set 2; - #X obj 690 500 link-set 28; - #X obj 720 500 link-set 12; - #X obj 750 500 link-set 20; - #X obj 780 500 link-set 4; - #X obj 810 500 link-set 24; - #X obj 840 500 link-set 8; - #X obj 870 500 link-set 16; - #X obj 900 500 link-set 0; #X restore 520 90 pd lsetter; #X text 504 43 Automatic scripting targets; --- 518,523 ---- *************** *** 571,575 **** #X obj 143 363 spigot; #X obj 180 310 tgl 15 0 empty empty global-send 0 -6 0 8 -262144 -1 ! -1 1 1; #X obj 143 336 r \$0-msd-out; #X obj 143 391 s MSD-OUT-GLOBAL; --- 533,537 ---- #X obj 143 363 spigot; #X obj 180 310 tgl 15 0 empty empty global-send 0 -6 0 8 -262144 -1 ! -1 0 1; #X obj 143 336 r \$0-msd-out; #X obj 143 391 s MSD-OUT-GLOBAL; *************** *** 599,602 **** --- 561,568 ---- #X msg 531 346 massesForcesL; #X msg 630 225 massesPosYL; + #X obj 28 133 nbx 5 14 -1e+37 1e+37 0 0 \$0-delay-stack empty delay-stack + 0 -6 0 10 -262144 -1 -1 0 256; + #X text 25 92 If you experience stack overflows \, try setting this + larger than 10; #X connect 1 0 0 0; #X connect 2 0 1 1; *************** *** 639,648 **** select more than two masses \, then all possible links between those masses will get created. Use this to mass-connect masses. :); ! #N canvas 630 176 576 613 forces 0; #X obj 295 415 s \$0-msd; #X obj 394 355 hsl 128 24 -5 5 0 1 empty empty empty -2 -6 0 8 -262144 -1 -1 6350 1; #X obj 295 230 vsl 24 128 -5 5 0 1 empty empty empty 0 -8 0 8 -262144 ! -1 -1 7550 1; #X msg 295 388 forceY id \$1; #X msg 391 388 forceX id \$1; --- 605,614 ---- select more than two masses \, then all possible links between those masses will get created. Use this to mass-connect masses. :); ! #N canvas 423 517 576 613 forces 0; #X obj 295 415 s \$0-msd; #X obj 394 355 hsl 128 24 -5 5 0 1 empty empty empty -2 -6 0 8 -262144 -1 -1 6350 1; #X obj 295 230 vsl 24 128 -5 5 0 1 empty empty empty 0 -8 0 8 -262144 ! -1 -1 6350 1; #X msg 295 388 forceY id \$1; #X msg 391 388 forceX id \$1; *************** *** 703,711 **** #X connect 29 0 28 0; #X restore 28 463 pd forces; ! #X obj 254 524 tgl 15 0 \$0-gem-masses-on empty gem_m 0 -6 0 8 -233017 -1 -1 0 1; ! #X obj 296 524 tgl 15 0 \$0-gem-links-on empty gem_l 0 -6 0 8 -233017 -1 -1 0 1; ! #N canvas 557 667 450 300 props 0; #X obj 117 204 s \$0-msd; #X obj 117 46 vsl 15 64 0 10 0 0 empty empty D 0 -8 0 8 -262144 -1 --- 669,677 ---- #X connect 29 0 28 0; #X restore 28 463 pd forces; ! #X obj 254 524 tgl 15 0 \$0-gem-masses-on empty gem_m 0 -6 0 8 -225280 -1 -1 0 1; ! #X obj 296 524 tgl 15 0 \$0-gem-links-on empty gem_l 0 -6 0 8 -225271 -1 -1 0 1; ! #N canvas 779 673 450 300 props 0; #X obj 117 204 s \$0-msd; #X obj 117 46 vsl 15 64 0 10 0 0 empty empty D 0 -8 0 8 -262144 -1 *************** *** 787,794 **** select the other masses and set toggle to 0; #X obj 707 106 tgl 15 0 \$0-poll-ds \$0-poll-ds poll-ds 0 -6 0 8 -225280 ! -1 -1 0 1; #X obj 765 106 tgl 15 0 \$0-set-ds \$0-set-ds set-ds 0 -6 0 8 -225271 ! -1 -1 0 1; #X text 669 75 Data struct anim ON/OFF:; #X connect 2 0 6 0; #X connect 7 0 8 0; --- 753,780 ---- select the other masses and set toggle to 0; #X obj 707 106 tgl 15 0 \$0-poll-ds \$0-poll-ds poll-ds 0 -6 0 8 -225280 ! -1 -1 1 1; #X obj 765 106 tgl 15 0 \$0-set-ds \$0-set-ds set-ds 0 -6 0 8 -225271 ! -1 -1 1 1; #X text 669 75 Data struct anim ON/OFF:; + #N canvas 504 489 531 315 TODO 0; + #X text 146 11 TODO :: IDEAS; + #X text 41 92 Make symbolic ids of new masses/links editable. For this + I need to add new fields \, probably called "sym" \, to masses and + links. They have to be floats for now (symbols in DS don't work yet). + Then [makefilename] symbolic ids of this.; + #X text 41 48 Save/load of MSD messages: Route [r \$0-msd] to a [textfile] + or [qlist]; + #X text 41 164 Related to that the props and forces subpatches should + be dynamic as well \, so that users can send messages to groups of + masses/links using the different symbolic names.; + #X restore 777 529 pd TODO; + #N canvas 307 452 509 305 NEWS 0; + #X text 42 52 Hopefully fixed the "stack overflows" when creating lots + of masses.; + #X text 32 24 RecentChanges; + #X text 39 90 Geos: Now it's possible to add masses in geometric formations: + rectangles (2d-networks) and circles (set center point \, radius and + number of masses).; + #X restore 777 508 pd NEWS; #X connect 2 0 6 0; #X connect 7 0 8 0; Index: msd_append.pd =================================================================== RCS file: /cvsroot/pure-data/externals/nusmuk/msd2D/editor/msd_append.pd,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** msd_append.pd 2 May 2005 10:36:10 -0000 1.3 --- msd_append.pd 8 May 2005 13:19:05 -0000 1.4 *************** *** 2,8 **** #X obj 2 16 cnv 15 80 60 empty empty empty 20 12 0 14 -233017 -66577 0; ! #X obj 16 29 bng 15 250 50 0 empty empty mass 0 -6 0 8 -1 -262144 -1 ; ! #X obj 54 29 bng 15 250 50 0 empty empty fix 0 -6 0 8 -258699 -1 -1 ; #N canvas 355 457 863 719 guts 0; --- 2,8 ---- #X obj 2 16 cnv 15 80 60 empty empty empty 20 12 0 14 -233017 -66577 0; ! #X obj 6 29 bng 15 250 50 0 empty empty mass 0 -6 0 8 -1 -262144 -1 ; ! #X obj 34 29 bng 15 250 50 0 empty empty fix 0 -6 0 8 -258699 -1 -1 ; #N canvas 355 457 863 719 guts 0; *************** *** 37,40 **** --- 37,42 ---- #X msg 552 224 100; #X obj 558 152 loadbang; + #X obj 21 135 r \$0-geos; + #X obj 252 77 r \$0-start-traverse; #X connect 0 0 24 5; #X connect 1 0 21 0; *************** *** 67,79 **** #X connect 28 0 27 0; #X connect 29 0 25 0; #X restore 105 79 pd guts; #X obj 126 6 inlet; #X obj 169 5 inlet; #X obj 25 59 nbx 5 14 -1e+37 1e+37 0 0 \$0-counter \$0-counter-in id ! -22 8 0 10 -262144 -1 -1 8 256; #X obj 2 77 cnv 15 80 30 empty empty empty 10 10 0 10 -195568 -1 0 ; #X obj 26 85 nbx 5 14 -1e+37 1e+37 0 0 \$0-M \$0-M M -12 8 0 10 -225271 ! -1 -1 0 256; #X connect 1 0 3 0; #X connect 2 0 3 1; --- 69,180 ---- #X connect 28 0 27 0; #X connect 29 0 25 0; + #X connect 30 0 24 0; + #X connect 31 0 2 0; #X restore 105 79 pd guts; #X obj 126 6 inlet; #X obj 169 5 inlet; #X obj 25 59 nbx 5 14 -1e+37 1e+37 0 0 \$0-counter \$0-counter-in id ! -22 8 0 10 -262144 -1 -1 0 256; #X obj 2 77 cnv 15 80 30 empty empty empty 10 10 0 10 -195568 -1 0 ; #X obj 26 85 nbx 5 14 -1e+37 1e+37 0 0 \$0-M \$0-M M -12 8 0 10 -225271 ! -1 -1 100 256; ! #N canvas 379 246 663 624 geos 0; ! #X obj 93 96 make_rect 100 100 30 30 10 10; ! #X obj 123 162 s \$0-geos; ! #X obj 93 188 s \$0-counter-bng; ! #X obj 48 33 r \$0-make-rect; ! #X msg 93 67 bang; ! #N canvas 449 480 450 300 1016-geos 1; ! #X obj 48 82 bng 24 250 50 0 \$0-make-rect empty make-rect 0 -6 0 8 ! -24198 -1 -1; ! #X floatatom 151 76 5 0 0 0 x0 - #0-x0; ! #X floatatom 151 92 5 0 0 0 y0 - #0-y0; ! #X floatatom 227 75 5 0 0 0 xgap - #0-xgap; ! #X floatatom 227 91 5 0 0 0 ygap - #0-ygap; ! #X floatatom 322 74 5 0 0 0 xsteps - #0-xsteps; ! #X floatatom 322 90 5 0 0 0 ysteps - #0-ysteps; ! #X text 46 18 Add various geometric forms; ! #X text 38 46 Rectangle Networks:; ! #X text 37 137 Circles:; ! #X obj 52 172 bng 24 250 50 0 \$0-make-circ empty make-circ 0 -6 0 ! 8 -24198 -1 -1; ! #X floatatom 145 166 5 0 0 0 x0 - #0-x0-circ; ! #X floatatom 145 182 5 0 0 0 y0 - #0-y0-circ; ! #X floatatom 251 166 5 0 0 0 radius - #0-radius; ! #X floatatom 251 184 5 0 0 0 masses_# - #0-masses-circ; ! #X text 107 266 All coords as used by data structs.; ! #X restore 518 165 pd \$0-geos; ! #X msg 519 125 \; \$1 vis 1; ! #X obj 518 96 makefilename pd-%s; ! #X obj 520 68 symbol \$0-geos; ! #X msg 516 22 bang; ! #X obj 48 66 t b b; ! #X obj 78 226 s \$0-start-traverse; ! #N canvas 0 0 930 534 1016-sixpack 0; ! #X obj 250 282 r \$0-x0; ! #X text 452 208 Args; ! #X obj 320 310 sixpack --------------------; ! #X obj 296 237 r \$0-y0; ! #X obj 336 206 r \$0-xgap; ! #X obj 376 185 r \$0-ygap; ! #X obj 412 164 r \$0-xsteps; ! #X obj 448 143 r \$0-ysteps; ! #X obj 326 342 outlet; ! #X connect 0 0 2 0; ! #X connect 2 0 8 0; ! #X connect 3 0 2 1; ! #X connect 4 0 2 2; ! #X connect 5 0 2 3; ! #X connect 6 0 2 4; ! #X connect 7 0 2 5; ! #X restore 291 40 pd \$0-sixpack; ! #X obj 93 128 t b a; ! #X obj 524 45 r \$0-show-geos; ! #X obj 63 322 r \$0-make-circ; ! #N canvas 0 0 930 534 1016-fourpack 0; ! #X text 452 208 Args; ! #X obj 320 310 sixpack --------------------; ! #X obj 319 390 outlet; ! #X msg 319 349 \$1 \$2 \$3 \$4; ! #X obj 252 282 r \$0-x0-circ; ! #X obj 296 237 r \$0-y0-circ; ! #X obj 376 185 r \$0-masses-circ; ! #X obj 336 206 r \$0-radius; ! #X connect 1 0 3 0; ! #X connect 3 0 2 0; ! #X connect 4 0 1 0; ! #X connect 5 0 1 1; ! #X connect 6 0 1 3; ! #X connect 7 0 1 2; ! #X restore 219 327 pd \$0-fourpack; ! #X obj 136 441 s \$0-geos; ! #X obj 106 467 s \$0-counter-bng; ! #X obj 63 345 t b b; ! #X obj 93 505 s \$0-start-traverse; ! #X obj 106 407 t b a; ! #X obj 63 370 make_circ 300 300 100 8; ! #X connect 0 0 13 0; ! #X connect 3 0 10 0; ! #X connect 4 0 0 0; ! #X connect 7 0 6 0; ! #X connect 8 0 7 0; ! #X connect 9 0 8 0; ! #X connect 10 0 0 0; ! #X connect 10 1 11 0; ! #X connect 12 0 0 1; ! #X connect 13 0 2 0; ! #X connect 13 1 1 0; ! #X connect 14 0 8 0; ! #X connect 15 0 19 0; ! #X connect 16 0 22 1; ! #X connect 19 0 22 0; ! #X connect 19 1 20 0; ! #X connect 21 0 18 0; ! #X connect 21 1 17 0; ! #X connect 22 0 21 0; ! #X restore 113 41 pd geos; ! #X obj 59 29 bng 15 250 50 0 \$0-show-geos \$0-show-geos geos 0 -6 ! 0 8 -225271 -1 -1; #X connect 1 0 3 0; #X connect 2 0 3 1; --- NEW FILE: make_rect.pd --- #N canvas 253 193 699 400 10; #X obj 77 53 inlet; #X obj 298 50 inlet; #X obj 298 77 unpack 0 0 0 0 0 0; #X obj 259 123 f \$1; #X obj 298 122 f \$2; #X obj 336 122 f \$3; #X obj 376 122 f \$4; #X obj 412 122 f \$5; #X obj 259 260 s \$0-x0; #X obj 448 122 f \$6; #X obj 298 239 s \$0-y0; #X obj 336 206 s \$0-xgap; #X obj 412 164 s \$0-xsteps; #X obj 448 143 s \$0-ysteps; #X obj 376 185 s \$0-ygap; #X obj 77 226 pack 0 0; #X obj 77 260 outlet; #X obj 77 129 t b f; #N canvas 0 0 490 471 1002-countx 0; #X obj 149 231 r \$0-x0; #X obj 126 258 + \$1; #X obj 126 200 * \$3; #X obj 149 171 r \$0-xgap; #X obj 126 115 f \$5; #X obj 149 92 r \$0-xsteps; #X text 194 49 count x; #X obj 126 23 inlet; #N canvas 0 0 450 300 1002-count 0; #X obj 112 28 inlet; #X obj 116 96 f 0; #X obj 156 98 + 1; #X obj 178 52 inlet; #X msg 175 73 0; #X obj 118 122 outlet; #X obj 112 66 until; #X connect 0 0 6 0; #X connect 1 0 2 0; #X connect 1 0 5 0; #X connect 2 0 1 1; #X connect 3 0 4 0; #X connect 4 0 1 1; #X connect 6 0 1 0; #X restore 126 146 pd \$0-count; #X obj 126 284 outlet; #X obj 126 48 t b b; #X connect 0 0 1 1; #X connect 1 0 9 0; #X connect 2 0 1 0; #X connect 3 0 2 1; #X connect 4 0 8 0; #X connect 5 0 4 1; #X connect 7 0 10 0; #X connect 8 0 2 0; #X connect 10 0 4 0; #X connect 10 1 8 1; #X restore 77 172 pd \$0-countx; #N canvas 0 0 723 519 1002-county 0; #X obj 260 174 r \$0-ysteps; #X obj 260 253 r \$0-ygap; #X obj 260 313 r \$0-y0; #X obj 237 340 + \$2; #X obj 237 282 * \$4; #X obj 237 197 f \$6; #X text 294 126 count y; #N canvas 0 0 450 300 1002-count 0; #X obj 112 28 inlet; #X obj 116 96 f 0; #X obj 156 98 + 1; #X obj 178 52 inlet; #X msg 175 73 0; #X obj 118 122 outlet; #X obj 112 66 until; #X connect 0 0 6 0; #X connect 1 0 2 0; #X connect 1 0 5 0; #X connect 2 0 1 1; #X connect 3 0 4 0; #X connect 4 0 1 1; #X connect 6 0 1 0; #X restore 237 228 pd \$0-count; #X obj 237 103 inlet; #X obj 237 371 outlet; #X obj 237 130 t b b; #X connect 0 0 5 1; #X connect 1 0 4 1; #X connect 2 0 3 1; #X connect 3 0 9 0; #X connect 4 0 3 0; #X connect 5 0 7 0; #X connect 7 0 4 0; #X connect 8 0 10 0; #X connect 10 0 5 0; #X connect 10 1 7 1; #X restore 77 100 pd \$0-county; #X obj 77 76 t b; #X text 452 208 Args; #X connect 0 0 20 0; #X connect 1 0 2 0; #X connect 2 0 3 0; #X connect 2 1 4 0; #X connect 2 2 5 0; #X connect 2 3 6 0; #X connect 2 4 7 0; #X connect 2 5 9 0; #X connect 3 0 8 0; #X connect 4 0 10 0; #X connect 5 0 11 0; #X connect 6 0 14 0; #X connect 7 0 12 0; #X connect 9 0 13 0; #X connect 15 0 16 0; #X connect 17 0 18 0; #X connect 17 1 15 1; #X connect 18 0 15 0; #X connect 19 0 17 0; #X connect 20 0 19 0; --- NEW FILE: sixpack.pd --- #N canvas 519 499 450 300 10; #X obj 143 51 inlet; #X obj 91 51 inlet; #X obj 141 72 t b f; #X obj 191 51 inlet; #X obj 189 72 t b f; #X obj 238 50 inlet; #X obj 236 71 t b f; #X obj 148 222 outlet; #X obj 287 49 inlet; #X obj 285 70 t b f; #X obj 334 48 inlet; #X obj 332 69 t b f; #X obj 148 179 pack 0 0 0 0 0 0; #X connect 0 0 2 0; #X connect 1 0 12 0; #X connect 2 0 12 0; #X connect 2 1 12 1; #X connect 3 0 4 0; #X connect 4 0 12 0; #X connect 4 1 12 2; #X connect 5 0 6 0; #X connect 6 0 12 0; #X connect 6 1 12 3; #X connect 8 0 9 0; #X connect 9 0 12 0; #X connect 9 1 12 4; #X connect 10 0 11 0; #X connect 11 0 12 0; #X connect 11 1 12 5; #X connect 12 0 7 0; Index: morelinks.pd =================================================================== RCS file: /cvsroot/pure-data/externals/nusmuk/msd2D/editor/morelinks.pd,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** morelinks.pd 2 May 2005 10:36:10 -0000 1.4 --- morelinks.pd 8 May 2005 13:19:05 -0000 1.5 *************** *** 1,5 **** #N canvas 225 469 135 183 10; #N canvas 375 417 614 523 left-right-links 0; - #X msg 111 227 vnext 1; #X obj 192 225 pointer mass; #X obj 184 423 pack p p; --- 1,4 ---- *************** *** 24,47 **** #X obj 184 454 link2masses; #X obj 256 416 r \$0-link-param; ! #X connect 0 0 1 0; ! #X connect 1 0 12 0; ! #X connect 1 1 0 0; ! #X connect 2 0 19 0; ! #X connect 3 0 1 0; ! #X connect 4 0 11 0; ! #X connect 7 0 6 0; ! #X connect 11 0 3 0; ! #X connect 11 1 15 0; ! #X connect 11 2 7 0; ! #X connect 12 0 0 0; ! #X connect 12 1 17 0; ! #X connect 12 2 14 0; ! #X connect 13 0 11 0; ! #X connect 14 0 2 1; ! #X connect 14 1 16 0; ! #X connect 15 0 16 1; ! #X connect 16 0 2 0; ! #X connect 17 0 16 1; ! #X connect 20 0 19 1; #X restore 141 68 pd left-right-links; #X obj 2 19 cnv 15 130 80 empty empty empty 20 12 0 14 -233017 -66577 --- 23,47 ---- #X obj 184 454 link2masses; #X obj 256 416 r \$0-link-param; ! #X obj 113 225 ds-vnext; ! #X connect 0 0 11 0; ! #X connect 0 1 20 0; ! #X connect 1 0 18 0; ! #X connect 2 0 0 0; ! #X connect 3 0 10 0; ! #X connect 6 0 5 0; ! #X connect 10 0 2 0; ! #X connect 10 1 14 0; ! #X connect 10 2 6 0; ! #X connect 11 0 20 0; ! #X connect 11 1 16 0; ! #X connect 11 2 13 0; ! #X connect 12 0 10 0; ! #X connect 13 0 1 1; ! #X connect 13 1 15 0; ! #X connect 14 0 15 1; ! #X connect 15 0 1 0; ! #X connect 16 0 15 1; ! #X connect 19 0 18 1; ! #X connect 20 0 0 0; #X restore 141 68 pd left-right-links; #X obj 2 19 cnv 15 130 80 empty empty empty 20 12 0 14 -233017 -66577 *************** *** 56,63 **** #X obj 69 120 inlet; #X obj 135 310 pointer mass; - #X msg 103 276 vnext 1; #X obj 203 196 t b p; #X obj 69 178 t b b; ! #X msg 134 242 traverse pd-data; #X obj 274 378 outlet; #X msg 274 325 label one2many-Start; --- 56,62 ---- #X obj 69 120 inlet; #X obj 135 310 pointer mass; #X obj 203 196 t b p; #X obj 69 178 t b b; ! #X msg 135 242 traverse pd-data; #X obj 274 378 outlet; #X msg 274 325 label one2many-Start; *************** *** 66,91 **** #X obj 182 473 link2masses; #X obj 254 440 r \$0-link-param; ! #X connect 0 0 7 0; ! #X connect 1 0 14 0; #X connect 2 0 0 0; ! #X connect 3 0 6 0; #X connect 3 1 1 0; ! #X connect 4 0 13 0; #X connect 5 0 3 0; ! #X connect 5 1 6 0; ! #X connect 5 2 11 0; ! #X connect 6 0 5 0; ! #X connect 7 0 12 0; ! #X connect 7 1 1 1; ! #X connect 8 0 6 0; ! #X connect 8 1 9 0; ! #X connect 9 0 5 0; ! #X connect 11 0 10 0; ! #X connect 12 0 10 0; ! #X connect 13 0 8 0; ! #X connect 13 1 2 0; ! #X connect 15 0 14 1; #X restore 143 95 pd one-to-many; ! #X obj 10 76 tgl 15 0 empty empty one2many-Start 20 8 0 8 -262131 -1 -1 0 1; #X obj 10 31 bng 15 250 50 0 empty empty all_selected 20 8 0 8 -241291 --- 65,91 ---- #X obj 182 473 link2masses; #X obj 254 440 r \$0-link-param; ! #X obj 69 281 ds-vnext; ! #X connect 0 0 6 0; ! #X connect 1 0 13 0; #X connect 2 0 0 0; ! #X connect 3 0 15 0; #X connect 3 1 1 0; ! #X connect 4 0 12 0; #X connect 5 0 3 0; ! #X connect 5 1 15 0; ! #X connect 5 2 10 0; ! #X connect 6 0 11 0; ! #X connect 6 1 1 1; ! #X connect 7 0 15 0; ! #X connect 7 1 8 0; ! #X connect 8 0 5 0; ! #X connect 10 0 9 0; ! #X connect 11 0 9 0; ! #X connect 12 0 7 0; ! #X connect 12 1 2 0; ! #X connect 14 0 13 1; ! #X connect 15 0 5 0; #X restore 143 95 pd one-to-many; ! #X obj 10 76 tgl 15 0 empty empty one2many-Ends 20 8 0 8 -262131 -1 -1 0 1; #X obj 10 31 bng 15 250 50 0 empty empty all_selected 20 8 0 8 -241291 *************** *** 152,157 **** #N canvas 0 0 483 507 ilinker 0; #X obj 195 306 pointer mass; - #X msg 147 260 vnext 1; - #X msg 274 218 vnext 1; #X obj 197 167 pointer mass; #X obj 197 190 t b p; --- 152,155 ---- *************** *** 164,183 **** masses like iLink.; #X obj 249 386 r \$0-link-param; ! #X connect 0 0 8 0; ! #X connect 0 1 1 0; ! #X connect 0 2 2 0; ! #X connect 1 0 0 0; ! #X connect 2 0 3 0; ! #X connect 3 0 4 0; ! #X connect 3 1 2 0; ! #X connect 4 0 1 0; ! #X connect 4 1 6 1; ! #X connect 4 1 0 1; ! #X connect 6 0 5 0; ! #X connect 7 0 3 0; ! #X connect 8 0 1 0; ! #X connect 8 1 6 0; ! #X connect 9 0 7 0; ! #X connect 11 0 5 1; #X restore 137 46 pd ilinker; #X connect 2 0 0 0; --- 162,183 ---- masses like iLink.; #X obj 249 386 r \$0-link-param; ! #X obj 274 214 ds-vnext; ! #X obj 147 257 ds-vnext; ! #X connect 0 0 6 0; ! #X connect 0 1 11 0; ! #X connect 0 2 10 0; ! #X connect 1 0 2 0; ! #X connect 1 1 10 0; ! #X connect 2 0 11 0; ! #X connect 2 1 4 1; ! #X connect 2 1 0 1; ! #X connect 4 0 3 0; ! #X connect 5 0 1 0; ! #X connect 6 0 11 0; ! #X connect 6 1 4 0; ! #X connect 7 0 5 0; ! #X connect 9 0 3 1; ! #X connect 10 0 1 0; ! #X connect 11 0 0 0; #X restore 137 46 pd ilinker; #X connect 2 0 0 0; *************** *** 187,190 **** --- 187,191 ---- #X connect 6 0 9 1; #X connect 7 0 9 0; + #X connect 8 0 15 0; #X connect 9 0 8 0; #X coords 0 0 1 1 132 180 1; --- NEW FILE: ds-next.pd --- #N canvas 0 0 450 300 10; #X obj 138 76 inlet; #X obj 138 214 outlet; #X obj 138 111 t b; #X msg 138 168 next; #X obj 138 140 del 0; #X connect 0 0 2 0; #X connect 2 0 4 0; #X connect 3 0 1 0; #X connect 4 0 3 0;

1 0

pd/src u_main.tk,1.4.4.8,1.4.4.9
by Tim Blechmann 07 May '05

07 May '05

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7217 Modified Files: Tag: devel_0_38 u_main.tk Log Message: help-menu fix Index: u_main.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/u_main.tk,v retrieving revision 1.4.4.8 retrieving revision 1.4.4.9 diff -C2 -d -r1.4.4.8 -r1.4.4.9 *** u_main.tk 6 May 2005 11:49:09 -0000 1.4.4.8 --- u_main.tk 7 May 2005 12:43:20 -0000 1.4.4.9 *************** *** 433,440 **** global help_top_directory pd_tearoff ! if { [lsearch [glob -dir $help_top_directory * ] "../doc/$subdir" ] == -1} { return } ! set menudir $help_top_directory/$subdir --- 433,440 ---- global help_top_directory pd_tearoff ! if { [lsearch [glob -dir $help_top_directory * ] "$help_top_directory/$subdir" ] == -1} { return } ! set menudir $help_top_directory/$subdir

1 0

← Newer
1
...
30
31
32
33
34
35
36
...
41
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

Pd-cvs May 2005