[Teem-commit] teem/src/ten tendGlyph.c,1.30,1.31 glyph.c,1.39,1.40

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

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

Modified Files:
	tendGlyph.c glyph.c 
Log Message:
added a shadowing extent option, and fixed the positioning of area lights

Index: glyph.c
===================================================================
RCS file: /cvsroot/teem/teem/src/ten/glyph.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** glyph.c	13 May 2004 15:30:39 -0000	1.39
--- glyph.c	26 May 2004 02:02:24 -0000	1.40
***************
*** 356,359 ****
--- 356,360 ----
      ELL_3V_SCALE(eval, parm->glyphScale, eval);     /* scale by evals */
      ELL_4M_SCALE_SET(mB, eval[0], eval[1], eval[2]);
+ 
      ell_4m_post_mul_f(mA, mB);
      ELL_43M_INSET(mB, rotEvec);                     /* rotate by evecs */

Index: tendGlyph.c
===================================================================
RCS file: /cvsroot/teem/teem/src/ten/tendGlyph.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** tendGlyph.c	17 May 2004 13:00:39 -0000	1.30
--- tendGlyph.c	26 May 2004 02:02:24 -0000	1.31
***************
*** 110,114 ****
    echoGlobalState *gstate;
    tenGlyphParm *gparm;
!   float bg[3], buvne[5];
    int ires[2], slice[2], nobg, hacknumcam, hackci,
      hackmin[3]={0,0,0}, hackmax[3]={2,0,0};
--- 110,114 ----
    echoGlobalState *gstate;
    tenGlyphParm *gparm;
!   float bg[3], buvne[5], shadow;
    int ires[2], slice[2], nobg, hacknumcam, hackci,
      hackmin[3]={0,0,0}, hackmax[3]={2,0,0};
***************
*** 291,294 ****
--- 291,296 ----
  	     "brightness 0 (the default) to turn this off, and use "
  	     "environment map-based shading (\"-emap\") instead. ");
+   hestOptAdd(&hopt, "shadow", "s", airTypeFloat, 1, 1, &shadow, "1.0",
+ 	     "the extent to which shadowing occurs");
    hestOptAdd(&hopt, "hack", "hack", airTypeString, 1, 1, &hackFN, "",
  	     "don't mind me");
***************
*** 336,339 ****
--- 338,342 ----
      cam->faar = 2;
      cam->atRelative = AIR_TRUE;
+     eparm->shadow = shadow;
      if (buvne[0] > 0) {
  
***************
*** 355,365 ****
        echoRectangleSet(rect,
  		       corn[0], corn[1], corn[2],
! 		       edir[0]*2, edir[1]*2, edir[2]*2,
! 		       fdir[0]*2, fdir[1]*2, fdir[2]*2);
        echoColorSet(rect, 1, 1, 1, 1);
        echoMatterLightSet(scene, rect, buvne[0], 0);
        echoObjectAdd(scene, rect);
      }
- 
      eparm->imgResU = ires[0];
      eparm->imgResV = ires[1];
--- 358,367 ----
        echoRectangleSet(rect,
  		       corn[0], corn[1], corn[2],
! 		       -edir[0]*2, -edir[1]*2, -edir[2]*2,
! 		       -fdir[0]*2, -fdir[1]*2, -fdir[2]*2);
        echoColorSet(rect, 1, 1, 1, 1);
        echoMatterLightSet(scene, rect, buvne[0], 0);
        echoObjectAdd(scene, rect);
      }
      eparm->imgResU = ires[0];
      eparm->imgResV = ires[1];