From ec427a5f2a769cd5d426a929b53dce79bfbb64e0 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Thu, 21 Sep 2006 00:14:29 +0000 Subject: made all three curves stay between 0 and 1 always svn path=/trunk/externals/mapping/; revision=5987 --- TODO | 8 +++++++ help/sinusoid-help.pd | 59 ++++++++++++++++++++++------------------------- sinusoid.pd | 64 +++++++++++++++++++++++++++------------------------ 3 files changed, 70 insertions(+), 61 deletions(-) diff --git a/TODO b/TODO index 2e20121..3d074f3 100644 --- a/TODO +++ b/TODO @@ -1,4 +1,12 @@ + +______________________________________________________________________________ += one->many + +something like [segment]? or [seglet]? + +______________________________________________________________________________ += - check out behavior of [curve_power] and [curve_root] if non-integers are used as arguments on in the right inlets diff --git a/help/sinusoid-help.pd b/help/sinusoid-help.pd index 62d89b0..a6a34f5 100644 --- a/help/sinusoid-help.pd +++ b/help/sinusoid-help.pd @@ -1,22 +1,21 @@ -#N canvas 528 218 492 373 10; -#X obj 5 2 cnv 15 450 20 empty empty [curve] 2 11 1 18 -233017 -66577 +#N canvas 88 40 476 378 10; +#X obj 5 2 cnv 15 450 20 empty empty [sinusoid] 2 11 1 18 -233017 -66577 0; -#X msg 422 3 pddp; #X text 27 320 (C) Copyright 2004 Hans-Christoph Steiner ; #X text 244 334 released under the GNU GPL; #X text 158 291 For more info:; #X floatatom 25 163 8 0 0 0 - - -; #X floatatom 25 224 8 0 0 0 - - -; -#X obj 28 241 hsl 200 15 -1 1 0 0 empty empty empty 22 8 1 12 -262144 +#X obj 28 241 hsl 200 15 0 1 0 0 empty empty empty 22 8 1 12 -262144 -1 -1 0 1; -#X obj 28 143 hsl 200 15 -1 1 0 0 empty empty empty 22 8 1 12 -261681 +#X obj 28 143 hsl 200 15 0 1 0 0 empty empty empty 22 8 1 12 -261681 -1 -1 0 1; #N canvas 0 22 450 300 graph1 0; -#X array \$0-curve 100 float 0; -#X coords 0 1 99 -1 100 100 1; +#X array \$0_ 100 float 0; +#X coords 0 1 99 0 100 100 1; #X restore 321 111 graph; -#N canvas 266 69 407 397 draw_array 0; +#N canvas 266 69 411 401 draw_array 0; #X msg 54 82 bang; #X obj 54 103 until; #X text 85 82 start; @@ -29,10 +28,9 @@ #X obj 138 9 receive \$0-type; #X obj 54 180 trigger float float; #X obj 127 127 select 0; -#X obj 53 313 tabwrite \$0-curve; +#X obj 53 313 tabwrite \$0_; #X text 96 257 mapping output range: 0 to 1; -#X obj 53 229 - 50; -#X obj 54 257 / 50; +#X obj 54 257 / 100; #X obj 53 283 sinusoid sin; #X connect 0 0 1 0; #X connect 1 0 3 0; @@ -43,35 +41,34 @@ #X connect 5 0 11 0; #X connect 6 0 0 0; #X connect 7 0 0 0; -#X connect 7 1 16 1; +#X connect 7 1 15 1; #X connect 8 0 7 0; #X connect 9 0 8 0; #X connect 10 0 14 0; #X connect 10 1 12 1; #X connect 11 0 1 1; #X connect 14 0 15 0; -#X connect 15 0 16 0; -#X connect 16 0 12 0; -#X restore 321 89 pd draw_array; -#X text 17 39 This object maps the input range to a exponential curve -\, the inverse of a logarithmic curve.; +#X connect 15 0 12 0; +#X restore 321 79 pd draw_array; #X msg 61 82 atan; #X msg 98 82 cos; #X obj 104 184 receive \$0-type; #X msg 128 82 sin; -#X obj 262 289 pddp_open mapping-about; -#X text 286 231 related objects:; -#X obj 342 250 curve_power; -#X obj 342 268 curve_log; -#X obj 259 268 curve_exp; +#X text 296 221 related objects:; +#X obj 352 240 curve_power; +#X obj 352 258 curve_log; +#X obj 269 258 curve_exp; #X obj 107 114 send \$0-type; #X obj 25 203 sinusoid sin; -#X obj 259 250 curve; -#X connect 5 0 22 0; -#X connect 6 0 7 0; -#X connect 8 0 5 0; -#X connect 12 0 21 0; -#X connect 13 0 21 0; -#X connect 14 0 22 1; -#X connect 15 0 21 0; -#X connect 22 0 6 0; +#X obj 269 240 curve; +#X text 17 39 This object maps the input range to a sinusoidal curve. +; +#X obj 262 289 pddp/open mapping-about; +#X connect 4 0 19 0; +#X connect 5 0 6 0; +#X connect 7 0 4 0; +#X connect 10 0 18 0; +#X connect 11 0 18 0; +#X connect 12 0 19 1; +#X connect 13 0 18 0; +#X connect 19 0 5 0; diff --git a/sinusoid.pd b/sinusoid.pd index 339ccbe..83b4cf6 100644 --- a/sinusoid.pd +++ b/sinusoid.pd @@ -1,35 +1,39 @@ -#N canvas 297 154 620 504 10; -#X obj 50 36 inlet; -#X obj 204 19 inlet; -#X obj 47 411 outlet; -#X obj 50 150 pack float symbol; -#X msg 50 175 \$2 \$1; -#X obj 39 256 atan; -#X obj 39 277 / 1.26263; -#X obj 190 225 symbol; -#X msg 189 251 ERROR: argument not supported \$1 \, try atan cos or +#N canvas 73 115 576 439 10; +#X obj 40 26 inlet; +#X obj 194 9 inlet; +#X obj 37 401 outlet; +#X obj 40 140 pack float symbol; +#X msg 40 165 \$2 \$1; +#X obj 29 246 atan; +#X obj 29 267 / 1.26263; +#X obj 180 215 symbol; +#X msg 179 241 ERROR: argument not supported \$1 \, try atan cos or sin; -#X obj 208 74 symbol_argument \$1; -#X obj 249 19 loadbang; -#X obj 50 98 * 3.14159; -#X obj 188 273 print [sinusoid]; -#X obj 50 198 route atan sin cos; -#X obj 123 260 sin; -#X obj 152 260 cos; -#X connect 0 0 11 0; -#X connect 1 0 9 0; +#X obj 207 40 loadbang; +#X obj 40 88 * 3.14159; +#X obj 178 263 print [sinusoid]; +#X obj 40 188 route atan sin cos; +#X obj 113 250 sin; +#X obj 142 250 cos; +#X obj 142 270 + 1; +#X obj 142 290 / 2; +#X obj 198 64 purepd/symbol_argument \$1; +#X connect 0 0 10 0; +#X connect 1 0 17 0; #X connect 3 0 4 0; -#X connect 4 0 13 0; +#X connect 4 0 12 0; #X connect 5 0 6 0; #X connect 6 0 2 0; #X connect 7 0 8 0; -#X connect 8 0 12 0; -#X connect 9 0 3 1; -#X connect 10 0 9 0; -#X connect 11 0 3 0; -#X connect 13 0 5 0; -#X connect 13 1 14 0; -#X connect 13 2 15 0; -#X connect 13 3 7 0; -#X connect 14 0 2 0; -#X connect 15 0 2 0; +#X connect 8 0 11 0; +#X connect 9 0 17 0; +#X connect 10 0 3 0; +#X connect 12 0 5 0; +#X connect 12 1 13 0; +#X connect 12 2 14 0; +#X connect 12 3 7 0; +#X connect 13 0 2 0; +#X connect 14 0 15 0; +#X connect 15 0 16 0; +#X connect 16 0 2 0; +#X connect 17 0 3 1; -- cgit v1.2.1