[Teem-commit] teem/src/mite ray.c,1.20,1.21

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

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

Modified Files:
	ray.c 
Log Message:
fixed bug in setting of Z depth

Index: ray.c
===================================================================
RCS file: /cvsroot/teem/teem/src/mite/ray.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** ray.c	4 Mar 2004 14:04:08 -0000	1.20
--- ray.c	25 Mar 2004 03:13:33 -0000	1.21
***************
*** 39,43 ****
    mtt->RR = mtt->GG = mtt->BB = 0.0;
    mtt->TT = 1.0;
!   mtt->ZZ = -1.0;
    ELL_3V_SCALE(mtt->V, -1, rayDirWorld);
  
--- 39,43 ----
    mtt->RR = mtt->GG = mtt->BB = 0.0;
    mtt->TT = 1.0;
!   mtt->ZZ = AIR_NAN;
    ELL_3V_SCALE(mtt->V, -1, rayDirWorld);
  
***************
*** 225,229 ****
  
    /* set Z if it hasn't been set already */
!   if (1-mtt->TT >= muu->opacMatters && mtt->ZZ < 0) {
      mtt->ZZ = rayT;
    }
--- 225,229 ----
  
    /* set Z if it hasn't been set already */
!   if (1-mtt->TT >= muu->opacMatters && !AIR_EXISTS(mtt->ZZ)) {
      mtt->ZZ = rayT;
    }
***************
*** 245,249 ****
  	       A, mtt->ZZ);
    } else {
!     ELL_5V_SET(imgData + 5*idx, 0, 0, 0, 0, -1);
    }
    return 0;
--- 245,249 ----
  	       A, mtt->ZZ);
    } else {
!     ELL_5V_SET(imgData + 5*idx, 0, 0, 0, 0, AIR_NAN);
    }
    return 0;