[Teem-commit] teem/src/bin GNUmakefile,1.30,1.31 miter.c,1.22,1.23

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

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

Modified Files:
	GNUmakefile miter.c 
Log Message:
begin valgrind debugging of new miter: bigger, better, stronger, slower

Index: GNUmakefile
===================================================================
RCS file: /cvsroot/teem/teem/src/bin/GNUmakefile,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** GNUmakefile	19 Feb 2004 03:57:52 -0000	1.30
--- GNUmakefile	26 Feb 2004 06:26:49 -0000	1.31
***************
*** 50,54 ****
  #  pos2idx unu pprobe vprobe qbert mrender miter gkms ungantry ilk tend spots
  BINS = airSanity affine cubic nrrdSanity overrgb idx2pos emap undos talkweb \
!   pos2idx unu pprobe vprobe qbert mrender ungantry ilk tend spots
  
  ## _binD(bins): list of development locations for given bins
--- 50,54 ----
  #  pos2idx unu pprobe vprobe qbert mrender miter gkms ungantry ilk tend spots
  BINS = airSanity affine cubic nrrdSanity overrgb idx2pos emap undos talkweb \
!   pos2idx unu pprobe vprobe qbert mrender miter ungantry ilk tend spots
  
  ## _binD(bins): list of development locations for given bins

Index: miter.c
===================================================================
RCS file: /cvsroot/teem/teem/src/bin/miter.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** miter.c	13 Feb 2004 23:01:12 -0000	1.22
--- miter.c	26 Feb 2004 06:26:49 -0000	1.23
***************
*** 34,38 ****
    hestParm *hparm=NULL;
    miteUser *muu;
!   char *me, *errS, *outS;
    int renorm;
    int E, Ecode;
--- 34,38 ----
    hestParm *hparm=NULL;
    miteUser *muu;
!   char *me, *errS, *outS, *shadeStr;
    int renorm;
    int E, Ecode;
***************
*** 48,53 ****
    
    hparm->respFileEnable = AIR_TRUE;
!   hestOptAdd(&hopt, "i", "nsin", airTypeOther, 1, 1, &(muu->nsin), NULL,
  	     "input scalar volume to render", NULL, NULL, nrrdHestNrrd);
    hestOptAdd(&hopt, "txf", "nin", airTypeOther, 1, -1, &(muu->ntxf), NULL,
  	     "one or more transfer functions",
--- 48,57 ----
    
    hparm->respFileEnable = AIR_TRUE;
!   hestOptAdd(&hopt, "i", "nsin", airTypeOther, 1, 1, &(muu->nsin), "",
  	     "input scalar volume to render", NULL, NULL, nrrdHestNrrd);
+   hestOptAdd(&hopt, "vi", "nvin", airTypeOther, 1, 1, &(muu->nvin), "",
+ 	     "input vector volume to render", NULL, NULL, nrrdHestNrrd);
+   hestOptAdd(&hopt, "ti", "ntin", airTypeOther, 1, 1, &(muu->ntin), "",
+ 	     "input tensor volume to render", NULL, NULL, nrrdHestNrrd);
    hestOptAdd(&hopt, "txf", "nin", airTypeOther, 1, -1, &(muu->ntxf), NULL,
  	     "one or more transfer functions",
***************
*** 79,82 ****
--- 83,88 ----
  	     "cubicdd:1,0",  "second derivative kernel",
  	     NULL, NULL, nrrdHestKernelSpec);
+   hestOptAdd(&hopt, "ss", "shading spec", airTypeString, 1, 1, &shadeStr,
+ 	     "phong:gage(scalar:n)", "how to do shading");
    hestOptAdd(&hopt, "ns", "normal side", airTypeInt, 1, 1, &(muu->normalSide),
  	     "1", "how to interpret gradients as normals:\n "
***************
*** 90,97 ****
  	     "\"Accurate\" kernels don't need this; doing it always "
  	     "makes things go slower");
-   hestOptAdd(&hopt, "sum", NULL, airTypeBool, 0, 0, &(muu->justSum), NULL,
- 	     "Ignore opacity and composite simply by summing");
-   hestOptAdd(&hopt, "nolight", NULL, airTypeBool, 0, 0, &(muu->noDirLight),
- 	     NULL, "Ignore directional lights, use ambient only");
    hestOptAdd(&hopt, "gmc", "min gradmag", airTypeDouble, 1, 1, &gmc, "0.0",
  	     "For curvature-based transfer functions, set curvature to "
--- 96,99 ----
***************
*** 102,106 ****
  	     "0.01", "\"reference\" step size (world space) for doing "
  	     "opacity correction in compositing");
!   hestOptAdd(&hopt, "n1", "near1", airTypeDouble, 1, 1, &(muu->near1),
  	     "0.99", "opacity close enough to 1.0 to terminate ray");
    hestOptAdd(&hopt, "nt", "# threads", airTypeInt, 1, 1,
--- 104,108 ----
  	     "0.01", "\"reference\" step size (world space) for doing "
  	     "opacity correction in compositing");
!   hestOptAdd(&hopt, "n1", "near1", airTypeDouble, 1, 1, &(muu->opacNear1),
  	     "0.99", "opacity close enough to 1.0 to terminate ray");
    hestOptAdd(&hopt, "nt", "# threads", airTypeInt, 1, 1,
***************
*** 136,140 ****
      return 1;
    }
! 
    nrrdAxisInfoGet_nva(muu->nsin, nrrdAxisInfoSize, muu->hctx->volSize);
    nrrdAxisInfoGet_nva(muu->nsin, nrrdAxisInfoSpacing, muu->hctx->volSpacing);
--- 138,143 ----
      return 1;
    }
!   strncpy(muu->shadeStr, shadeStr, AIR_STRLEN_MED-1);
!   muu->shadeStr[AIR_STRLEN_MED-1] = 0;
    nrrdAxisInfoGet_nva(muu->nsin, nrrdAxisInfoSize, muu->hctx->volSize);
    nrrdAxisInfoGet_nva(muu->nsin, nrrdAxisInfoSpacing, muu->hctx->volSpacing);