[Teem-commit] teem/src/echo/test trend.c,1.61,1.62

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

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

Modified Files:
	trend.c 
Log Message:
stuff

Index: trend.c
===================================================================
RCS file: /cvsroot/teem/teem/src/echo/test/trend.c,v
retrieving revision 1.61
retrieving revision 1.62
diff -C2 -d -r1.61 -r1.62
*** trend.c	12 May 2004 21:52:38 -0000	1.61
--- trend.c	26 May 2004 02:11:00 -0000	1.62
***************
*** 80,84 ****
    parm->seedRand = AIR_FALSE;
    parm->maxRecDepth = 10;
!   parm->doShadows = AIR_TRUE;
  
    nrrdLoad(ntext = nrrdNew(), "chirp.nrrd", NULL);
--- 80,84 ----
    parm->seedRand = AIR_FALSE;
    parm->maxRecDepth = 10;
!   parm->shadow = 1.0;
  
    nrrdLoad(ntext = nrrdNew(), "chirp.nrrd", NULL);
***************
*** 123,127 ****
    parm->seedRand = AIR_FALSE;
    parm->maxRecDepth = 10;
!   parm->doShadows = AIR_FALSE;
  
    N = 1000000;
--- 123,127 ----
    parm->seedRand = AIR_FALSE;
    parm->maxRecDepth = 10;
!   parm->shadow = 0.0;
  
    N = 1000000;
***************
*** 165,169 ****
    parm->aperture = 0.0;
    parm->renderLights = AIR_FALSE;
!   parm->doShadows = AIR_FALSE;
    parm->seedRand = AIR_FALSE;
    parm->maxRecDepth = 10;
--- 165,169 ----
    parm->aperture = 0.0;
    parm->renderLights = AIR_FALSE;
!   parm->shadow = 0.0;
    parm->seedRand = AIR_FALSE;
    parm->maxRecDepth = 10;
***************
*** 222,226 ****
    parm->aperture = 0.0;
    parm->renderLights = AIR_FALSE;
!   parm->doShadows = AIR_FALSE;
    parm->seedRand = AIR_FALSE;
    parm->maxRecDepth = 10;
--- 222,226 ----
    parm->aperture = 0.0;
    parm->renderLights = AIR_FALSE;
!   parm->shadow = 0.0;
    parm->seedRand = AIR_FALSE;
    parm->maxRecDepth = 10;
***************
*** 284,288 ****
    parm->seedRand = AIR_FALSE;
    parm->maxRecDepth = 10;
!   parm->doShadows = AIR_TRUE;
    
    ELL_4M_IDENTITY_SET(matx);
--- 284,288 ----
    parm->seedRand = AIR_FALSE;
    parm->maxRecDepth = 10;
!   parm->shadow = 1.0;
    
    ELL_4M_IDENTITY_SET(matx);
***************
*** 392,396 ****
    parm->seedRand = AIR_FALSE;
    ELL_3V_SET(scene->bkgr, 0.2, 0.3, 0.4);
!   /* parm->doShadows = AIR_FALSE; */
  
    /* create scene */
--- 392,396 ----
    parm->seedRand = AIR_FALSE;
    ELL_3V_SET(scene->bkgr, 0.2, 0.3, 0.4);
!   /* parm->shadow = 0.0; */
  
    /* create scene */
***************
*** 527,531 ****
    parm->seedRand = AIR_FALSE;
    parm->maxRecDepth = 10;
!   parm->doShadows = AIR_TRUE;
  
    rect = echoObjectNew(scene, echoTypeRectangle);
--- 527,531 ----
    parm->seedRand = AIR_FALSE;
    parm->maxRecDepth = 10;
!   parm->shadow = 1.0;
  
    rect = echoObjectNew(scene, echoTypeRectangle);
***************
*** 590,594 ****
    parm->seedRand = AIR_FALSE;
    parm->maxRecDepth = 10;
!   parm->doShadows = AIR_TRUE;
  
    nrrdLoad(ntext = nrrdNew(), "tmp.png", NULL);
--- 590,594 ----
    parm->seedRand = AIR_FALSE;
    parm->maxRecDepth = 10;
!   parm->shadow = 1.0;
  
    nrrdLoad(ntext = nrrdNew(), "tmp.png", NULL);
***************
*** 639,648 ****
    cam->vRange[1] = 1.8;
  
!   parm->jitterType = echoJitterJitter;
!   parm->numSamples = 4;
    parm->imgResU = 200;
    parm->imgResV = 200;
    parm->aperture = 0.0;
!   parm->renderLights = AIR_TRUE;
  
    /* create scene */
--- 639,649 ----
    cam->vRange[1] = 1.8;
  
!   parm->jitterType = echoJitterGrid;
!   parm->numSamples = 9;
    parm->imgResU = 200;
    parm->imgResV = 200;
    parm->aperture = 0.0;
!   parm->renderLights = AIR_FALSE;
!   parm->shadow = 0.5;
  
    /* create scene */
***************
*** 690,694 ****
    echoColorSet(rect, 1, 1, 1, 1);
    echoMatterLightSet(scene, rect, 1, 0);
! 
  }
  
--- 691,695 ----
    echoColorSet(rect, 1, 1, 1, 1);
    echoMatterLightSet(scene, rect, 1, 0);
!   echoObjectAdd(scene, rect);
  }
  
***************
*** 707,711 ****
  
    parm->jitterType = echoJitterJitter;
!   parm->numSamples = 25;
    parm->imgResU = 300;
    parm->imgResV = 300;
--- 708,712 ----
  
    parm->jitterType = echoJitterJitter;
!   parm->numSamples = 9;
    parm->imgResU = 300;
    parm->imgResV = 300;
***************
*** 717,721 ****
    parm->maxRecDepth = 10;
    ELL_3V_SET(parm->maxRecCol, 0, 0, 0);
!   parm->doShadows = AIR_TRUE;
  
    rect = echoObjectNew(scene, echoTypeRectangle);
--- 718,722 ----
    parm->maxRecDepth = 10;
    ELL_3V_SET(parm->maxRecCol, 0, 0, 0);
!   parm->shadow = 1.0;
  
    rect = echoObjectNew(scene, echoTypeRectangle);
***************
*** 805,809 ****
    parm->aperture = 0.0;
    parm->renderLights = AIR_TRUE;
!   parm->doShadows = AIR_FALSE;
    ELL_3V_SET(scene->bkgr, 0.1, 0.1, 0.1);
  
--- 806,810 ----
    parm->aperture = 0.0;
    parm->renderLights = AIR_TRUE;
!   parm->shadow = 0.0;
    ELL_3V_SET(scene->bkgr, 0.1, 0.1, 0.1);
  
***************
*** 875,882 ****
    /* makeSceneInstance(cam, parm, scene); */
    /* makeSceneTexture(cam, parm, scene); */
!   makeSceneSimple(cam, parm, scene);
    /* makeSceneRainLights(cam, parm, scene); */
    /* makeSceneAntialias(cam, parm, scene); */
!   /* makeSceneShadow(cam, parm, scene); */
    /* makeSceneDOF(cam, parm, scene); */
  
--- 876,883 ----
    /* makeSceneInstance(cam, parm, scene); */
    /* makeSceneTexture(cam, parm, scene); */
!   /* makeSceneSimple(cam, parm, scene);  */
    /* makeSceneRainLights(cam, parm, scene); */
    /* makeSceneAntialias(cam, parm, scene); */
!   makeSceneShadow(cam, parm, scene); 
    /* makeSceneDOF(cam, parm, scene); */