|
From: <kin...@us...> - 2004-03-04 14:18:18
|
Update of /cvsroot/teem/teem/src/bin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12973 Modified Files: miter.c Log Message: changed some stuff Index: miter.c =================================================================== RCS file: /cvsroot/teem/teem/src/bin/miter.c,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** miter.c 26 Feb 2004 18:41:51 -0000 1.25 --- miter.c 4 Mar 2004 14:04:52 -0000 1.26 *************** *** 34,39 **** hestParm *hparm=NULL; miteUser *muu; ! char *me, *errS, *outS, *shadeStr; ! int renorm, baseDim; int E, Ecode; float ads[3]; --- 34,39 ---- hestParm *hparm=NULL; miteUser *muu; ! char *me, *errS, *outS, *shadeStr, *normalStr; ! int renorm, baseDim, verbPix[2]; int E, Ecode; float ads[3]; *************** *** 86,90 **** 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 " "\b\bo \"1\": normal points to lower values (higher == " --- 86,93 ---- hestOptAdd(&hopt, "ss", "shading spec", airTypeString, 1, 1, &shadeStr, "phong:gage(scalar:n)", "how to do shading"); ! hestOptAdd(&hopt, "ns", "normal spec", airTypeString, 1, 1, &normalStr, ! "", "\"normal\" to use for those miteVal's that need one"); ! hestOptAdd(&hopt, "side", "normal side", airTypeInt, 1, 1, ! &(muu->normalSide), "1", "how to interpret gradients as normals:\n " "\b\bo \"1\": normal points to lower values (higher == " *************** *** 105,108 **** --- 108,113 ---- "0.01", "\"reference\" step size (world space) for doing " "opacity correction in compositing"); + hestOptAdd(&hopt, "vp", "verbose pixel", airTypeInt, 2, 2, verbPix, + "-1 -1", "pixel for which to turn on verbose messages"); hestOptAdd(&hopt, "n1", "near1", airTypeDouble, 1, 1, &(muu->opacNear1), "0.99", "opacity close enough to 1.0 to terminate ray"); *************** *** 141,144 **** --- 146,151 ---- gageParmSet(muu->gctx0, gageParmGradMagCurvMin, gmc); gageParmSet(muu->gctx0, gageParmRenormalize, renorm); + muu->verbUi = verbPix[0]; + muu->verbVi = verbPix[1]; muu->nout = nrrdNew(); *************** *** 155,158 **** --- 162,166 ---- } strncpy(muu->shadeStr, shadeStr, AIR_STRLEN_MED-1); + strncpy(muu->normalStr, normalStr, AIR_STRLEN_MED-1); muu->shadeStr[AIR_STRLEN_MED-1] = 0; muu->hctx->volSize[0] = nin->axis[baseDim+0].size; |