|
From: <kin...@us...> - 2003-12-23 09:31:00
|
Update of /cvsroot/teem/teem/src/ten
In directory sc8-pr-cvs1:/tmp/cvs-serv29945/ten
Modified Files:
tendGlyph.c tendHelix.c
Log Message:
little stuff
Index: tendGlyph.c
===================================================================
RCS file: /cvsroot/teem/teem/src/ten/tendGlyph.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** tendGlyph.c 8 Dec 2003 23:19:03 -0000 1.20
--- tendGlyph.c 23 Dec 2003 09:30:57 -0000 1.21
***************
*** 281,285 ****
win->ps.edgeWidth[3] = gparm->edgeWidth[3];
win->ps.edgeWidth[4] = gparm->edgeWidth[4];
! win->ps.creaseAngle = 33;
ELL_3V_COPY(win->ps.bg, bg);
if (limnObjRender(glyph, cam, win)
--- 281,285 ----
win->ps.edgeWidth[3] = gparm->edgeWidth[3];
win->ps.edgeWidth[4] = gparm->edgeWidth[4];
! win->ps.creaseAngle = 70;
ELL_3V_COPY(win->ps.bg, bg);
if (limnObjRender(glyph, cam, win)
Index: tendHelix.c
===================================================================
RCS file: /cvsroot/teem/teem/src/ten/tendHelix.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** tendHelix.c 21 Dec 2003 02:41:51 -0000 1.2
--- tendHelix.c 23 Dec 2003 09:30:57 -0000 1.3
***************
*** 41,45 ****
void
tend_helixDoit(Nrrd *nout, float bnd,
! float r, float R, float S, float angle) {
int sx, sy, sz, xi, yi, zi, idx;
double th, t0, t1, t2, t3, v1, v2,
--- 41,45 ----
void
tend_helixDoit(Nrrd *nout, float bnd,
! float r, float R, float S, float angle, float ev[3]) {
int sx, sy, sz, xi, yi, zi, idx;
double th, t0, t1, t2, t3, v1, v2,
***************
*** 113,119 ****
ELL_3M_TRANSPOSE(C2H, H2C);
ELL_3M_SCALE_SET(mA,
! AIR_LERP(inside, 0.5, 0.4),
! AIR_LERP(inside, 0.5, 0.2),
! AIR_LERP(inside, 0.5, 0.9));
ELL_3M_MUL(mB, mA, H2C);
ELL_3M_MUL(mA, mB, W2H);
--- 113,119 ----
ELL_3M_TRANSPOSE(C2H, H2C);
ELL_3M_SCALE_SET(mA,
! AIR_LERP(inside, 0.5, ev[1]),
! AIR_LERP(inside, 0.5, ev[2]),
! AIR_LERP(inside, 0.5, ev[0]));
ELL_3M_MUL(mB, mA, H2C);
ELL_3M_MUL(mA, mB, W2H);
***************
*** 138,142 ****
int size[3];
Nrrd *nout;
! float R, r, S, bnd, angle;
double min[4], max[4];
char *outS;
--- 138,142 ----
int size[3];
Nrrd *nout;
! float R, r, S, bnd, angle, ev[3];
double min[4], max[4];
char *outS;
***************
*** 167,170 ****
--- 167,173 ----
"positive spacing resulting in a right-handed twist around a "
"right-handed helix. ");
+ hestOptAdd(&hopt, "ev", "eigenvalues", airTypeFloat, 3, 3, ev, "0.9 0.4 0.2",
+ "eigenvalues of tensors (in order) along direction of coil, "
+ "circumferential around coil, and radial around coil. ");
hestOptAdd(&hopt, "o", "nout", airTypeString, 1, 1, &outS, "-",
"output file");
***************
*** 187,191 ****
nrrdAxisInfoSet_nva(nout, nrrdAxisInfoMax, max);
! tend_helixDoit(nout, bnd, r, R, S, angle);
if (nrrdSave(outS, nout, NULL)) {
--- 190,194 ----
nrrdAxisInfoSet_nva(nout, nrrdAxisInfoMax, max);
! tend_helixDoit(nout, bnd, r, R, S, angle, ev);
if (nrrdSave(outS, nout, NULL)) {
|