Pd-cvs May 2005

pd-cvs@lists.iem.at

14 participants
407 discussions

pd/src m_fifo.c,1.1.2.10,1.1.2.11
by Tim Blechmann 04 May '05

04 May '05

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21091 Modified Files: Tag: devel_0_38 m_fifo.c Log Message: Grame's beautiful implementation of lock-free fifos Index: m_fifo.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/m_fifo.c,v retrieving revision 1.1.2.10 retrieving revision 1.1.2.11 diff -C2 -d -r1.1.2.10 -r1.1.2.11 *** m_fifo.c 22 Jan 2005 20:28:22 -0000 1.1.2.10 --- m_fifo.c 4 May 2005 17:14:34 -0000 1.1.2.11 *************** *** 1,3 **** ! /* Copyright (c) 2004, Tim Blechmann * supported by vibrez.net * For information on usage and redistribution, and for a DISCLAIMER OF ALL --- 1,3 ---- ! ./* Copyright (c) 2004, Tim Blechmann * supported by vibrez.net * For information on usage and redistribution, and for a DISCLAIMER OF ALL *************** *** 10,248 **** #include "m_fifo.h" ! typedef struct _fifocell ! { ! void* data; /* pointer to our data */ ! struct _fifocell* next; ! } t_fifocell; ! ! #ifndef __POWERPC__ ! #define LOCKFREE ! #endif ! ! #ifdef LOCKFREE ! ! /* lock-free fifo implementation adapted from: ! * Dominique Fober, Yann Orlarey, Stephane Letz ! * Lock-Free Techniques for Concurrent Access to Shared Objects ! */ ! ! #if defined(__GNUC__) && (defined(_X86_) || defined(__i386__) || defined(__i586__) || defined(__i686__)) ! ! /* gcc on i386 */ ! ! #define CAS(mem, old, new) \ ! ({ int ret = 0; \ ! __asm__ __volatile__( \ ! "lock cmpxchg %3,%1 \n" \ ! "jnz 1f \n" \ ! "inc %0 \n" \ ! "1: \n" \ ! :"=r"(ret) : \ ! "m" (*mem), "a" (old), "r" (new), "0"(ret) ); \ ! ret; \ ! }) ! ! #define CAS2(mem, old1, old2, new1, new2) \ ! ({ int ret = 0; \ ! __asm__ __volatile__( \ ! "lock cmpxchg8b %1 \n" \ ! "jnz 1f \n" \ ! "inc %0 \n" \ ! "1: \n" \ ! :"=r"(ret) : \ ! "m" (*mem), "a" (old1), "d" (old2), \ ! "b" (new1), "c"(new2), "0"(ret)); \ ! ret; \ ! }) ! ! #elif defined(NT) && defined(_MSC_VER) ! ! /* msvc on i386 */ ! ! int CAS(void** mem, void* old, void* new1) ! { ! int retv = 0; ! __asm { ! mov eax, old ! mov ebx, new1 ! mov esi, mem ! lock cmpxchg dword ptr [esi], ebx ! jnz end ! inc [retv] ! end: ! } ! return retv; ! } ! ! int CAS2(void** mem, void* old1, unsigned long old2, void* new1, unsigned long new2) ! { ! int retv = 0; ! __asm { ! mov eax, old1 ! mov edx, old2 ! mov ebx, new1 ! mov ecx, new2 ! mov esi, mem ! lock cmpxchg8b qword ptr [esi] ! jnz end ! inc [retv] ! end: ! } ! return retv; ! } ! ! #elif defined(__POWERPC__) ! ! /* gcc on ppc */ ! #define CAS(mem, old, new) \ ! ({ __typeof__(old) tmp; \ ! int ret = 0; \ ! __asm__ __volatile__( \ ! "lwarx %0,0,%2 \n" \ ! "cmpw %0,%3 \n" \ ! "bne 1f \n" \ ! "sync \n" \ ! "stwcx %4,0,%2 \n" \ ! "bne 1f \n" \ ! "li %1,1 \n" \ ! "1: \n" \ ! :"=&r"(tmp), "=r"(ret) : \ ! "m" (*mem), "r" (old), "r" (new) ); \ ! ret; \ ! }) ! ! /* tb: i'm nut sure, if the handling of the two stwcx instructions ! * works correctly and if it's atomic */ ! #define CAS2(mem, old1, old2, new1, new2) \ ! ({ __typeof__(old1) tmp1; \ ! __typeof__(old2) tmp2; \ ! int ret = 0; \ ! __asm__ __volatile__( \ ! "lwarx %0,0,%3 \n" \ ! "cmpw %0,%5 \n" \ ! "bne 1f \n" \ ! "lwarx %1,0,%4 \n" \ ! "cmpw %1,%6 \n" \ ! "bne 1f \n" \ ! "sync \n" \ ! "stwcx %7,0,%3 \n" \ ! "bne 1f \n" \ ! "stwcx %8,0,%4 \n" \ ! "bne 1f \n" \ ! "li %2,1 \n" \ ! "1: \n" \ ! :"=&r"(tmp1), "=&r"(tmp2), "=r"(ret) : \ ! "m" (*mem), "m"(*(mem+(sizeof(__typeof__(old1))))), \ ! "r" (old1), "r" (old2), \ ! "r" (new1), "r"(new2), "0"(ret), ); \ ! ret; \ ! }) ! #endif /* LOCKFREE */ ! ! struct _fifo ! { ! t_fifocell* head; ! unsigned long ocount; /* operation counter */ ! t_fifocell* tail; ! unsigned long icount; /* operation counter */ ! }; ! ! t_fifo* fifo_init() ! { ! t_fifo* ret = (t_fifo*) getbytes(sizeof(t_fifo)); ! t_fifocell * fifo_begin = (t_fifocell*) getbytes (sizeof (t_fifocell) ); ! ! fifo_begin->data = NULL; ! fifo_begin->next = NULL; ! ! ret->head = fifo_begin; ! ret->tail = fifo_begin; ! ret->icount = 0; ! ret->ocount = 0; ! ! return ret; ! } ! ! void fifo_destroy(t_fifo* fifo) ! { ! void * data; ! ! do ! { ! data = fifo_get(fifo); ! } ! while (data != NULL); ! ! freebytes(fifo->head, sizeof(t_fifocell)); ! freebytes(fifo, sizeof(t_fifo)); ! return; ! } ! ! void fifo_put(t_fifo* fifo, void* data) ! { ! if (data != NULL) ! { ! t_fifocell * cell = (t_fifocell*) getbytes(sizeof(t_fifocell)); ! t_fifocell * tail; ! unsigned long icount; ! ! cell->data = data; ! cell->next = NULL; ! ! while(1) ! { ! icount = fifo->icount; ! tail = fifo->tail; ! ! if (CAS(&tail->next, NULL, cell)) ! break; ! else ! CAS2(&fifo->tail, tail, icount, tail->next, icount + 1); ! } ! ! CAS2(&fifo->tail, tail, icount, cell, icount + 1); ! return; ! } ! else ! error("invalid data: NULL"); ! } ! ! ! void* fifo_get(t_fifo* fifo) ! { ! t_fifocell * head; ! void* data; ! ! while (1) ! { ! unsigned long ocount = fifo->ocount; ! unsigned long icount = fifo->icount; ! t_fifocell * next; ! ! head = fifo->head; ! next = head->next; ! ! if (ocount == fifo->ocount) ! { ! if (head == fifo->tail) ! { ! if (next == NULL) ! return NULL; ! CAS2(&fifo->tail, head, icount, next, icount + 1); ! } ! else ! { ! data = next->data; ! if (CAS2(&fifo->head, head, ocount, next, ocount+1)) ! break; ! } ! } ! } ! ! freebytes(head, sizeof(t_fifocell)); ! return data; ! } ! ! #else /* we always have the implementation for posix systems with threadlocks */ --- 10,14 ---- #include "m_fifo.h" ! #ifndef LOCKFREE /* we always have the implementation for posix systems with threadlocks */ *************** *** 344,346 **** --- 110,453 ---- return data; } + + #else /* LOCKFREE */ + + /* + lockfree fifo adapted from the midishare: Copyright © Grame 1999 + Grame Research Laboratory, 9, rue du Garet 69001 Lyon - France + grame(a)rd.grame.fr + */ + + + + typedef struct _fifocell + { + struct _fifocell* next; + void* data; /* pointer to our data */ + } t_fifocell; + + typedef struct _lifo + { + unsigned long ic; /* operation counter */ + t_fifocell* top; /* stack pointer */ + unsigned long oc; /* operation counter */ + #ifdef __POWERPC__ + long unused [5]; /* lifo size must be at least 32 bytes */ + /* to avoid livelock in multiprocessor */ + #endif + } t_lifo; + + struct _fifo + { + t_lifo in; + t_lifo out; + }; + + /* platform dependent code */ + + #ifdef __SMP__ + #define LOCK lock ; + #else + #define LOCK + #endif + + #if defined(__GNUC__) && defined(__POWERPC__) + + static void* lifo_pop(t_lifo* lifo) + { + register void * data; + register volatile long a, b; + register long c=0; + asm volatile ( + "# LFPOP \n" + "0: \n" + " lwarx %4, %1, %2 \n" /* creates a reservation on lf */ + " cmpwi %4, 0 \n" /* test if the lifo is empty */ + " beq- 1f \n" + " lwz %5, 0(%4) \n" /* next cell in b */ + " sync \n" /* synchronize instructions */ + " stwcx. %5, %1, %2 \n" /* if the reservation is not altered */ + /* modify lifo top */ + " bne- 0b \n" /* otherwise: loop and try again */ + "0: \n" + " lwarx %5, %1, %3 \n" /* creates a reservation on lf->count */ + " addi %5, %5, -1 \n" /* dec count */ + " sync \n" /* synchronize instructions */ + " stwcx. %5, %1, %3 \n" /* conditionnal store */ + " bne- 0b \n" + "1: \n" + " mr %0, %4 \n" + :"=r" (data), "=r" (c) + : "r" (&lifo->top), "r" (&lf->oc), "r" (a), "r" (b), "1" (c) + : "r0" /* prevents using r0 because of the ambiguity of 'addi' coding: */ + /* gcc version 2.95.3 20010315 (release - Linux-Mandrake 8.0 for PPC) */ + /* compiles the instruction "addi 0, 0, n" as li 0, n */ + ); + return data; + } + + static void* lifo_push(register t_lifo* lifo, register void* data) + { + register volatile long t1; + register long t2=0; + asm volatile ( + "# LFPUSH \n" + "0: \n" + " lwarx %0, %3, %1 \n" + " stw %0, 0(%2) \n" + " sync \n" + " stwcx. %2, %3, %1 \n" + " bne- 0b \n" + "0: \n" + " lwarx %0, %3, %4 \n" + " addi %0, %0, 1 \n" + " sync \n" + " stwcx. %0, %3, %4 \n" + " bne- 0b \n" + : "=r" (t1) + : "r" (&lifo->top), "r" (data), "r" (t2), "r" (&lf->oc), "0" (t1) + : "r0" /* prevents using r0 because of the ambiguity of 'addi' coding: */ + /* gcc version 2.95.3 20010315 (release - Linux-Mandrake 8.0 for PPC) */ + /* compiles the instruction "addi 0, 0, n" as li 0, n */ + ); + } + + #elif defined(__Macintosh__) || defined(__MacOSX__) + + static void* lifo_pop(t_lifo* lifo) + { + register cell * data; + register long a, b; + asm { + addi lifo, lifo, 4 + loop: + lwarx a, 0, lifo /* creates a reservation on lifo */ + cmpwi a, 0 /* test if the lifo is empty */ + beq- empty + lwz b, 0(a) /* next cell in b */ + sync /* synchronize instructions */ + stwcx. b, 0, lifo /* if the reservation is not altered */ + /* modify lifo top */ + bne- loop /* otherwise: loop and try again */ + + addi lifo, lifo, 4 + dec: + lwarx b, 0, lifo /* creates a reservation on lifo->count */ + addi b, b, -1 /* dec count */ + sync /* synchronize instructions */ + stwcx. b, 0, lifo /* conditionnal store */ + bne- dec + + empty: + mr data, a + } + return data; + } + + static void lifo_push (register t_lifo * lifo, register void * data) + { + register long tmp; + asm { + addi lifo, lifo, 4 + loop: + lwarx tmp, 0, lifo /* creates a reservation on lifo */ + stw tmp, 0(data) /* link the new cell to the lifo */ + sync /* synchronize instructions */ + stwcx. data, 0, lifo /* if the reservation is not altered */ + /* modify lifo top */ + bne- loop /* otherwise: loop and try again */ + + addi lifo, lifo, 4 + inc: + lwarx tmp, 0, lifo /* creates a reservation on lifo->count */ + addi tmp, tmp, 1 /* inc count */ + sync /* synchronize instructions */ + stwcx. tmp, 0, lifo /* conditionnal store */ + bne- inc + } + } + + + + #elif defined(__GNUC__) && (defined(_X86_) || defined(__i386__) || defined(__i586__) || defined(__i686__)) + + static void* lifo_pop(t_lifo* lifo) + { + void * data = 0; + __asm__ __volatile__ ( + "# LFPOP \n\t" + "pushl %%ebx \n\t" + "pushl %%ecx \n\t" + "movl 4(%%esi), %%edx \n\t" + "movl (%%esi), %%eax \n\t" + "testl %%eax, %%eax \n\t" + "jz 20f \n" + "10:\t" + "movl (%%eax), %%ebx \n\t" + "movl %%edx, %%ecx \n\t" + "incl %%ecx \n\t" + LOCK "cmpxchg8b (%%esi) \n\t" + "jz 20f \n\t" + "testl %%eax, %%eax \n\t" + "jnz 10b \n" + "20:\t" + "popl %%ecx \n\t" + "popl %%ebx \n\t" + :"=a" (data) + :"S" (&lifo->top) + :"memory", "edx"); + return data; + } + + static void lifo_push(t_lifo * lifo, void * data) + { + __asm__ __volatile__ ( + "# LFPUSH \n\t" + "pushl %%ebx \n\t" + "pushl %%ecx \n\t" + "movl 0(%%esi), %%eax \n\t" + "movl 4(%%esi), %%edx \n" + "1:\t" + "movl %%eax, %%ebx \n\t" + "incl %%ebx \n\t" + "movl %%edx, (%%ecx) \n\t" + LOCK "cmpxchg8b (%%esi) \n\t" + "jnz 1b \n\t" + "popl %%ecx \n\t" + "popl %%ebx \n\t" + :/* no output */ + :"S" (lifo), "c" (data) + :"memory", "eax", "edx"); + } + + + #elif defined(__Windows__) + + static void* lifo_pop(t_lifo* lifo) + { + __asm + { + push ebx + push ecx + push edx + push esi + mov esi, lifo + add esi, 4 + mov edx, dword ptr [esi+4] + mov eax, dword ptr [esi] + test eax, eax + jz _end + _loop: + mov ebx, dword ptr [eax] + mov ecx, edx + inc ecx + LOCK cmpxchg8b qword ptr [esi] + jz _end + test eax, eax + jnz _loop + _end: + pop esi + pop edx + pop ecx + pop ebx + } + + static void lifo_push(t_lifo * lifo, void * data) + { + __asm + { + push eax + push ebx + push ecx + push edx + push esi + mov esi, lifo + mov eax, dword ptr [esi] + mov ecx, data + mov edx, dword ptr 4[esi] + _loop: + mov ebx, eax + inc ebx + mov [ecx], edx + LOCK cmpxchg8b qword ptr [esi] + jnz _loop + pop esi + pop edx + pop ecx + pop ebx + pop eax + } + } + + + #else + #error lockfree fifos not available on this platform + #endif + + + + static void lifo_init(t_lifo* lifo) + { + lifo->ic = 0; + lifo->top = NULL; + lifo->oc = 0; + } + + t_fifo* fifo_init(void) + { + t_fifo* ret = (t_fifo*) getbytes(sizeof(t_fifo)); + + lifo_init(&ret->in); + lifo_init(&ret->out); + + return ret; + } + + + void fifo_destroy(t_fifo* fifo) + { + void * data; + do + { + data = fifo_get(fifo); + } + while (data != NULL); + + freebytes(fifo, sizeof(t_fifo)); + return; + } + + void fifo_put(t_fifo* fifo, void* data) + { + lifo_push(&fifo->in, data); + } + + void* fifo_get(t_fifo* fifo) + { + void * data; + t_lifo *out = &fifo->out; + + data = lifo_pop(out); + + if (!data) + { + void * tmp; + t_lifo *in = &fifo->in; + data = lifo_pop(in); + + if (data) + { + while((tmp = lifo_pop(in))) + { + lifo_push(out, data); + data = tmp; + } + } + + } + return data; + } + + + #endif

1 0

pd/src m_sched.c,1.5.4.25,1.5.4.26
by Tim Blechmann 04 May '05

04 May '05

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20854 Modified Files: Tag: devel_0_38 m_sched.c Log Message: adapted for lockfree fifos Index: m_sched.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/m_sched.c,v retrieving revision 1.5.4.25 retrieving revision 1.5.4.26 diff -C2 -d -r1.5.4.25 -r1.5.4.26 *** m_sched.c 19 Apr 2005 14:28:03 -0000 1.5.4.25 --- m_sched.c 4 May 2005 17:13:57 -0000 1.5.4.26 *************** *** 622,629 **** typedef struct _sched_callback { t_int (*function) (t_int* argv); t_int* argv; t_int argc; - struct _sched_callback* next; /* next callback in ringbuffer */ } t_sched_callback; --- 622,629 ---- typedef struct _sched_callback { + struct _sched_callback* next; /* next callback in ringbuffer / in fifo */ t_int (*function) (t_int* argv); t_int* argv; t_int argc; } t_sched_callback;

1 0

externals/nusmuk/msd3D 02_msd3Dperf.pd, 1.5, 1.6 05_msd3Dvline.pd, 1.3, 1.4 partiel.pd, 1.3, 1.4
by Nicolas Montgermont 04 May '05

04 May '05

Update of /cvsroot/pure-data/externals/nusmuk/msd3D In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5064/msd3D Modified Files: 02_msd3Dperf.pd 05_msd3Dvline.pd partiel.pd Log Message: Some bugs fixed Index: 02_msd3Dperf.pd =================================================================== RCS file: /cvsroot/pure-data/externals/nusmuk/msd3D/02_msd3Dperf.pd,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** 02_msd3Dperf.pd 3 May 2005 12:03:42 -0000 1.5 --- 02_msd3Dperf.pd 4 May 2005 16:12:10 -0000 1.6 *************** *** 45,52 **** #X restore 52 699 pd massrender; #X obj 425 254 random 100; - #X msg 425 233 seed 1; #X obj 349 254 random 100; #X obj 274 233 random 100; - #X msg 349 233 seed 2; #X msg 274 212 seed 3; #X obj 274 254 + 100; --- 45,50 ---- *************** *** 91,167 **** #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 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 24 0; ! #X connect 5 4 17 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 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 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 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; --- 89,167 ---- #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 0 1 ; #X floatatom 107 470 5 0 0 0 - - -; #X text 74 453 instead of GEM; ! #X msg 349 233 seed 20; ! #X msg 425 233 seed 10; ! #X connect 0 0 28 0; #X connect 1 0 5 0; #X connect 2 0 0 0; #X connect 3 0 5 0; ! #X connect 5 0 36 0; ! #X connect 5 1 33 0; ! #X connect 5 2 35 0; ! #X connect 5 3 53 0; #X connect 5 4 2 0; ! #X connect 5 4 22 0; ! #X connect 5 4 15 0; ! #X connect 5 4 60 0; ! #X connect 5 4 59 0; ! #X connect 5 4 31 0; ! #X connect 6 0 27 0; ! #X connect 7 0 45 0; ! #X connect 9 0 27 0; ! #X connect 9 0 38 0; ! #X connect 10 0 40 0; ! #X connect 12 0 32 2; ! #X connect 13 0 32 1; ! #X connect 14 0 16 0; ! #X connect 15 0 14 0; ! #X connect 16 0 32 0; ! #X connect 17 0 23 0; ! #X connect 18 0 20 0; ! #X connect 18 0 21 0; ! #X connect 18 0 23 1; ! #X connect 19 0 24 1; ! #X connect 20 0 19 1; ! #X connect 21 0 24 0; ! #X connect 21 1 19 0; ! #X connect 22 0 23 1; ! #X connect 23 0 18 0; ! #X connect 24 0 25 0; ! #X connect 25 0 0 0; ! #X connect 26 0 10 0; ! #X connect 28 0 39 0; ! #X connect 29 0 14 0; ! #X connect 29 1 13 0; ! #X connect 29 1 30 0; ! #X connect 29 2 12 0; ! #X connect 30 0 32 3; ! #X connect 31 0 30 0; ! #X connect 32 0 54 0; ! #X connect 33 0 0 0; ! #X connect 34 0 27 0; ! #X connect 35 0 29 0; ! #X connect 36 0 17 0; ! #X connect 38 0 34 0; ! #X connect 39 0 11 0; ! #X connect 40 0 28 0; ! #X connect 42 0 45 1; ! #X connect 43 0 45 2; ! #X connect 44 0 45 3; ! #X connect 45 0 8 0; ! #X connect 46 0 35 1; ! #X connect 46 0 36 1; ! #X connect 47 0 28 0; ! #X connect 48 0 28 0; ! #X connect 49 0 28 0; ! #X connect 50 0 28 0; ! #X connect 51 0 28 0; ! #X connect 52 0 28 0; ! #X connect 53 0 0 0; ! #X connect 54 0 0 0; ! #X connect 55 0 28 0; ! #X connect 56 0 55 0; ! #X connect 57 0 55 1; ! #X connect 59 0 13 0; ! #X connect 60 0 12 0; Index: 05_msd3Dvline.pd =================================================================== RCS file: /cvsroot/pure-data/externals/nusmuk/msd3D/05_msd3Dvline.pd,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** 05_msd3Dvline.pd 26 Apr 2005 16:10:08 -0000 1.3 --- 05_msd3Dvline.pd 4 May 2005 16:12:11 -0000 1.4 *************** *** 1,3 **** ! #N canvas 499 155 796 654 10; #X obj 32 13 loadbang; #X obj 457 430 gemwin; --- 1,3 ---- ! #N canvas 583 104 796 654 10; #X obj 32 13 loadbang; #X obj 457 430 gemwin; *************** *** 12,16 **** #X msg 204 88 symbol reset; #X obj 33 497 msd3D --------------------------------; - #X text 156 412 Ambient force; #X obj 146 42 t b b b b; #X msg 296 393 forceZ filet \$1; --- 12,15 ---- *************** *** 23,27 **** ; #X obj 421 221 vsl 15 128 -1 1 0 0 empty empty empty 0 -8 0 8 -262131 ! -1 -1 11000 1; #X obj 206 315 sin; #X obj 206 335 *; --- 22,26 ---- ; #X obj 421 221 vsl 15 128 -1 1 0 0 empty empty empty 0 -8 0 8 -262131 ! -1 -1 11600 1; #X obj 206 315 sin; #X obj 206 335 *; *************** *** 32,58 **** #X obj 206 295 * 6.28319; #X obj 206 232 metro 35; ! #N canvas 0 0 504 533 getmmasses 0; ! #X obj 154 46 inlet; ! #X obj 175 226 outlet; ! #X obj 157 85 t b b; #X obj 264 43 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1 -1; ! #X obj 174 165 f 0; ! #X obj 175 197 + 1; ! #X obj 130 128 repeat 30; ! #X msg 229 140 209; #X connect 0 0 2 0; ! #X connect 2 0 6 0; ! #X connect 2 1 7 0; #X connect 3 0 2 0; #X connect 4 0 5 0; #X connect 5 0 4 1; ! #X connect 5 0 1 0; ! #X connect 6 0 4 0; ! #X connect 7 0 4 1; ! #X restore 33 359 pd getmmasses; #N canvas 224 164 901 724 synthese 0; ! #X obj 232 66 inlet; ! #X obj 232 176 pack f f f f; #X obj 231 316 partiel; #N canvas 582 426 450 300 drone 0; --- 31,57 ---- #X obj 206 295 * 6.28319; #X obj 206 232 metro 35; ! #N canvas 646 294 504 533 getmmasses 0; ! #X obj 154 13 inlet; ! #X obj 152 238 outlet; ! #X obj 154 45 t b b; #X obj 264 43 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1 -1; ! #X obj 156 162 f 0; ! #X obj 156 186 + 1; ! #X msg 242 154 0; ! #X obj 154 129 repeat 450; #X connect 0 0 2 0; ! #X connect 2 0 7 0; ! #X connect 2 1 6 0; #X connect 3 0 2 0; #X connect 4 0 5 0; + #X connect 4 0 1 0; #X connect 5 0 4 1; ! #X connect 6 0 4 1; ! #X connect 7 0 4 0; ! #X restore 51 364 pd getmmasses; #N canvas 224 164 901 724 synthese 0; ! #X obj 284 40 inlet; ! #X obj 298 181 pack f f f f; #X obj 231 316 partiel; #N canvas 582 426 450 300 drone 0; *************** *** 85,101 **** #X connect 13 0 5 0; #X connect 13 1 8 0; ! #X restore 627 480 pd drone; ! #X obj 232 154 t f f; ! #X msg 143 113 reset; ! #X obj 87 64 loadbang; ! #X obj 173 49 r resban; ! #X obj 232 110 t b f; #X obj 521 498 hip~ 20; #X obj 401 501 hip~ 20; #X obj 443 563 dac~; - #X obj 232 132 counter 0 29; #X obj 235 254 route 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29; ! #X obj 232 88 unpack f f f f; #X obj 288 385 partiel; #X obj 250 339 partiel; --- 84,95 ---- #X connect 13 0 5 0; #X connect 13 1 8 0; ! #X restore 270 489 pd drone; #X obj 521 498 hip~ 20; #X obj 401 501 hip~ 20; #X obj 443 563 dac~; #X obj 235 254 route 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29; ! #X obj 284 62 unpack f f f f; ! #X obj 286 127 % 30; #X obj 288 385 partiel; #X obj 250 339 partiel; *************** *** 127,269 **** #X obj 710 313 partiel; #X obj 729 336 partiel; ! #X connect 0 0 14 0; ! #X connect 1 0 13 0; ! #X connect 2 0 9 0; ! #X connect 3 0 10 0; ! #X connect 3 0 9 0; ! #X connect 4 0 1 0; ! #X connect 5 0 12 0; ! #X connect 6 0 5 0; ! #X connect 7 0 5 0; ! #X connect 8 0 12 0; #X connect 8 1 1 1; ! #X connect 9 0 11 1; ! #X connect 10 0 11 0; #X connect 12 0 4 0; ! #X connect 13 0 2 0; ! #X connect 13 1 16 0; ! #X connect 13 2 17 0; ! #X connect 13 3 15 0; ! #X connect 13 4 18 0; ! #X connect 13 5 19 0; ! #X connect 13 6 20 0; ! #X connect 13 7 21 0; ! #X connect 13 8 22 0; ! #X connect 13 9 23 0; ! #X connect 13 10 24 0; ! #X connect 13 11 25 0; ! #X connect 13 12 26 0; ! #X connect 13 13 27 0; ! #X connect 13 14 28 0; ! #X connect 13 15 29 0; ! #X connect 13 16 30 0; ! #X connect 13 17 31 0; ! #X connect 13 18 32 0; ! #X connect 13 19 33 0; ! #X connect 13 20 34 0; ! #X connect 13 21 35 0; ! #X connect 13 22 36 0; ! #X connect 13 23 37 0; ! #X connect 13 24 38 0; ! #X connect 13 25 39 0; ! #X connect 13 26 40 0; ! #X connect 13 27 41 0; ! #X connect 13 28 42 0; ! #X connect 13 29 43 0; ! #X connect 14 1 8 0; ! #X connect 14 2 1 2; ! #X connect 14 3 1 3; ! #X connect 15 0 10 0; ! #X connect 16 0 10 0; ! #X connect 17 0 9 0; ! #X connect 18 0 9 0; ! #X connect 19 0 10 0; ! #X connect 20 0 9 0; ! #X connect 21 0 10 0; ! #X connect 22 0 9 0; ! #X connect 23 0 10 0; ! #X connect 24 0 9 0; ! #X connect 25 0 10 0; ! #X connect 26 0 9 0; ! #X connect 27 0 10 0; ! #X connect 28 0 9 0; ! #X connect 29 0 10 0; ! #X connect 30 0 9 0; ! #X connect 31 0 10 0; ! #X connect 32 0 9 0; ! #X connect 33 0 10 0; ! #X connect 34 0 9 0; ! #X connect 35 0 10 0; ! #X connect 36 0 9 0; ! #X connect 37 0 10 0; ! #X connect 38 0 9 0; ! #X connect 39 0 10 0; ! #X connect 40 0 9 0; ! #X connect 41 0 10 0; ! #X connect 42 0 9 0; ! #X connect 43 0 10 0; ! #X restore 33 572 pd synthese; #X obj 183 219 vsl 15 128 0 30 0 0 empty empty empty 0 -8 0 8 -262131 ! -1 -1 10100 1; ! #N canvas 571 334 938 386 massrender 0; #X obj 286 2 inlet; ! #X obj 35 134 gemhead; ! #X obj 44 192 any; #X obj 306 144 pack f f f f; #X obj 306 99 % 30; ! #X obj 55 227 route 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29; - #X obj 306 119 sel 0; #X obj 44 288 curve16 --------------------------------------------- ; ! #X obj 306 74 unpack f f f f; ! #X connect 0 0 8 0; #X connect 1 0 2 1; ! #X connect 2 0 7 0; #X connect 3 0 5 0; - #X connect 4 0 6 0; #X connect 4 0 3 0; ! #X connect 5 0 7 1; ! #X connect 5 1 7 2; ! #X connect 5 2 7 3; ! #X connect 5 3 7 4; ! #X connect 5 4 7 5; ! #X connect 5 5 7 6; ! #X connect 5 6 7 7; ! #X connect 5 7 7 8; ! #X connect 5 8 7 9; ! #X connect 5 9 7 10; ! #X connect 5 10 7 11; ! #X connect 5 11 7 12; ! #X connect 5 12 7 13; ! #X connect 5 13 7 14; ! #X connect 5 14 7 15; ! #X connect 5 15 7 16; ! #X connect 5 16 7 17; ! #X connect 5 17 7 18; ! #X connect 5 18 7 19; ! #X connect 5 19 7 20; ! #X connect 5 20 7 21; ! #X connect 5 21 7 22; ! #X connect 5 22 7 23; ! #X connect 5 23 7 24; ! #X connect 5 24 7 25; ! #X connect 5 25 7 26; ! #X connect 5 26 7 27; ! #X connect 5 27 7 28; ! #X connect 5 28 7 29; ! #X connect 5 29 7 30; ! #X connect 6 0 2 0; ! #X connect 8 0 4 0; ! #X connect 8 1 3 1; ! #X connect 8 2 3 2; ! #X connect 8 3 3 3; ! #X restore 135 573 pd massrender; ! #X msg 165 140 setFixed 0 \, setFixed 29 \, setFixed 420 \, setFixed 449; ! #X text 459 114 Filet abstraction : x0 y0 stepx stepy ny nx; #X text 483 206 <-- Add constant force; #X text 240 204 <-- Add sinus force; - #X text 136 360 Get middles masses; #X obj 457 348 t b; #X text 179 18 Reset; --- 121,271 ---- #X obj 710 313 partiel; #X obj 729 336 partiel; ! #X text 7 465 If you're tired with the drone disconnect it :; ! #X connect 0 0 8 0; ! #X connect 1 0 7 0; ! #X connect 2 0 4 0; ! #X connect 3 0 5 0; ! #X connect 3 0 4 0; ! #X connect 4 0 6 1; ! #X connect 5 0 6 0; ! #X connect 7 0 2 0; ! #X connect 7 1 11 0; ! #X connect 7 2 12 0; ! #X connect 7 3 10 0; ! #X connect 7 4 13 0; ! #X connect 7 5 14 0; ! #X connect 7 6 15 0; ! #X connect 7 7 16 0; ! #X connect 7 8 17 0; ! #X connect 7 9 18 0; ! #X connect 7 10 19 0; ! #X connect 7 11 20 0; ! #X connect 7 12 21 0; ! #X connect 7 12 3 0; ! #X connect 7 13 22 0; ! #X connect 7 14 23 0; ! #X connect 7 15 24 0; ! #X connect 7 16 25 0; ! #X connect 7 17 26 0; ! #X connect 7 18 27 0; ! #X connect 7 19 28 0; ! #X connect 7 20 29 0; ! #X connect 7 21 30 0; ! #X connect 7 22 31 0; ! #X connect 7 23 32 0; ! #X connect 7 24 33 0; ! #X connect 7 25 34 0; ! #X connect 7 26 35 0; ! #X connect 7 27 36 0; ! #X connect 7 28 37 0; ! #X connect 7 29 38 0; ! #X connect 8 0 9 0; #X connect 8 1 1 1; ! #X connect 8 2 1 2; ! #X connect 8 3 1 3; ! #X connect 9 0 1 0; ! #X connect 10 0 5 0; ! #X connect 11 0 5 0; #X connect 12 0 4 0; ! #X connect 13 0 4 0; ! #X connect 14 0 5 0; ! #X connect 15 0 4 0; ! #X connect 16 0 5 0; ! #X connect 17 0 4 0; ! #X connect 18 0 5 0; ! #X connect 19 0 4 0; ! #X connect 20 0 5 0; ! #X connect 21 0 4 0; ! #X connect 22 0 5 0; ! #X connect 23 0 4 0; ! #X connect 24 0 5 0; ! #X connect 25 0 4 0; ! #X connect 26 0 5 0; ! #X connect 27 0 4 0; ! #X connect 28 0 5 0; ! #X connect 29 0 4 0; ! #X connect 30 0 5 0; ! #X connect 31 0 4 0; ! #X connect 32 0 5 0; ! #X connect 33 0 4 0; ! #X connect 34 0 5 0; ! #X connect 35 0 4 0; ! #X connect 36 0 5 0; ! #X connect 37 0 4 0; ! #X connect 38 0 5 0; ! #X restore 33 600 pd synthese; #X obj 183 219 vsl 15 128 0 30 0 0 empty empty empty 0 -8 0 8 -262131 ! -1 -1 11800 1; ! #N canvas 259 464 938 386 massrender 0; #X obj 286 2 inlet; ! #X obj 60 102 gemhead; ! #X obj 44 193 any; #X obj 306 144 pack f f f f; #X obj 306 99 % 30; ! #X obj 56 247 route 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29; #X obj 44 288 curve16 --------------------------------------------- ; ! #X obj 325 41 unpack f f f f; ! #X obj 261 125 sel 29; ! #X obj 559 210 pack f f f f; ! #X obj 430 147 moses 240; ! #X obj 432 177 moses 210; ! #X text 669 215 Get middle masses; ! #X obj 555 295 outlet; ! #X connect 0 0 7 0; #X connect 1 0 2 1; ! #X connect 2 0 6 0; #X connect 3 0 5 0; #X connect 4 0 3 0; ! #X connect 4 0 8 0; ! #X connect 5 0 6 1; ! #X connect 5 1 6 2; ! #X connect 5 2 6 3; ! #X connect 5 3 6 4; ! #X connect 5 4 6 5; ! #X connect 5 5 6 6; ! #X connect 5 6 6 7; ! #X connect 5 7 6 8; ! #X connect 5 8 6 9; ! #X connect 5 9 6 10; ! #X connect 5 10 6 11; ! #X connect 5 11 6 12; ! #X connect 5 12 6 13; ! #X connect 5 13 6 14; ! #X connect 5 14 6 15; ! #X connect 5 15 6 16; ! #X connect 5 16 6 17; ! #X connect 5 17 6 18; ! #X connect 5 18 6 19; ! #X connect 5 19 6 20; ! #X connect 5 20 6 21; ! #X connect 5 21 6 22; ! #X connect 5 22 6 23; ! #X connect 5 23 6 24; ! #X connect 5 24 6 25; ! #X connect 5 25 6 26; ! #X connect 5 26 6 27; ! #X connect 5 27 6 28; ! #X connect 5 28 6 29; ! #X connect 5 29 6 30; ! #X connect 7 0 4 0; ! #X connect 7 0 10 0; ! #X connect 7 1 3 1; ! #X connect 7 1 9 1; ! #X connect 7 2 3 2; ! #X connect 7 2 9 2; ! #X connect 7 3 3 3; ! #X connect 7 3 9 3; ! #X connect 8 0 2 0; ! #X connect 9 0 13 0; ! #X connect 10 0 11 0; ! #X connect 11 1 9 0; ! #X restore 33 565 pd massrender; ! #X msg 165 139 setFixed 0 \, setFixed 29 \, setFixed 420 \, setFixed 449; ! #X text 459 113 Filet abstraction : x0 y0 stepx stepy ny nx; #X text 483 206 <-- Add constant force; #X text 240 204 <-- Add sinus force; #X obj 457 348 t b; #X text 179 18 Reset; *************** *** 276,337 **** #X msg 457 388 view 0 0 5 0 0 0 1 0 0; #X text 624 390 <-- Zoom in; ! #X msg 33 412 forceZ filet 0; ! #X msg 33 379 get massesPos \$1; #X msg 146 173 Xmax 4 \, Xmin -4 \, Ymax 4 \, Ymin -4 \, Zmax 9 \, Zmin -6; #X msg 457 369 view 0 0 11 0 0 0 1 0 0; - #X msg 33 443 get massesPos; #X obj 33 539 route massesPosNo massesPos; #X obj 33 257 t b b; ! #X connect 0 0 12 0; #X connect 2 0 1 0; #X connect 3 0 4 0; #X connect 5 0 10 0; ! #X connect 6 0 12 0; #X connect 7 0 5 0; ! #X connect 8 0 52 0; ! #X connect 9 0 38 1; ! #X connect 10 0 51 0; ! #X connect 12 0 48 0; ! #X connect 12 0 40 0; ! #X connect 12 1 31 0; ! #X connect 12 2 38 0; ! #X connect 12 3 7 0; ! #X connect 12 3 9 0; ! #X connect 13 0 10 0; ! #X connect 14 0 16 0; ! #X connect 15 0 13 0; ! #X connect 16 0 15 0; ! #X connect 17 0 10 0; ! #X connect 18 0 1 0; ! #X connect 18 0 36 0; ! #X connect 19 0 15 1; ! #X connect 20 0 21 0; ! #X connect 21 0 13 0; ! #X connect 22 0 24 0; ! #X connect 23 0 26 0; ! #X connect 24 0 25 0; ! #X connect 25 0 20 0; ! #X connect 26 0 22 0; ! #X connect 27 0 47 0; ! #X connect 29 0 21 1; ! #X connect 31 0 5 0; ! #X connect 36 0 49 0; ! #X connect 38 0 5 0; #X connect 39 0 10 0; ! #X connect 41 0 10 0; ! #X connect 42 0 10 0; ! #X connect 44 0 1 0; ! #X connect 46 0 10 0; ! #X connect 47 0 10 0; ! #X connect 48 0 5 0; ! #X connect 49 0 1 0; #X connect 50 0 10 0; - #X connect 51 0 28 0; - #X connect 51 1 30 0; - #X connect 52 0 10 0; - #X connect 52 0 27 0; - #X connect 52 0 50 0; - #X connect 52 0 46 0; - #X connect 52 1 27 0; - #X connect 52 1 10 0; --- 278,341 ---- #X msg 457 388 view 0 0 5 0 0 0 1 0 0; #X text 624 390 <-- Zoom in; ! #X msg 51 388 get massesPos \$1; #X msg 146 173 Xmax 4 \, Xmin -4 \, Ymax 4 \, Ymin -4 \, Zmax 9 \, Zmin -6; #X msg 457 369 view 0 0 11 0 0 0 1 0 0; #X obj 33 539 route massesPosNo massesPos; #X obj 33 257 t b b; ! #X obj 37 219 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1 ! -1; ! #X msg 29 323 bang; ! #X text 154 365 Get masses in order; ! #X obj 326 541 print; ! #X connect 0 0 11 0; #X connect 2 0 1 0; #X connect 3 0 4 0; #X connect 5 0 10 0; ! #X connect 6 0 11 0; #X connect 7 0 5 0; ! #X connect 8 0 48 0; ! #X connect 9 0 36 1; ! #X connect 10 0 47 0; ! #X connect 10 1 52 0; ! #X connect 11 0 45 0; ! #X connect 11 0 38 0; ! #X connect 11 1 30 0; ! #X connect 11 2 36 0; ! #X connect 11 3 7 0; ! #X connect 11 3 9 0; ! #X connect 12 0 10 0; ! #X connect 13 0 15 0; ! #X connect 14 0 12 0; ! #X connect 15 0 14 0; ! #X connect 16 0 10 0; ! #X connect 17 0 1 0; ! #X connect 17 0 34 0; ! #X connect 18 0 14 1; ! #X connect 19 0 20 0; ! #X connect 20 0 12 0; ! #X connect 21 0 23 0; ! #X connect 22 0 25 0; ! #X connect 23 0 24 0; ! #X connect 24 0 19 0; ! #X connect 25 0 21 0; ! #X connect 26 0 44 0; ! #X connect 28 0 20 1; ! #X connect 29 0 27 0; ! #X connect 30 0 5 0; ! #X connect 34 0 46 0; ! #X connect 36 0 5 0; ! #X connect 37 0 10 0; #X connect 39 0 10 0; ! #X connect 40 0 10 0; ! #X connect 42 0 1 0; ! #X connect 44 0 10 0; ! #X connect 45 0 5 0; ! #X connect 46 0 1 0; ! #X connect 47 0 29 0; ! #X connect 48 0 26 0; ! #X connect 48 0 50 0; ! #X connect 48 1 26 0; ! #X connect 48 1 50 0; ! #X connect 49 0 48 0; #X connect 50 0 10 0; Index: partiel.pd =================================================================== RCS file: /cvsroot/pure-data/externals/nusmuk/msd3D/partiel.pd,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** partiel.pd 26 Apr 2005 16:10:08 -0000 1.3 --- partiel.pd 4 May 2005 16:12:11 -0000 1.4 *************** *** 9,15 **** #X msg 174 167 \$1 50; #X msg 131 60 \$2; ! #X obj 131 83 / 10; ! #X obj 182 112 + 10; ! #X obj 172 84 * 5; #X connect 0 0 8 0; #X connect 0 0 5 0; --- 9,17 ---- #X msg 174 167 \$1 50; #X msg 131 60 \$2; ! #X obj 131 119 / 2; ! #X obj 131 88 abs; ! #X obj 174 86 abs; ! #X obj 177 108 * 5; ! #X obj 187 136 + 10; #X connect 0 0 8 0; #X connect 0 0 5 0; *************** *** 20,25 **** #X connect 6 0 4 0; #X connect 7 0 2 0; ! #X connect 8 0 9 0; #X connect 9 0 7 0; ! #X connect 10 0 6 0; ! #X connect 11 0 10 0; --- 22,29 ---- #X connect 6 0 4 0; #X connect 7 0 2 0; ! #X connect 8 0 10 0; #X connect 9 0 7 0; ! #X connect 10 0 9 0; ! #X connect 11 0 12 0; ! #X connect 12 0 13 0; ! #X connect 13 0 6 0;

1 0

externals/nusmuk/msd2D 02_msd2Dadd.pd, 1.5, 1.6 help-msd2D.pd, 1.6, 1.7
by Nicolas Montgermont 04 May '05

04 May '05

Update of /cvsroot/pure-data/externals/nusmuk/msd2D In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5064/msd2D Modified Files: 02_msd2Dadd.pd help-msd2D.pd Log Message: Some bugs fixed Index: help-msd2D.pd =================================================================== RCS file: /cvsroot/pure-data/externals/nusmuk/msd2D/help-msd2D.pd,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** help-msd2D.pd 4 May 2005 12:36:18 -0000 1.6 --- help-msd2D.pd 4 May 2005 16:12:10 -0000 1.7 *************** *** 21,25 **** #X text 347 486 Add force on mass(es); #X msg 85 485 forceX \$1 \$2; ! #X obj 61 617 cnv 15 610 230 empty empty GET_ATTRIBUTES 20 12 0 14 -261689 -66577 0; #X msg 147 644 massePosL; --- 21,25 ---- #X text 347 486 Add force on mass(es); #X msg 85 485 forceX \$1 \$2; ! #X obj 61 617 cnv 15 610 260 empty empty GET_ATTRIBUTES 20 12 0 14 -261689 -66577 0; #X msg 147 644 massePosL; *************** *** 36,40 **** #X text 248 292 Delete a mass and associated links; #X text 338 309 \$1 : Creation No of mass; ! #X msg 144 815 infosL; #X text 247 815 Get infos on all masses and links on outlet No 2; #X text 347 555 \$1 : Value; --- 36,40 ---- #X text 248 292 Delete a mass and associated links; #X text 338 309 \$1 : Creation No of mass; ! #X msg 144 813 infosL; #X text 247 815 Get infos on all masses and links on outlet No 2; #X text 347 555 \$1 : Value; *************** *** 65,68 **** --- 65,72 ---- #X text 248 669 output all masses x/y position in a list on outlet No 1; + #X msg 112 838 grabMass \$1 \$2 \$3; + #X text 247 838 Get nearest mass and grab it; + #X text 112 857 \$1 \, \$2 : X \, Y position of mouse; + #X text 357 857 \$3 : grab or not (left click); #X connect 1 0 44 0; #X connect 8 0 44 0; *************** *** 78,82 **** #X connect 46 0 44 0; #X connect 50 0 44 0; ! #X restore 222 312 pd masses; #X text 75 312 HELP on masses --->; #X text 74 343 HELP on links --->; --- 82,86 ---- #X connect 46 0 44 0; #X connect 50 0 44 0; ! #X restore 221 312 pd masses; #X text 75 312 HELP on masses --->; #X text 74 343 HELP on links --->; Index: 02_msd2Dadd.pd =================================================================== RCS file: /cvsroot/pure-data/externals/nusmuk/msd2D/02_msd2Dadd.pd,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** 02_msd2Dadd.pd 4 May 2005 12:36:17 -0000 1.5 --- 02_msd2Dadd.pd 4 May 2005 16:12:10 -0000 1.6 *************** *** 220,230 **** #X connect 93 0 64 0; #X restore 230 679 pd synthese; ! #X obj 295 454 gemhead; #X msg 155 258 Xmax 100 \, Xmin 0 \, Ymax 100 \, Ymin 0; #X msg 511 503 reset \, create \, lighting 1 \, 1; #X obj 52 399 t b; ! #N canvas 643 123 605 590 massrender 0; #X obj 127 22 inlet; ! #X obj 62 231 translateXYZ; #X obj 141 87 / 12.5; #X obj 141 110 - 4; --- 220,230 ---- #X connect 93 0 64 0; #X restore 230 679 pd synthese; ! #X obj 10 698 gemhead; #X msg 155 258 Xmax 100 \, Xmin 0 \, Ymax 100 \, Ymin 0; #X msg 511 503 reset \, create \, lighting 1 \, 1; #X obj 52 399 t b; ! #N canvas 643 123 605 590 massrender 1; #X obj 127 22 inlet; ! #X obj 62 267 translateXYZ; #X obj 141 87 / 12.5; #X obj 141 110 - 4; *************** *** 232,246 **** #X obj 206 111 - 4; #X obj 78 115 gemhead; ! #X obj 62 205 separator; #X obj 62 181 any; #X obj 127 57 unpack f f f; ! #X obj 185 178 f; ! #X msg 185 241 \$1; #X obj 141 137 t b b f; ! #X obj 185 221 / 99; ! #X obj 185 199 - 29; ! #X obj 62 322 sphere 0.1; #X connect 0 0 9 0; ! #X connect 1 0 15 0; #X connect 2 0 3 0; #X connect 3 0 12 0; --- 232,246 ---- #X obj 206 111 - 4; #X obj 78 115 gemhead; ! #X obj 62 241 separator; #X obj 62 181 any; #X obj 127 57 unpack f f f; ! #X obj 212 182 f; ! #X msg 212 241 \$1; #X obj 141 137 t b b f; ! #X obj 62 314 sphere 0.1; ! #X obj 62 219 colorRGB 1 1 1; ! #X obj 212 221 / 29; #X connect 0 0 9 0; ! #X connect 1 0 13 0; #X connect 2 0 3 0; #X connect 3 0 12 0; *************** *** 249,262 **** #X connect 6 0 8 1; #X connect 7 0 1 0; ! #X connect 8 0 7 0; #X connect 9 0 10 1; #X connect 9 1 2 0; #X connect 9 2 4 0; ! #X connect 10 0 14 0; ! #X connect 12 0 10 0; #X connect 12 1 8 0; #X connect 12 2 1 1; ! #X connect 13 0 11 0; ! #X connect 14 0 13 0; #X restore 141 657 pd massrender; #N canvas 284 227 587 558 linkrender 0; --- 249,264 ---- #X connect 6 0 8 1; #X connect 7 0 1 0; ! #X connect 8 0 14 0; #X connect 9 0 10 1; #X connect 9 1 2 0; #X connect 9 2 4 0; ! #X connect 10 0 15 0; ! #X connect 11 0 14 2; ! #X connect 11 0 14 3; #X connect 12 1 8 0; + #X connect 12 1 10 0; #X connect 12 2 1 1; ! #X connect 14 0 7 0; ! #X connect 15 0 11 0; #X restore 141 657 pd massrender; #N canvas 284 227 587 558 linkrender 0; *************** *** 325,337 **** #X obj 52 358 gemhead; #X obj 511 547 gemwin; - #X obj 52 628 route linksPos massesPos massesSpeedsNo; - #X msg 71 498 forceX mob -200; - #X msg 52 420 bang \, get massesPos \, get linksPos \, get massesSpeeds - 1 5 9 13 17 21 25 29; - #X msg 71 478 forceX mob 200; #X text 175 41 Reset; #X text 484 171 Random positions and masses; ! #X text 370 502 1 Create window -->; ! #X text 196 484 Add force; #X msg 522 585 \; pd dsp 1; #X text 396 591 2 SET DSP ON -->; --- 327,334 ---- #X obj 52 358 gemhead; #X obj 511 547 gemwin; #X text 175 41 Reset; #X text 484 171 Random positions and masses; ! #X text 367 502 1 Create window -->; ! #X text 225 498 Add force; #X msg 522 585 \; pd dsp 1; #X text 396 591 2 SET DSP ON -->; *************** *** 358,373 **** #X connect 8 0 9 0; #X connect 9 0 1 0; ! #X restore 295 476 pd gemmouse2; ! #X msg 295 518 grabMass \$1 \$2 \$3; #X obj 173 126 repeat 30; #X obj 79 187 repeat 29; #X msg 129 348 link souple \$1 \$2 10 0.5 0.5; #X connect 0 0 6 0; #X connect 1 0 4 0; #X connect 2 0 0 0; #X connect 3 0 4 0; ! #X connect 4 0 50 0; #X connect 4 1 12 0; ! #X connect 4 2 49 0; #X connect 4 4 2 0; #X connect 4 4 31 0; --- 355,378 ---- #X connect 8 0 9 0; #X connect 9 0 1 0; ! #X restore 10 720 pd gemmouse2; ! #X msg 10 762 grabMass \$1 \$2 \$3; #X obj 173 126 repeat 30; #X obj 79 187 repeat 29; #X msg 129 348 link souple \$1 \$2 10 0.5 0.5; + #X text 130 713 Move red masses for bass and white ones for high tones... + !Index errors; + #X obj 52 628 route linksPos massesPos massesSpeedsNo; + #X msg 52 420 bang \, get massesPos \, get linksPos \, get massesSpeeds + 1 5 9 13 17 21 25 29; + #X obj 334 684 print; + #X msg 95 518 forceX mob -1000; + #X msg 94 492 forceX mob 1000; #X connect 0 0 6 0; #X connect 1 0 4 0; #X connect 2 0 0 0; #X connect 3 0 4 0; ! #X connect 4 0 46 0; #X connect 4 1 12 0; ! #X connect 4 2 45 0; #X connect 4 4 2 0; #X connect 4 4 31 0; *************** *** 375,386 **** #X connect 4 4 19 0; #X connect 4 4 22 0; ! #X connect 6 0 37 0; #X connect 6 1 5 0; #X connect 7 0 36 0; #X connect 8 0 9 0; ! #X connect 11 0 47 0; #X connect 12 0 0 0; #X connect 13 0 36 0; ! #X connect 14 0 39 0; #X connect 17 0 0 0; #X connect 18 0 25 2; --- 380,391 ---- #X connect 4 4 19 0; #X connect 4 4 22 0; ! #X connect 6 0 49 0; #X connect 6 1 5 0; #X connect 7 0 36 0; #X connect 8 0 9 0; ! #X connect 11 0 43 0; #X connect 12 0 0 0; #X connect 13 0 36 0; ! #X connect 14 0 50 0; #X connect 17 0 0 0; #X connect 18 0 25 2; *************** *** 402,419 **** #X connect 31 0 32 1; #X connect 32 0 27 0; ! #X connect 33 0 51 0; #X connect 34 0 21 0; #X connect 34 1 20 0; #X connect 34 2 18 0; #X connect 35 0 14 0; ! #X connect 37 0 16 0; ! #X connect 37 1 15 0; ! #X connect 37 2 10 0; ! #X connect 38 0 6 0; ! #X connect 39 0 6 0; ! #X connect 40 0 6 0; ! #X connect 47 0 48 0; ! #X connect 48 0 6 0; ! #X connect 49 0 34 0; ! #X connect 50 0 26 0; ! #X connect 51 0 0 0; --- 407,424 ---- #X connect 31 0 32 1; #X connect 32 0 27 0; ! #X connect 33 0 47 0; #X connect 34 0 21 0; #X connect 34 1 20 0; #X connect 34 2 18 0; #X connect 35 0 14 0; ! #X connect 43 0 44 0; ! #X connect 44 0 6 0; ! #X connect 45 0 34 0; ! #X connect 46 0 26 0; ! #X connect 47 0 0 0; ! #X connect 49 0 16 0; ! #X connect 49 1 15 0; ! #X connect 49 2 10 0; ! #X connect 50 0 6 0; ! #X connect 52 0 6 0; ! #X connect 53 0 6 0;

1 0

externals/nusmuk msd.h,1.6,1.7
by Nicolas Montgermont 04 May '05

04 May '05

Update of /cvsroot/pure-data/externals/nusmuk In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5064 Modified Files: msd.h Log Message: Some bugs fixed Index: msd.h =================================================================== RCS file: /cvsroot/pure-data/externals/nusmuk/msd.h,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** msd.h 4 May 2005 12:36:17 -0000 1.6 --- msd.h 4 May 2005 16:12:09 -0000 1.7 *************** *** 9,13 **** at La Kitchen supervised by Cyrille Henry. ! ptimized by Thomas Grill for Flext Based on Pure Data by Miller Puckette and others Based on pmpd by Cyrille Henry --- 9,13 ---- at La Kitchen supervised by Cyrille Henry. ! Optimized by Thomas Grill for Flext Based on Pure Data by Miller Puckette and others Based on pmpd by Cyrille Henry *************** *** 743,747 **** for(mit = massids.find(GetSymbol(argv[j])); mit; ++mit) { SetSymbol(sortie[0],mit.data()->Id); ! for(int i = 0; i < N; ++i) SetFloat(sortie[1],mit.data()->pos[i]); ToOutAnything(0,S_massesPosId,1+N,sortie); } --- 743,747 ---- for(mit = massids.find(GetSymbol(argv[j])); mit; ++mit) { SetSymbol(sortie[0],mit.data()->Id); ! for(int i = 0; i < N; ++i) SetFloat(sortie[1+i],mit.data()->pos[i]); ToOutAnything(0,S_massesPosId,1+N,sortie); } *************** *** 751,755 **** if(m) { SetInt(sortie[0],m->nbr); ! for(int i = 0; i < N; ++i) SetFloat(sortie[1],m->pos[i]); ToOutAnything(0,S_massesPosNo,1+N,sortie); } --- 751,755 ---- if(m) { SetInt(sortie[0],m->nbr); ! for(int i = 0; i < N; ++i) SetFloat(sortie[1+i],m->pos[i]); ToOutAnything(0,S_massesPosNo,1+N,sortie); }

1 0

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

04 May '05

Update of /cvsroot/pure-data/externals/nusmuk/msd3D In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11519/msd3D Modified Files: help-msd3D.pd Log Message: Added methods Index: help-msd3D.pd =================================================================== RCS file: /cvsroot/pure-data/externals/nusmuk/msd3D/help-msd3D.pd,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** help-msd3D.pd 28 Apr 2005 15:22:13 -0000 1.5 --- help-msd3D.pd 4 May 2005 12:36:18 -0000 1.6 *************** *** 1,42 **** ! #N canvas 0 0 467 396 10; ! #N canvas 271 52 742 843 masses 0; ! #X obj 62 154 cnv 15 610 180 empty empty CREATION 20 12 0 14 -262131 -66577 0; ! #X msg 79 183 reset; ! #X text 249 214 Add a mass; ! #X text 335 215 \$1 : Id (symbol); ! #X text 334 235 \$2 : fixed or mobile (0/1); ! #X text 334 253 \$3 : mass; ! #X text 251 184 Delete all masses and links; ! #X obj 62 338 cnv 15 610 60 empty empty COMPUTATION 20 12 0 14 -261689 -66577 0; ! #X msg 82 367 bang; ! #X text 235 367 Compute new masses positions; ! #X obj 61 403 cnv 15 610 210 empty empty DYNAMIC_SETTING 20 12 0 14 -262131 -66577 0; ! #X text 350 467 \$2 : New value; ! #X text 348 521 \$2 : New value; ! #X msg 87 429 posX \$1 \$2; ! #X text 350 431 Set position of mass(es); ! #X text 347 486 Add force on mass(es); ! #X msg 82 480 forceX \$1 \$2; ! #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; ! #X text 247 673 output all masses forces in a list on outlet No 1; ! #X msg 146 710 get \$1 \$2; ! #X text 249 711 Get specific attribute; ! #X text 249 736 \$1 : Attribute type ( massesPos / massesSpeeds / massesForces / linksPos ); ! #X text 249 773 \$2 : Id (symbol or creations numbers); ! #X msg 79 290 deleteMass \$1; ! #X text 248 292 Delete a mass and associated links; ! #X text 338 309 \$1 : Creation No of mass; ! #X msg 144 793 infosL; ! #X text 247 793 Get infos on all masses and links on outlet No 2; ! #X text 347 555 \$1 : Value; #X text 73 22 MASSES :; #X text 66 69 They got only one physical parameter \, the value of --- 1,42 ---- ! #N canvas 369 233 467 396 10; ! #N canvas 271 52 742 855 masses 0; ! #X obj 62 132 cnv 15 610 180 empty empty CREATION 20 12 0 14 -262131 -66577 0; ! #X msg 79 161 reset; ! #X text 249 192 Add a mass; ! #X text 335 193 \$1 : Id (symbol); ! #X text 334 213 \$2 : fixed or mobile (0/1); ! #X text 334 231 \$3 : mass; ! #X text 251 162 Delete all masses and links; ! #X obj 62 316 cnv 15 610 60 empty empty COMPUTATION 20 12 0 14 -261689 -66577 0; ! #X msg 82 345 bang; ! #X text 235 345 Compute new masses positions; ! #X obj 61 381 cnv 15 610 210 empty empty DYNAMIC_SETTING 20 12 0 14 -262131 -66577 0; ! #X text 350 445 \$2 : New value; ! #X text 348 499 \$2 : New value; ! #X msg 87 407 posX \$1 \$2; ! #X text 350 409 Set position of mass(es); ! #X text 347 464 Add force on mass(es); ! #X msg 82 458 forceX \$1 \$2; ! #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; ! #X text 246 697 output all masses forces in a list on outlet No 1; ! #X msg 145 734 get \$1 \$2; ! #X text 248 735 Get specific attribute; ! #X text 248 760 \$1 : Attribute type ( massesPos / massesSpeeds / massesForces / linksPos ); ! #X text 248 797 \$2 : Id (symbol or creations numbers); ! #X msg 79 268 deleteMass \$1; ! #X text 248 270 Delete a mass and associated links; ! #X text 338 287 \$1 : Creation No of mass; ! #X msg 143 817 infosL; ! #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 *************** *** 49,67 **** \, by; #X text 67 112 messages \, don't do anything.; ! #X msg 81 578 setMobile \$1 \, setFixed \$1; ! #X text 345 578 Change mobile parameter; ! #X text 345 594 \$1 : Creation No of mass; ! #X msg 166 429 posY \$1 \$2; ! #X msg 174 480 forceY \$1 \$2; ! #X text 347 538 Set minimimum and maximum X \, Y of masses; ! #X msg 83 525 Xmin \$1 \, Xmax \$1 \, Ymin \$1 \, Ymax \$1; ! #X msg 79 214 mass \$1 \$2 \$3 \$4 \$5 \$6; ! #X text 334 271 \$4 \, \$5 \, \$6 : initial position; ! #X msg 246 429 posZ \$1 \$2; ! #X msg 83 503 forceZ \$1 \$2; ! #X msg 83 548 Zmin \$1 \, Zmax \$1; #X obj 33 821 msd3D; ! #X text 350 449 \$1 : Id (symbol) or No; ! #X text 348 503 \$1 : Id (symbol) or No; #X connect 1 0 50 0; #X connect 8 0 50 0; --- 49,72 ---- \, 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; ! #X text 345 572 \$1 : Creation No of mass; ! #X msg 166 407 posY \$1 \$2; ! #X msg 174 458 forceY \$1 \$2; ! #X text 347 516 Set minimimum and maximum X \, Y of masses; ! #X msg 83 503 Xmin \$1 \, Xmax \$1 \, Ymin \$1 \, Ymax \$1; ! #X msg 79 192 mass \$1 \$2 \$3 \$4 \$5 \$6; ! #X text 334 249 \$4 \, \$5 \, \$6 : initial position; ! #X msg 246 407 posZ \$1 \$2; ! #X msg 83 481 forceZ \$1 \$2; ! #X msg 83 526 Zmin \$1 \, Zmax \$1; #X obj 33 821 msd3D; ! #X text 350 427 \$1 : Id (symbol) or No; ! #X text 348 481 \$1 : Id (symbol) or No; ! #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; *************** *** 76,80 **** #X connect 44 0 50 0; #X connect 45 0 50 0; ! #X restore 158 305 pd masses; #X text 12 305 HELP on masses --->; #X text 11 336 HELP on links --->; --- 81,88 ---- #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 --->; #X text 11 336 HELP on links --->;

1 0

externals/nusmuk/msd2D 02_msd2Dadd.pd, 1.4, 1.5 help-msd2D.pd, 1.5, 1.6
by Nicolas Montgermont 04 May '05

04 May '05

Update of /cvsroot/pure-data/externals/nusmuk/msd2D In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11519/msd2D Modified Files: 02_msd2Dadd.pd help-msd2D.pd Log Message: Added methods Index: help-msd2D.pd =================================================================== RCS file: /cvsroot/pure-data/externals/nusmuk/msd2D/help-msd2D.pd,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** help-msd2D.pd 28 Apr 2005 15:22:06 -0000 1.5 --- help-msd2D.pd 4 May 2005 12:36:18 -0000 1.6 *************** *** 1,4 **** #N canvas 0 0 478 397 10; ! #N canvas 271 52 742 843 masses 0; #X obj 62 154 cnv 15 610 180 empty empty CREATION 20 12 0 14 -262131 -66577 0; --- 1,4 ---- #N canvas 0 0 478 397 10; ! #N canvas 289 25 787 879 masses 0; #X obj 62 154 cnv 15 610 180 empty empty CREATION 20 12 0 14 -262131 -66577 0; *************** *** 21,41 **** #X text 347 486 Add force on mass(es); #X msg 85 485 forceX \$1 \$2; ! #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; ! #X text 247 673 output all masses forces in a list on outlet No 1; ! #X msg 146 710 get \$1 \$2; ! #X text 249 711 Get specific attribute; ! #X text 249 736 \$1 : Attribute type ( massesPos / massesSpeeds / massesForces / linksPos ); ! #X text 249 773 \$2 : Id (symbol or creations numbers); #X msg 79 290 deleteMass \$1; #X text 248 292 Delete a mass and associated links; #X text 338 309 \$1 : Creation No of mass; ! #X msg 144 793 infosL; ! #X text 247 793 Get infos on all masses and links on outlet No 2; #X text 347 555 \$1 : Value; #X text 73 22 MASSES :; --- 21,41 ---- #X text 347 486 Add force on mass(es); #X msg 85 485 forceX \$1 \$2; ! #X obj 61 617 cnv 15 610 230 empty empty GET_ATTRIBUTES 20 12 0 14 -261689 -66577 0; #X msg 147 644 massePosL; ! #X msg 147 694 masseForcesL; #X text 248 644 output all masses positions in a list on outlet No 1; ! #X text 247 695 output all masses forces in a list on outlet No 1; ! #X msg 146 732 get \$1 \$2; ! #X text 249 733 Get specific attribute; ! #X text 249 758 \$1 : Attribute type ( massesPos / massesSpeeds / massesForces / linksPos ); ! #X text 249 795 \$2 : Id (symbol or creations numbers); #X msg 79 290 deleteMass \$1; #X text 248 292 Delete a mass and associated links; #X text 338 309 \$1 : Creation No of mass; ! #X msg 144 815 infosL; ! #X text 247 815 Get infos on all masses and links on outlet No 2; #X text 347 555 \$1 : Value; #X text 73 22 MASSES :; *************** *** 61,64 **** --- 61,68 ---- #X text 350 449 \$1 : Id (symbol) or No; #X text 348 503 \$1 : Id (symbol) or No; + #X msg 68 668 massePosXL; + #X msg 147 669 massePosYL; + #X text 248 669 output all masses x/y position in a list on outlet + No 1; #X connect 1 0 44 0; #X connect 8 0 44 0; *************** *** 73,77 **** #X connect 41 0 44 0; #X connect 46 0 44 0; ! #X restore 221 312 pd masses; #X text 75 312 HELP on masses --->; #X text 74 343 HELP on links --->; --- 77,82 ---- #X connect 41 0 44 0; #X connect 46 0 44 0; ! #X connect 50 0 44 0; ! #X restore 222 312 pd masses; #X text 75 312 HELP on masses --->; #X text 74 343 HELP on links --->; Index: 02_msd2Dadd.pd =================================================================== RCS file: /cvsroot/pure-data/externals/nusmuk/msd2D/02_msd2Dadd.pd,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** 02_msd2Dadd.pd 2 May 2005 12:43:10 -0000 1.4 --- 02_msd2Dadd.pd 4 May 2005 12:36:17 -0000 1.5 *************** *** 11,15 **** #X obj 481 320 gemhead; #X obj 481 343 world_light; ! #N canvas 177 95 946 729 synthese 1; #X obj 267 9 inlet; #X msg -35 224 \$1 50; --- 11,15 ---- #X obj 481 320 gemhead; #X obj 481 343 world_light; ! #N canvas 177 95 946 729 synthese 0; #X obj 267 9 inlet; #X msg -35 224 \$1 50; *************** *** 224,263 **** #X msg 511 503 reset \, create \, lighting 1 \, 1; #X obj 52 399 t b; ! #N canvas 643 123 605 590 massrender 1; #X obj 127 22 inlet; ! #X obj 48 230 translateXYZ; ! #X obj 48 321 sphere 0.1; ! #X obj 127 86 / 12.5; ! #X obj 127 109 - 4; ! #X obj 192 87 / 12.5; ! #X obj 192 110 - 4; ! #X obj 64 114 gemhead; ! #X obj 48 204 separator; ! #X obj 48 180 any; #X obj 127 57 unpack f f f; ! #X obj 48 283 color 1 1 1; ! #X msg 171 224 1 \$1 \$1; ! #X obj 171 202 / 29; ! #X obj 127 136 t b f b; ! #X obj 171 177 f; ! #X connect 0 0 10 0; ! #X connect 1 0 11 0; ! #X connect 3 0 4 0; ! #X connect 4 0 14 0; ! #X connect 5 0 6 0; ! #X connect 6 0 1 2; ! #X connect 7 0 9 1; ! #X connect 8 0 1 0; ! #X connect 9 0 8 0; ! #X connect 10 0 15 1; ! #X connect 10 1 3 0; ! #X connect 10 2 5 0; ! #X connect 11 0 2 0; ! #X connect 12 0 11 1; ! #X connect 13 0 12 0; ! #X connect 14 0 9 0; ! #X connect 14 1 1 1; ! #X connect 14 2 15 0; ! #X connect 15 0 13 0; #X restore 141 657 pd massrender; #N canvas 284 227 587 558 linkrender 0; --- 224,262 ---- #X msg 511 503 reset \, create \, lighting 1 \, 1; #X obj 52 399 t b; ! #N canvas 643 123 605 590 massrender 0; #X obj 127 22 inlet; ! #X obj 62 231 translateXYZ; ! #X obj 141 87 / 12.5; ! #X obj 141 110 - 4; ! #X obj 206 88 / 12.5; ! #X obj 206 111 - 4; ! #X obj 78 115 gemhead; ! #X obj 62 205 separator; ! #X obj 62 181 any; #X obj 127 57 unpack f f f; ! #X obj 185 178 f; ! #X msg 185 241 \$1; ! #X obj 141 137 t b b f; ! #X obj 185 221 / 99; ! #X obj 185 199 - 29; ! #X obj 62 322 sphere 0.1; ! #X connect 0 0 9 0; ! #X connect 1 0 15 0; ! #X connect 2 0 3 0; ! #X connect 3 0 12 0; ! #X connect 4 0 5 0; ! #X connect 5 0 1 2; ! #X connect 6 0 8 1; ! #X connect 7 0 1 0; ! #X connect 8 0 7 0; ! #X connect 9 0 10 1; ! #X connect 9 1 2 0; ! #X connect 9 2 4 0; ! #X connect 10 0 14 0; ! #X connect 12 0 10 0; ! #X connect 12 1 8 0; ! #X connect 12 2 1 1; ! #X connect 13 0 11 0; ! #X connect 14 0 13 0; #X restore 141 657 pd massrender; #N canvas 284 227 587 558 linkrender 0; *************** *** 281,284 **** --- 280,284 ---- #X msg 207 216 \$1 \$2 0; #X obj 93 69 unpack f f f f f; + #X obj 44 244 colorRGB 1 1 1; #X connect 0 0 18 0; #X connect 1 0 2 0; *************** *** 287,291 **** #X connect 4 0 14 1; #X connect 5 0 7 1; ! #X connect 6 0 9 0; #X connect 7 0 6 0; #X connect 8 0 7 0; --- 287,291 ---- #X connect 4 0 14 1; #X connect 5 0 7 1; ! #X connect 6 0 19 0; #X connect 7 0 6 0; #X connect 8 0 7 0; *************** *** 303,306 **** --- 303,307 ---- #X connect 18 3 10 0; #X connect 18 4 12 0; + #X connect 19 0 9 0; #X restore 52 678 pd linkrender; #X msg 221 231 mass mob 1 \$1 \$2 \$3; *************** *** 322,327 **** #X obj 70 317 pack f f; #X obj 173 148 t b b b; ! #X msg 129 350 link souple \$1 \$2 100 0.5 0.5; ! #X obj 52 379 gemhead; #X obj 511 547 gemwin; #X obj 52 628 route linksPos massesPos massesSpeedsNo; --- 323,327 ---- #X obj 70 317 pack f f; #X obj 173 148 t b b b; ! #X obj 52 358 gemhead; #X obj 511 547 gemwin; #X obj 52 628 route linksPos massesPos massesSpeedsNo; *************** *** 333,337 **** #X text 484 171 Random positions and masses; #X text 370 502 1 Create window -->; - #X text 405 643 3 Drag mouse; #X text 196 484 Add force; #X msg 522 585 \; pd dsp 1; --- 333,336 ---- *************** *** 363,373 **** #X obj 173 126 repeat 30; #X obj 79 187 repeat 29; #X connect 0 0 6 0; #X connect 1 0 4 0; #X connect 2 0 0 0; #X connect 3 0 4 0; ! #X connect 4 0 52 0; #X connect 4 1 12 0; ! #X connect 4 2 51 0; #X connect 4 4 2 0; #X connect 4 4 31 0; --- 362,373 ---- #X obj 173 126 repeat 30; #X obj 79 187 repeat 29; + #X msg 129 348 link souple \$1 \$2 10 0.5 0.5; #X connect 0 0 6 0; #X connect 1 0 4 0; #X connect 2 0 0 0; #X connect 3 0 4 0; ! #X connect 4 0 50 0; #X connect 4 1 12 0; ! #X connect 4 2 49 0; #X connect 4 4 2 0; #X connect 4 4 31 0; *************** *** 375,386 **** #X connect 4 4 19 0; #X connect 4 4 22 0; ! #X connect 6 0 38 0; #X connect 6 1 5 0; ! #X connect 7 0 37 0; #X connect 8 0 9 0; ! #X connect 11 0 49 0; #X connect 12 0 0 0; ! #X connect 13 0 37 0; ! #X connect 14 0 40 0; #X connect 17 0 0 0; #X connect 18 0 25 2; --- 375,386 ---- #X connect 4 4 19 0; #X connect 4 4 22 0; ! #X connect 6 0 37 0; #X connect 6 1 5 0; ! #X connect 7 0 36 0; #X connect 8 0 9 0; ! #X connect 11 0 47 0; #X connect 12 0 0 0; ! #X connect 13 0 36 0; ! #X connect 14 0 39 0; #X connect 17 0 0 0; #X connect 18 0 25 2; *************** *** 402,418 **** #X connect 31 0 32 1; #X connect 32 0 27 0; ! #X connect 33 0 35 0; #X connect 34 0 21 0; #X connect 34 1 20 0; #X connect 34 2 18 0; ! #X connect 35 0 0 0; ! #X connect 36 0 14 0; ! #X connect 38 1 15 0; ! #X connect 38 2 10 0; #X connect 39 0 6 0; #X connect 40 0 6 0; ! #X connect 41 0 6 0; ! #X connect 49 0 50 0; ! #X connect 50 0 6 0; ! #X connect 51 0 34 0; ! #X connect 52 0 26 0; --- 402,419 ---- #X connect 31 0 32 1; #X connect 32 0 27 0; ! #X connect 33 0 51 0; #X connect 34 0 21 0; #X connect 34 1 20 0; #X connect 34 2 18 0; ! #X connect 35 0 14 0; ! #X connect 37 0 16 0; ! #X connect 37 1 15 0; ! #X connect 37 2 10 0; ! #X connect 38 0 6 0; #X connect 39 0 6 0; #X connect 40 0 6 0; ! #X connect 47 0 48 0; ! #X connect 48 0 6 0; ! #X connect 49 0 34 0; ! #X connect 50 0 26 0; ! #X connect 51 0 0 0;

1 0

externals/nusmuk msd.h,1.5,1.6
by Nicolas Montgermont 04 May '05

04 May '05

Update of /cvsroot/pure-data/externals/nusmuk In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11519 Modified Files: msd.h Log Message: Added methods Index: msd.h =================================================================== RCS file: /cvsroot/pure-data/externals/nusmuk/msd.h,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** msd.h 3 May 2005 12:03:42 -0000 1.5 --- msd.h 4 May 2005 12:36:17 -0000 1.6 *************** *** 8,17 **** Signal processing and Computing Applied to Music (ATIAM, Paris 6) at La Kitchen supervised by Cyrille Henry. ! Based on Pure Data by Miller Puckette and others - Use FLEXT C++ Layer by Thomas Grill (xovo(a)gmx.net) Based on pmpd by Cyrille Henry - Contact : Nicolas Montgermont, montgermont(a)la-kitchen.fr Cyrille Henry, Cyrille.Henry(a)la-kitchen.fr --- 8,16 ---- Signal processing and Computing Applied to Music (ATIAM, Paris 6) at La Kitchen supervised by Cyrille Henry. ! ! ptimized by Thomas Grill for Flext Based on Pure Data by Miller Puckette and others Based on pmpd by Cyrille Henry Contact : Nicolas Montgermont, montgermont(a)la-kitchen.fr Cyrille Henry, Cyrille.Henry(a)la-kitchen.fr *************** *** 337,341 **** t_float limit[N][2]; // Limit values ! unsigned int id_mass, id_link; // --------------------------------------------------------------- RESET --- 336,340 ---- t_float limit[N][2]; // Limit values ! unsigned int id_mass, id_link, mouse_grab, nearest_mass; // --------------------------------------------------------------- RESET *************** *** 506,509 **** --- 505,561 ---- inline void m_Zmax(int argc,t_atom *argv) { m_limit(argc,argv,2,1); } + void m_grab_mass(int argc,t_atom *argv) + { + // grab nearest mass X Y + t_mass **mi; + t_float aux, distance; + t_atom aux2[2]; + bool mobil; + + // if click + if (GetInt(argv[2])==1 && mass.size()>0) { + + if (argc != 3) + error("grabMass : X Y click"); + // first time we grab this mass?Find nearest mass + if (mouse_grab == 0) { + t_mass *m = mass.find(0); + aux = sqr(m->pos[0]-GetFloat(argv[0])) + sqr(m->pos[1]-GetFloat(argv[1])); + nearest_mass = 0; + for(typename IndexMap<t_mass *>::iterator mit(mass); mit; ++mit) { + distance = sqr(mit.data()->pos[0]-GetFloat(argv[0])) + sqr(mit.data()->pos[1]-GetFloat(argv[1])); + if (distance<aux) { + aux = distance; + nearest_mass = mit.data()->nbr; + } + } + + + } + + // Set fixed if mobile + mobil = mass.find(nearest_mass)->M; + SetInt(aux2[0],nearest_mass); + if (mobil != 0) + m_set_fixe(1,aux2); + + // Set XY + SetFloat(aux2[1],GetFloat(argv[0])); + m_posX(2,aux2); + SetFloat(aux2[1],GetFloat(argv[1])); + m_posY(2,aux2); + + // Set mobile + if(mobil != 0) + m_set_mobile(1,aux2); + + // Current grabbing on + mouse_grab = 1; + } + else + // Grabing off + mouse_grab = 0; + } + // -------------------------------------------------------------- LINKS // --------------------------------------------------------------------- *************** *** 795,798 **** --- 847,885 ---- 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); + } + + // List of masses y positions on first outlet + 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); + } + + // List of masses z positions on first outlet + 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); + } // List of masses forces on first outlet *************** *** 832,836 **** mass.reset(); ! id_mass = id_link = 0; } --- 919,923 ---- mass.reset(); ! id_mass = id_link = mouse_grab = 0; } *************** *** 888,891 **** --- 975,981 ---- const static t_symbol *S_massesSpeedsId; const static t_symbol *S_massesPosL; + const static t_symbol *S_massesPosXL; + const static t_symbol *S_massesPosYL; + const static t_symbol *S_massesPosZL; const static t_symbol *S_massesForcesL; *************** *** 911,914 **** --- 1001,1007 ---- S_massesSpeedsId = MakeSymbol("massesSpeedsId"); S_massesPosL = MakeSymbol("massesPosL"); + S_massesPosXL = MakeSymbol("massesPosXL"); + S_massesPosYL = MakeSymbol("massesPosYL"); + S_massesPosZL = MakeSymbol("massesPosZL"); S_massesForcesL = MakeSymbol("massesForcesL"); *************** *** 927,930 **** --- 1020,1025 ---- FLEXT_CADDMETHOD_(c,0,"Xmax",m_Xmax); FLEXT_CADDMETHOD_(c,0,"Xmin",m_Xmin); + FLEXT_CADDMETHOD_(c,0,"massesPosL",m_mass_dumpl); + FLEXT_CADDMETHOD_(c,0,"massesPosXL",m_mass_dump_xl); if(N >= 2) { FLEXT_CADDMETHOD_(c,0,"forceY",m_forceY); *************** *** 932,935 **** --- 1027,1032 ---- FLEXT_CADDMETHOD_(c,0,"Ymax",m_Ymax); FLEXT_CADDMETHOD_(c,0,"Ymin",m_Ymin); + FLEXT_CADDMETHOD_(c,0,"massesPosYL",m_mass_dump_yl); + FLEXT_CADDMETHOD_(c,0,"grabMass",m_grab_mass); } if(N >= 3) { *************** *** 938,941 **** --- 1035,1039 ---- FLEXT_CADDMETHOD_(c,0,"Zmax",m_Zmax); FLEXT_CADDMETHOD_(c,0,"Zmin",m_Zmin); + FLEXT_CADDMETHOD_(c,0,"massesPosZL",m_mass_dump_zl); } *************** *** 951,955 **** FLEXT_CADDMETHOD_(c,0,"deleteLink",m_delete_link); FLEXT_CADDMETHOD_(c,0,"deleteMass",m_delete_mass); - FLEXT_CADDMETHOD_(c,0,"massesPosL",m_mass_dumpl); FLEXT_CADDMETHOD_(c,0,"infosL",m_info_dumpl); FLEXT_CADDMETHOD_(c,0,"massesForcesL",m_force_dumpl); --- 1049,1052 ---- *************** *** 959,962 **** --- 1056,1062 ---- FLEXT_CALLBACK(m_bang) FLEXT_CALLBACK(m_mass_dumpl) + FLEXT_CALLBACK(m_mass_dump_xl) + FLEXT_CALLBACK(m_mass_dump_yl) + FLEXT_CALLBACK(m_mass_dump_zl) FLEXT_CALLBACK(m_info_dumpl) FLEXT_CALLBACK(m_force_dumpl) *************** *** 985,988 **** --- 1085,1089 ---- FLEXT_CALLBACK_V(m_delete_link) FLEXT_CALLBACK_V(m_delete_mass) + FLEXT_CALLBACK_V(m_grab_mass) }; // -------------------------------------------------------------- STATIC VARIABLES *************** *** 998,1002 **** *msdN<N>::S_massesForces,*msdN<N>::S_massesForcesNo,*msdN<N>::S_massesForcesId, \ *msdN<N>::S_massesSpeeds,*msdN<N>::S_massesSpeedsNo,*msdN<N>::S_massesSpeedsId, \ ! *msdN<N>::S_massesPosL,*msdN<N>::S_massesForcesL; \ \ typedef msdN<N> CLASS; \ --- 1099,1104 ---- *msdN<N>::S_massesForces,*msdN<N>::S_massesForcesNo,*msdN<N>::S_massesForcesId, \ *msdN<N>::S_massesSpeeds,*msdN<N>::S_massesSpeedsNo,*msdN<N>::S_massesSpeedsId, \ ! *msdN<N>::S_massesPosL,*msdN<N>::S_massesPosXL,*msdN<N>::S_massesPosYL, \ ! *msdN<N>::S_massesPosZL,*msdN<N>::S_massesForcesL; \ \ typedef msdN<N> CLASS; \

1 0

externals/tb/jack_transport jack_transport.c, NONE, 1.1 jack_transport.pd, NONE, 1.1 makefile, NONE, 1.1
by Tim Blechmann 04 May '05

04 May '05

Update of /cvsroot/pure-data/externals/tb/jack_transport In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1995 Added Files: jack_transport.c jack_transport.pd makefile Log Message: initial checkin --- NEW FILE: jack_transport.pd --- #N canvas 0 0 450 300 10; #X floatatom 243 177 10 0 0 0 - - -; #X obj 243 129 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1 -1; #X obj 243 153 jack_transport; #X obj 243 203 / 48000; #X floatatom 243 227 5 0 0 0 - - -; #X connect 0 0 3 0; #X connect 1 0 2 0; #X connect 2 0 0 0; #X connect 3 0 4 0; --- NEW FILE: makefile --- NAME=jack_transport CSYM=jack_transport current: pd_linux # ----------------------- NT ----------------------- pd_nt: $(NAME).dll .SUFFIXES: .dll PDNTCFLAGS = /W3 /WX /DNT /DPD /nologo VC="C:\Program Files\Microsoft Visual Studio\Vc98" PDNTINCLUDE = /I. /I..\..\src /I$(VC)\include PDNTLDIR = $(VC)\lib PDNTLIB = $(PDNTLDIR)\libc.lib \ $(PDNTLDIR)\oldnames.lib \ $(PDNTLDIR)\kernel32.lib \ ..\..\bin\pd.lib .c.dll: cl $(PDNTCFLAGS) $(PDNTINCLUDE) /c $*.c link /dll /export:$(CSYM)_setup $*.obj $(PDNTLIB) # ----------------------- IRIX 5.x ----------------------- pd_irix5: $(NAME).pd_irix5 .SUFFIXES: .pd_irix5 SGICFLAGS5 = -o32 -DPD -DUNIX -DIRIX -O2 SGIINCLUDE = -I../../src .c.pd_irix5: $(CC) $(SGICFLAGS5) $(SGIINCLUDE) -o $*.o -c $*.c ld -elf -shared -rdata_shared -o $*.pd_irix5 $*.o rm $*.o # ----------------------- IRIX 6.x ----------------------- pd_irix6: $(NAME).pd_irix6 .SUFFIXES: .pd_irix6 SGICFLAGS6 = -n32 -DPD -DUNIX -DIRIX -DN32 -woff 1080,1064,1185 \ -OPT:roundoff=3 -OPT:IEEE_arithmetic=3 -OPT:cray_ivdep=true \ -Ofast=ip32 .c.pd_irix6: $(CC) $(SGICFLAGS6) $(SGIINCLUDE) -o $*.o -c $*.c ld -n32 -IPA -shared -rdata_shared -o $*.pd_irix6 $*.o rm $*.o # ----------------------- LINUX i386 ----------------------- pd_linux: $(NAME).pd_linux .SUFFIXES: .pd_linux LINUXCFLAGS = -DPD -O3 -fPIC -funroll-loops -fomit-frame-pointer \ -Wall -W -Wshadow -Wstrict-prototypes -Werror \ -Wno-unused -Wno-parentheses -Wno-switch -g LINUXINCLUDE = -I../../../src LSTRIP = strip --strip-unneeded -R .note -R .comment .c.pd_linux: cc $(LINUXCFLAGS) $(LINUXINCLUDE) -o $*.o -c $*.c cc -Wl,-export_dynamic --shared -o $*.pd_linux $*.o -lm $(LSTRIP) $*.pd_linux rm -f $*.o # ----------------------- Mac OSX ----------------------- pd_darwin: $(NAME).pd_darwin .SUFFIXES: .pd_darwin DARWINCFLAGS = -DPD -O2 -Wall -W -Wshadow -Wstrict-prototypes \ -Wno-unused -Wno-parentheses -Wno-switch .c.pd_darwin: $(CC) $(DARWINCFLAGS) $(LINUXINCLUDE) -o $*.o -c $*.c $(CC) -bundle -undefined suppress -flat_namespace -o $*.pd_darwin $*.o rm -f $*.o # ---------------------------------------------------------- clean: rm -f *.o *.pd_* so_locations --- NEW FILE: jack_transport.c --- /* * * jack_transport Copyright (C) 2005 Tim Blechmann * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 59 Temple Place - Suite 330, * Boston, MA 02111-1307, USA. */ #include "m_pd.h" #include "jack/jack.h" #include "stdio.h" static t_class *jack_transport_class; typedef struct _jack_transport { t_object x_obj; t_outlet * x_outlet; jack_client_t* x_jack_client; jack_position_t* x_pos; } jack_transport_t; /* connect to jack server */ static int jack_transport_connect(jack_transport_t * x) { char port_name[80] = ""; static int client = 0; do { sprintf(port_name,"pure_data_jack_transport_%d",client); client++; } while (((x->x_jack_client = jack_client_new (port_name)) == 0) && client < 100); client = 0; if (!x->x_jack_client) { post("jack_transport: can't connect to jack server"); return 1; } post("jack_transport: connecting as %s", port_name); jack_activate(x->x_jack_client); return 0; } static jack_transport_t * jack_transport_new(void) { int status = 0; jack_transport_t *x = (jack_transport_t*) pd_new(jack_transport_class); x->x_outlet = outlet_new(&x->x_obj, NULL); x->x_pos = (jack_position_t*) getbytes(sizeof(jack_position_t)); status = jack_transport_connect(x); return x; } static void jack_transport_starter(jack_transport_t * x) { jack_transport_start(x->x_jack_client); return; } static void jack_transport_stoper(jack_transport_t * x) { jack_transport_stop(x->x_jack_client); return; } static void jack_transport_bang(jack_transport_t * x) { float f; if (!x->x_jack_client) return; jack_transport_query(x->x_jack_client,x->x_pos); f = x->x_pos->frame; outlet_float(x->x_outlet, f); } void jack_transport_setup(void) { jack_transport_class = class_new(gensym("jack_transport"), (t_newmethod)jack_transport_new, NULL, sizeof(jack_transport_t), CLASS_DEFAULT, 0); class_addmethod(jack_transport_class, (t_method)jack_transport_starter, gensym("start"),0,0); class_addmethod(jack_transport_class, (t_method)jack_transport_stoper, gensym("stop"),0,0); class_addbang(jack_transport_class, (t_method)jack_transport_bang); }

1 0

externals/tb/jack_transport - New directory
by Tim Blechmann 04 May '05

04 May '05

Update of /cvsroot/pure-data/externals/tb/jack_transport In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1004/jack_transport Log Message: Directory /cvsroot/pure-data/externals/tb/jack_transport added to the repository --> Using per-directory sticky date `2005.04.12.10.18.32'

1 0

← Newer
1
...
34
35
36
37
38
39
40
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