--- ray/src/rt/rview.c 2003/02/25 02:47:23 2.19 +++ ray/src/rt/rview.c 2003/09/24 14:55:54 2.24 @@ -1,5 +1,5 @@ #ifndef lint -static const char RCSid[] = "$Id: rview.c,v 2.19 2003/02/25 02:47:23 greg Exp $"; +static const char RCSid[] = "$Id: rview.c,v 2.24 2003/09/24 14:55:54 greg Exp $"; #endif /* * rview.c - routines and variables for interactive view generation. @@ -9,14 +9,13 @@ static const char RCSid[] = "$Id: rview.c,v 2.19 2003/ #include "copyright.h" -#include "ray.h" +#include +#include +#include "ray.h" #include "rpaint.h" -#include -#include - CUBE thescene; /* our scene */ OBJECT nsceneobjs; /* number of objects in our scene */ @@ -57,16 +56,16 @@ 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 */ +int ambres = 32; /* ambient resolution */ +int ambdiv = 128; /* ambient divisions */ +int ambssamp = 32; /* ambient super-samples */ int ambounce = 0; /* ambient bounces */ char *amblist[128]; /* ambient include/exclude list */ int ambincl = -1; /* include == 1, exclude == 0 */ @@ -115,19 +114,18 @@ 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; -#ifndef NIX + } /* not there, try exec */ if ((dev = comm_init(dname, id)) == NULL) { sprintf(errmsg, "cannot start device \"%s\"", dname); error(USER, errmsg); } -#endif }