From 73146871639d8a92d24d0ec5db01f6e5729b12f1 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Thu, 17 Jan 2013 23:33:42 +0000 Subject: fix bug where outlet order was reversed, bug report and patch from Mike McGonagle svn path=/trunk/externals/chaos/; revision=16908 --- attract1.c | 2 +- dejong.c | 2 +- gingerbreadman.c | 2 +- henon.c | 2 +- hopalong.c | 2 +- ikeda.c | 2 +- latoocarfian.c | 2 +- latoomutalpha.c | 2 +- latoomutbeta.c | 2 +- latoomutgamma.c | 2 +- lorenz.c | 4 ++-- lotkavolterra.c | 2 +- martin.c | 2 +- pickover.c | 4 ++-- popcorn.c | 2 +- quadruptwo.c | 2 +- rossler.c | 4 ++-- standardmap.c | 2 +- strange1.c | 2 +- three_d.c | 4 ++-- threeply.c | 2 +- tinkerbell.c | 2 +- unity.c | 2 +- 23 files changed, 27 insertions(+), 27 deletions(-) diff --git a/attract1.c b/attract1.c index f7082ae..c3471e1 100644 --- a/attract1.c +++ b/attract1.c @@ -87,8 +87,8 @@ static void calc(attract1_struct *attract1, double *vars) { static void calculate(attract1_struct *attract1) { calc(attract1, attract1 -> vars); - outlet_float(attract1 -> x_obj.ob_outlet, attract1 -> vars[M_x]); outlet_float(attract1 -> outlets[M_y - 1], attract1 -> vars[M_y]); + outlet_float(attract1 -> x_obj.ob_outlet, attract1 -> vars[M_x]); } // end calculate static void reset(attract1_struct *attract1, t_symbol *s, int argc, t_atom *argv) { diff --git a/dejong.c b/dejong.c index 33a5394..f90d819 100644 --- a/dejong.c +++ b/dejong.c @@ -81,8 +81,8 @@ static void calc(dejong_struct *dejong, double *vars) { static void calculate(dejong_struct *dejong) { calc(dejong, dejong -> vars); - outlet_float(dejong -> x_obj.ob_outlet, dejong -> vars[M_x]); outlet_float(dejong -> outlets[M_y - 1], dejong -> vars[M_y]); + outlet_float(dejong -> x_obj.ob_outlet, dejong -> vars[M_x]); } // end calculate static void reset(dejong_struct *dejong, t_symbol *s, int argc, t_atom *argv) { diff --git a/gingerbreadman.c b/gingerbreadman.c index a425f71..29848c5 100644 --- a/gingerbreadman.c +++ b/gingerbreadman.c @@ -59,8 +59,8 @@ static void calc(gingerbreadman_struct *gingerbreadman, double *vars) { static void calculate(gingerbreadman_struct *gingerbreadman) { calc(gingerbreadman, gingerbreadman -> vars); - outlet_float(gingerbreadman -> x_obj.ob_outlet, gingerbreadman -> vars[M_x]); outlet_float(gingerbreadman -> outlets[M_y - 1], gingerbreadman -> vars[M_y]); + outlet_float(gingerbreadman -> x_obj.ob_outlet, gingerbreadman -> vars[M_x]); } // end calculate static void reset(gingerbreadman_struct *gingerbreadman, t_symbol *s, int argc, t_atom *argv) { diff --git a/henon.c b/henon.c index 533d850..d730e1c 100644 --- a/henon.c +++ b/henon.c @@ -75,8 +75,8 @@ static void calc(henon_struct *henon, double *vars) { static void calculate(henon_struct *henon) { calc(henon, henon -> vars); - outlet_float(henon -> x_obj.ob_outlet, henon -> vars[M_x]); outlet_float(henon -> outlets[M_y - 1], henon -> vars[M_y]); + outlet_float(henon -> x_obj.ob_outlet, henon -> vars[M_x]); } // end calculate static void reset(henon_struct *henon, t_symbol *s, int argc, t_atom *argv) { diff --git a/hopalong.c b/hopalong.c index 76efe66..a2d4886 100644 --- a/hopalong.c +++ b/hopalong.c @@ -78,8 +78,8 @@ static void calc(hopalong_struct *hopalong, double *vars) { static void calculate(hopalong_struct *hopalong) { calc(hopalong, hopalong -> vars); - outlet_float(hopalong -> x_obj.ob_outlet, hopalong -> vars[M_x]); outlet_float(hopalong -> outlets[M_y - 1], hopalong -> vars[M_y]); + outlet_float(hopalong -> x_obj.ob_outlet, hopalong -> vars[M_x]); } // end calculate static void reset(hopalong_struct *hopalong, t_symbol *s, int argc, t_atom *argv) { diff --git a/ikeda.c b/ikeda.c index a9e473e..40ab0f0 100644 --- a/ikeda.c +++ b/ikeda.c @@ -84,8 +84,8 @@ static void calc(ikeda_struct *ikeda, double *vars) { static void calculate(ikeda_struct *ikeda) { calc(ikeda, ikeda -> vars); - outlet_float(ikeda -> x_obj.ob_outlet, ikeda -> vars[M_x]); outlet_float(ikeda -> outlets[M_y - 1], ikeda -> vars[M_y]); + outlet_float(ikeda -> x_obj.ob_outlet, ikeda -> vars[M_x]); } // end calculate static void reset(ikeda_struct *ikeda, t_symbol *s, int argc, t_atom *argv) { diff --git a/latoocarfian.c b/latoocarfian.c index b70b22c..c2badc9 100644 --- a/latoocarfian.c +++ b/latoocarfian.c @@ -81,8 +81,8 @@ static void calc(latoocarfian_struct *latoocarfian, double *vars) { static void calculate(latoocarfian_struct *latoocarfian) { calc(latoocarfian, latoocarfian -> vars); - outlet_float(latoocarfian -> x_obj.ob_outlet, latoocarfian -> vars[M_x]); outlet_float(latoocarfian -> outlets[M_y - 1], latoocarfian -> vars[M_y]); + outlet_float(latoocarfian -> x_obj.ob_outlet, latoocarfian -> vars[M_x]); } // end calculate static void reset(latoocarfian_struct *latoocarfian, t_symbol *s, int argc, t_atom *argv) { diff --git a/latoomutalpha.c b/latoomutalpha.c index 94a8082..bbdea33 100644 --- a/latoomutalpha.c +++ b/latoomutalpha.c @@ -81,8 +81,8 @@ static void calc(latoomutalpha_struct *latoomutalpha, double *vars) { static void calculate(latoomutalpha_struct *latoomutalpha) { calc(latoomutalpha, latoomutalpha -> vars); - outlet_float(latoomutalpha -> x_obj.ob_outlet, latoomutalpha -> vars[M_x]); outlet_float(latoomutalpha -> outlets[M_y - 1], latoomutalpha -> vars[M_y]); + outlet_float(latoomutalpha -> x_obj.ob_outlet, latoomutalpha -> vars[M_x]); } // end calculate static void reset(latoomutalpha_struct *latoomutalpha, t_symbol *s, int argc, t_atom *argv) { diff --git a/latoomutbeta.c b/latoomutbeta.c index bace348..3f5514a 100644 --- a/latoomutbeta.c +++ b/latoomutbeta.c @@ -81,8 +81,8 @@ static void calc(latoomutbeta_struct *latoomutbeta, double *vars) { static void calculate(latoomutbeta_struct *latoomutbeta) { calc(latoomutbeta, latoomutbeta -> vars); - outlet_float(latoomutbeta -> x_obj.ob_outlet, latoomutbeta -> vars[M_x]); outlet_float(latoomutbeta -> outlets[M_y - 1], latoomutbeta -> vars[M_y]); + outlet_float(latoomutbeta -> x_obj.ob_outlet, latoomutbeta -> vars[M_x]); } // end calculate static void reset(latoomutbeta_struct *latoomutbeta, t_symbol *s, int argc, t_atom *argv) { diff --git a/latoomutgamma.c b/latoomutgamma.c index 6d5c07c..b5e96b8 100644 --- a/latoomutgamma.c +++ b/latoomutgamma.c @@ -81,8 +81,8 @@ static void calc(latoomutgamma_struct *latoomutgamma, double *vars) { static void calculate(latoomutgamma_struct *latoomutgamma) { calc(latoomutgamma, latoomutgamma -> vars); - outlet_float(latoomutgamma -> x_obj.ob_outlet, latoomutgamma -> vars[M_x]); outlet_float(latoomutgamma -> outlets[M_y - 1], latoomutgamma -> vars[M_y]); + outlet_float(latoomutgamma -> x_obj.ob_outlet, latoomutgamma -> vars[M_x]); } // end calculate static void reset(latoomutgamma_struct *latoomutgamma, t_symbol *s, int argc, t_atom *argv) { diff --git a/lorenz.c b/lorenz.c index 7f2864d..6870d09 100644 --- a/lorenz.c +++ b/lorenz.c @@ -84,9 +84,9 @@ static void calc(lorenz_struct *lorenz, double *vars) { static void calculate(lorenz_struct *lorenz) { calc(lorenz, lorenz -> vars); - outlet_float(lorenz -> x_obj.ob_outlet, lorenz -> vars[M_x]); - outlet_float(lorenz -> outlets[M_y - 1], lorenz -> vars[M_y]); outlet_float(lorenz -> outlets[M_z - 1], lorenz -> vars[M_z]); + outlet_float(lorenz -> outlets[M_y - 1], lorenz -> vars[M_y]); + outlet_float(lorenz -> x_obj.ob_outlet, lorenz -> vars[M_x]); } // end calculate static void reset(lorenz_struct *lorenz, t_symbol *s, int argc, t_atom *argv) { diff --git a/lotkavolterra.c b/lotkavolterra.c index aad45c4..be5b9b1 100644 --- a/lotkavolterra.c +++ b/lotkavolterra.c @@ -81,8 +81,8 @@ static void calc(lotkavolterra_struct *lotkavolterra, double *vars) { static void calculate(lotkavolterra_struct *lotkavolterra) { calc(lotkavolterra, lotkavolterra -> vars); - outlet_float(lotkavolterra -> x_obj.ob_outlet, lotkavolterra -> vars[M_r]); outlet_float(lotkavolterra -> outlets[M_f - 1], lotkavolterra -> vars[M_f]); + outlet_float(lotkavolterra -> x_obj.ob_outlet, lotkavolterra -> vars[M_r]); } // end calculate static void reset(lotkavolterra_struct *lotkavolterra, t_symbol *s, int argc, t_atom *argv) { diff --git a/martin.c b/martin.c index b1368c3..570fde6 100644 --- a/martin.c +++ b/martin.c @@ -72,8 +72,8 @@ static void calc(martin_struct *martin, double *vars) { static void calculate(martin_struct *martin) { calc(martin, martin -> vars); - outlet_float(martin -> x_obj.ob_outlet, martin -> vars[M_x]); outlet_float(martin -> outlets[M_y - 1], martin -> vars[M_y]); + outlet_float(martin -> x_obj.ob_outlet, martin -> vars[M_x]); } // end calculate static void reset(martin_struct *martin, t_symbol *s, int argc, t_atom *argv) { diff --git a/pickover.c b/pickover.c index 1aae04b..eb369d1 100644 --- a/pickover.c +++ b/pickover.c @@ -84,9 +84,9 @@ static void calc(pickover_struct *pickover, double *vars) { static void calculate(pickover_struct *pickover) { calc(pickover, pickover -> vars); - outlet_float(pickover -> x_obj.ob_outlet, pickover -> vars[M_x]); - outlet_float(pickover -> outlets[M_y - 1], pickover -> vars[M_y]); outlet_float(pickover -> outlets[M_z - 1], pickover -> vars[M_z]); + outlet_float(pickover -> outlets[M_y - 1], pickover -> vars[M_y]); + outlet_float(pickover -> x_obj.ob_outlet, pickover -> vars[M_x]); } // end calculate static void reset(pickover_struct *pickover, t_symbol *s, int argc, t_atom *argv) { diff --git a/popcorn.c b/popcorn.c index 4ba8db2..31fb922 100644 --- a/popcorn.c +++ b/popcorn.c @@ -72,8 +72,8 @@ static void calc(popcorn_struct *popcorn, double *vars) { static void calculate(popcorn_struct *popcorn) { calc(popcorn, popcorn -> vars); - outlet_float(popcorn -> x_obj.ob_outlet, popcorn -> vars[M_x]); outlet_float(popcorn -> outlets[M_y - 1], popcorn -> vars[M_y]); + outlet_float(popcorn -> x_obj.ob_outlet, popcorn -> vars[M_x]); } // end calculate static void reset(popcorn_struct *popcorn, t_symbol *s, int argc, t_atom *argv) { diff --git a/quadruptwo.c b/quadruptwo.c index e074bcf..dc18df2 100644 --- a/quadruptwo.c +++ b/quadruptwo.c @@ -78,8 +78,8 @@ static void calc(quadruptwo_struct *quadruptwo, double *vars) { static void calculate(quadruptwo_struct *quadruptwo) { calc(quadruptwo, quadruptwo -> vars); - outlet_float(quadruptwo -> x_obj.ob_outlet, quadruptwo -> vars[M_x]); outlet_float(quadruptwo -> outlets[M_y - 1], quadruptwo -> vars[M_y]); + outlet_float(quadruptwo -> x_obj.ob_outlet, quadruptwo -> vars[M_x]); } // end calculate static void reset(quadruptwo_struct *quadruptwo, t_symbol *s, int argc, t_atom *argv) { diff --git a/rossler.c b/rossler.c index b9b4027..d5642a9 100644 --- a/rossler.c +++ b/rossler.c @@ -84,9 +84,9 @@ static void calc(rossler_struct *rossler, double *vars) { static void calculate(rossler_struct *rossler) { calc(rossler, rossler -> vars); - outlet_float(rossler -> x_obj.ob_outlet, rossler -> vars[M_x]); - outlet_float(rossler -> outlets[M_y - 1], rossler -> vars[M_y]); outlet_float(rossler -> outlets[M_z - 1], rossler -> vars[M_z]); + outlet_float(rossler -> outlets[M_y - 1], rossler -> vars[M_y]); + outlet_float(rossler -> x_obj.ob_outlet, rossler -> vars[M_x]); } // end calculate static void reset(rossler_struct *rossler, t_symbol *s, int argc, t_atom *argv) { diff --git a/standardmap.c b/standardmap.c index c062dee..fb8d29a 100644 --- a/standardmap.c +++ b/standardmap.c @@ -72,8 +72,8 @@ static void calc(standardmap_struct *standardmap, double *vars) { static void calculate(standardmap_struct *standardmap) { calc(standardmap, standardmap -> vars); - outlet_float(standardmap -> x_obj.ob_outlet, standardmap -> vars[M_p]); outlet_float(standardmap -> outlets[M_q - 1], standardmap -> vars[M_q]); + outlet_float(standardmap -> x_obj.ob_outlet, standardmap -> vars[M_p]); } // end calculate static void reset(standardmap_struct *standardmap, t_symbol *s, int argc, t_atom *argv) { diff --git a/strange1.c b/strange1.c index 4f01233..4a619ad 100644 --- a/strange1.c +++ b/strange1.c @@ -105,8 +105,8 @@ static void calc(strange1_struct *strange1, double *vars) { static void calculate(strange1_struct *strange1) { calc(strange1, strange1 -> vars); - outlet_float(strange1 -> x_obj.ob_outlet, strange1 -> vars[M_x]); outlet_float(strange1 -> outlets[M_y - 1], strange1 -> vars[M_y]); + outlet_float(strange1 -> x_obj.ob_outlet, strange1 -> vars[M_x]); } // end calculate static void reset(strange1_struct *strange1, t_symbol *s, int argc, t_atom *argv) { diff --git a/three_d.c b/three_d.c index b80a728..7346b43 100644 --- a/three_d.c +++ b/three_d.c @@ -87,9 +87,9 @@ static void calc(three_d_struct *three_d, double *vars) { static void calculate(three_d_struct *three_d) { calc(three_d, three_d -> vars); - outlet_float(three_d -> x_obj.ob_outlet, three_d -> vars[M_x]); - outlet_float(three_d -> outlets[M_y - 1], three_d -> vars[M_y]); outlet_float(three_d -> outlets[M_z - 1], three_d -> vars[M_z]); + outlet_float(three_d -> outlets[M_y - 1], three_d -> vars[M_y]); + outlet_float(three_d -> x_obj.ob_outlet, three_d -> vars[M_x]); } // end calculate static void reset(three_d_struct *three_d, t_symbol *s, int argc, t_atom *argv) { diff --git a/threeply.c b/threeply.c index 6b236ff..2495c19 100644 --- a/threeply.c +++ b/threeply.c @@ -78,8 +78,8 @@ static void calc(threeply_struct *threeply, double *vars) { static void calculate(threeply_struct *threeply) { calc(threeply, threeply -> vars); - outlet_float(threeply -> x_obj.ob_outlet, threeply -> vars[M_x]); outlet_float(threeply -> outlets[M_y - 1], threeply -> vars[M_y]); + outlet_float(threeply -> x_obj.ob_outlet, threeply -> vars[M_x]); } // end calculate static void reset(threeply_struct *threeply, t_symbol *s, int argc, t_atom *argv) { diff --git a/tinkerbell.c b/tinkerbell.c index 7ccdd47..853fdad 100644 --- a/tinkerbell.c +++ b/tinkerbell.c @@ -81,8 +81,8 @@ static void calc(tinkerbell_struct *tinkerbell, double *vars) { static void calculate(tinkerbell_struct *tinkerbell) { calc(tinkerbell, tinkerbell -> vars); - outlet_float(tinkerbell -> x_obj.ob_outlet, tinkerbell -> vars[M_x]); outlet_float(tinkerbell -> outlets[M_y - 1], tinkerbell -> vars[M_y]); + outlet_float(tinkerbell -> x_obj.ob_outlet, tinkerbell -> vars[M_x]); } // end calculate static void reset(tinkerbell_struct *tinkerbell, t_symbol *s, int argc, t_atom *argv) { diff --git a/unity.c b/unity.c index 63af1dd..f4633b3 100644 --- a/unity.c +++ b/unity.c @@ -60,8 +60,8 @@ static void calc(unity_struct *unity, double *vars) { static void calculate(unity_struct *unity) { calc(unity, unity -> vars); - outlet_float(unity -> x_obj.ob_outlet, unity -> vars[M_x]); outlet_float(unity -> outlets[M_y - 1], unity -> vars[M_y]); + outlet_float(unity -> x_obj.ob_outlet, unity -> vars[M_x]); } // end calculate static void reset(unity_struct *unity, t_symbol *s, int argc, t_atom *argv) { -- cgit v1.2.1