Pd-cvs July 2006

pd-cvs@lists.iem.at

14 participants
147 discussions

externals/unauthorized/probalizer help-probalizer.pd, 1.2, 1.3 probalizer.tk2c, NONE, 1.1 tk2c.bash, NONE, 1.1 CHANGES.LOG, 1.2, 1.3 probalizer.c, 1.8, 1.9
by Yves Degoyon 26 Jul '06

26 Jul '06

Update of /cvsroot/pure-data/externals/unauthorized/probalizer In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7577 Modified Files: CHANGES.LOG probalizer.c Added Files: help-probalizer.pd probalizer.tk2c tk2c.bash Log Message: fixed coordinates for GOP Index: CHANGES.LOG =================================================================== RCS file: /cvsroot/pure-data/externals/unauthorized/probalizer/CHANGES.LOG,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** CHANGES.LOG 2 Mar 2005 02:47:29 -0000 1.2 --- CHANGES.LOG 26 Jul 2006 16:54:24 -0000 1.3 *************** *** 1,2 **** --- 1,4 ---- + 0.4 + fixed coordinates for GOP support 0.3 added GOP support --- NEW FILE: probalizer.tk2c --- // ########### probalizer procedures -- ydegoyon(a)free.fr ######### sys_gui("proc probalizer_apply {id} {\n"); // strip "." from the TK id to make a variable name suffix sys_gui("set vid [string trimleft $id .]\n"); // for each variable, make a local variable to hold its name... sys_gui("set var_graph_width [concat graph_width_$vid]\n"); sys_gui("global $var_graph_width\n"); sys_gui("set var_graph_height [concat graph_height_$vid]\n"); sys_gui("global $var_graph_height\n"); sys_gui("set var_graph_nvalues [concat graph_nvalues_$vid]\n"); sys_gui("global $var_graph_nvalues\n"); sys_gui("set var_graph_noccurrences [concat graph_noccurrences_$vid]\n"); sys_gui("global $var_graph_noccurrences\n"); sys_gui("set var_graph_save [concat graph_save_$vid]\n"); sys_gui("global $var_graph_save\n"); sys_gui("set cmd [concat $id dialog [eval concat $$var_graph_width] [eval concat $$var_graph_height] [eval concat $$var_graph_nvalues] [eval concat $$var_graph_noccurrences] [eval concat $$var_graph_save] \\;]\n"); // puts stderr $cmd sys_gui("pd $cmd\n"); sys_gui("}\n"); sys_gui("proc probalizer_cancel {id} {\n"); sys_gui("set cmd [concat $id cancel \\;]\n"); // puts stderr $cmd sys_gui("pd $cmd\n"); sys_gui("}\n"); sys_gui("proc probalizer_ok {id} {\n"); sys_gui("probalizer_apply $id\n"); sys_gui("probalizer_cancel $id\n"); sys_gui("}\n"); sys_gui("proc pdtk_probalizer_dialog {id width height nvalues noccurrences save } {\n"); sys_gui("set vid [string trimleft $id .]\n"); sys_gui("set var_graph_width [concat graph_width_$vid]\n"); sys_gui("global $var_graph_width\n"); sys_gui("set var_graph_height [concat graph_height_$vid]\n"); sys_gui("global $var_graph_height\n"); sys_gui("set var_graph_nvalues [concat graph_nvalues_$vid]\n"); sys_gui("global $var_graph_nvalues\n"); sys_gui("set var_graph_noccurrences [concat graph_noccurrences_$vid]\n"); sys_gui("global $var_graph_noccurrences\n"); sys_gui("set var_graph_save [concat graph_save_$vid]\n"); sys_gui("global $var_graph_save\n"); sys_gui("set $var_graph_width $width\n"); sys_gui("set $var_graph_height $height\n"); sys_gui("set $var_graph_nvalues $nvalues\n"); sys_gui("set $var_graph_noccurrences $noccurrences\n"); sys_gui("set $var_graph_save $save\n"); sys_gui("toplevel $id\n"); sys_gui("wm title $id {probalizer}\n"); sys_gui("wm protocol $id WM_DELETE_WINDOW [concat probalizer_cancel $id]\n"); sys_gui("label $id.label -text {PROBALIZER PROPERTIES}\n"); sys_gui("pack $id.label -side top\n"); sys_gui("frame $id.buttonframe\n"); sys_gui("pack $id.buttonframe -side bottom -fill x -pady 2m\n"); sys_gui("button $id.buttonframe.cancel -text {Cancel} -command \"probalizer_cancel $id\"\n"); sys_gui("button $id.buttonframe.apply -text {Apply} -command \"probalizer_apply $id\"\n"); sys_gui("button $id.buttonframe.ok -text {OK} -command \"probalizer_ok $id\"\n"); sys_gui("pack $id.buttonframe.cancel -side left -expand 1\n"); sys_gui("pack $id.buttonframe.apply -side left -expand 1\n"); sys_gui("pack $id.buttonframe.ok -side left -expand 1\n"); sys_gui("frame $id.1rangef\n"); sys_gui("pack $id.1rangef -side top\n"); sys_gui("label $id.1rangef.lwidth -text \"Width :\"\n"); sys_gui("entry $id.1rangef.width -textvariable $var_graph_width -width 7\n"); sys_gui("pack $id.1rangef.lwidth $id.1rangef.width -side left\n"); sys_gui("frame $id.2rangef\n"); sys_gui("pack $id.2rangef -side top\n"); sys_gui("label $id.2rangef.lheight -text \"Height :\"\n"); sys_gui("entry $id.2rangef.height -textvariable $var_graph_height -width 7\n"); sys_gui("pack $id.2rangef.lheight $id.2rangef.height -side left\n"); sys_gui("frame $id.3rangef\n"); sys_gui("pack $id.3rangef -side top\n"); sys_gui("label $id.3rangef.lnvalues -text \"Values :\"\n"); sys_gui("entry $id.3rangef.nvalues -textvariable $var_graph_nvalues -width 7\n"); sys_gui("pack $id.3rangef.lnvalues $id.3rangef.nvalues -side left\n"); sys_gui("frame $id.4rangef\n"); sys_gui("pack $id.4rangef -side top\n"); sys_gui("label $id.4rangef.lnoccurrences -text \"Max Occurrences :\"\n"); sys_gui("entry $id.4rangef.noccurrences -textvariable $var_graph_noccurrences -width 7\n"); sys_gui("pack $id.4rangef.lnoccurrences $id.4rangef.noccurrences -side left\n"); sys_gui("checkbutton $id.save -text {Save contents} -variable $var_graph_save -anchor w\n"); sys_gui("pack $id.save -side top\n"); sys_gui("bind $id.1rangef.width <KeyPress-Return> [concat probalizer_ok $id]\n"); sys_gui("bind $id.2rangef.height <KeyPress-Return> [concat probalizer_ok $id]\n"); sys_gui("bind $id.3rangef.nvalues <KeyPress-Return> [concat probalizer_ok $id]\n"); sys_gui("bind $id.4rangef.noccurrences <KeyPress-Return> [concat probalizer_ok $id]\n"); sys_gui("focus $id.1rangef.width\n"); sys_gui("}\n"); // ########### probalizer procedures END -- ydegoyon(a)free.fr ######### Index: probalizer.c =================================================================== RCS file: /cvsroot/pure-data/externals/unauthorized/probalizer/probalizer.c,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** probalizer.c 18 Dec 2005 18:55:09 -0000 1.8 --- probalizer.c 26 Jul 2006 16:54:24 -0000 1.9 *************** *** 43,52 **** #include "probalizer.h" ! #ifdef _WIN32 #include <io.h> - #define random rand #else #include <unistd.h> ! #endif /* _WIN32 */ #define DEFAULT_PROBALIZER_WIDTH 200 --- 43,51 ---- #include "probalizer.h" ! #ifdef NT #include <io.h> #else #include <unistd.h> ! #endif #define DEFAULT_PROBALIZER_WIDTH 200 *************** *** 56,60 **** #define DEFAULT_PROB_VALUE 10 ! static char *probalizer_version = "probalizer : outputs integer values according to a drawn probability curve , version 0.3 (ydegoyon(a)free.fr)"; t_widgetbehavior probalizer_widgetbehavior; --- 55,59 ---- #define DEFAULT_PROB_VALUE 10 ! static char *probalizer_version = "probalizer : outputs integer values according to a drawn probability curve , version 0.4 (ydegoyon(a)free.fr)"; t_widgetbehavior probalizer_widgetbehavior; *************** *** 277,281 **** binbuf_addv(b, "ssiisiiiii", gensym("#X"),gensym("obj"), ! (t_int)text_xpix(&x->x_obj, x->x_glist), (t_int)text_ypix(&x->x_obj, x->x_glist), gensym("probalizer"), x->x_width, x->x_height, x->x_nvalues, x->x_noccurrences, x->x_save ); --- 276,280 ---- binbuf_addv(b, "ssiisiiiii", gensym("#X"),gensym("obj"), ! (t_int)x->x_obj.te_xpix, (t_int)x->x_obj.te_ypix, gensym("probalizer"), x->x_width, x->x_height, x->x_nvalues, x->x_noccurrences, x->x_save ); --- NEW FILE: help-probalizer.pd --- #N canvas 191 -6 970 685 10; #X text 374 167 (invoke with <right mouse>Properties ); #X text 375 156 You can set the following properties :; #X text 395 188 * Width : graphical x size; #X text 395 200 * Height : graphical y size; #X text 442 506 bugs and comments @ ydegoyon(a)free.fr; #X msg 404 603 \; pd dsp 0; #X msg 470 603 \; pd dsp 1; #X text 376 110 Probalizer output serial of integers according to the probability curve; #X obj 470 581 loadbang; #X obj 64 92 probalizer 200 200 10 100 1 0 53 1 61 2 8 3 39 4 9 5 40 6 6 7 6 8 14 9 24; #X text 395 213 * Values : number of values ( range is [ 1 \, nvalues ] ); #X msg 93 54 bang; #X msg 93 4 bang; #X text 389 458 but without repetitions; #X msg 295 16 zero; #X msg 294 40 equi; #X text 389 433 Note = If the probabilities are all equal to 1 \,; #X msg 293 64 reset; #X text 338 63 Reset output; #X text 396 227 * Max Occurrences : max number of occurences in a serial ; #X obj 68 358 probalizer 200 200 10 100 1 0 19 1 15 2 4 3 17 4 5 5 14 6 1 7 0 8 4 9 7; #X obj 193 331 loadbang; #X msg 145 331 zero; #X text 306 345 The output of first probalizer; #X text 306 357 is stored in the second one; #X floatatom 187 30 5 0 0; #X msg 187 5 bang; #X text 276 281 End of the serial; #X text 390 445 probalizer behaves as a random object; #X obj 276 308 print probalizer::end; #X text 47 6 Start; #X text 332 42 Set equal probabilities; #X obj 93 29 metro 10; #X connect 8 0 6 0; #X connect 9 0 20 0; #X connect 9 1 22 0; #X connect 9 1 29 0; #X connect 11 0 9 0; #X connect 12 0 32 0; #X connect 14 0 9 0; #X connect 15 0 9 0; #X connect 17 0 9 0; #X connect 21 0 22 0; #X connect 22 0 20 0; #X connect 25 0 9 0; #X connect 26 0 25 0; #X connect 32 0 11 0; --- NEW FILE: tk2c.bash --- #!/bin/bash #set -x while read line do for word in $line do if [ "X"$word != "X"${word#\#} ] then echo // ${line#\#} break else line=${line//\'/\\\'} #useless, slashes never gets in line=${line//\\/\\\\} #this one's dirty, i know line=${line//;/\\\\;} line=${line//\"/\\\"} echo 'sys_gui("'$line'\n");' break fi done done

1 0

externals/unauthorized/playlist CHANGES.LOG, 1.5, 1.6 playlist.c, 1.12, 1.13
by Yves Degoyon 26 Jul '06

26 Jul '06

Update of /cvsroot/pure-data/externals/unauthorized/playlist In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6514 Modified Files: CHANGES.LOG playlist.c Log Message: fixed coordinates for GOP Index: CHANGES.LOG =================================================================== RCS file: /cvsroot/pure-data/externals/unauthorized/playlist/CHANGES.LOG,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** CHANGES.LOG 16 Nov 2005 16:57:46 -0000 1.5 --- CHANGES.LOG 26 Jul 2006 16:52:01 -0000 1.6 *************** *** 1,2 **** --- 1,4 ---- + 0.12 + fixed coordinates for GOP support 0.11 added option to hide the graphic parts ( embedded list ) Index: playlist.c =================================================================== RCS file: /cvsroot/pure-data/externals/unauthorized/playlist/playlist.c,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** playlist.c 24 Jun 2006 12:45:49 -0000 1.12 --- playlist.c 26 Jul 2006 16:52:01 -0000 1.13 *************** *** 56,60 **** static int guidebug=0; ! static char *playlist_version = "playlist: 1 click file chooser : version 0.11, written by Yves Degoyon (ydegoyon(a)free.fr)"; #define MAX_DIR_LENGTH 2048 // maximum length for a directory name --- 56,60 ---- static int guidebug=0; ! static char *playlist_version = "playlist: 1 click file chooser : version 0.12, written by Yves Degoyon (ydegoyon(a)free.fr)"; #define MAX_DIR_LENGTH 2048 // maximum length for a directory name *************** *** 404,408 **** // post( "saving playlist : %s", x->x_extension ); binbuf_addv(b, "ssiissiisssss", gensym("#X"), gensym("obj"), ! (t_int)text_xpix(&x->x_obj, x->x_glist), (t_int)text_ypix(&x->x_obj, x->x_glist), gensym("playlist"), gensym(x->x_extension), x->x_width, x->x_height, gensym(x->x_font), gensym(x->x_bgcolor), gensym(x->x_sbcolor), --- 404,408 ---- // post( "saving playlist : %s", x->x_extension ); binbuf_addv(b, "ssiissiisssss", gensym("#X"), gensym("obj"), ! (t_int)x->x_obj.te_xpix, (t_int)x->x_obj.te_ypix, gensym("playlist"), gensym(x->x_extension), x->x_width, x->x_height, gensym(x->x_font), gensym(x->x_bgcolor), gensym(x->x_sbcolor),

1 0

externals/unauthorized/pianoroll CHANGES.LOG, 1.2, 1.3 pianoroll.c, 1.6, 1.7
by Yves Degoyon 26 Jul '06

26 Jul '06

Update of /cvsroot/pure-data/externals/unauthorized/pianoroll In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6017 Modified Files: CHANGES.LOG pianoroll.c Log Message: fixed coordinates for GOP Index: pianoroll.c =================================================================== RCS file: /cvsroot/pure-data/externals/unauthorized/pianoroll/pianoroll.c,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** pianoroll.c 2 Mar 2005 02:46:23 -0000 1.6 --- pianoroll.c 26 Jul 2006 16:50:42 -0000 1.7 *************** *** 61,65 **** #define DEFAULT_SEQUENCER_PITCH_MAX 15 ! static char *pianoroll_version = "pianoroll: a graphical sequencer controller, version 0.9 (ydegoyon(a)free.fr)"; t_widgetbehavior pianoroll_widgetbehavior; --- 61,65 ---- #define DEFAULT_SEQUENCER_PITCH_MAX 15 ! static char *pianoroll_version = "pianoroll: a graphical sequencer controller, version 0.10 (ydegoyon(a)free.fr)"; t_widgetbehavior pianoroll_widgetbehavior; *************** *** 264,268 **** // post( "saving pianoroll : %s", x->x_name->s_name ); binbuf_addv(b, "ssiissiiffiiifi", gensym("#X"),gensym("obj"), ! (t_int)text_xpix(&x->x_obj, x->x_glist), (t_int)text_ypix(&x->x_obj, x->x_glist), gensym("pianoroll"), x->x_name, x->x_width, x->x_height, x->x_pmin, x->x_pmax, --- 264,268 ---- // post( "saving pianoroll : %s", x->x_name->s_name ); binbuf_addv(b, "ssiissiiffiiifi", gensym("#X"),gensym("obj"), ! (t_int)x->x_obj.te_xpix, (t_int)x->x_obj.te_ypix, gensym("pianoroll"), x->x_name, x->x_width, x->x_height, x->x_pmin, x->x_pmax, Index: CHANGES.LOG =================================================================== RCS file: /cvsroot/pure-data/externals/unauthorized/pianoroll/CHANGES.LOG,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** CHANGES.LOG 2 Mar 2005 02:46:23 -0000 1.2 --- CHANGES.LOG 26 Jul 2006 16:50:42 -0000 1.3 *************** *** 1,2 **** --- 1,4 ---- + 0.10 + fixed coordinates for GOP support 0.9 added GOP support

1 0

externals/unauthorized/grid CHANGES.LOG, 1.3, 1.4 grid.c, 1.7, 1.8
by Yves Degoyon 26 Jul '06

26 Jul '06

Update of /cvsroot/pure-data/externals/unauthorized/grid In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5555 Modified Files: CHANGES.LOG grid.c Log Message: fixed coordinates for GOP Index: CHANGES.LOG =================================================================== RCS file: /cvsroot/pure-data/externals/unauthorized/grid/CHANGES.LOG,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** CHANGES.LOG 2 Mar 2005 02:45:49 -0000 1.3 --- CHANGES.LOG 26 Jul 2006 16:49:45 -0000 1.4 *************** *** 1,2 **** --- 1,4 ---- + 0.7 + fixed coordinates for GOP support 0.6 added GOP support Index: grid.c =================================================================== RCS file: /cvsroot/pure-data/externals/unauthorized/grid/grid.c,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** grid.c 2 Mar 2005 02:45:49 -0000 1.7 --- grid.c 26 Jul 2006 16:49:45 -0000 1.8 *************** *** 36,40 **** static int pointsize = 5; ! static char *grid_version = "grid: version 0.6, written by Yves Degoyon (ydegoyon(a)free.fr)"; #define GRID_SYS_VGUI2(a,b) if (guidebug) \ --- 36,40 ---- static int pointsize = 5; ! static char *grid_version = "grid: version 0.7, written by Yves Degoyon (ydegoyon(a)free.fr)"; #define GRID_SYS_VGUI2(a,b) if (guidebug) \ *************** *** 272,276 **** // post( "saving grid : %s", x->x_name->s_name ); binbuf_addv(b, "ssiissiffiffiffiiff", gensym("#X"),gensym("obj"), ! (t_int)text_xpix(&x->x_obj, x->x_glist), (t_int)text_ypix(&x->x_obj, x->x_glist), gensym("grid"), x->x_name, x->x_width, x->x_min, x->x_max, x->x_height, --- 272,276 ---- // post( "saving grid : %s", x->x_name->s_name ); binbuf_addv(b, "ssiissiffiffiffiiff", gensym("#X"),gensym("obj"), ! (t_int)x->x_obj.te_xpix, (t_int)x->x_obj.te_ypix, gensym("grid"), x->x_name, x->x_width, x->x_min, x->x_max, x->x_height,

1 0

externals/unauthorized/filterbank~ CHANGES.LOG, 1.2, 1.3 Makefile, 1.2, 1.3 filterbank~.c, 1.7, 1.8
by Yves Degoyon 26 Jul '06

26 Jul '06

Update of /cvsroot/pure-data/externals/unauthorized/filterbank~ In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5168 Modified Files: CHANGES.LOG Makefile filterbank~.c Log Message: fixed coordinates for GOP Index: CHANGES.LOG =================================================================== RCS file: /cvsroot/pure-data/externals/unauthorized/filterbank~/CHANGES.LOG,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** CHANGES.LOG 2 Mar 2005 02:40:44 -0000 1.2 --- CHANGES.LOG 26 Jul 2006 16:48:28 -0000 1.3 *************** *** 1,2 **** --- 1,4 ---- + 0.4 + fixed coordinates for GOP support 0.3 Added GOP support Index: Makefile =================================================================== RCS file: /cvsroot/pure-data/externals/unauthorized/filterbank~/Makefile,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Makefile 2 Mar 2005 02:40:44 -0000 1.2 --- Makefile 26 Jul 2006 16:48:28 -0000 1.3 *************** *** 72,76 **** LINUXCFLAGS = -DPD -DUNIX -DICECAST -O2 -funroll-loops -fomit-frame-pointer \ -Wall -W -Wno-shadow -Wstrict-prototypes -g \ ! -Wno-unused -Wno-parentheses -Wno-switch -Werror LINUXINCLUDE = -I../../src --- 72,76 ---- LINUXCFLAGS = -DPD -DUNIX -DICECAST -O2 -funroll-loops -fomit-frame-pointer \ -Wall -W -Wno-shadow -Wstrict-prototypes -g \ ! -Wno-unused -Wno-parentheses -Wno-switch LINUXINCLUDE = -I../../src Index: filterbank~.c =================================================================== RCS file: /cvsroot/pure-data/externals/unauthorized/filterbank~/filterbank~.c,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** filterbank~.c 18 Dec 2005 18:55:07 -0000 1.7 --- filterbank~.c 26 Jul 2006 16:48:28 -0000 1.8 *************** *** 34,43 **** #include "filterbank~.h" ! #ifdef _WIN32 #include <io.h> - #define random rand #else #include <unistd.h> ! #endif /* _WIN32 */ #define DEFAULT_FILTERBANK_LOWFREQ 0 --- 34,42 ---- #include "filterbank~.h" ! #ifdef NT #include <io.h> #else #include <unistd.h> ! #endif #define DEFAULT_FILTERBANK_LOWFREQ 0 *************** *** 47,51 **** #define FILTERBANK_HEIGHT 16 ! static char *filterbank_version = "filterbank : responses from a set of band-pass filters, version 0.3 (ydegoyon(a)free.fr)"; t_widgetbehavior filterbank_widgetbehavior; --- 46,50 ---- #define FILTERBANK_HEIGHT 16 ! static char *filterbank_version = "filterbank : responses from a set of band-pass filters, version 0.4 (ydegoyon(a)free.fr)"; t_widgetbehavior filterbank_widgetbehavior; *************** *** 254,258 **** binbuf_addv(b, "ssiisiii", gensym("#X"),gensym("obj"), ! (t_int)text_xpix(&x->x_obj, x->x_glist), (t_int)text_ypix(&x->x_obj, x->x_glist), gensym("filterbank~"), x->x_lowfreq, x->x_highfreq, x->x_nbfilters ); --- 253,257 ---- binbuf_addv(b, "ssiisiii", gensym("#X"),gensym("obj"), ! (t_int)x->x_obj.te_xpix, (t_int)x->x_obj.te_ypix, gensym("filterbank~"), x->x_lowfreq, x->x_highfreq, x->x_nbfilters );

1 0

externals/unauthorized/exciter CHANGES.LOG, NONE, 1.1 exciter.c, 1.8, 1.9 CHANGE.LOG, 1.1, NONE
by Yves Degoyon 26 Jul '06

26 Jul '06

Update of /cvsroot/pure-data/externals/unauthorized/exciter In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4806 Modified Files: exciter.c Added Files: CHANGES.LOG Removed Files: CHANGE.LOG Log Message: fixed coordinates for GOP --- NEW FILE: CHANGES.LOG --- 0.5 fixed coordinates for GOP support 0.4 added GOP support 0.3 adapted for pd 0.37 0.2 fixed : could set event nnumber to one do not set "started" at initialization 0.1 basic bang-events sequencer --- CHANGE.LOG DELETED --- Index: exciter.c =================================================================== RCS file: /cvsroot/pure-data/externals/unauthorized/exciter/exciter.c,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** exciter.c 18 Dec 2005 18:55:06 -0000 1.8 --- exciter.c 26 Jul 2006 16:47:35 -0000 1.9 *************** *** 45,51 **** #include "exciter.h" ! #ifdef _WIN32 #include <io.h> - #include "timeval.h" #else #include <unistd.h> --- 45,50 ---- #include "exciter.h" ! #ifdef NT #include <io.h> #else #include <unistd.h> *************** *** 64,68 **** #define EXCITER_PIXEL_GRAIN 5 ! static char *exciter_version = "exciter: a bang-events sequencer, version 0.4 (ydegoyon(a)free.fr)"; t_widgetbehavior exciter_widgetbehavior; --- 63,67 ---- #define EXCITER_PIXEL_GRAIN 5 ! static char *exciter_version = "exciter: a bang-events sequencer, version 0.5 (ydegoyon(a)free.fr)"; t_widgetbehavior exciter_widgetbehavior; *************** *** 323,327 **** binbuf_addv(b, "ssiisiiifii", gensym("#X"),gensym("obj"), ! (t_int)text_xpix(&x->x_obj, x->x_glist), (t_int)text_ypix(&x->x_obj, x->x_glist), gensym("exciter"), x->x_width, x->x_height, x->x_nbevents, x->x_timegrain, --- 322,326 ---- binbuf_addv(b, "ssiisiiifii", gensym("#X"),gensym("obj"), ! (t_int)x->x_obj.te_xpix, (t_int)x->x_obj.te_ypix, gensym("exciter"), x->x_width, x->x_height, x->x_nbevents, x->x_timegrain, *************** *** 351,356 **** sprintf(buf, "pdtk_exciter_dialog %%s %d %d %d %.2f %d %d\n", ! (int)x->x_width, (int)x->x_height, (int)x->x_nbevents, ! x->x_timegrain, x->x_loop, x->x_save ); // post("exciter_properties : %s", buf ); gfxstub_new(&x->x_obj.ob_pd, x, buf); --- 350,354 ---- sprintf(buf, "pdtk_exciter_dialog %%s %d %d %d %.2f %d %d\n", ! x->x_width, x->x_height, x->x_nbevents, x->x_timegrain, x->x_loop, x->x_save ); // post("exciter_properties : %s", buf ); gfxstub_new(&x->x_obj.ob_pd, x, buf);

1 0

externals/unauthorized/cooled~ CHANGES.LOG, 1.3, 1.4 cooled~.c, 1.11, 1.12
by Yves Degoyon 26 Jul '06

26 Jul '06

Update of /cvsroot/pure-data/externals/unauthorized/cooled~ In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3733 Modified Files: CHANGES.LOG cooled~.c Log Message: fixed coordinates for GOP Index: CHANGES.LOG =================================================================== RCS file: /cvsroot/pure-data/externals/unauthorized/cooled~/CHANGES.LOG,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** CHANGES.LOG 2 Mar 2005 02:44:30 -0000 1.3 --- CHANGES.LOG 26 Jul 2006 16:44:53 -0000 1.4 *************** *** 1,2 **** --- 1,4 ---- + 0.14 + remove GOP support 0.13 added GOP support Index: cooled~.c =================================================================== RCS file: /cvsroot/pure-data/externals/unauthorized/cooled~/cooled~.c,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** cooled~.c 18 Dec 2005 18:55:03 -0000 1.11 --- cooled~.c 26 Jul 2006 16:44:53 -0000 1.12 *************** *** 37,60 **** #include <fcntl.h> #include <sys/stat.h> - - #ifdef __APPLE__ - #include <sys/malloc.h> - #else #include <malloc.h> - #endif - #include <ctype.h> #include <pthread.h> ! #ifdef _WIN32 ! #include <io.h> ! #define usleep(a) _sleep(a/1000) ! #else #include <unistd.h> #endif ! ! #include <math.h> ! #ifndef M_PI #define M_PI 3.14159265358979323846 #endif #include "m_pd.h" --- 37,50 ---- #include <fcntl.h> #include <sys/stat.h> #include <malloc.h> #include <ctype.h> #include <pthread.h> ! #ifdef UNIX #include <unistd.h> #endif ! #ifdef NT #define M_PI 3.14159265358979323846 #endif + #include <math.h> #include "m_pd.h" *************** *** 126,135 **** t_object x_obj; ! t_int x_size; /* size of the stored sound */ t_float x_readpos; /* data's playing position */ ! t_int x_writepos; /* data's recording position */ t_float x_readstart; /* data's starting position for reading */ t_float x_readend; /* data's ending position for reading */ ! t_int x_play; /* playing on/off flag */ t_float x_readspeed; /* speed increment */ t_float x_record; /* flag to start recording process */ --- 116,125 ---- t_object x_obj; ! int x_size; /* size of the stored sound */ t_float x_readpos; /* data's playing position */ ! int x_writepos; /* data's recording position */ t_float x_readstart; /* data's starting position for reading */ t_float x_readend; /* data's ending position for reading */ ! int x_play; /* playing on/off flag */ t_float x_readspeed; /* speed increment */ t_float x_record; /* flag to start recording process */ *************** *** 146,168 **** char* x_gifdata; /* buffer to store graphic data */ char* x_guicommand; /* buffer to store gui command */ ! t_int x_draw; /* drawing option */ /* graphical data block */ ! t_int x_width; /* graphical width */ ! t_int x_height; /* graphical height */ ! t_int x_selected; /* flag to remember if we are seleted or not */ ! t_int x_erase; /* flag used when an erase is needed */ ! t_int x_redraw; /* flag used when drawing is needed */ t_glist *x_glist; /* keep graphic context for various operations */ ! t_int x_zoom; /* zoom factor */ pthread_t x_updatechild; /* thread id for the update child */ ! t_int x_updatestart; /* starting position for update */ ! t_int x_updateend; /* ending position for update */ ! t_int x_xpos; /* stuck x position */ ! t_int x_ypos; /* stuck y position */ ! t_int x_shifted; /* remember shift state from last click */ ! t_int x_alted; /* remember alt state from last click */ ! t_int x_xdraw; /* x drawing position */ ! t_int x_edraw; /* end of drawing */ t_float x_f; /* float needed for signal input */ --- 136,158 ---- char* x_gifdata; /* buffer to store graphic data */ char* x_guicommand; /* buffer to store gui command */ ! int x_draw; /* drawing option */ /* graphical data block */ ! int x_width; /* graphical width */ ! int x_height; /* graphical height */ ! int x_selected; /* flag to remember if we are seleted or not */ ! int x_erase; /* flag used when an erase is needed */ ! int x_redraw; /* flag used when drawing is needed */ t_glist *x_glist; /* keep graphic context for various operations */ ! int x_zoom; /* zoom factor */ pthread_t x_updatechild; /* thread id for the update child */ ! int x_updatestart; /* starting position for update */ ! int x_updateend; /* ending position for update */ ! int x_xpos; /* stuck x position */ ! int x_ypos; /* stuck y position */ ! int x_shifted; /* remember shift state from last click */ ! int x_alted; /* remember alt state from last click */ ! int x_xdraw; /* x drawing position */ ! int x_edraw; /* end of drawing */ t_float x_f; /* float needed for signal input */ *************** *** 172,180 **** /* ------------------------ drawing functions ---------------------------- */ ! static void cooled_update_block(t_cooled *x, t_glist *glist, t_int bnumber) { ! t_int hi, i=0; t_float fspectrum=0.0; ! t_int phase=0; char color[8]; --- 162,170 ---- /* ------------------------ drawing functions ---------------------------- */ ! static void cooled_update_block(t_cooled *x, t_glist *glist, int bnumber) { ! int hi, i=0; t_float fspectrum=0.0; ! int phase=0; char color[8]; *************** *** 204,210 **** // set all points { ! t_int fsamp = ( bnumber * x->x_size ) / x->x_width; ! t_int lsamp = ( ( bnumber+1) * x->x_size ) / x->x_width; ! t_int si; // post ( "cooled~ : updating samples [%d,%d]", fsamp, lsamp ); --- 194,200 ---- // set all points { ! int fsamp = ( bnumber * x->x_size ) / x->x_width; ! int lsamp = ( ( bnumber+1) * x->x_size ) / x->x_width; ! int si; // post ( "cooled~ : updating samples [%d,%d]", fsamp, lsamp ); *************** *** 214,218 **** // calculate right channel index { ! t_int rind = 3*x->x_height/4 + ( *(x->x_rdata+si) * (x->x_height/4) ) - 1; if ( rind > x->x_height - 1 ) rind = x->x_height - 1; --- 204,208 ---- // calculate right channel index { ! int rind = 3*x->x_height/4 + ( *(x->x_rdata+si) * (x->x_height/4) ) - 1; if ( rind > x->x_height - 1 ) rind = x->x_height - 1; *************** *** 228,232 **** // calculate left channel index { ! t_int lind = x->x_height/4 + ( *(x->x_ldata+si) * (x->x_height/4) ) - 1; if ( lind > x->x_height/2 - 1 ) lind = x->x_height/2 - 1; --- 218,222 ---- // calculate left channel index { ! int lind = x->x_height/4 + ( *(x->x_ldata+si) * (x->x_height/4) ) - 1; if ( lind > x->x_height/2 - 1 ) lind = x->x_height/2 - 1; *************** *** 251,258 **** } ! static void cooled_erase_block(t_cooled *x, t_glist *glist, t_int sample ) { t_canvas *canvas=glist_getcanvas(glist); ! t_int hi; t_float fspectrum=0.0; char fillColor[ 16 ]; --- 241,248 ---- } ! static void cooled_erase_block(t_cooled *x, t_glist *glist, int sample ) { t_canvas *canvas=glist_getcanvas(glist); ! int hi; t_float fspectrum=0.0; char fillColor[ 16 ]; *************** *** 278,283 **** t_cooled *x = (t_cooled*) tdata; t_canvas *canvas=glist_getcanvas(x->x_glist); ! t_int si; ! t_int nbpoints = 0; t_float percentage = 0, opercentage = 0; --- 268,273 ---- t_cooled *x = (t_cooled*) tdata; t_canvas *canvas=glist_getcanvas(x->x_glist); ! int si; ! int nbpoints = 0; t_float percentage = 0, opercentage = 0; *************** *** 343,348 **** } ! static void cooled_update_part(t_cooled *x, t_glist *glist, t_int bstart, t_int bend, ! t_int erase, t_int redraw, t_int keepframe) { pthread_attr_t update_child_attr; --- 333,338 ---- } ! static void cooled_update_part(t_cooled *x, t_glist *glist, int bstart, int bend, ! int erase, int redraw, int keepframe) { pthread_attr_t update_child_attr; *************** *** 602,606 **** binbuf_addv(b, "ssiisiiii", gensym("#X"),gensym("obj"), ! (t_int)x->x_xpos, (t_int)x->x_ypos, gensym("cooled~"), x->x_size, x->x_width, x->x_height, x->x_draw ); binbuf_addv(b, ";"); --- 592,596 ---- binbuf_addv(b, "ssiisiiii", gensym("#X"),gensym("obj"), ! (int)x->x_obj.te_xpix, (int)x->x_obj.te_ypix, gensym("cooled~"), x->x_size, x->x_width, x->x_height, x->x_draw ); binbuf_addv(b, ";"); *************** *** 639,644 **** { t_cooled *x = (t_cooled *)z; ! t_int xold = x->x_xpos; ! t_int yold = x->x_ypos; x->x_xpos += dx; --- 629,634 ---- { t_cooled *x = (t_cooled *)z; ! int xold = x->x_xpos; ! int yold = x->x_ypos; x->x_xpos += dx; *************** *** 666,671 **** static void cooled_erase( t_cooled *x ) { ! t_int startsamp, endsamp, si; ! t_int lreadstart = x->x_readstart, lreadend = x->x_readend; if (x->x_allocate) { --- 656,661 ---- static void cooled_erase( t_cooled *x ) { ! int startsamp, endsamp, si; ! int lreadstart = x->x_readstart, lreadend = x->x_readend; if (x->x_allocate) { *************** *** 695,700 **** static void cooled_paste( t_cooled *x ) { ! t_int startsamp, endsamp, si, inssamp, hlimit, csize; ! t_int lreadstart = x->x_readstart, lreadend = x->x_readend; if (x->x_allocate) { --- 685,690 ---- static void cooled_paste( t_cooled *x ) { ! int startsamp, endsamp, si, inssamp, hlimit, csize; ! int lreadstart = x->x_readstart, lreadend = x->x_readend; if (x->x_allocate) { *************** *** 736,741 **** static void cooled_replace( t_cooled *x ) { ! t_int startsamp, endsamp, si, inssamp, hlimit, csize; ! t_int lreadstart = x->x_readstart, lreadend = x->x_readend; if (x->x_allocate) { --- 726,731 ---- static void cooled_replace( t_cooled *x ) { ! int startsamp, endsamp, si, inssamp, hlimit, csize; ! int lreadstart = x->x_readstart, lreadend = x->x_readend; if (x->x_allocate) { *************** *** 839,843 **** { t_cooled* x = (t_cooled *)z; ! t_int pipos; t_canvas *canvas=glist_getcanvas(x->x_glist); --- 829,833 ---- { t_cooled* x = (t_cooled *)z; ! int pipos; t_canvas *canvas=glist_getcanvas(x->x_glist); *************** *** 925,931 **** /* allocate tables for storing sound and temporary copy */ ! static t_int cooled_allocate(t_cooled *x) { ! t_int fi; if ( !(x->x_rdata = getbytes( x->x_size*sizeof(float) ) ) ) { --- 915,921 ---- /* allocate tables for storing sound and temporary copy */ ! static int cooled_allocate(t_cooled *x) { ! int fi; if ( !(x->x_rdata = getbytes( x->x_size*sizeof(float) ) ) ) { *************** *** 970,976 **** /* allocate tables for storing sound and temporary copy */ ! static t_int cooled_reallocate(t_cooled *x, t_int ioldsize, t_int inewsize) { ! t_int fi, csize; t_float *prdata=x->x_rdata, *pldata=x->x_ldata, *prsemp=x->x_rsemp, *plsemp=x->x_lsemp; --- 960,966 ---- /* allocate tables for storing sound and temporary copy */ ! static int cooled_reallocate(t_cooled *x, int ioldsize, int inewsize) { ! int fi, csize; t_float *prdata=x->x_rdata, *pldata=x->x_ldata, *prsemp=x->x_rsemp, *plsemp=x->x_lsemp; *************** *** 1040,1048 **** t_float *rout = (t_float *)(w[3]); t_float *lout = (t_float *)(w[4]); ! t_int is; ! t_int n = (int)(w[5]); /* number of samples */ ! t_int startsamp, endsamp; t_cooled *x = (t_cooled *)(w[6]); ! t_int lreadstart = x->x_readstart, lreadend = x->x_readend; if ( lreadstart <= lreadend ) --- 1030,1038 ---- t_float *rout = (t_float *)(w[3]); t_float *lout = (t_float *)(w[4]); ! int is; ! int n = (int)(w[5]); /* number of samples */ ! int startsamp, endsamp; t_cooled *x = (t_cooled *)(w[6]); ! int lreadstart = x->x_readstart, lreadend = x->x_readend; if ( lreadstart <= lreadend ) *************** *** 1122,1126 **** static void cooled_stereo(t_cooled *x) { ! t_int si; if (x->x_allocate) { --- 1112,1116 ---- static void cooled_stereo(t_cooled *x) { ! int si; if (x->x_allocate) { *************** *** 1227,1231 **** { char *operator = soperator->s_name; ! t_int ci; t_float fvalue, freadstart = x->x_readstart, freadend = x->x_readend; --- 1217,1221 ---- { char *operator = soperator->s_name; ! int ci; t_float fvalue, freadstart = x->x_readstart, freadend = x->x_readend;

1 0

externals/unauthorized/audience~ CHANGES.LOG, 1.2, 1.3 Makefile, 1.3, 1.4 audience~.c, 1.6, 1.7
by Yves Degoyon 26 Jul '06

26 Jul '06

Update of /cvsroot/pure-data/externals/unauthorized/audience~ In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3000 Modified Files: CHANGES.LOG Makefile audience~.c Log Message: fixed coordinates for GOP Index: CHANGES.LOG =================================================================== RCS file: /cvsroot/pure-data/externals/unauthorized/audience~/CHANGES.LOG,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** CHANGES.LOG 2 Mar 2005 02:43:38 -0000 1.2 --- CHANGES.LOG 26 Jul 2006 16:42:34 -0000 1.3 *************** *** 1,2 **** --- 1,4 ---- + 0.7 + added GOP support 0.6 Adaptattions for pd 0.37 Index: audience~.c =================================================================== RCS file: /cvsroot/pure-data/externals/unauthorized/audience~/audience~.c,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** audience~.c 2 Mar 2005 02:43:38 -0000 1.6 --- audience~.c 26 Jul 2006 16:42:34 -0000 1.7 *************** *** 66,70 **** #define PIXELSIZE 0.1 ! static char *audience_version = "audience : 2d audience simulation, version 0.6 (ydegoyon(a)free.fr)"; t_widgetbehavior audience_widgetbehavior; --- 66,70 ---- #define PIXELSIZE 0.1 ! static char *audience_version = "audience : 2d audience simulation, version 0.7 (ydegoyon(a)free.fr)"; t_widgetbehavior audience_widgetbehavior; *************** *** 367,371 **** binbuf_addv(b, "ssiisiiiifi", gensym("#X"),gensym("obj"), ! (t_int)text_xpix(&x->x_obj, x->x_glist), (t_int)text_ypix(&x->x_obj, x->x_glist), gensym("audience~"), x->x_width, x->x_height, x->x_nbinputs, x->x_nboutputs, x->x_attenuation, x->x_applydelay ); --- 367,371 ---- binbuf_addv(b, "ssiisiiiifi", gensym("#X"),gensym("obj"), ! (t_int)x->x_obj.te_xpix, (t_int)x->x_obj.te_ypix, gensym("audience~"), x->x_width, x->x_height, x->x_nbinputs, x->x_nboutputs, x->x_attenuation, x->x_applydelay ); Index: Makefile =================================================================== RCS file: /cvsroot/pure-data/externals/unauthorized/audience~/Makefile,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Makefile 2 Mar 2005 02:43:38 -0000 1.3 --- Makefile 26 Jul 2006 16:42:34 -0000 1.4 *************** *** 63,67 **** LINUXCFLAGS = -DPD -DUNIX -DICECAST -O2 -funroll-loops -fomit-frame-pointer \ -Wall -W -Wno-shadow -Wstrict-prototypes -g \ ! -Wno-unused -Wno-parentheses -Wno-switch -Werror LINUXINCLUDE = -I../../src --- 63,67 ---- LINUXCFLAGS = -DPD -DUNIX -DICECAST -O2 -funroll-loops -fomit-frame-pointer \ -Wall -W -Wno-shadow -Wstrict-prototypes -g \ ! -Wno-unused -Wno-parentheses -Wno-switch LINUXINCLUDE = -I../../src

1 0

externals/nusmuk/msd 03_msdwave.pd,1.7,1.8
by Nicolas Montgermont 26 Jul '06

26 Jul '06

Update of /cvsroot/pure-data/externals/nusmuk/msd In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30132/msd Modified Files: 03_msdwave.pd Log Message: Index: 03_msdwave.pd =================================================================== RCS file: /cvsroot/pure-data/externals/nusmuk/msd/03_msdwave.pd,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** 03_msdwave.pd 1 May 2006 02:43:13 -0000 1.7 --- 03_msdwave.pd 26 Jul 2006 15:03:48 -0000 1.8 *************** *** 1,3 **** ! #N canvas 493 42 947 811 10; #X obj 32 13 loadbang; #X obj 603 265 gemwin; --- 1,3 ---- ! #N canvas 555 25 947 765 10; #X obj 32 13 loadbang; #X obj 603 265 gemwin; *************** *** 18,25 **** #X obj 127 57 unpack f f f; #X obj 64 114 gemhead 45; - #X obj 48 239 color 0.2 0.2 0.2; #X obj 48 283 cuboid 0.005 0.15 0.08; #X connect 0 0 5 0; ! #X connect 1 0 7 0; #X connect 2 0 1 0; #X connect 3 0 2 0; --- 18,25 ---- #X obj 127 57 unpack f f f; #X obj 64 114 gemhead 45; #X obj 48 283 cuboid 0.005 0.15 0.08; + #X obj 48 239 color 0.8 0.8 0.8; #X connect 0 0 5 0; ! #X connect 1 0 8 0; #X connect 2 0 1 0; #X connect 3 0 2 0; *************** *** 28,34 **** #X connect 5 0 4 0; #X connect 5 1 1 2; ! #X connect 5 2 8 3; #X connect 6 0 3 1; ! #X connect 7 0 8 0; #X restore 274 531 pd massrender; #X msg 203 83 symbol reset; --- 28,34 ---- #X connect 5 0 4 0; #X connect 5 1 1 2; ! #X connect 5 2 7 3; #X connect 6 0 3 1; ! #X connect 8 0 7 0; #X restore 274 531 pd massrender; #X msg 203 83 symbol reset; *************** *** 49,57 **** #X obj 602 334 rotateXYZ; #X obj 56 547 vsl 15 128 0 4 0 0 empty empty empty 0 -8 0 8 -262131 ! -1 -1 400 1; #X obj 75 547 vsl 15 128 0 4 0 0 empty empty empty 0 -8 0 8 -262131 -1 -1 0 1; #X obj 94 547 vsl 15 128 0 4 0 0 empty empty empty 0 -8 0 8 -262131 ! -1 -1 0 1; #X obj 112 547 vsl 15 128 0 4 0 0 empty empty empty 0 -8 0 8 -262131 -1 -1 0 1; --- 49,57 ---- #X obj 602 334 rotateXYZ; #X obj 56 547 vsl 15 128 0 4 0 0 empty empty empty 0 -8 0 8 -262131 ! -1 -1 0 1; #X obj 75 547 vsl 15 128 0 4 0 0 empty empty empty 0 -8 0 8 -262131 -1 -1 0 1; #X obj 94 547 vsl 15 128 0 4 0 0 empty empty empty 0 -8 0 8 -262131 ! -1 -1 600 1; #X obj 112 547 vsl 15 128 0 4 0 0 empty empty empty 0 -8 0 8 -262131 -1 -1 0 1;

1 0

externals/nusmuk msd.h,1.13,1.14
by Nicolas Montgermont 26 Jul '06

26 Jul '06

Update of /cvsroot/pure-data/externals/nusmuk In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30132 Modified Files: msd.h Log Message: Index: msd.h =================================================================== RCS file: /cvsroot/pure-data/externals/nusmuk/msd.h,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** msd.h 21 Apr 2006 07:54:41 -0000 1.13 --- msd.h 26 Jul 2006 15:03:48 -0000 1.14 *************** *** 13,17 **** Based on pmpd by Cyrille Henry ! Contact : Nicolas Montgermont, montgermont(a)la-kitchen.fr Cyrille Henry, Cyrille.Henry(a)la-kitchen.fr --- 13,17 ---- Based on pmpd by Cyrille Henry ! Contact : Nicolas Montgermont, nicolas(a)basseslumieres.org Cyrille Henry, Cyrille.Henry(a)la-kitchen.fr *************** *** 30,34 **** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ! Version 0.07 -- 17.05.2005 */ --- 30,34 ---- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ! Version 0.08 -- 26.07.2006 */ *************** *** 168,174 **** t_float puissance; t_int oriented; //0 : no, 1 : tangential, 2 : normal ! t_float tdirection1[3], tdirection2[3]; ! Link(t_int n,const t_symbol *id,Mass<N> *m1,Mass<N> *m2,t_float k1,t_float d1, t_int o=0, t_float xa=0, t_float ya=0, t_float za=0,t_float pow=1, t_float lmin = 0,t_float lmax = 1e10) : nbr(n),Id(id) , mass1(m1),mass2(m2) --- 168,174 ---- t_float puissance; t_int oriented; //0 : no, 1 : tangential, 2 : normal ! t_float tdirection1[N], tdirection2[N]; ! Link(t_int n,const t_symbol *id,Mass<N> *m1,Mass<N> *m2,t_float k1,t_float d1, t_int o=0, t_float tangent[N]=NULL,t_float pow=1, t_float lmin = 0,t_float lmax = 1e10) : nbr(n),Id(id) , mass1(m1),mass2(m2) *************** *** 176,180 **** , long_min(lmin),long_max(lmax) { ! for (int i=0; i<3; i++) { tdirection1[i] = 0; tdirection2[i] = 0; --- 176,180 ---- , long_min(lmin),long_max(lmax) { ! for (int i=0; i<N; i++) { tdirection1[i] = 0; tdirection2[i] = 0; *************** *** 183,190 **** distance_old = longueur = Mass<N>::dist(*mass1,*mass2); // L[n-1] else if (oriented == 1) { // TANGENTIAL LINK ! const t_float norme = sqrt(sqr(xa)+sqr(ya)+sqr(za)); ! tdirection1[0] = xa/norme; ! tdirection1[1] = ya/norme; ! tdirection1[2] = za/norme; distance_old = 0; for(int i = 0; i < N; ++i) --- 183,193 ---- distance_old = longueur = Mass<N>::dist(*mass1,*mass2); // L[n-1] else if (oriented == 1) { // TANGENTIAL LINK ! t_float norme = 0; ! for(int i = 0; i < N; ++i) norme += sqr(tangent[i]); ! norme = sqrt(norme); ! //t_float norme = sqrt(sqr(xa)+sqr(ya)+sqr(za)); ! for(int i = 0; i < N; ++i)tdirection1[i] = tangent[i]/norme; ! //tdirection1[1] = ya/norme; ! //tdirection1[2] = za/norme; distance_old = 0; for(int i = 0; i < N; ++i) *************** *** 193,197 **** longueur = distance_old; } ! else if (oriented == 2) { // NORMAL LINK 2D if (N >= 2) { const t_float norme = sqrt(sqr(xa)+sqr(ya)); --- 196,200 ---- longueur = distance_old; } ! /*else if (oriented == 2) { // NORMAL LINK 2D if (N >= 2) { const t_float norme = sqrt(sqr(xa)+sqr(ya)); *************** *** 223,227 **** longueur = distance_old; } ! } mass1->links.insert(this); mass2->links.insert(this); --- 226,230 ---- longueur = distance_old; } ! }*/ mass1->links.insert(this); mass2->links.insert(this); *************** *** 747,751 **** GetAFloat(argv[3]), // K1 GetAFloat(argv[4]), // D1 ! 0,0,0,0, argc >= 6?GetFloat(argv[5]):1, // power argc >= 7?GetFloat(argv[6]):0, --- 750,754 ---- GetAFloat(argv[3]), // K1 GetAFloat(argv[4]), // D1 ! 0,NULL, argc >= 6?GetFloat(argv[5]):1, // power argc >= 7?GetFloat(argv[6]):0, *************** *** 769,773 **** GetAFloat(argv[3]), // K1 GetAFloat(argv[4]), // D1 ! 0,0,0,0, argc >= 6?GetFloat(argv[5]):1, // power argc >= 7?GetFloat(argv[6]):0, --- 772,776 ---- GetAFloat(argv[3]), // K1 GetAFloat(argv[4]), // D1 ! 0,NULL, argc >= 6?GetFloat(argv[5]):1, // power argc >= 7?GetFloat(argv[6]):0, *************** *** 790,794 **** GetAFloat(argv[3]), // K1 GetAFloat(argv[4]), // D1 ! 0,0,0,0, argc >= 6?GetFloat(argv[5]):1, // power argc >= 7?GetFloat(argv[6]):0, --- 793,797 ---- GetAFloat(argv[3]), // K1 GetAFloat(argv[4]), // D1 ! 0,NULL, argc >= 6?GetFloat(argv[5]):1, // power argc >= 7?GetFloat(argv[6]):0, *************** *** 815,819 **** GetAFloat(argv[3]), // K1 GetAFloat(argv[4]), // D1 ! 0,0,0,0, argc >= 6?GetFloat(argv[5]):1, // power argc >= 7?GetFloat(argv[6]):0, // Lmin --- 818,822 ---- GetAFloat(argv[3]), // K1 GetAFloat(argv[4]), // D1 ! 0,NULL, argc >= 6?GetFloat(argv[5]):1, // power argc >= 7?GetFloat(argv[6]):0, // Lmin *************** *** 847,851 **** GetAFloat(argv[3]), // K1 GetAFloat(argv[4]), // D1 ! 0,0,0,0, argc >= 6?GetFloat(argv[5]):1, // power argc >= 7?GetFloat(argv[6]):0, --- 850,854 ---- GetAFloat(argv[3]), // K1 GetAFloat(argv[4]), // D1 ! 0,NULL, argc >= 6?GetFloat(argv[5]):1, // power argc >= 7?GetFloat(argv[6]):0, *************** *** 868,871 **** --- 871,876 ---- return; } + t_float tangent[N]; + for(int i = 0; i < N; ++i) tangent[i] = GetAFloat(argv[5+i]); if (IsSymbol(argv[1]) && IsSymbol(argv[2])) { // ID & ID *************** *** 882,889 **** GetAFloat(argv[4]), // D1 1, // tangential ! GetAFloat(argv[5]),N >= 2?GetAFloat(argv[6]):0,N >= 3?GetAFloat(argv[7]):0, // vector ! (N==1 && argc >= 7)?GetFloat(argv[6]):((N==2 && argc >= 8)?GetFloat(argv[7]):((N==3 && argc >= 9)?GetFloat(argv[8]):1)), // power ! (N==1 && argc >= 8)?GetFloat(argv[7]):((N==2 && argc >= 9)?GetFloat(argv[8]):((N==3 && argc >= 10)?GetFloat(argv[9]):0)), // Lmin ! (N==1 && argc >= 9)?GetFloat(argv[8]):((N==2 && argc >= 10)?GetFloat(argv[9]):((N==3 && argc >= 11)?GetFloat(argv[10]):1e10))// Lmax ); --- 887,899 ---- GetAFloat(argv[4]), // D1 1, // tangential ! tangent, ! argc >= 6+N?GetFloat(argv[5+N]):1, // power ! argc >= 7+N?GetFloat(argv[6+N]):0, // Lmin ! argc >= 8+N?GetFloat(argv[7+N]):1e10 // Lmax ! ! //GetAFloat(argv[5]),N >= 2?GetAFloat(argv[6]):0,N >= 3?GetAFloat(argv[7]):0, // vector ! //(N==1 && argc >= 7)?GetFloat(argv[6]):((N==2 && argc >= 8)?GetFloat(argv[7]):((N==3 && argc >= 9)?GetFloat(argv[8]):1)), // power ! //(N==1 && argc >= 8)?GetFloat(argv[7]):((N==2 && argc >= 9)?GetFloat(argv[8]):((N==3 && argc >= 10)?GetFloat(argv[9]):0)), // Lmin ! //(N==1 && argc >= 9)?GetFloat(argv[8]):((N==2 && argc >= 10)?GetFloat(argv[9]):((N==3 && argc >= 11)?GetFloat(argv[10]):1e10))// Lmax ); *************** *** 906,917 **** GetAFloat(argv[4]), // D1 1, // tangential ! GetAFloat(argv[5]),N >= 2?GetAFloat(argv[6]):0,N >= 3?GetAFloat(argv[7]):0, // vector ! (N==1 && argc >= 7)?GetFloat(argv[6]):((N==2 && argc >= 8)?GetFloat(argv[7]):((N==3 && argc >= 9)?GetFloat(argv[8]):1)), // power ! (N==1 && argc >= 8)?GetFloat(argv[7]):((N==2 && argc >= 9)?GetFloat(argv[8]):((N==3 && argc >= 10)?GetFloat(argv[9]):0)), // Lmin ! (N==1 && argc >= 9)?GetFloat(argv[8]):((N==2 && argc >= 10)?GetFloat(argv[9]):((N==3 && argc >= 11)?GetFloat(argv[10]):1e10))// Lmax ); linkids.insert(l); link.insert(id_link++,l); ! outlink(S_iLink,l); } } --- 916,932 ---- GetAFloat(argv[4]), // D1 1, // tangential ! tangent, ! argc >= 6+N?GetFloat(argv[5+N]):1, // power ! argc >= 7+N?GetFloat(argv[6+N]):0, // Lmin ! argc >= 8+N?GetFloat(argv[7+N]):1e10 // Lmax ! ! //GetAFloat(argv[5]),N >= 2?GetAFloat(argv[6]):0,N >= 3?GetAFloat(argv[7]):0, // vector ! //(N==1 && argc >= 7)?GetFloat(argv[6]):((N==2 && argc >= 8)?GetFloat(argv[7]):((N==3 && argc >= 9)?GetFloat(argv[8]):1)), // power ! //(N==1 && argc >= 8)?GetFloat(argv[7]):((N==2 && argc >= 9)?GetFloat(argv[8]):((N==3 && argc >= 10)?GetFloat(argv[9]):0)), // Lmin ! //(N==1 && argc >= 9)?GetFloat(argv[8]):((N==2 && argc >= 10)?GetFloat(argv[9]):((N==3 && argc >= 11)?GetFloat(argv[10]):1e10))// Lmax ); linkids.insert(l); link.insert(id_link++,l); ! outlink(S_tLink,l); } } *************** *** 927,939 **** GetAFloat(argv[3]), // K1 GetAFloat(argv[4]), // D1 ! 1, // tangential ! GetAFloat(argv[5]),N >= 2?GetAFloat(argv[6]):0,N >= 3?GetAFloat(argv[7]):0, // vector ! (N==1 && argc >= 7)?GetFloat(argv[6]):((N==2 && argc >= 8)?GetFloat(argv[7]):((N==3 && argc >= 9)?GetFloat(argv[8]):1)), // power ! (N==1 && argc >= 8)?GetFloat(argv[7]):((N==2 && argc >= 9)?GetFloat(argv[8]):((N==3 && argc >= 10)?GetFloat(argv[9]):0)), // Lmin ! (N==1 && argc >= 9)?GetFloat(argv[8]):((N==2 && argc >= 10)?GetFloat(argv[9]):((N==3 && argc >= 11)?GetFloat(argv[10]):1e10))// Lmax ); linkids.insert(l); link.insert(id_link++,l); ! outlink(S_iLink,l); } } --- 942,959 ---- GetAFloat(argv[3]), // K1 GetAFloat(argv[4]), // D1 ! 1, ! tangent, // tangential ! argc >= 6+N?GetFloat(argv[5+N]):1, // power ! argc >= 7+N?GetFloat(argv[6+N]):0, // Lmin ! argc >= 8+N?GetFloat(argv[7+N]):1e10 // Lmax ! ! //GetAFloat(argv[5]),N >= 2?GetAFloat(argv[6]):0,N >= 3?GetAFloat(argv[7]):0, // vector ! //(N==1 && argc >= 7)?GetFloat(argv[6]):((N==2 && argc >= 8)?GetFloat(argv[7]):((N==3 && argc >= 9)?GetFloat(argv[8]):1)), // power ! //(N==1 && argc >= 8)?GetFloat(argv[7]):((N==2 && argc >= 9)?GetFloat(argv[8]):((N==3 && argc >= 10)?GetFloat(argv[9]):0)), // Lmin ! //(N==1 && argc >= 9)?GetFloat(argv[8]):((N==2 && argc >= 10)?GetFloat(argv[9]):((N==3 && argc >= 11)?GetFloat(argv[10]):1e10))// Lmax ); linkids.insert(l); link.insert(id_link++,l); ! outlink(S_tLink,l); } } *************** *** 953,961 **** GetAFloat(argv[4]), // D1 1, // tangential ! GetAFloat(argv[5]),N >= 2?GetAFloat(argv[6]):0,N >= 3?GetAFloat(argv[7]):0, // vector ! (N==1 && argc >= 7)?GetFloat(argv[6]):((N==2 && argc >= 8)?GetFloat(argv[7]):((N==3 && argc >= 9)?GetFloat(argv[8]):1)), // power ! (N==1 && argc >= 8)?GetFloat(argv[7]):((N==2 && argc >= 9)?GetFloat(argv[8]):((N==3 && argc >= 10)?GetFloat(argv[9]):0)), // Lmin ! (N==1 && argc >= 9)?GetFloat(argv[8]):((N==2 && argc >= 10)?GetFloat(argv[9]):((N==3 && argc >= 11)?GetFloat(argv[10]):1e10))// Lmax ! ); linkids.insert(l); link.insert(id_link++,l); --- 973,986 ---- GetAFloat(argv[4]), // D1 1, // tangential ! tangent, // tangential ! argc >= 6+N?GetFloat(argv[5+N]):1, // power ! argc >= 7+N?GetFloat(argv[6+N]):0, // Lmin ! argc >= 8+N?GetFloat(argv[7+N]):1e10 // Lmax ! ! //GetAFloat(argv[5]),N >= 2?GetAFloat(argv[6]):0,N >= 3?GetAFloat(argv[7]):0, // vector ! //(N==1 && argc >= 7)?GetFloat(argv[6]):((N==2 && argc >= 8)?GetFloat(argv[7]):((N==3 && argc >= 9)?GetFloat(argv[8]):1)), // power ! //(N==1 && argc >= 8)?GetFloat(argv[7]):((N==2 && argc >= 9)?GetFloat(argv[8]):((N==3 && argc >= 10)?GetFloat(argv[9]):0)), // Lmin ! //(N==1 && argc >= 9)?GetFloat(argv[8]):((N==2 && argc >= 10)?GetFloat(argv[9]):((N==3 && argc >= 11)?GetFloat(argv[10]):1e10))// Lmax ! ); linkids.insert(l); link.insert(id_link++,l); *************** *** 967,971 **** // Id, *mass1, *mass2, K1, D1, D2, (Lmin,Lmax) void m_nlink(int argc,t_atom *argv) ! { if (argc < 5+N || argc > 8+N) { error("%s - %s Syntax : Id No/Idmass1 No/Idmass2 K D1 xa%s%s (pow Lmin Lmax)",thisName(),GetString(thisTag()),N >= 2?" ya":"",N >= 3?" za":""); --- 992,996 ---- // Id, *mass1, *mass2, K1, D1, D2, (Lmin,Lmax) void m_nlink(int argc,t_atom *argv) ! {/* if (argc < 5+N || argc > 8+N) { error("%s - %s Syntax : Id No/Idmass1 No/Idmass2 K D1 xa%s%s (pow Lmin Lmax)",thisName(),GetString(thisTag()),N >= 2?" ya":"",N >= 3?" za":""); *************** *** 1070,1074 **** outlink(S_nLink,l); } ! } // set Id of link(s) named Id or number No --- 1095,1099 ---- outlink(S_nLink,l); } ! */} // set Id of link(s) named Id or number No

1 0

← Newer
1
2
3
4
5
6
7
8
...
15
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 July 2006