diff options
| author | Cyrille Henry <nusmuk@users.sourceforge.net> | 2014-06-13 14:05:26 +0000 |
|---|---|---|
| committer | Cyrille Henry <nusmuk@users.sourceforge.net> | 2014-06-13 14:05:26 +0000 |
| commit | 219d5dd7abfbccd2e45fe46d64d5fb0f28b7b7e7 (patch) | |
| tree | 8cbdfccf0de5b2daa63e036125bce99ea8d4a92e | |
| parent | 3513c7f0c0dbb5e6f5e711618f3433f65c81e6b3 (diff) | |
better bilinear interpolation for iMatrix
svn path=/trunk/externals/pmpd/; revision=17321
| -rw-r--r-- | pmpd2d_interactor.c | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/pmpd2d_interactor.c b/pmpd2d_interactor.c index 83888b8..3e956bc 100644 --- a/pmpd2d_interactor.c +++ b/pmpd2d_interactor.c @@ -202,18 +202,24 @@ void pmpd2d_iMatrix_i(t_pmpd2d *x, int i, t_float zone_x_min, t_float zone_x_max { Xtable = (x->mass[i].posX - zone_x_min) / (zone_x_max - zone_x_min); Ytable = (x->mass[i].posY - zone_y_min) / (zone_y_max - zone_y_min); - Xtable *= taille_x - 1; //from [ 0 to table size - 1[ - Ytable *= taille_y - 1; + Xtable = max(Xtable, 0); + Xtable = min(Xtable, 1); + Ytable = max(Ytable, 0); + Ytable = min(Ytable, 1); + Xtable *= taille_x - 1.001; //from [ 0 to table size - 1[ + Ytable *= taille_y - 1.001; // taille_x must be > 1 index = (int)Xtable; - index += (int)Ytable*taille_x; + index += ((int)Ytable)*taille_x; Xtable = Xtable - (int)(Xtable); Ytable = Ytable - (int)(Ytable); + force1 = (1-Xtable) * tableX[index].w_float + (Xtable) * tableX[index+1].w_float ; - force2 = (1-Xtable) * tableX[index+taille_y].w_float + (Xtable) * tableX[index+1+taille_y].w_float; + force2 = (1-Xtable) * tableX[index+taille_x].w_float + (Xtable) * tableX[index+1+taille_x].w_float; force = (1-Ytable) * force1 + Ytable * force2; x->mass[i].forceX += K * force; + force1 = (1-Xtable) * tableY[index].w_float + (Xtable) * tableY[index+1].w_float ; - force2 = (1-Xtable) * tableY[index+taille_y].w_float + (Xtable) * tableY[index+1+taille_y].w_float; + force2 = (1-Xtable) * tableY[index+taille_x].w_float + (Xtable) * tableY[index+1+taille_x].w_float; force = (1-Ytable) * force1 + Ytable * force2; x->mass[i].forceY += K * force; } @@ -245,6 +251,8 @@ void pmpd2d_iMatrix(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv) } X = atom_getfloatarg(6, argc, argv); Y = atom_getfloatarg(7, argc, argv); + X = max(2,X); + Y = max(2,Y); if (!(a1 = (t_garray *)pd_findbyclass(atom_getsymbolarg(8,argc,argv), garray_class))) pd_error(x, "%s: no such array", atom_getsymbolarg(8,argc,argv)->s_name); |