|
From: <kin...@us...> - 2004-02-13 23:03:35
|
Update of /cvsroot/teem/teem/src/limn In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29503 Modified Files: limn.h methodsLimn.c obj.c renderLimn.c Log Message: added option to NOT initially fill the background color in the bounding box area Index: limn.h =================================================================== RCS file: /cvsroot/teem/teem/src/limn/limn.h,v retrieving revision 1.47 retrieving revision 1.48 diff -C2 -d -r1.47 -r1.48 *** limn.h 10 Feb 2004 09:26:52 -0000 1.47 --- limn.h 13 Feb 2004 22:57:29 -0000 1.48 *************** *** 143,147 **** bg[3]; /* background color */ int showpage, /* finish with "showpage" */ ! wireFrame; /* just render wire-frame */ } limnOptsPS; --- 143,148 ---- bg[3]; /* background color */ int showpage, /* finish with "showpage" */ ! wireFrame, /* just render wire-frame */ ! noBackground; /* refrain from initially filling with bg[] color */ } limnOptsPS; *************** *** 440,444 **** extern int limnObjectSpaceTransform(limnObject *obj, limnCamera *cam, limnWindow *win, int space); ! extern int limnObjectPartTransform(limnObject *obj, int ri, float tx[16]); extern int limnObjectDepthSortParts(limnObject *obj); extern int limnObjectDepthSortFaces(limnObject *obj); --- 441,445 ---- extern int limnObjectSpaceTransform(limnObject *obj, limnCamera *cam, limnWindow *win, int space); ! extern int limnObjectPartTransform(limnObject *obj, int partIdx, float tx[16]); extern int limnObjectDepthSortParts(limnObject *obj); extern int limnObjectDepthSortFaces(limnObject *obj); Index: methodsLimn.c =================================================================== RCS file: /cvsroot/teem/teem/src/limn/methodsLimn.c,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** methodsLimn.c 9 Feb 2004 22:48:01 -0000 1.11 --- methodsLimn.c 13 Feb 2004 22:57:30 -0000 1.12 *************** *** 82,85 **** --- 82,86 ---- ps->showpage = AIR_FALSE; ps->wireFrame = AIR_FALSE; + ps->noBackground = AIR_FALSE; ELL_3V_SET(ps->bg, 1, 1, 1); } Index: obj.c =================================================================== RCS file: /cvsroot/teem/teem/src/limn/obj.c,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** obj.c 10 Feb 2004 04:42:18 -0000 1.18 --- obj.c 13 Feb 2004 22:57:30 -0000 1.19 *************** *** 29,33 **** look = &(obj->look[lookIdx]); ELL_4V_SET(look->rgba, 1, 1, 1, 1); ! ELL_3V_SET(look->kads, 0.5, 0.5, 0.0); look->spow = 50; return lookIdx; --- 29,33 ---- look = &(obj->look[lookIdx]); ELL_4V_SET(look->rgba, 1, 1, 1, 1); ! ELL_3V_SET(look->kads, 0.0, 1.0, 0.0); look->spow = 50; return lookIdx; Index: renderLimn.c =================================================================== RCS file: /cvsroot/teem/teem/src/limn/renderLimn.c,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** renderLimn.c 10 Feb 2004 09:26:53 -0000 1.20 --- renderLimn.c 13 Feb 2004 22:57:30 -0000 1.21 *************** *** 67,72 **** fprintf(win->file, "%g %g lineto\n", win->bbox[0], win->bbox[3]); fprintf(win->file, "closepath\n"); ! fprintf(win->file, "gsave %g %g %g setrgbcolor fill grestore\n", ! win->ps.bg[0], win->ps.bg[1], win->ps.bg[2]); fprintf(win->file, "clip\n"); fprintf(win->file, "gsave newpath\n"); --- 67,74 ---- fprintf(win->file, "%g %g lineto\n", win->bbox[0], win->bbox[3]); fprintf(win->file, "closepath\n"); ! if (!win->ps.noBackground) { ! fprintf(win->file, "gsave %g %g %g setrgbcolor fill grestore\n", ! win->ps.bg[0], win->ps.bg[1], win->ps.bg[2]); ! } fprintf(win->file, "clip\n"); fprintf(win->file, "gsave newpath\n"); |