[Teem-commit] teem/src/echo intx.c,1.39,1.40 model.c,1.4,1.5

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

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

Modified Files:
	intx.c model.c 
Log Message:
going crazy: replaced M_E with AIR_E and M_PI with AIR_PI, out of spite for windows

Index: intx.c
===================================================================
RCS file: /cvsroot/teem/teem/src/echo/intx.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** intx.c	7 Jan 2004 15:34:28 -0000	1.39
--- intx.c	19 Feb 2004 06:45:11 -0000	1.40
***************
*** 158,164 ****
    if (intx->norm[0] || intx->norm[1]) {
      u = atan2(intx->norm[1], intx->norm[0]);
!     intx->u = AIR_AFFINE(-M_PI, u, M_PI, 0.0, 1.0);
      v = -asin(intx->norm[2]);
!     intx->v = AIR_AFFINE(-M_PI/2, v, M_PI/2, 0.0, 1.0);
    }
    else {
--- 158,164 ----
    if (intx->norm[0] || intx->norm[1]) {
      u = atan2(intx->norm[1], intx->norm[0]);
!     intx->u = AIR_AFFINE(-AIR_PI, u, AIR_PI, 0.0, 1.0);
      v = -asin(intx->norm[2]);
!     intx->v = AIR_AFFINE(-AIR_PI/2, v, AIR_PI/2, 0.0, 1.0);
    }
    else {
***************
*** 487,493 ****
    if (norm[0] || norm[1]) {
      u = atan2(norm[1], norm[0]);
!     intx->u = AIR_AFFINE(-M_PI, u, M_PI, 0.0, 1.0);
      v = -asin(norm[2]);
!     intx->v = AIR_AFFINE(-M_PI/2, v, M_PI/2, 0.0, 1.0);
    }
    else {
--- 487,493 ----
    if (norm[0] || norm[1]) {
      u = atan2(norm[1], norm[0]);
!     intx->u = AIR_AFFINE(-AIR_PI, u, AIR_PI, 0.0, 1.0);
      v = -asin(norm[2]);
!     intx->v = AIR_AFFINE(-AIR_PI/2, v, AIR_PI/2, 0.0, 1.0);
    }
    else {

Index: model.c
===================================================================
RCS file: /cvsroot/teem/teem/src/echo/model.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** model.c	7 Jan 2004 15:34:28 -0000	1.4
--- model.c	19 Feb 2004 06:45:11 -0000	1.5
***************
*** 51,57 ****
    ELL_3V_SET(tmp, 0, 0, 1); _echoPosSet(pos, matx, tmp); pos += 3;
    for (phidx=1; phidx<phiRes; phidx++) {
!     ph = AIR_AFFINE(0, phidx, phiRes, 0.0, M_PI);
      for (thidx=0; thidx<theRes; thidx++) {
!       th = AIR_AFFINE(0, thidx, theRes, 0.0, 2*M_PI);
        ELL_3V_SET(tmp, cos(th)*sin(ph), sin(th)*sin(ph), cos(ph));
        _echoPosSet(pos, matx, tmp); pos += 3;
--- 51,57 ----
    ELL_3V_SET(tmp, 0, 0, 1); _echoPosSet(pos, matx, tmp); pos += 3;
    for (phidx=1; phidx<phiRes; phidx++) {
!     ph = AIR_AFFINE(0, phidx, phiRes, 0.0, AIR_PI);
      for (thidx=0; thidx<theRes; thidx++) {
!       th = AIR_AFFINE(0, thidx, theRes, 0.0, 2*AIR_PI);
        ELL_3V_SET(tmp, cos(th)*sin(ph), sin(th)*sin(ph), cos(ph));
        _echoPosSet(pos, matx, tmp); pos += 3;