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"; |
18 |
|
|
19 |
|
#include "rpaint.h" |
20 |
|
|
21 |
+ |
#include "resolu.h" |
22 |
+ |
|
23 |
|
#include <ctype.h> |
24 |
|
|
25 |
< |
#define CTRL(c) ('c'-'@') |
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) { |
92 |
|
sprintf(buf, "view type (%c): ", ourview.type); |
93 |
|
(*dev->comout)(buf); |
94 |
|
(*dev->comin)(buf, NULL); |
95 |
< |
if (buf[0] == CTRL(C)) return; |
95 |
> |
if (buf[0] == CTRL('C')) return; |
96 |
|
if (buf[0] && buf[0] != ourview.type) { |
97 |
|
nv.type = buf[0]; |
98 |
|
change++; |
102 |
|
ourview.vp[0], ourview.vp[1], ourview.vp[2]); |
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) |
105 |
> |
if (buf[0] == CTRL('C')) return; |
106 |
> |
if (sscanvec(buf, nv.vp)) |
107 |
|
change++; |
108 |
|
else |
109 |
|
VCOPY(nv.vp, ourview.vp); |
111 |
|
ourview.vdir[0], ourview.vdir[1], ourview.vdir[2]); |
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) |
114 |
> |
if (buf[0] == CTRL('C')) return; |
115 |
> |
if (sscanvec(buf, nv.vdir)) |
116 |
|
change++; |
117 |
|
else |
118 |
|
VCOPY(nv.vdir, ourview.vdir); |
120 |
|
ourview.vup[0], ourview.vup[1], ourview.vup[2]); |
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) |
123 |
> |
if (buf[0] == CTRL('C')) return; |
124 |
> |
if (sscanvec(buf, nv.vup)) |
125 |
|
change++; |
126 |
|
else |
127 |
|
VCOPY(nv.vup, ourview.vup); |
129 |
|
ourview.horiz, ourview.vert); |
130 |
|
(*dev->comout)(buf); |
131 |
|
(*dev->comin)(buf, NULL); |
132 |
< |
if (buf[0] == CTRL(C)) return; |
132 |
> |
if (buf[0] == CTRL('C')) return; |
133 |
|
if (sscanf(buf, "%lf %lf", &nv.horiz, &nv.vert) == 2) |
134 |
|
change++; |
135 |
|
else { |
139 |
|
ourview.hoff, ourview.voff); |
140 |
|
(*dev->comout)(buf); |
141 |
|
(*dev->comin)(buf, NULL); |
142 |
< |
if (buf[0] == CTRL(C)) return; |
142 |
> |
if (buf[0] == CTRL('C')) return; |
143 |
|
if (sscanf(buf, "%lf %lf", &nv.hoff, &nv.voff) == 2) |
144 |
|
change++; |
145 |
|
else { |
161 |
|
if (sscanf(s, "%s", buf) == 1) { /* get parameters from a file */ |
162 |
|
copystruct(&nv, &stdview); |
163 |
|
if ((fname = getpath(buf, NULL, 0)) == NULL || |
164 |
< |
(success = viewfile(fname, &nv, 0, 0)) == -1) { |
164 |
> |
(success = viewfile(fname, &nv, NULL)) == -1) { |
165 |
|
sprintf(errmsg, "cannot open \"%s\"", buf); |
166 |
|
error(COMMAND, errmsg); |
167 |
|
return; |
263 |
|
getexposure(s) /* get new exposure */ |
264 |
|
char *s; |
265 |
|
{ |
247 |
– |
double atof(), pow(), fabs(); |
266 |
|
char buf[128]; |
267 |
|
register char *cp; |
268 |
|
register PNODE *p; |
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 |
|
} |
339 |
|
(*dev->comout)(buf); |
340 |
|
(*dev->comin)(buf, NULL); |
341 |
|
if (sscanf(buf, "%d", &i0) != 1) |
342 |
< |
break; |
342 |
> |
return(0); |
343 |
|
} |
344 |
|
ptr->i = i0; |
345 |
< |
break; |
345 |
> |
return(1); |
346 |
|
case 'r': /* real */ |
347 |
|
if (sscanf(str, "%lf", &d0) != 1) { |
348 |
|
(*dev->comout)(dsc); |
350 |
|
(*dev->comout)(buf); |
351 |
|
(*dev->comin)(buf, NULL); |
352 |
|
if (sscanf(buf, "%lf", &d0) != 1) |
353 |
< |
break; |
353 |
> |
return(0); |
354 |
|
} |
355 |
|
ptr->d = d0; |
356 |
< |
break; |
356 |
> |
return(1); |
357 |
|
case 'b': /* boolean */ |
358 |
|
if (sscanf(str, "%1s", buf) != 1) { |
359 |
|
(*dev->comout)(dsc); |
360 |
< |
sprintf(buf, " (%c): ", ptr->i ? 'y' : 'n'); |
360 |
> |
sprintf(buf, "? (%c): ", ptr->i ? 'y' : 'n'); |
361 |
|
(*dev->comout)(buf); |
362 |
|
(*dev->comin)(buf, NULL); |
363 |
|
if (buf[0] == '\0' || |
364 |
|
index("yY+1tTnN-0fF", buf[0]) == NULL) |
365 |
< |
break; |
365 |
> |
return(0); |
366 |
|
} |
367 |
|
ptr->i = index("yY+1tT", buf[0]) != NULL; |
368 |
< |
break; |
368 |
> |
return(1); |
369 |
|
case 'C': /* color */ |
370 |
|
if (sscanf(str, "%lf %lf %lf", &d0, &d1, &d2) != 3) { |
371 |
|
(*dev->comout)(dsc); |
376 |
|
(*dev->comout)(buf); |
377 |
|
(*dev->comin)(buf, NULL); |
378 |
|
if (sscanf(buf, "%lf %lf %lf", &d0, &d1, &d2) != 3) |
379 |
< |
break; |
379 |
> |
return(0); |
380 |
|
} |
381 |
|
setcolor(ptr->C, d0, d1, d2); |
382 |
< |
break; |
382 |
> |
return(1); |
383 |
|
} |
384 |
|
} |
385 |
|
|
396 |
|
extern double shadcert; |
397 |
|
extern COLOR ambval; |
398 |
|
extern double ambacc; |
381 |
– |
extern double minarad; |
399 |
|
extern int ambres; |
400 |
|
extern int ambdiv; |
401 |
|
extern int ambssamp; |
402 |
|
extern int ambounce; |
403 |
|
extern int directinvis; |
404 |
+ |
extern double srcsizerat; |
405 |
|
extern int do_irrad; |
406 |
+ |
extern double specjitter; |
407 |
+ |
extern double specthresh; |
408 |
|
char buf[128]; |
409 |
|
|
410 |
|
if (s[0] == '\0') { |
411 |
|
(*dev->comout)( |
412 |
< |
"aa ab ad ar as av b dc di dj dt i lr lw sp st: "); |
412 |
> |
"aa ab ad ar as av b dc di dj ds dt i lr lw ps pt sj st: "); |
413 |
|
(*dev->comin)(buf, NULL); |
414 |
|
s = buf; |
415 |
|
} |
441 |
|
getparam(s+2, "direct invisibility", |
442 |
|
'b', &directinvis); |
443 |
|
break; |
444 |
+ |
case 's': /* sampling */ |
445 |
+ |
getparam(s+2, "direct sampling", 'r', &srcsizerat); |
446 |
+ |
break; |
447 |
|
default: |
448 |
|
goto badparam; |
449 |
|
} |
472 |
|
getparam(s+2, "ambient bounces", 'i', &ambounce); |
473 |
|
break; |
474 |
|
case 'r': |
475 |
< |
getparam(s+2, "ambient resolution", 'i', &ambres); |
476 |
< |
minarad = ambres > 0 ? thescene.cusize/ambres : 0.0; |
475 |
> |
if (getparam(s+2, "ambient resolution", 'i', &ambres)) |
476 |
> |
setambres(ambres); |
477 |
|
break; |
478 |
|
default: |
479 |
|
goto badparam; |
480 |
|
} |
481 |
|
break; |
482 |
< |
case 's': /* sample */ |
482 |
> |
case 'p': /* pixel */ |
483 |
|
switch (s[1]) { |
484 |
< |
case 'p': /* pixel */ |
485 |
< |
getparam(s+2, "sample pixel", 'i', &psample); |
486 |
< |
pdepth = 0; |
484 |
> |
case 's': /* sample */ |
485 |
> |
if (getparam(s+2, "pixel sample", 'i', &psample)) |
486 |
> |
pdepth = 0; |
487 |
|
break; |
488 |
|
case 't': /* threshold */ |
489 |
< |
getparam(s+2, "sample threshold", 'r', &maxdiff); |
490 |
< |
pdepth = 0; |
489 |
> |
if (getparam(s+2, "pixel threshold", 'r', &maxdiff)) |
490 |
> |
pdepth = 0; |
491 |
|
break; |
492 |
|
default: |
493 |
|
goto badparam; |
494 |
|
} |
495 |
|
break; |
496 |
+ |
case 's': /* specular */ |
497 |
+ |
switch (s[1]) { |
498 |
+ |
case 'j': /* jitter */ |
499 |
+ |
getparam(s+2, "specular jitter", 'r', &specjitter); |
500 |
+ |
break; |
501 |
+ |
case 't': /* threshold */ |
502 |
+ |
getparam(s+2, "specular threshold", 'r', &specthresh); |
503 |
+ |
break; |
504 |
+ |
default: |
505 |
+ |
goto badparam; |
506 |
+ |
} |
507 |
+ |
break; |
508 |
|
case '\0': /* nothing */ |
509 |
|
break; |
510 |
|
default:; |
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], |
494 |
< |
&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; |
565 |
|
(*dev->comout)(buf); |
566 |
|
} |
567 |
|
(*dev->comin)(buf, NULL); |
568 |
< |
sprintf(buf, "with value (%.6g %.6g %.6g)", |
568 |
> |
sprintf(buf, "value (%.5g %.5g %.5g) (%.1fL)", |
569 |
|
colval(thisray.rcol,RED), |
570 |
|
colval(thisray.rcol,GRN), |
571 |
< |
colval(thisray.rcol,BLU)); |
571 |
> |
colval(thisray.rcol,BLU), |
572 |
> |
luminance(thisray.rcol)); |
573 |
|
(*dev->comout)(buf); |
574 |
|
} |
575 |
|
(*dev->comin)(buf, NULL); |
612 |
|
fputaspect(dev->pixaspect, fp); |
613 |
|
fputformat(COLRFMT, fp); |
614 |
|
putc('\n', fp); |
615 |
< |
fputresolu(YMAJOR|YDECR, hresolu, vresolu, fp); |
615 |
> |
fprtresolu(hresolu, vresolu, fp); |
616 |
|
|
617 |
|
scanline = (COLR *)malloc(hresolu*sizeof(COLR)); |
618 |
|
if (scanline == NULL) { |