[Teem-commit] teem/src/moss privateMoss.h,1.3,1.4 xform.c,1.13,1.14

[<kin...@us...>]

Update of /cvsroot/teem/teem/src/moss
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20107/moss

Modified Files:
	privateMoss.h xform.c 
Log Message:
propogated change in ell from column-major to row-major

Index: privateMoss.h
===================================================================
RCS file: /cvsroot/teem/teem/src/moss/privateMoss.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** privateMoss.h	7 Jan 2004 15:34:30 -0000	1.3
--- privateMoss.h	4 Mar 2004 23:57:22 -0000	1.4
***************
*** 18,25 ****
  */
  
! #define MOSS_MAT_SET(mat, a, b, c, d, x, y) \
!   (mat)[0]=(a); (mat)[1]=(b); \
!   (mat)[2]=(c); (mat)[3]=(d); \
!   (mat)[4]=(x); (mat)[5]=(y)
  
  #define MOSS_MAT_COPY(m2, m1) \
--- 18,24 ----
  */
  
! #define MOSS_MAT_SET(mat, a, b, x, c, d, y) \
!   (mat)[0]=(a); (mat)[1]=(b); (mat)[2]=(x); \
!   (mat)[3]=(c); (mat)[4]=(d); (mat)[5]=(y)
  
  #define MOSS_MAT_COPY(m2, m1) \
***************
*** 28,37 ****
  
  #define MOSS_MAT_6TO9(m2, m1) \
!   ELL_3V_SET((m2)+0, (m1)[0], (m1)[1], 0); \
!   ELL_3V_SET((m2)+3, (m1)[2], (m1)[3], 0); \
!   ELL_3V_SET((m2)+6, (m1)[4], (m1)[5], 1)
  
  #define MOSS_MAT_9TO6(m2, m1) \
!   MOSS_MAT_SET(m2, (m1)[0], (m1)[1], (m1)[3], (m1)[4], (m1)[6], (m1)[7])
  
  
--- 27,36 ----
  
  #define MOSS_MAT_6TO9(m2, m1) \
!   ELL_3V_COPY((m2)+0, (m1)+0); \
!   ELL_3V_COPY((m2)+3, (m1)+3); \
!   ELL_3V_SET((m2)+6, 0, 0, 1)
  
  #define MOSS_MAT_9TO6(m2, m1) \
!   MOSS_MAT_SET(m2, (m1)[0], (m1)[1], (m1)[2], (m1)[3], (m1)[4], (m1)[5])
  
  

Index: xform.c
===================================================================
RCS file: /cvsroot/teem/teem/src/moss/xform.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** xform.c	19 Feb 2004 06:45:12 -0000	1.13
--- xform.c	4 Mar 2004 23:57:22 -0000	1.14
***************
*** 23,29 ****
  /*
  
!  0  3  6
!  1  4  7
!  2  5  8
  
   a  c  tx
--- 23,29 ----
  /*
  
!  0  1  2
!  3  4  5
!  6  7  8
  
   a  c  tx
***************
*** 31,36 ****
   0  0  1
  
!  0  2  4
!  1  3  5
  
  */
--- 31,36 ----
   0  0  1
  
!  0  1  2
!  3  4  5
  
  */
***************
*** 40,46 ****
  
    fprintf(f, "% 15.7f % 15.7f % 15.7f\n", 
! 	  (float)mat[0], (float)mat[2], (float)mat[4]);
    fprintf(f, "% 15.7f % 15.7f % 15.7f\n", 
! 	  (float)mat[1], (float)mat[3], (float)mat[5]);
  }
  
--- 40,46 ----
  
    fprintf(f, "% 15.7f % 15.7f % 15.7f\n", 
! 	  (float)mat[0], (float)mat[1], (float)mat[2]);
    fprintf(f, "% 15.7f % 15.7f % 15.7f\n", 
! 	  (float)mat[3], (float)mat[4], (float)mat[5]);
  }
  
***************
*** 80,84 ****
  mossMatIdentitySet (double *mat) {
  
!   MOSS_MAT_SET(mat, 1, 0, 0, 1, 0, 0);
    return mat;
  }
--- 80,84 ----
  mossMatIdentitySet (double *mat) {
  
!   MOSS_MAT_SET(mat, 1, 0, 0, 0, 1, 0);
    return mat;
  }
***************
*** 87,91 ****
  mossMatTranslateSet (double *mat, double tx, double ty) {
  
!   MOSS_MAT_SET(mat, 1, 0, 0, 1, tx, ty);
    return mat;
  }
--- 87,91 ----
  mossMatTranslateSet (double *mat, double tx, double ty) {
  
!   MOSS_MAT_SET(mat, 1, 0, tx, 0, 1, ty);
    return mat;
  }
***************
*** 95,99 ****
  
    angle *= AIR_PI/180.0;
!   MOSS_MAT_SET(mat, cos(angle), sin(angle), -sin(angle), cos(angle), 0, 0);
    return mat;
  }
--- 95,99 ----
  
    angle *= AIR_PI/180.0;
!   MOSS_MAT_SET(mat, cos(angle), -sin(angle), 0, sin(angle), cos(angle), 0);
    return mat;
  }
***************
*** 103,107 ****
    double rot[6], flip[6];
  
!   MOSS_MAT_SET(flip, -1, 0, 0, 1, 0, 0);
    mossMatIdentitySet(mat);
    mossMatLeftMultiply(mat, mossMatRotateSet(rot, -angle));
--- 103,107 ----
    double rot[6], flip[6];
  
!   MOSS_MAT_SET(flip, -1, 0, 0, 0, 1, 0);
    mossMatIdentitySet(mat);
    mossMatLeftMultiply(mat, mossMatRotateSet(rot, -angle));
***************
*** 115,119 ****
    double rot[6], shear[6];
  
!   MOSS_MAT_SET(shear, 1, 0, amount, 1, 0, 0);
    mossMatIdentitySet(mat);
    mossMatLeftMultiply(mat, mossMatRotateSet(rot, -angleFixed));
--- 115,119 ----
    double rot[6], shear[6];
  
!   MOSS_MAT_SET(shear, 1, amount, 0, 0, 1, 0);
    mossMatIdentitySet(mat);
    mossMatLeftMultiply(mat, mossMatRotateSet(rot, -angleFixed));
***************
*** 126,130 ****
  mossMatScaleSet (double *mat, double sx, double sy) {
  
!   MOSS_MAT_SET(mat, sx, 0, 0, sy, 0, 0);
    return mat;
  }
--- 126,130 ----
  mossMatScaleSet (double *mat, double sx, double sy) {
  
!   MOSS_MAT_SET(mat, sx, 0, 0, 0, sy, 0);
    return mat;
  }
***************
*** 133,138 ****
  mossMatApply (double *ox, double *oy, double *mat, double ix, double iy) {
    
!   *ox = mat[0]*ix + mat[2]*iy + mat[4];
!   *oy = mat[1]*ix + mat[3]*iy + mat[5];
  }
  
--- 133,138 ----
  mossMatApply (double *ox, double *oy, double *mat, double ix, double iy) {
    
!   *ox = mat[0]*ix + mat[1]*iy + mat[2];
!   *oy = mat[3]*ix + mat[4]*iy + mat[5];
  }