1 |
– |
/* Copyright (c) 1992 Regents of the University of California */ |
2 |
– |
|
1 |
|
#ifndef lint |
2 |
< |
static char SCCSid[] = "$SunId$ LBL"; |
2 |
> |
static const char RCSid[] = "$Id$"; |
3 |
|
#endif |
6 |
– |
|
4 |
|
/* |
5 |
|
* rv2.c - command routines used in tracing a view. |
6 |
|
* |
7 |
< |
* 3/24/87 |
7 |
> |
* External symbols declared in rpaint.h |
8 |
|
*/ |
9 |
|
|
10 |
< |
#include "ray.h" |
10 |
> |
#include "copyright.h" |
11 |
|
|
12 |
< |
#include "octree.h" |
12 |
> |
#include <ctype.h> |
13 |
> |
#include <string.h> |
14 |
|
|
15 |
+ |
#include "platform.h" |
16 |
+ |
#include "ray.h" |
17 |
|
#include "otypes.h" |
18 |
– |
|
18 |
|
#include "rpaint.h" |
19 |
|
|
20 |
< |
#include "resolu.h" |
20 |
> |
extern int psample; /* pixel sample size */ |
21 |
> |
extern double maxdiff; /* max. sample difference */ |
22 |
|
|
23 |
– |
#include <ctype.h> |
24 |
– |
|
23 |
|
#define CTRL(c) ((c)-'@') |
24 |
|
|
25 |
|
#ifdef SMLFLT |
28 |
|
#define sscanvec(s,v) (sscanf(s,"%lf %lf %lf",v,v+1,v+2)==3) |
29 |
|
#endif |
30 |
|
|
31 |
+ |
extern char rifname[128]; /* rad input file name */ |
32 |
|
|
34 |
– |
extern char VersionID[]; |
33 |
|
extern char *progname; |
34 |
|
extern char *octname; |
35 |
|
|
36 |
|
|
37 |
+ |
void |
38 |
|
getframe(s) /* get a new frame */ |
39 |
|
char *s; |
40 |
|
{ |
44 |
|
} |
45 |
|
|
46 |
|
|
47 |
+ |
void |
48 |
|
getrepaint(s) /* get area and repaint */ |
49 |
|
char *s; |
50 |
|
{ |
56 |
|
} |
57 |
|
|
58 |
|
|
59 |
+ |
void |
60 |
|
getview(s) /* get/show view parameters */ |
61 |
|
char *s; |
62 |
|
{ |
69 |
|
while (isspace(*s)) |
70 |
|
s++; |
71 |
|
if (*s == '-') { /* command line parameters */ |
72 |
< |
copystruct(&nv, &ourview); |
72 |
> |
nv = ourview; |
73 |
|
if (sscanview(&nv, s)) |
74 |
|
newview(&nv); |
75 |
|
else |
86 |
|
fputs(progname, fp); |
87 |
|
fprintview(&ourview, fp); |
88 |
|
fputs(sskip(s), fp); |
89 |
< |
fputs("\n", fp); |
89 |
> |
putc('\n', fp); |
90 |
|
fclose(fp); |
91 |
|
return; |
92 |
|
} |
136 |
|
else { |
137 |
|
nv.horiz = ourview.horiz; nv.vert = ourview.vert; |
138 |
|
} |
139 |
+ |
sprintf(buf, "fore and aft clipping plane (%.6g %.6g): ", |
140 |
+ |
ourview.vfore, ourview.vaft); |
141 |
+ |
(*dev->comout)(buf); |
142 |
+ |
(*dev->comin)(buf, NULL); |
143 |
+ |
if (buf[0] == CTRL('C')) return; |
144 |
+ |
if (sscanf(buf, "%lf %lf", &nv.vfore, &nv.vaft) == 2) |
145 |
+ |
change++; |
146 |
+ |
else { |
147 |
+ |
nv.vfore = ourview.vfore; nv.vaft = ourview.vaft; |
148 |
+ |
} |
149 |
|
sprintf(buf, "view shift and lift (%.6g %.6g): ", |
150 |
|
ourview.hoff, ourview.voff); |
151 |
|
(*dev->comout)(buf); |
161 |
|
} |
162 |
|
|
163 |
|
|
164 |
+ |
void |
165 |
|
lastview(s) /* return to a previous view */ |
166 |
|
char *s; |
167 |
|
{ |
171 |
|
VIEW nv; |
172 |
|
|
173 |
|
if (sscanf(s, "%s", buf) == 1) { /* get parameters from a file */ |
174 |
< |
copystruct(&nv, &stdview); |
175 |
< |
if ((fname = getpath(buf, NULL, 0)) == NULL || |
174 |
> |
nv = stdview; |
175 |
> |
if ((fname = getpath(buf, "", R_OK)) == NULL || |
176 |
|
(success = viewfile(fname, &nv, NULL)) == -1) { |
177 |
|
sprintf(errmsg, "cannot open \"%s\"", buf); |
178 |
|
error(COMMAND, errmsg); |
188 |
|
error(COMMAND, "no previous view"); |
189 |
|
return; |
190 |
|
} |
191 |
< |
copystruct(&nv, &ourview); |
192 |
< |
copystruct(&ourview, &oldview); |
193 |
< |
copystruct(&oldview, &nv); |
191 |
> |
nv = ourview; |
192 |
> |
ourview = oldview; |
193 |
> |
oldview = nv; |
194 |
|
newimage(); |
195 |
|
} |
196 |
|
|
197 |
|
|
198 |
+ |
void |
199 |
+ |
saveview(s) /* save view to rad file */ |
200 |
+ |
char *s; |
201 |
+ |
{ |
202 |
+ |
char view[64]; |
203 |
+ |
char *fname; |
204 |
+ |
FILE *fp; |
205 |
+ |
|
206 |
+ |
if (*atos(view, sizeof(view), s)) { |
207 |
+ |
if (isint(view)) { |
208 |
+ |
error(COMMAND, "cannot write view by number"); |
209 |
+ |
return; |
210 |
+ |
} |
211 |
+ |
s = sskip(s); |
212 |
+ |
} |
213 |
+ |
while (isspace(*s)) |
214 |
+ |
s++; |
215 |
+ |
if (*s) |
216 |
+ |
atos(rifname, sizeof(rifname), s); |
217 |
+ |
else if (rifname[0] == '\0') { |
218 |
+ |
error(COMMAND, "no previous rad file"); |
219 |
+ |
return; |
220 |
+ |
} |
221 |
+ |
if ((fname = getpath(rifname, NULL, 0)) == NULL || |
222 |
+ |
(fp = fopen(fname, "a")) == NULL) { |
223 |
+ |
sprintf(errmsg, "cannot open \"%s\"", rifname); |
224 |
+ |
error(COMMAND, errmsg); |
225 |
+ |
return; |
226 |
+ |
} |
227 |
+ |
fputs("view= ", fp); |
228 |
+ |
fputs(view, fp); |
229 |
+ |
fprintview(&ourview, fp); |
230 |
+ |
putc('\n', fp); |
231 |
+ |
fclose(fp); |
232 |
+ |
} |
233 |
+ |
|
234 |
+ |
|
235 |
+ |
void |
236 |
+ |
loadview(s) /* load view from rad file */ |
237 |
+ |
char *s; |
238 |
+ |
{ |
239 |
+ |
char buf[512]; |
240 |
+ |
char *fname; |
241 |
+ |
FILE *fp; |
242 |
+ |
VIEW nv; |
243 |
+ |
|
244 |
+ |
strcpy(buf, "rad -n -s -V -v "); |
245 |
+ |
if (sscanf(s, "%s", buf+strlen(buf)) == 1) |
246 |
+ |
s = sskip(s); |
247 |
+ |
else |
248 |
+ |
strcat(buf, "1"); |
249 |
+ |
if (*s) |
250 |
+ |
atos(rifname, sizeof(rifname), s); |
251 |
+ |
else if (rifname[0] == '\0') { |
252 |
+ |
error(COMMAND, "no previous rad file"); |
253 |
+ |
return; |
254 |
+ |
} |
255 |
+ |
if ((fname = getpath(rifname, "", R_OK)) == NULL) { |
256 |
+ |
sprintf(errmsg, "cannot access \"%s\"", rifname); |
257 |
+ |
error(COMMAND, errmsg); |
258 |
+ |
return; |
259 |
+ |
} |
260 |
+ |
sprintf(buf+strlen(buf), " %s", fname); |
261 |
+ |
if ((fp = popen(buf, "r")) == NULL) { |
262 |
+ |
error(COMMAND, "cannot run rad"); |
263 |
+ |
return; |
264 |
+ |
} |
265 |
+ |
buf[0] = '\0'; |
266 |
+ |
fgets(buf, sizeof(buf), fp); |
267 |
+ |
pclose(fp); |
268 |
+ |
nv = stdview; |
269 |
+ |
if (!sscanview(&nv, buf)) { |
270 |
+ |
error(COMMAND, "rad error -- no such view?"); |
271 |
+ |
return; |
272 |
+ |
} |
273 |
+ |
newview(&nv); |
274 |
+ |
} |
275 |
+ |
|
276 |
+ |
|
277 |
+ |
void |
278 |
|
getaim(s) /* aim camera */ |
279 |
|
char *s; |
280 |
|
{ |
286 |
|
nv.type = ourview.type; |
287 |
|
VCOPY(nv.vp, ourview.vp); |
288 |
|
VCOPY(nv.vup, ourview.vup); |
197 |
– |
nv.hoff = ourview.hoff; nv.voff = ourview.voff; |
289 |
|
nv.horiz = ourview.horiz; nv.vert = ourview.vert; |
290 |
+ |
nv.vfore = ourview.vfore; nv.vaft = ourview.vaft; |
291 |
+ |
nv.hoff = ourview.hoff; nv.voff = ourview.voff; |
292 |
|
zoomview(&nv, zfact); |
293 |
|
newview(&nv); |
294 |
|
} |
295 |
|
|
296 |
|
|
297 |
+ |
void |
298 |
|
getmove(s) /* move camera */ |
299 |
|
char *s; |
300 |
|
{ |
307 |
|
} |
308 |
|
|
309 |
|
|
310 |
+ |
void |
311 |
|
getrotate(s) /* rotate camera */ |
312 |
|
char *s; |
313 |
|
{ |
324 |
|
VCOPY(nv.vp, ourview.vp); |
325 |
|
VCOPY(nv.vup, ourview.vup); |
326 |
|
nv.hoff = ourview.hoff; nv.voff = ourview.voff; |
327 |
+ |
nv.vfore = ourview.vfore; nv.vaft = ourview.vaft; |
328 |
|
spinvector(nv.vdir, ourview.vdir, ourview.vup, angle*(PI/180.)); |
329 |
|
if (elev != 0.0) { |
330 |
|
fcross(v1, nv.vdir, ourview.vup); |
337 |
|
} |
338 |
|
|
339 |
|
|
340 |
+ |
void |
341 |
|
getpivot(s) /* pivot viewpoint */ |
342 |
|
register char *s; |
343 |
|
{ |
349 |
|
error(COMMAND, "missing angle"); |
350 |
|
return; |
351 |
|
} |
352 |
< |
if (getinterest(sskip(sskip(s)), 0, vc, &mag) < 0) |
352 |
> |
if (getinterest(sskip2(s,2), 0, vc, &mag) < 0) |
353 |
|
return; |
354 |
|
moveview(angle, elev, mag, vc); |
355 |
|
} |
356 |
|
|
357 |
|
|
358 |
+ |
void |
359 |
|
getexposure(s) /* get new exposure */ |
360 |
|
char *s; |
361 |
|
{ |
362 |
|
char buf[128]; |
363 |
|
register char *cp; |
266 |
– |
register PNODE *p; |
364 |
|
RECT r; |
365 |
|
int x, y; |
366 |
< |
double e; |
366 |
> |
register PNODE *p = &ptrunk; |
367 |
> |
int adapt = 0; |
368 |
> |
double e = 1.0; |
369 |
|
|
370 |
|
for (cp = s; isspace(*cp); cp++) |
371 |
|
; |
372 |
+ |
if (*cp == '@') { |
373 |
+ |
adapt++; |
374 |
+ |
while (isspace(*++cp)) |
375 |
+ |
; |
376 |
+ |
} |
377 |
|
if (*cp == '\0') { /* normalize to point */ |
378 |
|
if (dev->getcur == NULL) |
379 |
|
return; |
383 |
|
r.l = r.d = 0; |
384 |
|
r.r = hresolu; r.u = vresolu; |
385 |
|
p = findrect(x, y, &ptrunk, &r, -1); |
282 |
– |
e = 1.0; |
386 |
|
} else { |
387 |
|
if (*cp == '=') { /* absolute setting */ |
388 |
|
p = NULL; |
390 |
|
for (cp++; isspace(*cp); cp++) |
391 |
|
; |
392 |
|
if (*cp == '\0') { /* interactive */ |
393 |
< |
sprintf(buf, "exposure (%lf): ", exposure); |
393 |
> |
sprintf(buf, "exposure (%f): ", exposure); |
394 |
|
(*dev->comout)(buf); |
395 |
|
(*dev->comin)(buf, NULL); |
396 |
|
for (cp = buf; isspace(*cp); cp++) |
398 |
|
if (*cp == '\0') |
399 |
|
return; |
400 |
|
} |
298 |
– |
} else { /* normalize to average */ |
299 |
– |
p = &ptrunk; |
300 |
– |
e = 1.0; |
401 |
|
} |
402 |
|
if (*cp == '+' || *cp == '-') /* f-stops */ |
403 |
|
e *= pow(2.0, atof(cp)); |
405 |
|
e *= atof(cp); |
406 |
|
} |
407 |
|
if (p != NULL) { /* relative setting */ |
408 |
< |
if (bright(p->v) < 1e-25) { |
408 |
> |
if (bright(p->v) < 1e-15) { |
409 |
|
error(COMMAND, "cannot normalize to zero"); |
410 |
|
return; |
411 |
|
} |
412 |
< |
e *= 0.5 / bright(p->v); |
412 |
> |
if (adapt) |
413 |
> |
e *= 106./pow(1.219+pow(luminance(p->v)/exposure,.4),2.5)/exposure; |
414 |
> |
else |
415 |
> |
e *= 0.5 / bright(p->v); |
416 |
|
} |
417 |
|
if (e <= FTINY || fabs(1.0 - e) <= FTINY) |
418 |
|
return; |
421 |
|
redraw(); |
422 |
|
} |
423 |
|
|
424 |
+ |
typedef union {int i; double d; COLOR C;} *MyUptr; |
425 |
|
|
426 |
< |
getparam(str, dsc, typ, ptr) /* get variable from user */ |
426 |
> |
int |
427 |
> |
getparam(str, dsc, typ, p) /* get variable from user */ |
428 |
|
char *str, *dsc; |
429 |
|
int typ; |
430 |
< |
register union {int i; double d; COLOR C;} *ptr; |
430 |
> |
void *p; |
431 |
|
{ |
432 |
< |
extern char *index(); |
432 |
> |
register MyUptr ptr = (MyUptr)p; |
433 |
|
int i0; |
434 |
|
double d0, d1, d2; |
435 |
|
char buf[48]; |
464 |
|
(*dev->comout)(buf); |
465 |
|
(*dev->comin)(buf, NULL); |
466 |
|
if (buf[0] == '\0' || |
467 |
< |
index("yY+1tTnN-0fF", buf[0]) == NULL) |
467 |
> |
strchr("yY+1tTnN-0fF", buf[0]) == NULL) |
468 |
|
return(0); |
469 |
|
} |
470 |
< |
ptr->i = index("yY+1tT", buf[0]) != NULL; |
470 |
> |
ptr->i = strchr("yY+1tT", buf[0]) != NULL; |
471 |
|
return(1); |
472 |
|
case 'C': /* color */ |
473 |
|
if (sscanf(str, "%lf %lf %lf", &d0, &d1, &d2) != 3) { |
487 |
|
} |
488 |
|
|
489 |
|
|
490 |
+ |
void |
491 |
|
setparam(s) /* get/set program parameter */ |
492 |
|
register char *s; |
493 |
|
{ |
388 |
– |
extern int psample; |
389 |
– |
extern double maxdiff; |
390 |
– |
extern double minweight; |
391 |
– |
extern int maxdepth; |
392 |
– |
extern double dstrsrc; |
393 |
– |
extern double shadthresh; |
394 |
– |
extern double shadcert; |
395 |
– |
extern COLOR ambval; |
396 |
– |
extern double ambacc; |
397 |
– |
extern int ambres; |
398 |
– |
extern int ambdiv; |
399 |
– |
extern int ambssamp; |
400 |
– |
extern int ambounce; |
401 |
– |
extern int directinvis; |
402 |
– |
extern double srcsizerat; |
403 |
– |
extern int do_irrad; |
404 |
– |
extern double specjitter; |
405 |
– |
extern double specthresh; |
494 |
|
char buf[128]; |
495 |
|
|
496 |
|
if (s[0] == '\0') { |
497 |
|
(*dev->comout)( |
498 |
< |
"aa ab ad ar as av b dc di dj ds dt i lr lw ps pt sj st: "); |
498 |
> |
"aa ab ad ar as av aw b dc dv dj ds dt i lr lw me ma mg ms ps pt sj st bv: "); |
499 |
|
(*dev->comin)(buf, NULL); |
500 |
|
s = buf; |
501 |
|
} |
503 |
|
case 'l': /* limit */ |
504 |
|
switch (s[1]) { |
505 |
|
case 'w': /* weight */ |
506 |
< |
getparam(s+2, "limit weight", 'r', &minweight); |
506 |
> |
getparam(s+2, "limit weight", 'r', |
507 |
> |
(void *)&minweight); |
508 |
|
break; |
509 |
|
case 'r': /* reflection */ |
510 |
< |
getparam(s+2, "limit reflection", 'i', &maxdepth); |
510 |
> |
getparam(s+2, "limit reflection", 'i', |
511 |
> |
(void *)&maxdepth); |
512 |
|
break; |
513 |
|
default: |
514 |
|
goto badparam; |
517 |
|
case 'd': /* direct */ |
518 |
|
switch (s[1]) { |
519 |
|
case 'j': /* jitter */ |
520 |
< |
getparam(s+2, "direct jitter", 'r', &dstrsrc); |
520 |
> |
getparam(s+2, "direct jitter", 'r', |
521 |
> |
(void *)&dstrsrc); |
522 |
|
break; |
523 |
|
case 'c': /* certainty */ |
524 |
< |
getparam(s+2, "direct certainty", 'r', &shadcert); |
524 |
> |
getparam(s+2, "direct certainty", 'r', |
525 |
> |
(void *)&shadcert); |
526 |
|
break; |
527 |
|
case 't': /* threshold */ |
528 |
< |
getparam(s+2, "direct threshold", 'r', &shadthresh); |
528 |
> |
getparam(s+2, "direct threshold", 'r', |
529 |
> |
(void *)&shadthresh); |
530 |
|
break; |
531 |
< |
case 'i': /* invisibility */ |
532 |
< |
getparam(s+2, "direct invisibility", |
533 |
< |
'b', &directinvis); |
531 |
> |
case 'v': /* visibility */ |
532 |
> |
getparam(s+2, "direct visibility", 'b', |
533 |
> |
(void *)&directvis); |
534 |
|
break; |
535 |
|
case 's': /* sampling */ |
536 |
< |
getparam(s+2, "direct sampling", 'r', &srcsizerat); |
536 |
> |
getparam(s+2, "direct sampling", 'r', |
537 |
> |
(void *)&srcsizerat); |
538 |
|
break; |
539 |
|
default: |
540 |
|
goto badparam; |
541 |
|
} |
542 |
|
break; |
543 |
< |
case 'b': /* black and white */ |
544 |
< |
getparam(s+1, "black and white", 'b', &greyscale); |
543 |
> |
case 'b': /* back faces or black and white */ |
544 |
> |
switch (s[1]) { |
545 |
> |
case 'v': /* back face visibility */ |
546 |
> |
getparam(s+2, "back face visibility", 'b', |
547 |
> |
(void *)&backvis); |
548 |
> |
break; |
549 |
> |
case '\0': /* black and white */ |
550 |
> |
case ' ': |
551 |
> |
case 'y': case 'Y': case 't': case 'T': case '1': case '+': |
552 |
> |
case 'n': case 'N': case 'f': case 'F': case '0': case '-': |
553 |
> |
getparam(s+1, "black and white", 'b', |
554 |
> |
(void *)&greyscale); |
555 |
> |
break; |
556 |
> |
default: |
557 |
> |
goto badparam; |
558 |
> |
} |
559 |
|
break; |
560 |
|
case 'i': /* irradiance */ |
561 |
< |
getparam(s+1, "irradiance", 'b', &do_irrad); |
561 |
> |
getparam(s+1, "irradiance", 'b', |
562 |
> |
(void *)&do_irrad); |
563 |
|
break; |
564 |
|
case 'a': /* ambient */ |
565 |
|
switch (s[1]) { |
566 |
|
case 'v': /* value */ |
567 |
< |
getparam(s+2, "ambient value", 'C', ambval); |
567 |
> |
getparam(s+2, "ambient value", 'C', |
568 |
> |
(void *)ambval); |
569 |
|
break; |
570 |
+ |
case 'w': /* weight */ |
571 |
+ |
getparam(s+2, "ambient value weight", 'i', |
572 |
+ |
(void *)&ambvwt); |
573 |
+ |
break; |
574 |
|
case 'a': /* accuracy */ |
575 |
< |
getparam(s+2, "ambient accuracy", 'r', &ambacc); |
575 |
> |
if (getparam(s+2, "ambient accuracy", 'r', |
576 |
> |
(void *)&ambacc)) |
577 |
> |
setambacc(ambacc); |
578 |
|
break; |
579 |
|
case 'd': /* divisions */ |
580 |
< |
getparam(s+2, "ambient divisions", 'i', &ambdiv); |
580 |
> |
getparam(s+2, "ambient divisions", 'i', |
581 |
> |
(void *)&ambdiv); |
582 |
|
break; |
583 |
|
case 's': /* samples */ |
584 |
< |
getparam(s+2, "ambient super-samples", 'i', &ambssamp); |
584 |
> |
getparam(s+2, "ambient super-samples", 'i', |
585 |
> |
(void *)&ambssamp); |
586 |
|
break; |
587 |
|
case 'b': /* bounces */ |
588 |
< |
getparam(s+2, "ambient bounces", 'i', &ambounce); |
588 |
> |
getparam(s+2, "ambient bounces", 'i', |
589 |
> |
(void *)&ambounce); |
590 |
|
break; |
591 |
|
case 'r': |
592 |
< |
if (getparam(s+2, "ambient resolution", 'i', &ambres)) |
592 |
> |
if (getparam(s+2, "ambient resolution", 'i', |
593 |
> |
(void *)&ambres)) |
594 |
|
setambres(ambres); |
595 |
|
break; |
596 |
|
default: |
597 |
|
goto badparam; |
598 |
|
} |
599 |
|
break; |
600 |
+ |
case 'm': /* medium */ |
601 |
+ |
switch (s[1]) { |
602 |
+ |
case 'e': /* extinction coefficient */ |
603 |
+ |
getparam(s+2, "extinction coefficient", 'C', |
604 |
+ |
(void *)cextinction); |
605 |
+ |
break; |
606 |
+ |
case 'a': /* scattering albedo */ |
607 |
+ |
getparam(s+2, "scattering albedo", 'C', |
608 |
+ |
(void *)salbedo); |
609 |
+ |
break; |
610 |
+ |
case 'g': /* scattering eccentricity */ |
611 |
+ |
getparam(s+2, "scattering eccentricity", 'r', |
612 |
+ |
(void *)&seccg); |
613 |
+ |
break; |
614 |
+ |
case 's': /* sampling distance */ |
615 |
+ |
getparam(s+2, "mist sampling distance", 'r', |
616 |
+ |
(void *)&ssampdist); |
617 |
+ |
break; |
618 |
+ |
default: |
619 |
+ |
goto badparam; |
620 |
+ |
} |
621 |
+ |
break; |
622 |
|
case 'p': /* pixel */ |
623 |
|
switch (s[1]) { |
624 |
|
case 's': /* sample */ |
625 |
< |
if (getparam(s+2, "pixel sample", 'i', &psample)) |
625 |
> |
if (getparam(s+2, "pixel sample", 'i', |
626 |
> |
(void *)&psample)) |
627 |
|
pdepth = 0; |
628 |
|
break; |
629 |
|
case 't': /* threshold */ |
630 |
< |
if (getparam(s+2, "pixel threshold", 'r', &maxdiff)) |
630 |
> |
if (getparam(s+2, "pixel threshold", 'r', |
631 |
> |
(void *)&maxdiff)) |
632 |
|
pdepth = 0; |
633 |
|
break; |
634 |
|
default: |
638 |
|
case 's': /* specular */ |
639 |
|
switch (s[1]) { |
640 |
|
case 'j': /* jitter */ |
641 |
< |
getparam(s+2, "specular jitter", 'r', &specjitter); |
641 |
> |
getparam(s+2, "specular jitter", 'r', |
642 |
> |
(void *)&specjitter); |
643 |
|
break; |
644 |
|
case 't': /* threshold */ |
645 |
< |
getparam(s+2, "specular threshold", 'r', &specthresh); |
645 |
> |
getparam(s+2, "specular threshold", 'r', |
646 |
> |
(void *)&specthresh); |
647 |
|
break; |
648 |
|
default: |
649 |
|
goto badparam; |
661 |
|
} |
662 |
|
|
663 |
|
|
664 |
+ |
void |
665 |
|
traceray(s) /* trace a single ray */ |
666 |
|
char *s; |
667 |
|
{ |
668 |
|
char buf[128]; |
669 |
|
int x, y; |
670 |
+ |
OBJREC *ino; |
671 |
|
RAY thisray; |
672 |
|
|
673 |
+ |
thisray.rmax = 0.0; |
674 |
+ |
|
675 |
|
if (!sscanvec(s, thisray.rorg) || |
676 |
< |
!sscanvec(sskip(sskip(sskip(s))), thisray.rdir)) { |
676 |
> |
!sscanvec(sskip2(s,3), thisray.rdir)) { |
677 |
|
|
678 |
|
if (dev->getcur == NULL) |
679 |
|
return; |
681 |
|
if ((*dev->getcur)(&x, &y) == ABORT) |
682 |
|
return; |
683 |
|
|
684 |
< |
if (viewray(thisray.rorg, thisray.rdir, &ourview, |
685 |
< |
(x+.5)/hresolu, (y+.5)/vresolu) < 0) { |
684 |
> |
if ((thisray.rmax = viewray(thisray.rorg, thisray.rdir, |
685 |
> |
&ourview, (x+.5)/hresolu, (y+.5)/vresolu)) < -FTINY) { |
686 |
|
error(COMMAND, "not on image"); |
687 |
|
return; |
688 |
|
} |
699 |
|
if (thisray.ro == NULL) |
700 |
|
(*dev->comout)("ray hit nothing"); |
701 |
|
else { |
702 |
< |
sprintf(buf, "ray hit %s %s \"%s\"", |
703 |
< |
objptr(thisray.ro->omod)->oname, |
702 |
> |
sprintf(buf, "ray hit %s%s %s \"%s\"", |
703 |
> |
thisray.rod < 0.0 ? "back of " : "", |
704 |
> |
thisray.ro->omod == OVOID ? VOIDID : |
705 |
> |
objptr(thisray.ro->omod)->oname, |
706 |
|
ofun[thisray.ro->otype].funame, |
707 |
|
thisray.ro->oname); |
708 |
+ |
if ((ino = objptr(thisray.robj)) != thisray.ro) |
709 |
+ |
sprintf(buf+strlen(buf), " in %s \"%s\"", |
710 |
+ |
ofun[ino->otype].funame, ino->oname); |
711 |
|
(*dev->comout)(buf); |
712 |
|
(*dev->comin)(buf, NULL); |
713 |
|
if (thisray.rot >= FHUGE) |
714 |
|
(*dev->comout)("at infinity"); |
715 |
|
else { |
716 |
< |
sprintf(buf, "at (%.6g %.6g %.6g)", thisray.rop[0], |
717 |
< |
thisray.rop[1], thisray.rop[2]); |
716 |
> |
sprintf(buf, "at (%.6g %.6g %.6g) (%.6g)", |
717 |
> |
thisray.rop[0], thisray.rop[1], |
718 |
> |
thisray.rop[2], thisray.rt); |
719 |
|
(*dev->comout)(buf); |
720 |
|
} |
721 |
|
(*dev->comin)(buf, NULL); |
722 |
< |
sprintf(buf, "value (%.5g %.5g %.5g) (%.1fL)", |
722 |
> |
sprintf(buf, "value (%.5g %.5g %.5g) (%.3gL)", |
723 |
|
colval(thisray.rcol,RED), |
724 |
|
colval(thisray.rcol,GRN), |
725 |
|
colval(thisray.rcol,BLU), |
730 |
|
} |
731 |
|
|
732 |
|
|
733 |
+ |
void |
734 |
|
writepict(s) /* write the picture to a file */ |
735 |
|
char *s; |
736 |
|
{ |
740 |
|
COLR *scanline; |
741 |
|
int y; |
742 |
|
|
743 |
< |
if (sscanf(s, "%s", buf) != 1 && buf[0] == '\0') { |
743 |
> |
while (isspace(*s)) |
744 |
> |
s++; |
745 |
> |
if (*s) |
746 |
> |
atos(buf, sizeof(buf), s); |
747 |
> |
else if (buf[0] == '\0') { |
748 |
|
error(COMMAND, "no file"); |
749 |
|
return; |
750 |
|
} |
754 |
|
error(COMMAND, errmsg); |
755 |
|
return; |
756 |
|
} |
757 |
+ |
SET_FILE_BINARY(fp); |
758 |
|
(*dev->comout)("writing \""); |
759 |
|
(*dev->comout)(fname); |
760 |
|
(*dev->comout)("\"...\n"); |
761 |
|
/* write header */ |
762 |
+ |
newheader("RADIANCE", fp); |
763 |
|
fputs(progname, fp); |
764 |
|
fprintview(&ourview, fp); |
765 |
|
if (octname != NULL) |
767 |
|
else |
768 |
|
putc('\n', fp); |
769 |
|
fprintf(fp, "SOFTWARE= %s\n", VersionID); |
770 |
+ |
fputnow(fp); |
771 |
|
if (exposure != 1.0) |
772 |
|
fputexpos(exposure, fp); |
773 |
|
if (dev->pixaspect != 1.0) |
788 |
|
if (fwritecolrs(scanline, hresolu, fp) < 0) |
789 |
|
break; |
790 |
|
} |
791 |
< |
free((char *)scanline); |
791 |
> |
free((void *)scanline); |
792 |
|
if (fclose(fp) < 0) |
793 |
|
error(COMMAND, "write error"); |
794 |
|
} |