--- ray/src/rt/rview.c 2003/07/03 15:00:19 2.22 +++ ray/src/rt/rview.c 2005/01/21 00:52:59 2.27 @@ -1,5 +1,5 @@ #ifndef lint -static const char RCSid[] = "$Id: rview.c,v 2.22 2003/07/03 15:00:19 greg Exp $"; +static const char RCSid[] = "$Id: rview.c,v 2.27 2005/01/21 00:52:59 greg Exp $"; #endif /* * rview.c - routines and variables for interactive view generation. @@ -56,18 +56,18 @@ double specjitter = 1.; /* specular sampling jitter * int backvis = 1; /* back face visibility */ -int maxdepth = 4; /* maximum recursion depth */ +int maxdepth = 6; /* maximum recursion depth */ double minweight = 1e-2; /* minimum ray weight */ char *ambfile = NULL; /* ambient file name */ COLOR ambval = BLKCOLOR; /* ambient value */ int ambvwt = 0; /* initial weight for ambient value */ -double ambacc = 0.2; /* ambient accuracy */ -int ambres = 8; /* ambient resolution */ -int ambdiv = 32; /* ambient divisions */ -int ambssamp = 0; /* ambient super-samples */ +double ambacc = 0.3; /* ambient accuracy */ +int ambres = 32; /* ambient resolution */ +int ambdiv = 256; /* ambient divisions */ +int ambssamp = 64; /* ambient super-samples */ int ambounce = 0; /* ambient bounces */ -char *amblist[128]; /* ambient include/exclude list */ +char *amblist[AMBLLEN]; /* ambient include/exclude list */ int ambincl = -1; /* include == 1, exclude == 0 */ int greyscale = 0; /* map colors to brightness? */ @@ -114,12 +114,13 @@ char *dname; id = octname!=NULL ? octname : progname; /* check device table */ for (i = 0; devtable[i].name; i++) - if (!strcmp(dname, devtable[i].name)) + if (!strcmp(dname, devtable[i].name)) { if ((dev = (*devtable[i].init)(dname, id)) == NULL) { sprintf(errmsg, "cannot initialize %s", dname); error(USER, errmsg); } else return; + } /* not there, try exec */ if ((dev = comm_init(dname, id)) == NULL) { sprintf(errmsg, "cannot start device \"%s\"", dname); @@ -214,11 +215,15 @@ again: else *++args = '\0'; switch (inpbuf[0]) { - case 'f': /* new frame (or free mem.) */ + case 'f': /* new frame (|focus|free) */ if (badcom("frame")) { - if (badcom("free")) - goto commerr; - free_objmem(); + if (badcom("focus")) { + if (badcom("free")) + goto commerr; + free_objmem(); + break; + } + getfocus(args); break; } getframe(args);