wrap is something like modulo for floats, although the upper and lower limit can be set

svn path=/trunk/externals/zexy/; revision=620

2 files changed, 66 insertions, 2 deletions

diff --git a/src/z_wrap.c b/src/z_wrap.c
new file mode 100644
index 0000000..ca2e726
--- /dev/null
+++ b/src/z_wrap.c
@@ -0,0 +1,62 @@
+/* wrap floats between to limits */
+
+#include "zexy.h"
+#include <math.h>
+
+static t_class *wrap_class;
+
+typedef struct _wrap {
+  t_object  x_obj;
+  t_float f_upper, f_lower;
+} t_wrap;
+
+
+void wrap_float(t_wrap *x, t_float f)
+{
+  if (x->f_lower==x->f_upper)
+    outlet_float(x->x_obj.ob_outlet, x->f_lower);
+  else {
+    t_float modulo = fmod((f-x->f_lower),(x->f_upper-x->f_lower));
+    if (modulo<0)modulo+=(x->f_upper-x->f_lower);
+    
+    outlet_float(x->x_obj.ob_outlet, x->f_lower+modulo);
+  }
+}
+void wrap_set(t_wrap *x, t_symbol *s, int argc, t_atom *argv){
+  t_float f1, f2;
+  switch (argc){
+  case 0:
+    f1=0.0;
+    f2=1.0;
+    break;
+  case 1:
+    f1=0.0;
+    f2 = atom_getfloat(argv);
+    break;
+  default:
+    f1 = atom_getfloat(argv);
+    f2 = atom_getfloat(argv+1);
+  }
+  x->f_lower=(f1<f2)?f1:f2;
+  x->f_upper=(f1>f2)?f1:f2;
+}
+
+void *wrap_new(t_symbol *s, int argc, t_atom*argv)
+{
+  t_wrap *x = (t_wrap *)pd_new(wrap_class);
+  wrap_set(x, s, argc, argv);
+
+  outlet_new(&x->x_obj, &s_float);
+
+  return (void *)x;
+}
+
+void z_wrap_setup(void) {
+  wrap_class = class_new(gensym("wrap"),
+			  (t_newmethod)wrap_new,
+			  0, sizeof(t_wrap),
+			  CLASS_DEFAULT, A_GIMME, A_NULL);
+
+  class_addfloat (wrap_class, wrap_float);
+  class_addmethod(wrap_class, (t_method)wrap_set, gensym("set"), A_GIMME, 0);
+}
diff --git a/src/zexy.c b/src/zexy.c
index dd818f6..87a929b 100644
--- a/src/zexy.c
+++ b/src/zexy.c
@@ -91,9 +91,9 @@ static void zexy_help(void)
        "\nsort\t\t:: shell-sort a package of floats"
        "\ndemux\t\t:: demultiplex the input to a specified output"
        "\nmsgfile\t\t:: store and handles lists of lists"
-#ifdef linux
        "\nlp\t\t:: write to the (parallel) port"
-#endif
+       "\nwrap\t\t:: wrap a floating number between 2 limits"
+       "\nurn\t\t:: unique random numbers"
 #if 0
        "\nexecute\t\t:: execute an application"
 #endif
@@ -196,6 +196,7 @@ void z_down_setup();
 
 void z_prime_setup();
 void z_random_setup();
+void z_wrap_setup();
 /*
   waiting to be released in near future:
   make stdin~ and stdout~ work
@@ -251,6 +252,7 @@ void zexy_setup(void)
 
   z_prime_setup();
   z_random_setup();
+  z_wrap_setup();
 #if 0
   z_stdinout_setup();