[Teem-commit] teem/src/nrrd/test genvol.c,1.13,1.14

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

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

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

Index: genvol.c
===================================================================
RCS file: /cvsroot/teem/teem/src/nrrd/test/genvol.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** genvol.c	7 Jan 2004 15:34:31 -0000	1.13
--- genvol.c	19 Feb 2004 06:45:13 -0000	1.14
***************
*** 26,30 ****
  float
  rho(float r) {
!   return cos(2*M_PI*6.0*cos(M_PI*r/2));
  }
  
--- 26,30 ----
  float
  rho(float r) {
!   return cos(2*AIR_PI*6.0*cos(AIR_PI*r/2));
  }
  
***************
*** 38,46 ****
    */
    /* marschner-lobb, the real thing
!   return ((1 - sin(M_PI*z/2))
  	  + 0.25*(1 + rho(sqrt(x*x + y*y))))/(2*(1 + 0.25));
  	   */
    /* marschner-lobb, linear variation in Z */
!   return (1 - (M_PI*z + 3)/5) + 0.25*(1 + rho(sqrt(x*x + y*y)))/(2*(1 + 0.25));
  
    /* cone 
--- 38,47 ----
    */
    /* marschner-lobb, the real thing
!   return ((1 - sin(AIR_PI*z/2))
  	  + 0.25*(1 + rho(sqrt(x*x + y*y))))/(2*(1 + 0.25));
  	   */
    /* marschner-lobb, linear variation in Z */
!   return (1 - (AIR_PI*z + 3)/5
! 	  + 0.25*(1 + rho(sqrt(x*x + y*y)))/(2*(1 + 0.25)));
  
    /* cone