| 1 |
< |
/* Copyright (c) 1991 Regents of the University of California */ |
| 1 |
> |
/* Copyright (c) 1992 Regents of the University of California */ |
| 2 |
|
|
| 3 |
|
#ifndef lint |
| 4 |
|
static char SCCSid[] = "$SunId$ LBL"; |
| 24 |
|
|
| 25 |
|
#define CTRL(c) ((c)-'@') |
| 26 |
|
|
| 27 |
+ |
#ifdef SMLFLT |
| 28 |
+ |
#define sscanvec(s,v) (sscanf(s,"%f %f %f",v,v+1,v+2)==3) |
| 29 |
+ |
#else |
| 30 |
+ |
#define sscanvec(s,v) (sscanf(s,"%lf %lf %lf",v,v+1,v+2)==3) |
| 31 |
+ |
#endif |
| 32 |
+ |
|
| 33 |
+ |
|
| 34 |
|
extern char VersionID[]; |
| 35 |
|
extern char *progname; |
| 36 |
|
extern char *octname; |
| 65 |
|
int change = 0; |
| 66 |
|
VIEW nv; |
| 67 |
|
|
| 68 |
+ |
while (isspace(*s)) |
| 69 |
+ |
s++; |
| 70 |
+ |
if (*s == '-') { /* command line parameters */ |
| 71 |
+ |
copystruct(&nv, &ourview); |
| 72 |
+ |
if (sscanview(&nv, s)) |
| 73 |
+ |
newview(&nv); |
| 74 |
+ |
else |
| 75 |
+ |
error(COMMAND, "bad view option(s)"); |
| 76 |
+ |
return; |
| 77 |
+ |
} |
| 78 |
|
if (sscanf(s, "%s", buf) == 1) { /* write parameters to a file */ |
| 79 |
|
if ((fname = getpath(buf, NULL, 0)) == NULL || |
| 80 |
|
(fp = fopen(fname, "a")) == NULL) { |
| 103 |
|
(*dev->comout)(buf); |
| 104 |
|
(*dev->comin)(buf, NULL); |
| 105 |
|
if (buf[0] == CTRL('C')) return; |
| 106 |
< |
if (sscanf(buf, "%lf %lf %lf", &nv.vp[0], &nv.vp[1], &nv.vp[2]) == 3) |
| 106 |
> |
if (sscanvec(buf, nv.vp)) |
| 107 |
|
change++; |
| 108 |
|
else |
| 109 |
|
VCOPY(nv.vp, ourview.vp); |
| 112 |
|
(*dev->comout)(buf); |
| 113 |
|
(*dev->comin)(buf, NULL); |
| 114 |
|
if (buf[0] == CTRL('C')) return; |
| 115 |
< |
if (sscanf(buf,"%lf %lf %lf",&nv.vdir[0],&nv.vdir[1],&nv.vdir[2]) == 3) |
| 115 |
> |
if (sscanvec(buf, nv.vdir)) |
| 116 |
|
change++; |
| 117 |
|
else |
| 118 |
|
VCOPY(nv.vdir, ourview.vdir); |
| 121 |
|
(*dev->comout)(buf); |
| 122 |
|
(*dev->comin)(buf, NULL); |
| 123 |
|
if (buf[0] == CTRL('C')) return; |
| 124 |
< |
if (sscanf(buf,"%lf %lf %lf",&nv.vup[0],&nv.vup[1],&nv.vup[2]) == 3) |
| 124 |
> |
if (sscanvec(buf, nv.vup)) |
| 125 |
|
change++; |
| 126 |
|
else |
| 127 |
|
VCOPY(nv.vup, ourview.vup); |
| 307 |
|
e *= atof(cp); |
| 308 |
|
} |
| 309 |
|
if (p != NULL) { /* relative setting */ |
| 310 |
< |
if (bright(p->v) <= FTINY) { |
| 310 |
> |
if (bright(p->v) < 1e-25) { |
| 311 |
|
error(COMMAND, "cannot normalize to zero"); |
| 312 |
|
return; |
| 313 |
|
} |
| 396 |
|
extern double shadcert; |
| 397 |
|
extern COLOR ambval; |
| 398 |
|
extern double ambacc; |
| 382 |
– |
extern double minarad; |
| 399 |
|
extern int ambres; |
| 400 |
|
extern int ambdiv; |
| 401 |
|
extern int ambssamp; |
| 473 |
|
break; |
| 474 |
|
case 'r': |
| 475 |
|
if (getparam(s+2, "ambient resolution", 'i', &ambres)) |
| 476 |
< |
minarad = ambres > 0 ? |
| 461 |
< |
thescene.cusize/ambres : 0.0; |
| 476 |
> |
setambres(ambres); |
| 477 |
|
break; |
| 478 |
|
default: |
| 479 |
|
goto badparam; |
| 524 |
|
int x, y; |
| 525 |
|
RAY thisray; |
| 526 |
|
|
| 527 |
< |
if (sscanf(s, "%lf %lf %lf %lf %lf %lf", |
| 528 |
< |
&thisray.rorg[0], &thisray.rorg[1], &thisray.rorg[2], |
| 514 |
< |
&thisray.rdir[0], &thisray.rdir[1], &thisray.rdir[2]) != 6) { |
| 527 |
> |
if (!sscanvec(s, thisray.rorg) || |
| 528 |
> |
!sscanvec(sskip(sskip(sskip(s))), thisray.rdir)) { |
| 529 |
|
|
| 530 |
|
if (dev->getcur == NULL) |
| 531 |
|
return; |
