41 |
|
|
42 |
|
if (getrect(s, &box) < 0) |
43 |
|
return; |
44 |
< |
paintrect(&ptrunk, 0, 0, ourview.hresolu, ourview.vresolu, &box); |
44 |
> |
paintrect(&ptrunk, 0, 0, hresolu, vresolu, &box); |
45 |
|
} |
46 |
|
|
47 |
|
|
63 |
|
} |
64 |
|
fputs(progname, fp); |
65 |
|
fprintview(&ourview, fp); |
66 |
+ |
fputs(sskip(s), fp); |
67 |
|
fputs("\n", fp); |
68 |
|
fclose(fp); |
69 |
|
return; |
70 |
|
} |
71 |
|
sprintf(buf, "view type (%c): ", ourview.type); |
72 |
|
(*dev->comout)(buf); |
73 |
< |
(*dev->comin)(buf); |
73 |
> |
(*dev->comin)(buf, NULL); |
74 |
|
if (buf[0] == CTRL(C)) return; |
75 |
|
if (buf[0] && buf[0] != ourview.type) { |
76 |
|
nv.type = buf[0]; |
80 |
|
sprintf(buf, "view point (%.6g %.6g %.6g): ", |
81 |
|
ourview.vp[0], ourview.vp[1], ourview.vp[2]); |
82 |
|
(*dev->comout)(buf); |
83 |
< |
(*dev->comin)(buf); |
83 |
> |
(*dev->comin)(buf, NULL); |
84 |
|
if (buf[0] == CTRL(C)) return; |
85 |
|
if (sscanf(buf, "%lf %lf %lf", &nv.vp[0], &nv.vp[1], &nv.vp[2]) == 3) |
86 |
|
change++; |
89 |
|
sprintf(buf, "view direction (%.6g %.6g %.6g): ", |
90 |
|
ourview.vdir[0], ourview.vdir[1], ourview.vdir[2]); |
91 |
|
(*dev->comout)(buf); |
92 |
< |
(*dev->comin)(buf); |
92 |
> |
(*dev->comin)(buf, NULL); |
93 |
|
if (buf[0] == CTRL(C)) return; |
94 |
|
if (sscanf(buf,"%lf %lf %lf",&nv.vdir[0],&nv.vdir[1],&nv.vdir[2]) == 3) |
95 |
|
change++; |
98 |
|
sprintf(buf, "view up (%.6g %.6g %.6g): ", |
99 |
|
ourview.vup[0], ourview.vup[1], ourview.vup[2]); |
100 |
|
(*dev->comout)(buf); |
101 |
< |
(*dev->comin)(buf); |
101 |
> |
(*dev->comin)(buf, NULL); |
102 |
|
if (buf[0] == CTRL(C)) return; |
103 |
|
if (sscanf(buf,"%lf %lf %lf",&nv.vup[0],&nv.vup[1],&nv.vup[2]) == 3) |
104 |
|
change++; |
107 |
|
sprintf(buf, "view horiz and vert size (%.6g %.6g): ", |
108 |
|
ourview.horiz, ourview.vert); |
109 |
|
(*dev->comout)(buf); |
110 |
< |
(*dev->comin)(buf); |
110 |
> |
(*dev->comin)(buf, NULL); |
111 |
|
if (buf[0] == CTRL(C)) return; |
112 |
|
if (sscanf(buf, "%lf %lf", &nv.horiz, &nv.vert) == 2) |
113 |
|
change++; |
114 |
|
else { |
115 |
|
nv.horiz = ourview.horiz; nv.vert = ourview.vert; |
116 |
|
} |
117 |
< |
sprintf(buf, "x and y resolution (%d %d): ", |
118 |
< |
ourview.hresolu, ourview.vresolu); |
117 |
> |
sprintf(buf, "view shift and lift (%.6g %.6g): ", |
118 |
> |
ourview.hoff, ourview.voff); |
119 |
|
(*dev->comout)(buf); |
120 |
< |
(*dev->comin)(buf); |
120 |
> |
(*dev->comin)(buf, NULL); |
121 |
|
if (buf[0] == CTRL(C)) return; |
122 |
< |
if (sscanf(buf, "%d %d", &nv.hresolu, &nv.vresolu) == 2) |
122 |
> |
if (sscanf(buf, "%lf %lf", &nv.hoff, &nv.voff) == 2) |
123 |
|
change++; |
124 |
|
else { |
125 |
< |
nv.hresolu = ourview.hresolu; nv.vresolu = ourview.vresolu; |
125 |
> |
nv.hoff = ourview.hoff; nv.voff = ourview.voff; |
126 |
|
} |
127 |
|
if (change) |
128 |
|
newview(&nv); |
138 |
|
VIEW nv; |
139 |
|
|
140 |
|
if (sscanf(s, "%s", buf) == 1) { /* get parameters from a file */ |
141 |
< |
bcopy(&stdview, &nv, sizeof(VIEW)); |
141 |
> |
copystruct(&nv, &stdview); |
142 |
|
if ((fname = getpath(buf, NULL, 0)) == NULL || |
143 |
< |
(success = viewfile(fname, &nv)) == -1) { |
143 |
> |
(success = viewfile(fname, &nv, 0, 0)) == -1) { |
144 |
|
sprintf(errmsg, "cannot open \"%s\"", buf); |
145 |
|
error(COMMAND, errmsg); |
146 |
|
return; |
151 |
|
newview(&nv); |
152 |
|
return; |
153 |
|
} |
154 |
< |
if (oldview.hresolu == 0) { /* no old view! */ |
154 |
> |
if (oldview.type == 0) { /* no old view! */ |
155 |
|
error(COMMAND, "no previous view"); |
156 |
|
return; |
157 |
|
} |
158 |
< |
bcopy(&ourview, &nv, sizeof(VIEW)); |
159 |
< |
bcopy(&oldview, &ourview, sizeof(VIEW)); |
160 |
< |
bcopy(&nv, &oldview, sizeof(VIEW)); |
158 |
> |
copystruct(&nv, &ourview); |
159 |
> |
copystruct(&ourview, &oldview); |
160 |
> |
copystruct(&oldview, &nv); |
161 |
|
newimage(); |
162 |
|
} |
163 |
|
|
171 |
|
|
172 |
|
if (getinterest(s, 1, nv.vdir, &zfact) < 0) |
173 |
|
return; |
174 |
+ |
nv.type = ourview.type; |
175 |
|
VCOPY(nv.vp, ourview.vp); |
176 |
|
VCOPY(nv.vup, ourview.vup); |
177 |
< |
nv.hresolu = ourview.hresolu; nv.vresolu = ourview.vresolu; |
178 |
< |
if ((nv.type = ourview.type) == VT_PAR) { |
179 |
< |
nv.horiz = ourview.horiz / zfact; |
178 |
< |
nv.vert = ourview.vert / zfact; |
179 |
< |
} else { |
180 |
< |
nv.horiz = atan(tan(ourview.horiz*(PI/180./2.))/zfact) / |
181 |
< |
(PI/180./2.); |
182 |
< |
nv.vert = atan(tan(ourview.vert*(PI/180./2.))/zfact) / |
183 |
< |
(PI/180./2.); |
184 |
< |
} |
177 |
> |
nv.hoff = ourview.hoff; nv.voff = ourview.voff; |
178 |
> |
nv.horiz = ourview.horiz; nv.vert = ourview.vert; |
179 |
> |
zoomview(&nv, zfact); |
180 |
|
newview(&nv); |
181 |
|
} |
182 |
|
|
206 |
|
error(COMMAND, "missing angle"); |
207 |
|
return; |
208 |
|
} |
209 |
+ |
nv.type = ourview.type; |
210 |
|
VCOPY(nv.vp, ourview.vp); |
211 |
|
VCOPY(nv.vup, ourview.vup); |
212 |
< |
nv.hresolu = ourview.hresolu; nv.vresolu = ourview.vresolu; |
212 |
> |
nv.hoff = ourview.hoff; nv.voff = ourview.voff; |
213 |
|
spinvector(nv.vdir, ourview.vdir, ourview.vup, angle*(PI/180.)); |
214 |
|
if (elev != 0.0) { |
215 |
|
fcross(v1, nv.vdir, ourview.vup); |
216 |
|
normalize(v1); |
217 |
|
spinvector(nv.vdir, nv.vdir, v1, elev*(PI/180.)); |
218 |
|
} |
219 |
< |
if ((nv.type = ourview.type) == VT_PAR) { |
220 |
< |
nv.horiz = ourview.horiz / zfact; |
225 |
< |
nv.vert = ourview.vert / zfact; |
226 |
< |
} else { |
227 |
< |
nv.horiz = atan(tan(ourview.horiz*(PI/180./2.))/zfact) / |
228 |
< |
(PI/180./2.); |
229 |
< |
nv.vert = atan(tan(ourview.vert*(PI/180./2.))/zfact) / |
230 |
< |
(PI/180./2.); |
231 |
< |
} |
219 |
> |
nv.horiz = ourview.horiz; nv.vert = ourview.vert; |
220 |
> |
zoomview(&nv, zfact); |
221 |
|
newview(&nv); |
222 |
|
} |
223 |
|
|
259 |
|
if ((*dev->getcur)(&x, &y) == ABORT) |
260 |
|
return; |
261 |
|
r.l = r.d = 0; |
262 |
< |
r.r = ourview.hresolu; r.u = ourview.vresolu; |
262 |
> |
r.r = hresolu; r.u = vresolu; |
263 |
|
p = findrect(x, y, &ptrunk, &r, -1); |
264 |
|
e = 1.0; |
265 |
|
} else { |
271 |
|
if (*cp == '\0') { /* interactive */ |
272 |
|
sprintf(buf, "exposure (%lf): ", exposure); |
273 |
|
(*dev->comout)(buf); |
274 |
< |
(*dev->comin)(buf); |
274 |
> |
(*dev->comin)(buf, NULL); |
275 |
|
for (cp = buf; isspace(*cp); cp++) |
276 |
|
; |
277 |
|
if (*cp == '\0') |
318 |
|
extern int ambdiv; |
319 |
|
extern int ambssamp; |
320 |
|
extern int ambounce; |
321 |
+ |
extern int directinvis; |
322 |
+ |
extern int do_irrad; |
323 |
|
int i0; |
324 |
|
double d0, d1, d2; |
325 |
< |
char buf[128]; |
325 |
> |
char buf[128], ans[4]; |
326 |
|
|
327 |
|
if (s[0] == '\0') { |
328 |
< |
(*dev->comout)("aa ab ad ar as av dc dj dt lr lw sp st: "); |
329 |
< |
(*dev->comin)(buf); |
328 |
> |
(*dev->comout)( |
329 |
> |
"aa ab ad ar as av b dc dj di dt i lr lw sp st: "); |
330 |
> |
(*dev->comin)(buf, NULL); |
331 |
|
s = buf; |
332 |
|
} |
333 |
|
switch (s[0]) { |
338 |
|
sprintf(buf, "limit weight (%.6g): ", |
339 |
|
minweight); |
340 |
|
(*dev->comout)(buf); |
341 |
< |
(*dev->comin)(buf); |
341 |
> |
(*dev->comin)(buf, NULL); |
342 |
|
if (sscanf(buf, "%lf", &d0) != 1) |
343 |
|
break; |
344 |
|
} |
349 |
|
sprintf(buf, "limit reflection (%d): ", |
350 |
|
maxdepth); |
351 |
|
(*dev->comout)(buf); |
352 |
< |
(*dev->comin)(buf); |
352 |
> |
(*dev->comin)(buf, NULL); |
353 |
|
if (sscanf(buf, "%d", &i0) != 1) |
354 |
|
break; |
355 |
|
} |
366 |
|
sprintf(buf, "direct jitter (%.6g): ", |
367 |
|
dstrsrc); |
368 |
|
(*dev->comout)(buf); |
369 |
< |
(*dev->comin)(buf); |
369 |
> |
(*dev->comin)(buf, NULL); |
370 |
|
if (sscanf(buf, "%lf", &d0) != 1) |
371 |
|
break; |
372 |
|
} |
377 |
|
sprintf(buf, "direct certainty (%.6g): ", |
378 |
|
shadcert); |
379 |
|
(*dev->comout)(buf); |
380 |
< |
(*dev->comin)(buf); |
380 |
> |
(*dev->comin)(buf, NULL); |
381 |
|
if (sscanf(buf, "%lf", &d0) != 1) |
382 |
|
break; |
383 |
|
} |
388 |
|
sprintf(buf, "direct threshold (%.6g): ", |
389 |
|
shadthresh); |
390 |
|
(*dev->comout)(buf); |
391 |
< |
(*dev->comin)(buf); |
391 |
> |
(*dev->comin)(buf, NULL); |
392 |
|
if (sscanf(buf, "%lf", &d0) != 1) |
393 |
|
break; |
394 |
|
} |
395 |
|
shadthresh = d0; |
396 |
|
break; |
397 |
+ |
case 'i': /* invisibility */ |
398 |
+ |
if (sscanf(s+2, "%1s", ans) != 1) { |
399 |
+ |
sprintf(buf, "direct invisibility (%c): ", |
400 |
+ |
directinvis ? 'y' : 'n'); |
401 |
+ |
(*dev->comout)(buf); |
402 |
+ |
(*dev->comin)(buf, NULL); |
403 |
+ |
if (sscanf(buf, "%1s", ans) != 1) |
404 |
+ |
break; |
405 |
+ |
} |
406 |
+ |
directinvis = tolower(ans[0]) == 'y'; |
407 |
+ |
break; |
408 |
|
default: |
409 |
|
goto badparam; |
410 |
|
} |
411 |
|
break; |
412 |
+ |
case 'b': /* black and white */ |
413 |
+ |
if (sscanf(s+1, "%1s", ans) != 1) { |
414 |
+ |
sprintf(buf, "black and white (%c): ", |
415 |
+ |
greyscale ? 'y' : 'n'); |
416 |
+ |
(*dev->comout)(buf); |
417 |
+ |
(*dev->comin)(buf, NULL); |
418 |
+ |
if (sscanf(buf, "%1s", ans) != 1) |
419 |
+ |
break; |
420 |
+ |
} |
421 |
+ |
greyscale = tolower(ans[0]) == 'y'; |
422 |
+ |
break; |
423 |
+ |
case 'i': /* irradiance */ |
424 |
+ |
if (sscanf(s+1, "%1s", ans) != 1) { |
425 |
+ |
sprintf(buf, "irradiance (%c): ", |
426 |
+ |
do_irrad ? 'y' : 'n'); |
427 |
+ |
(*dev->comout)(buf); |
428 |
+ |
(*dev->comin)(buf, NULL); |
429 |
+ |
if (sscanf(buf, "%1s", ans) != 1) |
430 |
+ |
break; |
431 |
+ |
} |
432 |
+ |
do_irrad = tolower(ans[0]) == 'y'; |
433 |
+ |
break; |
434 |
|
case 'a': /* ambient */ |
435 |
|
switch (s[1]) { |
436 |
|
case 'v': /* value */ |
441 |
|
colval(ambval,GRN), |
442 |
|
colval(ambval,BLU)); |
443 |
|
(*dev->comout)(buf); |
444 |
< |
(*dev->comin)(buf); |
444 |
> |
(*dev->comin)(buf, NULL); |
445 |
|
if (sscanf(buf, "%lf %lf %lf", |
446 |
|
&d0, &d1, &d2) != 3) |
447 |
|
break; |
453 |
|
sprintf(buf, "ambient accuracy (%.6g): ", |
454 |
|
ambacc); |
455 |
|
(*dev->comout)(buf); |
456 |
< |
(*dev->comin)(buf); |
456 |
> |
(*dev->comin)(buf, NULL); |
457 |
|
if (sscanf(buf, "%lf", &d0) != 1) |
458 |
|
break; |
459 |
|
} |
464 |
|
sprintf(buf, "ambient divisions (%d): ", |
465 |
|
ambdiv); |
466 |
|
(*dev->comout)(buf); |
467 |
< |
(*dev->comin)(buf); |
467 |
> |
(*dev->comin)(buf, NULL); |
468 |
|
if (sscanf(buf, "%d", &i0) != 1) |
469 |
|
break; |
470 |
|
} |
475 |
|
sprintf(buf, "ambient super-samples (%d): ", |
476 |
|
ambssamp); |
477 |
|
(*dev->comout)(buf); |
478 |
< |
(*dev->comin)(buf); |
478 |
> |
(*dev->comin)(buf, NULL); |
479 |
|
if (sscanf(buf, "%d", &i0) != 1) |
480 |
|
break; |
481 |
|
} |
486 |
|
sprintf(buf, "ambient bounces (%d): ", |
487 |
|
ambounce); |
488 |
|
(*dev->comout)(buf); |
489 |
< |
(*dev->comin)(buf); |
489 |
> |
(*dev->comin)(buf, NULL); |
490 |
|
if (sscanf(buf, "%d", &i0) != 1) |
491 |
|
break; |
492 |
|
} |
497 |
|
sprintf(buf, "ambient resolution (%d): ", |
498 |
|
ambres); |
499 |
|
(*dev->comout)(buf); |
500 |
< |
(*dev->comin)(buf); |
500 |
> |
(*dev->comin)(buf, NULL); |
501 |
|
if (sscanf(buf, "%d", &i0) != 1) |
502 |
|
break; |
503 |
|
} |
514 |
|
if (sscanf(s+2, "%d", &i0) != 1) { |
515 |
|
sprintf(buf, "sample pixel (%d): ", psample); |
516 |
|
(*dev->comout)(buf); |
517 |
< |
(*dev->comin)(buf); |
517 |
> |
(*dev->comin)(buf, NULL); |
518 |
|
if (sscanf(buf, "%d", &i0) != 1) |
519 |
|
break; |
520 |
|
} |
526 |
|
sprintf(buf, "sample threshold (%.6g): ", |
527 |
|
maxdiff); |
528 |
|
(*dev->comout)(buf); |
529 |
< |
(*dev->comin)(buf); |
529 |
> |
(*dev->comin)(buf, NULL); |
530 |
|
if (sscanf(buf, "%lf", &d0) != 1) |
531 |
|
break; |
532 |
|
} |
565 |
|
if ((*dev->getcur)(&x, &y) == ABORT) |
566 |
|
return; |
567 |
|
|
568 |
< |
rayview(thisray.rorg, thisray.rdir, &ourview, x+.5, y+.5); |
569 |
< |
|
568 |
> |
if (viewray(thisray.rorg, thisray.rdir, &ourview, |
569 |
> |
(x+.5)/hresolu, (y+.5)/vresolu) < 0) { |
570 |
> |
error(COMMAND, "not on image"); |
571 |
> |
return; |
572 |
> |
} |
573 |
> |
|
574 |
|
} else if (normalize(thisray.rdir) == 0.0) { |
575 |
|
error(COMMAND, "zero ray direction"); |
576 |
|
return; |
588 |
|
ofun[thisray.ro->otype].funame, |
589 |
|
thisray.ro->oname); |
590 |
|
(*dev->comout)(buf); |
591 |
< |
(*dev->comin)(buf); |
591 |
> |
(*dev->comin)(buf, NULL); |
592 |
|
if (thisray.rot >= FHUGE) |
593 |
|
(*dev->comout)("at infinity"); |
594 |
|
else { |
596 |
|
thisray.rop[1], thisray.rop[2]); |
597 |
|
(*dev->comout)(buf); |
598 |
|
} |
599 |
< |
(*dev->comin)(buf); |
599 |
> |
(*dev->comin)(buf, NULL); |
600 |
|
sprintf(buf, "with value (%.6g %.6g %.6g)", |
601 |
|
colval(thisray.rcol,RED), |
602 |
|
colval(thisray.rcol,GRN), |
603 |
|
colval(thisray.rcol,BLU)); |
604 |
|
(*dev->comout)(buf); |
605 |
|
} |
606 |
< |
(*dev->comin)(buf); |
606 |
> |
(*dev->comin)(buf, NULL); |
607 |
|
} |
608 |
|
|
609 |
|
|
635 |
|
putc('\n', fp); |
636 |
|
if (exposure != 1.0) |
637 |
|
fputexpos(exposure, fp); |
638 |
+ |
if (dev->pixaspect != 1.0) |
639 |
+ |
fputaspect(dev->pixaspect, fp); |
640 |
+ |
fputformat(COLRFMT, fp); |
641 |
|
putc('\n', fp); |
642 |
< |
fputresolu(YMAJOR|YDECR, ourview.hresolu, ourview.vresolu, fp); |
642 |
> |
fputresolu(YMAJOR|YDECR, hresolu, vresolu, fp); |
643 |
|
|
644 |
< |
scanline = (COLR *)malloc(ourview.hresolu*sizeof(COLR)); |
644 |
> |
scanline = (COLR *)malloc(hresolu*sizeof(COLR)); |
645 |
|
if (scanline == NULL) |
646 |
|
error(SYSTEM, "out of memory in writepict"); |
647 |
< |
for (y = ourview.vresolu-1; y >= 0; y--) { |
648 |
< |
getpictcolrs(y, scanline, &ptrunk, |
649 |
< |
ourview.hresolu, ourview.vresolu); |
618 |
< |
if (fwritecolrs(scanline, ourview.hresolu, fp) < 0) |
647 |
> |
for (y = vresolu-1; y >= 0; y--) { |
648 |
> |
getpictcolrs(y, scanline, &ptrunk, hresolu, vresolu); |
649 |
> |
if (fwritecolrs(scanline, hresolu, fp) < 0) |
650 |
|
break; |
651 |
|
} |
652 |
|
if (fclose(fp) < 0) |