*** empty log message ***

svn path=/trunk/externals/pmpd/; revision=5230

2 files changed, 0 insertions, 310 deletions

diff --git a/src/tLia2D.c b/src/tLia2D.c
deleted file mode 100755
index 968e5de..0000000
--- a/src/tLia2D.c
+++ /dev/null
@@ -1,157 +0,0 @@
-#include "m_pd.h"

-#include "math.h"

-

-static t_class *tLia2D_class;

-

-typedef struct _tLia2D {

-  t_object  x_obj;

-  t_float distance_old, position2Dx1, position2Dy1, position2Dx2, position2Dy2;

-  t_outlet *force1;

-  t_outlet *force2;

-  t_outlet *force3;

-  t_outlet *force4;

-  t_symbol *x_sym;  // receive

-} t_tLia2D;

-

-void tLia2D_reset(t_tLia2D *x)

-{

-}

-

-void tLia2D_resetF(t_tLia2D *x)

-{

-}

-

-void tLia2D_resetL(t_tLia2D *x)

-{

-}

-

-void tLia2D_setK(t_tLia2D *x, t_float K)

-{

-}

-

-void tLia2D_setL(t_tLia2D *x, t_float L)

-{

-}

-

-void tLia2D_setD(t_tLia2D *x, t_float D)

-{

-}

-

-void tLia2D_setD2(t_tLia2D *x, t_float D)

-{

-}

-

-void tLia2D_Lmin(t_tLia2D *x, t_float Lmin)

-{

-}

-

-void tLia2D_Lmax(t_tLia2D *x, t_float Lmax)

-{

-}

-

-void tLia2D_position2D(t_tLia2D *x, t_floatarg f1, t_floatarg f2)

-{

-  x->position2Dx1 = f1;

-  x->position2Dy1 = f2;

-}

-

-void tLia2D_position2D2(t_tLia2D *x, t_floatarg f1, t_floatarg f2)

-{

-  x->position2Dx2 = f1;

-  x->position2Dy2 = f2;

-}

-

-void tLia2D_bang(t_tLia2D *x)

-{

-  t_float vitesse, distance, orientation;

-  t_atom force1[2];

-

-  distance = sqrt ( pow((x->position2Dx2-x->position2Dx1), 2) + pow((x->position2Dy2-x->position2Dy1), 2) );

-

-  vitesse = x->distance_old - distance;

-

-  SETFLOAT(&(force1[0]), (x->position2Dx2 + x->position2Dx1)/ 2);

-  SETFLOAT(&(force1[1]), (x->position2Dy2 + x->position2Dy1)/ 2);

- 

-  outlet_anything(x->force4, gensym("position2D"), 2, force1);

-

-  if ((x->position2Dx2-x->position2Dx1) != 0)

-  {

-	  orientation = 180/3.14159 * atan((float)(x->position2Dy2 - x->position2Dy1)/(x->position2Dx2 - x->position2Dx1));

-		  if ((x->position2Dx2 - x->position2Dx1)<0)

-			  orientation +=180;

-		  if (orientation<0)

-			  orientation +=360;

-

-	  outlet_float(x->force3, orientation);

-  }

-  else

-  {

-	  if ((x->position2Dy2 - x->position2Dy1)<0)

-		  outlet_float(x->force3,270);

-	  else 	

-		  outlet_float(x->force3,90);

-  }

-

-  outlet_float(x->force2, vitesse);

-

-  outlet_float(x->force1, distance);

-

-  x->distance_old = distance;

-

-}

-

-

-static void tLia2D_free(t_tLia2D *x)

-{

-    pd_unbind(&x->x_obj.ob_pd, x->x_sym);

-}

-

-void *tLia2D_new(t_symbol *s)

-{ 

-  t_tLia2D *x = (t_tLia2D *)pd_new(tLia2D_class);

-

-  x->x_sym = s;

-  pd_bind(&x->x_obj.ob_pd, s);

-

-  inlet_new(&x->x_obj, &x->x_obj.ob_pd, gensym("position2D"), gensym("position2D2"));

- 

-  x->force1=outlet_new(&x->x_obj, 0);

-  x->force2=outlet_new(&x->x_obj, 0);

-  x->force3=outlet_new(&x->x_obj, 0);

-  x->force4=outlet_new(&x->x_obj, 0);

-

-  x->distance_old = 0;

-

-  return (x);

-}

-

-void tLia2D_setup(void) 

-{

-

-  tLia2D_class = class_new(gensym("tLia2D"),

-        (t_newmethod)tLia2D_new,

-        (t_method)tLia2D_free, 

-		sizeof(t_tLia2D),

-        CLASS_DEFAULT, A_DEFSYM, 0);

-

-  class_addcreator((t_newmethod)tLia2D_new, gensym("tLink2D"), A_DEFSYM, 0);

-  class_addcreator((t_newmethod)tLia2D_new, gensym("pmpd.tLink2D"), A_DEFSYM, 0);

-

-  class_addbang(tLia2D_class, tLia2D_bang);

-

-  class_addmethod(tLia2D_class, (t_method)tLia2D_position2D, gensym("position2D"), A_DEFFLOAT, A_DEFFLOAT, 0);

-  class_addmethod(tLia2D_class, (t_method)tLia2D_position2D2, gensym("position2D2"), A_DEFFLOAT, A_DEFFLOAT, 0);

-

-  // only for the object not to output erreor when having the same name as the link

-  class_addmethod(tLia2D_class, (t_method)tLia2D_reset, gensym("reset"), 0);

-  class_addmethod(tLia2D_class, (t_method)tLia2D_resetL, gensym("resetL"), 0);

-  class_addmethod(tLia2D_class, (t_method)tLia2D_resetF, gensym("resetF"), 0);

-  class_addmethod(tLia2D_class, (t_method)tLia2D_setD, gensym("setD"), A_DEFFLOAT, 0);

-  class_addmethod(tLia2D_class, (t_method)tLia2D_setD2, gensym("setD2"), A_DEFFLOAT, 0);

-  class_addmethod(tLia2D_class, (t_method)tLia2D_setK, gensym("setK"), A_DEFFLOAT, 0);

-  class_addmethod(tLia2D_class, (t_method)tLia2D_setL, gensym("setL"), A_DEFFLOAT, 0);

-  class_addmethod(tLia2D_class, (t_method)tLia2D_Lmin, gensym("setLmin"), A_DEFFLOAT, 0);

-  class_addmethod(tLia2D_class, (t_method)tLia2D_Lmax, gensym("setLmax"), A_DEFFLOAT, 0);

-

-}

diff --git a/src/tLia3D.c b/src/tLia3D.c
deleted file mode 100755
index 507d113..0000000
--- a/src/tLia3D.c
+++ /dev/null
@@ -1,153 +0,0 @@
-#include "m_pd.h"

-#include "math.h"

-

-static t_class *tLia3D_class;

-

-typedef struct _tLia3D {

-  t_object  x_obj;

-  t_float distance_old, position2Dx1, position2Dy1, position2Dz1, position2Dx2, position2Dy2,  position2Dz2;

-  t_outlet *force1;

-  t_outlet *force2;

-  t_outlet *force3;

-  t_outlet *force4;

-  t_symbol *x_sym;  // receive

-} t_tLia3D;

-

-void tLia3D_reset(t_tLia3D *x)

-{

-}

-

-void tLia3D_resetF(t_tLia3D *x)

-{

-}

-

-void tLia3D_resetL(t_tLia3D *x)

-{

-}

-

-

-void tLia3D_setK(t_tLia3D *x, t_float K)

-{

-}

-

-void tLia3D_setL(t_tLia3D *x, t_float L)

-{

-}

-

-void tLia3D_setD(t_tLia3D *x, t_float D)

-{

-}

-

-void tLia3D_setD2(t_tLia3D *x, t_float D)

-{

-}

-

-void tLia3D_Lmin(t_tLia3D *x, t_float Lmin)

-{

-}

-

-void tLia3D_Lmax(t_tLia3D *x, t_float Lmax)

-{

-}

-

-

-void tLia3D_position3D(t_tLia3D *x, t_floatarg f1, t_floatarg f2, t_floatarg f3)

-{

-  x->position2Dx1 = f1;

-  x->position2Dy1 = f2;

-  x->position2Dz1 = f3;

-}

-

-void tLia3D_position3D2(t_tLia3D *x, t_floatarg f1, t_floatarg f2, t_floatarg f3)

-{

-  x->position2Dx2 = f1;

-  x->position2Dy2 = f2;

-  x->position2Dz2 = f3;

-}

-

-void tLia3D_bang(t_tLia3D *x)

-{

-  t_float vitesse, distance, orientation;

-  t_atom force1[3];

-

-  distance = sqrt ( pow((x->position2Dx2-x->position2Dx1), 2) + pow((x->position2Dy2-x->position2Dy1), 2) + pow((x->position2Dz2-x->position2Dz1), 2) );

-

-  vitesse = x->distance_old - distance;

-

-

-  SETFLOAT(&(force1[0]), (x->position2Dx2 + x->position2Dx1)/ 2);

-  SETFLOAT(&(force1[1]), (x->position2Dy2 + x->position2Dy1)/ 2);

-  SETFLOAT(&(force1[2]), (x->position2Dz2 + x->position2Dz1)/ 2);

- 

-  outlet_anything(x->force4, gensym("position3D"), 3, force1);

-

-  

-  SETFLOAT(&(force1[0]), (x->position2Dx2 - x->position2Dx1)/ distance);

-  SETFLOAT(&(force1[1]), (x->position2Dy2 - x->position2Dy1)/ distance);

-  SETFLOAT(&(force1[2]), (x->position2Dz2 - x->position2Dz1)/ distance);

- 

-  outlet_anything(x->force3, gensym("vector3D"), 3, force1);

-

-  outlet_float(x->force2, vitesse);

-

-  outlet_float(x->force1, distance);

-

-  x->distance_old = distance;

-

-}

-

-

-static void tLia3D_free(t_tLia3D *x)

-{

-    pd_unbind(&x->x_obj.ob_pd, x->x_sym);

-}

-

-void *tLia3D_new(t_symbol *s)

-{

-  

-  t_tLia3D *x = (t_tLia3D *)pd_new(tLia3D_class);

-

-  x->x_sym = s;

-  pd_bind(&x->x_obj.ob_pd, s);

-

-  inlet_new(&x->x_obj, &x->x_obj.ob_pd, gensym("position3D"), gensym("position3D2"));

- 

-  x->force1=outlet_new(&x->x_obj, 0);

-  x->force2=outlet_new(&x->x_obj, 0);

-  x->force3=outlet_new(&x->x_obj, 0);

-  x->force4=outlet_new(&x->x_obj, 0);

-

-  x->distance_old = 0;

-

-  return (x);

-}

-

-void tLia3D_setup(void) 

-{

-

-  tLia3D_class = class_new(gensym("tLia3D"),

-        (t_newmethod)tLia3D_new,

-        (t_method)tLia3D_free, 

-		sizeof(t_tLia3D),

-        CLASS_DEFAULT, A_DEFSYM, 0);

-

-  class_addcreator((t_newmethod)tLia3D_new, gensym("tLink3D"), A_DEFSYM, 0);

-  class_addcreator((t_newmethod)tLia3D_new, gensym("pmpd.tLink3D"), A_DEFSYM, 0);

-

-  class_addbang(tLia3D_class, tLia3D_bang);

-

-  class_addmethod(tLia3D_class, (t_method)tLia3D_position3D, gensym("position3D"), A_DEFFLOAT, A_DEFFLOAT, A_DEFFLOAT, 0);

-  class_addmethod(tLia3D_class, (t_method)tLia3D_position3D2, gensym("position3D2"), A_DEFFLOAT, A_DEFFLOAT, A_DEFFLOAT, 0);

-

-  // only for the object not to output erreor when having the same name as the link

-  class_addmethod(tLia3D_class, (t_method)tLia3D_reset, gensym("reset"), 0);

-  class_addmethod(tLia3D_class, (t_method)tLia3D_resetL, gensym("resetL"), 0);

-  class_addmethod(tLia3D_class, (t_method)tLia3D_resetF, gensym("resetF"), 0);

-  class_addmethod(tLia3D_class, (t_method)tLia3D_setD, gensym("setD"), A_DEFFLOAT, 0);

-  class_addmethod(tLia3D_class, (t_method)tLia3D_setD2, gensym("setD2"), A_DEFFLOAT, 0);

-  class_addmethod(tLia3D_class, (t_method)tLia3D_setK, gensym("setK"), A_DEFFLOAT, 0);

-  class_addmethod(tLia3D_class, (t_method)tLia3D_setL, gensym("setL"), A_DEFFLOAT, 0);

-  class_addmethod(tLia3D_class, (t_method)tLia3D_Lmin, gensym("setLmin"), A_DEFFLOAT, 0);

-  class_addmethod(tLia3D_class, (t_method)tLia3D_Lmax, gensym("setLmax"), A_DEFFLOAT, 0);

-

-}