[Teem-commit] teem/src/echo/test test.c,1.16,1.17 trend.c,1.59,1.60

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

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

Modified Files:
	test.c trend.c 
Log Message:
multi-threading may be working

Index: test.c
===================================================================
RCS file: /cvsroot/teem/teem/src/echo/test/test.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** test.c	7 Jan 2004 15:34:29 -0000	1.16
--- test.c	12 May 2004 11:07:24 -0000	1.17
***************
*** 40,46 ****
    for (I=0; I<30; I++) {
      sph = echoObjectNew(scene, echoTypeSphere);
!     R = airRand();
!     G = airRand();
!     B = airRand();
      echoSphereSet(sph,
  		  AIR_AFFINE(0, R, 1, -1, 1),
--- 40,46 ----
    for (I=0; I<30; I++) {
      sph = echoObjectNew(scene, echoTypeSphere);
!     R = airDrand48();
!     G = airDrand48();
!     B = airDrand48();
      echoSphereSet(sph,
  		  AIR_AFFINE(0, R, 1, -1, 1),

Index: trend.c
===================================================================
RCS file: /cvsroot/teem/teem/src/echo/test/trend.c,v
retrieving revision 1.59
retrieving revision 1.60
diff -C2 -d -r1.59 -r1.60
*** trend.c	12 May 2004 04:03:31 -0000	1.59
--- trend.c	12 May 2004 11:07:24 -0000	1.60
***************
*** 126,130 ****
  
    N = 1000000;
-   /* airSrand(); */
    airArraySetLen(LIST(scene)->objArr, N);
    for (i=0; i<N; i++) {
--- 126,129 ----
***************
*** 708,719 ****
  
    parm->jitterType = echoJitterJitter;
!   parm->numSamples = 4;
!   parm->imgResU = 200;
!   parm->imgResV = 200;
    parm->aperture = 0.0;
    parm->textureNN = AIR_FALSE;
    parm->renderLights = AIR_TRUE;
    parm->renderBoxes = AIR_FALSE;
!   parm->seedRand = AIR_FALSE;
    parm->maxRecDepth = 10;
    ELL_3V_SET(parm->maxRecCol, 0, 0, 0);
--- 707,718 ----
  
    parm->jitterType = echoJitterJitter;
!   parm->numSamples = 25;
!   parm->imgResU = 300;
!   parm->imgResV = 300;
    parm->aperture = 0.0;
    parm->textureNN = AIR_FALSE;
    parm->renderLights = AIR_TRUE;
    parm->renderBoxes = AIR_FALSE;
!   parm->seedRand = AIR_TRUE;
    parm->maxRecDepth = 10;
    ELL_3V_SET(parm->maxRecCol, 0, 0, 0);
***************
*** 727,732 ****
    echoColorSet(rect, 1, 1, 1, 1.0);
    echoMatterPhongSet(scene, rect, 0.1, 0.5, 0.6, 50);
!   nrrdLoad(ntext=nrrdNew(), "pot.png", NULL);
!   echoMatterTextureSet(scene, rect, ntext);
    echoObjectAdd(scene, rect);
  
--- 726,736 ----
    echoColorSet(rect, 1, 1, 1, 1.0);
    echoMatterPhongSet(scene, rect, 0.1, 0.5, 0.6, 50);
!   if (nrrdLoad(ntext=nrrdNew(), "pot.png", NULL)) {
!     /* oops, no pot */
!     airFree(biffGetDone(NRRD));
!     nrrdNuke(ntext);
!   } else {
!     echoMatterTextureSet(scene, rect, ntext);
!   }
    echoObjectAdd(scene, rect);
  
***************
*** 836,841 ****
    echoScene *scene;
    airArray *mop;
!   char *me, *err;
!   int E;
    
    me = argv[0];
--- 840,845 ----
    echoScene *scene;
    airArray *mop;
!   char *me, *err, *env;
!   int E, tmp;
    
    me = argv[0];
***************
*** 877,881 ****
    /* makeSceneDOF(cam, parm, scene); */
  
!   parm->numThreads = 1;
    E = 0;
    if (!E) E |= echoRTRender(nraw, cam, scene, parm, state);
--- 881,892 ----
    /* makeSceneDOF(cam, parm, scene); */
  
!   if ((env = getenv("NT"))) {
!     if (1 == sscanf(env, "%d", &tmp)) {
!       parm->numThreads = tmp;
!     }
!   } else {
!     parm->numThreads = 1;
!   }
! 
    E = 0;
    if (!E) E |= echoRTRender(nraw, cam, scene, parm, state);